Author: arekm Date: Wed Mar 23 20:39:09 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; disable ipv6 if it's not enabled in sysconfig/network
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.353 -> 1.354) , rc-scripts-svn.patch (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.353 packages/rc-scripts/rc-scripts.spec:1.354 --- packages/rc-scripts/rc-scripts.spec:1.353 Tue Mar 22 00:15:52 2011 +++ packages/rc-scripts/rc-scripts.spec Wed Mar 23 21:39:04 2011 @@ -10,12 +10,13 @@ Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.4.1 -Release: 2 +Release: 3 License: GPL v2 Group: Base Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz # Source0-md5: ff522ac3a98dc6c8c0c891f91a164ec2 Patch0: %{name}-routes6.patch +Patch1: %{name}-svn.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -113,6 +114,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p0 %build %{__aclocal} @@ -366,6 +368,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.354 2011/03/23 20:39:04 arekm +- rel 3; disable ipv6 if it's not enabled in sysconfig/network + Revision 1.353 2011/03/21 23:15:52 baggins - rel 2 - added static-routes6 feature from SVN ================================================================ Index: packages/rc-scripts/rc-scripts-svn.patch diff -u /dev/null packages/rc-scripts/rc-scripts-svn.patch:1.11 --- /dev/null Wed Mar 23 21:39:09 2011 +++ packages/rc-scripts/rc-scripts-svn.patch Wed Mar 23 21:39:04 2011 @@ -0,0 +1,19 @@ +Index: sysconfig/network-scripts/functions.network +=================================================================== +--- sysconfig/network-scripts/functions.network (wersja 12211) ++++ sysconfig/network-scripts/functions.network (kopia robocza) +@@ -370,8 +370,12 @@ + + modprobe_net() + { +- if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then +- _modprobe single ipv6 ++ if is_yes "$IPV6_NETWORKING" ++ if is_module "ipv6"; then ++ _modprobe single ipv6 ++ fi ++ elif [ -d /proc/sys/net/ipv6 ]; then ++ sysctl -w net.ipv6.conf.all.disable_ipv6=0 + fi + + if is_yes "$IPX" && is_module "ipx"; then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.353&r2=1.354&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts-svn.patch?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
