- Version: 0.4.4.2

Changed files:
    rc-scripts-routes6.patch -> 1.2
    rc-scripts.spec -> 1.360

diff --git a/rc-scripts-routes6.patch b/rc-scripts-routes6.patch
deleted file mode 100644 (file)
index 6302744..0000000
--- a/rc-scripts-routes6.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-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 ()

diff --git a/rc-scripts.spec b/rc-scripts.spec
index 7f6375704465367b998c9284aa855859de2f8910..0c94a1da15176c437e91b7569f85da4ab4551508 100644 (file)
--- a/rc-scripts.spec
+++ b/rc-scripts.spec
@@ -8,13 +8,12 @@ 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.4.1
-Release:       7
+Version:       0.4.4.2
+Release:       1
 License:       GPL v2
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.gz
-# Source0-md5: ff522ac3a98dc6c8c0c891f91a164ec2
-Patch0:                %{name}-routes6.patch
+# Source0-md5: 6e62fd462f8cdfe1e72957ee504a6ee6
 URL:           http://svn.pld-linux.org/cgi-bin/viewsvn/rc-scripts/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -112,7 +111,6 @@ programcıklar içerir.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__aclocal}