Author: baggins Date: Mon Mar 21 23:15:57 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 2 - added static-routes6 feature from SVN
---- Files affected: packages/rc-scripts: rc-scripts.spec (1.352 -> 1.353) , rc-scripts-routes6.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/rc-scripts/rc-scripts.spec diff -u packages/rc-scripts/rc-scripts.spec:1.352 packages/rc-scripts/rc-scripts.spec:1.353 --- packages/rc-scripts/rc-scripts.spec:1.352 Mon Mar 21 21:18:20 2011 +++ packages/rc-scripts/rc-scripts.spec Tue Mar 22 00:15:52 2011 @@ -10,11 +10,12 @@ Summary(tr.UTF-8): inittab ve /etc/rc.d dosyaları Name: rc-scripts Version: 0.4.4.1 -Release: 1 +Release: 2 License: GPL v2 Group: Base Source0: ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz # Source0-md5: ff522ac3a98dc6c8c0c891f91a164ec2 +Patch0: %{name}-routes6.patch URL: http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/ BuildRequires: autoconf BuildRequires: automake @@ -111,6 +112,7 @@ %prep %setup -q +%patch0 -p1 %build %{__aclocal} @@ -343,6 +345,7 @@ %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-arp %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-nat %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/static-routes6 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/system %{_mandir}/man?/* @@ -363,6 +366,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.353 2011/03/21 23:15:52 baggins +- rel 2 +- added static-routes6 feature from SVN + Revision 1.352 2011/03/21 20:18:20 baggins - drop the fraking static-rules link, it adds nothing but confusion and it's not referenced anywhere ================================================================ Index: packages/rc-scripts/rc-scripts-routes6.patch diff -u /dev/null packages/rc-scripts/rc-scripts-routes6.patch:1.1 --- /dev/null Tue Mar 22 00:15:57 2011 +++ packages/rc-scripts/rc-scripts-routes6.patch Tue Mar 22 00:15:52 2011 @@ -0,0 +1,141 @@ +Index: rc-scripts/doc/sysconfig.txt +=================================================================== +--- rc-scripts/doc/sysconfig.txt (revision 12207) ++++ rc-scripts/doc/sysconfig.txt (working copy) +@@ -61,7 +61,7 @@ + + <device> may be a device name to have the route brought up and + down with the device, or "any" to have the correct devices calculated +- at run time. [type] is optional. RH style isn't supported ! ++ at run time. [type] is optional. RH style isn't supported! + + Also you can set few options after "<gateway>": + tos <tos> +@@ -77,8 +77,12 @@ + protocol <rtproto> + onlink + equalize +- For more informations see iproute2 documentation . ++ For more informations see iproute2 documentation. + ++/etc/sysconfig/static-routes6: ++ ++ Same as /etc/sysconfig/static-routes but for IPv6. ++ + /etc/sysconfig/routed: + + SILENT=yes|no +Index: rc-scripts/sysconfig/static-routes6 +=================================================================== +--- rc-scripts/sysconfig/static-routes6 (revision 0) ++++ rc-scripts/sysconfig/static-routes6 (revision 12210) +@@ -0,0 +1,14 @@ ++# IPv6 specific rules and routes ++ ++# Entry format for ip rule: ++# <rule> ++# Entry format for static route: ++# <device> <network_ip>/<network_mask_length> <other arguments> ++# ++# Combined example: ++ ++#from fec0:2::/32 table 10 ++#eth0 default via fec0:2::1 table 10 ++# ++# route fec0:12::34 via fec0:2::3 via any interface ++#any fec0:12::34 via fec0:2::3 +Index: rc-scripts/sysconfig/Makefile.am +=================================================================== +--- rc-scripts/sysconfig/Makefile.am (revision 12207) ++++ rc-scripts/sysconfig/Makefile.am (working copy) +@@ -10,6 +10,7 @@ + system \ + network \ + static-routes \ ++ static-routes6 \ + static-nat \ + static-arp \ + i18n +Index: rc-scripts/sysconfig/network-scripts/ifup-routes +=================================================================== +--- rc-scripts/sysconfig/network-scripts/ifup-routes (revision 12207) ++++ rc-scripts/sysconfig/network-scripts/ifup-routes (working copy) +@@ -5,7 +5,7 @@ + # Adds static routes which go through device $DEVICE + # Called from ifup-post. + +-if [ ! -f /etc/sysconfig/static-routes ]; then ++if [ ! -f /etc/sysconfig/static-routes -a ! -f /etc/sysconfig/static-routes6 ]; then + return + fi + +@@ -23,6 +23,11 @@ + /sbin/ip route add $args dev $REALDEVICE + done + ++if ! is_no "$IPV6_NETWORKING"; then ++ grep -E "^($DEVICE|any)[[:blank:]]" /etc/sysconfig/static-routes6 | while read device args; do ++ /sbin/ip -6 route add $args dev $REALDEVICE ++ done ++fi + + # based on information from http://avahi.org/wiki/AvahiAutoipd#Routes + if is_yes "$ZEROCONF" && ! /sbin/ip link show dev $REALDEVICE | grep -q POINTOPOINT ; then +Index: rc-scripts/sysconfig/network-scripts/functions.network +=================================================================== +--- rc-scripts/sysconfig/network-scripts/functions.network (revision 12207) ++++ rc-scripts/sysconfig/network-scripts/functions.network (working copy) +@@ -327,6 +327,18 @@ + done + fi + fi ++ is_no "$IPV6_NETWORKING" && return ++ if [ -f /etc/sysconfig/static-routes6 ]; then ++ if [ "$1" = "on" -o "$1" = "yes" ]; then ++ grep -E "^(none|any)[[:blank:]]" /etc/sysconfig/static-routes6 | while read device args; do ++ /sbin/ip -6 route add $args ++ done ++ else ++ grep -E "^(none|any)[[:blank:]]" /etc/sysconfig/static-routes6 | while read device args; do ++ /sbin/ip -6 route del $args 2>/dev/null ++ done ++ fi ++ fi + } + + # Add ONLY IPv4 address (IPv6 address is added automaticly) +@@ -344,6 +356,10 @@ + fi + /sbin/ip route add $args dev lo + done ++ is_no "$IPV6_NETWORKING" && return ++ grep -E "^(lo|any)[[:blank:]]" /etc/sysconfig/static-routes6 | while read device args; do ++ /sbin/ip -6 route add $args dev lo ++ done + } + + set_down_loopback() +@@ -460,10 +476,22 @@ + done + elif is_no "$1"; then + LC_ALL=C /sbin/ip rule show | grep -vE -e "from all lookup (main|default|local) \$" -e " map-to " | while read prio from src args; do +- [ "$src" = "all" ] && ip rule delete $args || ip rule delete $from $src $args ++ [ "$src" = "all" ] && /sbin/ip rule delete $args || /sbin/ip rule delete $from $src $args + done + fi + fi ++ is_no "$IPV6_NETWORKING" && return ++ if [ -f /etc/sysconfig/static-routes6 ]; then ++ if is_yes "$1"; then ++ grep -E "^(from|to|iif|tos|fwmark|dev|pref|priority|prio)[[:blank:]]" /etc/sysconfig/static-routes6 | while read args; do ++ /sbin/ip -6 rule add $args ++ done ++ elif is_no "$1"; then ++ LC_ALL=C /sbin/ip -6 rule show | grep -vE -e "from all lookup (main|default|local) \$" -e " map-to " | while read prio from src args; do ++ [ "$src" = "all" ] && /sbin/ip -6 rule delete $args || /sbin/ip -6 rule delete $from $src $args ++ done ++ fi ++ fi + } + + is_wireless_device () ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.352&r2=1.353&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
