commit bca84613517dba9906af800c8cd50c1c8edd6a51
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Mar 18 09:31:46 2013 +0100
- up to 0.4.5.5; fixes static-rules order and other things
rc-scripts-dot_named_ifaces.patch | 31 -------------------------------
rc-scripts-usbfs.patch | 13 -------------
rc-scripts.spec | 10 +++-------
3 files changed, 3 insertions(+), 51 deletions(-)
---
diff --git a/rc-scripts.spec b/rc-scripts.spec
index 1f2e3ab..1a4f22f 100644
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,18 +8,16 @@ 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.4
-Release: 6
+Version: 0.4.5.5
+Release: 1
License: GPL v2
Group: Base
#Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
-# Source0-md5: e073e75ca6220e463bd659d25feefde6
+# Source0-md5: e6f5f1d3afcdad7e0d808ffaaa8e2aba
Source1: rc-local.service
Source2: sys-chroots.service
Source3: %{name}.tmpfiles
-Patch0: %{name}-dot_named_ifaces.patch
-Patch1: %{name}-usbfs.patch
URL: http://svn.pld-linux.org/trac/svn/wiki/packages/rc-scripts
BuildRequires: autoconf
BuildRequires: automake
@@ -118,8 +116,6 @@ programcıklar içerir.
%prep
%setup -q
-%patch0 -p0
-%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"
diff --git a/rc-scripts-dot_named_ifaces.patch
b/rc-scripts-dot_named_ifaces.patch
deleted file mode 100644
index 224a994..0000000
--- a/rc-scripts-dot_named_ifaces.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: lib/ifup
-===================================================================
---- lib/ifup (revision 12567)
-+++ lib/ifup (working copy)
-@@ -24,6 +24,8 @@
- # device name must be ifcfg-somename
- DEV=$1
-
-+SYSCTLDEVICE=$(echo ${DEVICE} | sed 's/\./\//g')
-+
- [ -z "$DEV" ] && {
- nls "Usage: %s <device name>" "ifup" >&2
- exit 1
-@@ -118,7 +120,7 @@
- fi
-
- if is_yes "${IPV6_NETWORKING}" && is_yes "${IPV6_DISABLE_AUTOCONF}"; then
-- run_cmd "Disabling IPv6 autoconfiguration" sysctl -w
net.ipv6.conf.${DEVICE}.autoconf=0
-+ run_cmd "Disabling IPv6 autoconfiguration" sysctl -w
net.ipv6.conf.${SYSCTLDEVICE}.autoconf=0
- fi
-
- if is_wireless_device "${DEVICE}"; then
-@@ -232,7 +234,7 @@
-
- # device have to have ip address set before
- if is_yes "$PROXYARP"; then
-- run_cmd "$(nls 'Enabling proxy ARP on %s' "${DEVICE}")" sysctl -w
net.ipv4.conf.${DEVICE}.proxy_arp=1
-+ run_cmd "$(nls 'Enabling proxy ARP on %s' "${DEVICE}")" sysctl -w
net.ipv4.conf.${SYSCTLDEVICE}.proxy_arp=1
- fi
-
- if [ "$HANDLING" = "3" ]; then
diff --git a/rc-scripts-usbfs.patch b/rc-scripts-usbfs.patch
deleted file mode 100644
index 7df40d2..0000000
--- a/rc-scripts-usbfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rc.d/rc.sysinit
-===================================================================
---- rc.d/rc.sysinit (wersja 12628)
-+++ rc.d/rc.sysinit (kopia robocza)
-@@ -335,7 +335,7 @@
- fi
- fi
-
-- if [ "$usb" = "1" ] && ! is_fsmounted usbfs /proc/bus/usb ; then
-+ if [ "$usb" = "1" -a -d /proc/bus/usb ] && ! is_fsmounted usbfs
/proc/bus/usb ; then
- run_cmd "Mounting USB filesystem" mount -n -t usbfs -o
devgid=78,devmode=664 usbfs /proc/bus/usb
- fi
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rc-scripts.git/commitdiff/bca84613517dba9906af800c8cd50c1c8edd6a51
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
