- 0.4.5.4

- removed svn patches

Changed files:
    rc-scripts-skip_networkmanager_users_config.patch -> 1.2
    rc-scripts-svn.patch -> 1.21
    rc-scripts.spec -> 1.395

diff --git a/rc-scripts-skip_networkmanager_users_config.patch b/rc-scripts-skip_networkmanager_users_config.patch
deleted file mode 100644 (file)
index e81710b..0000000
--- a/rc-scripts-skip_networkmanager_users_config.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- rc-scripts-0.4.5.2/rc.d/init.d/network.orig        2011-12-14 12:23:30.000000000 +0100
-+++ rc-scripts-0.4.5.2/rc.d/init.d/network     2012-01-25 10:37:12.670299072 +0100
-@@ -135,7 +135,8 @@
-                               case $i in
-                                       *ifcfg-lo) continue ;;
-                               esac
--                              ONBOOT=""; . "$i" 2>/dev/null
-+                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
-+                              [ ${USERS:-no} != no ] && continue
-                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
-                       done
-               `
-@@ -145,7 +146,8 @@
-                               case ${i##*/} in
-                                       ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*) continue ;;
-                               esac
--                              ONBOOT=""; . "$i" 2>/dev/null
-+                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
-+                              [ ${USERS:-no} != no ] && continue
-                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
-                       done
-               `
-@@ -156,7 +158,8 @@
-                                       ifcfg-*.*) ;;
-                                       *) continue ;;
-                               esac
--                              ONBOOT=""; . "$i" 2>/dev/null
-+                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
-+                              [ ${USERS:-no} != no ] && continue
-                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
-                       done
-               `
-@@ -167,7 +170,8 @@
-                                       ifcfg-br*) ;;
-                                       *) continue ;;
-                               esac
--                              ONBOOT=""; . "$i" 2>/dev/null
-+                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
-+                              [ ${USERS:-no} != no ] && continue
-                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
-                       done
-               `
-@@ -178,7 +182,8 @@
-                                       ifcfg-sit*) ;;
-                                       *) continue ;;
-                               esac
--                              ONBOOT=""; . "$i" 2>/dev/null
-+                              ONBOOT=""; USERS=""; . "$i" 2>/dev/null
-+                              [ ${USERS:-no} != no ] && continue
-                               [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
-                       done
-               `
-@@ -186,7 +191,8 @@
- 
-       tunnels=$(
-               for i in $(network_interface_configs 'tnlcfg-*'); do
--                      ONBOOT=""; . "$i" 2>/dev/null
-+                      ONBOOT=""; USERS=""; . "$i" 2>/dev/null
-+                      [ ${USERS:-no} != no ] && continue
-                       [ ${ONBOOT:-no} = yes ] && echo "${i##*/tnlcfg-}"
-               done
-       )

diff --git a/rc-scripts-svn.patch b/rc-scripts-svn.patch
deleted file mode 100644 (file)
index 47ffc74..0000000
--- a/rc-scripts-svn.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit    (wersja 12481)
-+++ rc.d/rc.sysinit    (wersja 12485)
-@@ -570,6 +570,10 @@
-       # Load modules
-       if ! use_upstart; then
-               load_kernel_modules modules
-+              for f in /etc/modules-load.d/*.conf ; do
-+                      [ -r $f ] || continue
-+                      load_kernel_modules ${f##/etc/}
-+              done
-       fi
- 
-       if [ -x /sbin/multipath ] && ! is_no "$DM_MULTIPATH"; then
-Index: service
-===================================================================
---- service    (wersja 12481)
-+++ service    (wersja 12485)
-@@ -85,6 +85,14 @@
-               echo "${VERSION}" >&2
-               exit 0
-               ;;
-+      --ignore-dependencies)
-+              export SYSTEMCTL_IGNORE_DEPENDENCIES=1
-+              shift
-+              ;;
-+      --skip-redirect)
-+              export SYSTEMCTL_SKIP_REDIRECT=1
-+              shift
-+              ;;
-       --upstart)
-               USE_UPSTART=yes
-               shift
-@@ -116,7 +124,10 @@
-       esac
- done
- 
--if [ -x "${SERVICEDIR}/${SERVICE}" ]; then
-+if [ -x /bin/systemd_booted ] && /bin/systemd_booted && /bin/systemctl status ${SERVICE}.service > /dev/null 2>&1; then
-+      echo >&2 "Redirecting to /bin/systemctl ${OPTIONS} ${SERVICE}.service"
-+      exec /bin/systemctl ${ACTION} ${SERVICE}.service ${OPTIONS}
-+elif [ -x "${SERVICEDIR}/${SERVICE}" ]; then
-       exec env -i USE_UPSTART=$USE_UPSTART LANG=$LANG PATH=$PATH TERM=$TERM "${SERVICEDIR}/${SERVICE}" ${ACTION} ${OPTIONS}
- else
-       echo "${SERVICE}: unrecognized service" >&2
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit    (wersja 12506)
-+++ rc.d/rc.sysinit    (kopia robocza)
-@@ -173,7 +173,7 @@
-       fi
- 
-       # we need /proc mounted before everything
--      is_fsmounted proc /proc || mount -n -o gid=17 -t proc /proc /proc
-+      is_fsmounted proc /proc || mount -n /proc || mount -n -o gid=17,hidepid=2 -t proc /proc /proc
- 
-       # Only read this once.
-       cmdline=$(cat /proc/cmdline)

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 068c3f9eaab0dbaf6fab0ece0d05f8cf236aab4d..16d4a7ef21b2f370052fa8f9aeaec02608acf030 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,18 +8,18 @@ Summary(fr.UTF-8):    inittab et scripts /etc/rc.d
 Summary(pl.UTF-8):     inittab i skrypty startowe z katalogu /etc/rc.d
 Summary(tr.UTF-8):     inittab ve /etc/rc.d dosyaları
 Name:          rc-scripts
-Version:       0.4.5.3
-Release:       9
+Version:       0.4.5.4
+Release:       0.1
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: ac04b9e70d2bb1583f5ea41dd2d1894e
+#Source0:      %{name}-%{version}.tar.gz
+Source0:       http://duch.mimuw.edu.pl/~baggins/%{name}-%{version}.tar.gz
+# Source0-md5: e073e75ca6220e463bd659d25feefde6
 Source1:       rc-local.service
 Source2:       sys-chroots.service
 Source3:       %{name}.tmpfiles
 URL:           http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
-Patch0:                %{name}-skip_networkmanager_users_config.patch
 Patch1:                %{name}-svn.patch
 BuildRequires: autoconf
 BuildRequires: automake
@@ -119,8 +119,6 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
 
 # hack, currently this results in errno@@GLIBC_PRIVATE symbol in ppp-watch:
 #GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"