From 93330f9a026535da6eea1e3e6b7312e3da463e25 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 28 Jul 2010 16:29:20 +0200 Subject: [PATCH] etcnet: Updated (0.9.7 -> 0.9.10) (also added upstream fixes) --- ...oved-unintentionally-left-debug-line.patch | 41 +++++++ ...eparator-match-in-locale-insensitive.patch | 100 ++++++++++++++++++ ...-VARPREFIX-in-sysctl-completion-code.patch | 41 +++++++ ...ix-when-handling-special-route-types.patch | 43 ++++++++ network/etcnet/etcnet.desc | 6 +- 5 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 network/etcnet/0001-removed-unintentionally-left-debug-line.patch create mode 100644 network/etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch create mode 100644 network/etcnet/0003-fix-use-of-VARPREFIX-in-sysctl-completion-code.patch create mode 100644 network/etcnet/0004-do-not-add-dev-xxx-suffix-when-handling-special-route-types.patch diff --git a/network/etcnet/0001-removed-unintentionally-left-debug-line.patch b/network/etcnet/0001-removed-unintentionally-left-debug-line.patch new file mode 100644 index 000000000..c9b730714 --- /dev/null +++ b/network/etcnet/0001-removed-unintentionally-left-debug-line.patch @@ -0,0 +1,41 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../etcnet/0001-removed-unintentionally-left-debug-line.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From 221cbec3b0f5c83e1bc64209fd2068dad4fd3283 Mon Sep 17 00:00:00 2001 +From: Sergey Bolshakov +Date: Sun, 17 Jan 2010 17:32:00 +0300 +Subject: [PATCH 1/4] removed unintentionally left debug line + +--- + etc/net/scripts/ifdown-removable | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/etc/net/scripts/ifdown-removable b/etc/net/scripts/ifdown-removable +index 469d5f4..cfe38a8 100755 +--- a/etc/net/scripts/ifdown-removable ++++ b/etc/net/scripts/ifdown-removable +@@ -2,8 +2,6 @@ + + # This script is a hook for hotplug or pcmcia-cs. + +-/sbin/ip ad > /tmp/ipad +- + usage() + { + echo "Usage: $0 " >&2 +-- +1.6.6.2 + diff --git a/network/etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch b/network/etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch new file mode 100644 index 000000000..ae0a13380 --- /dev/null +++ b/network/etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch @@ -0,0 +1,100 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../etcnet/0002-redo-BOOTPROTO-separator-match-in-locale-insensitive.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From 670cedacc62048bbfa8e46d58d27786d67170870 Mon Sep 17 00:00:00 2001 +From: Sergey Bolshakov +Date: Sun, 17 Jan 2010 17:52:03 +0300 +Subject: [PATCH 2/4] redo BOOTPROTO separator match in locale-insensitive manner + +--- + etc/net/scripts/config-ipv4 | 6 +++--- + etc/net/scripts/ifdown | 4 ++-- + etc/net/scripts/ifdown-ifplugd | 2 +- + etc/net/scripts/ifdown-removable | 2 +- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/etc/net/scripts/config-ipv4 b/etc/net/scripts/config-ipv4 +index c4c0b9d..ce6dc0e 100755 +--- a/etc/net/scripts/config-ipv4 ++++ b/etc/net/scripts/config-ipv4 +@@ -33,13 +33,13 @@ case $ACTION in + ipv4ll) + try_ipv4ll && config_ipv4_routes_rules add + ;; +- dhcp[\ -,]static) ++ dhcp[-,\ ]static) + try_dhcp || try_static && config_ipv4_routes_rules add + ;; +- dhcp[\ -,]ipv4ll) ++ dhcp[-,\ ]ipv4ll) + try_dhcp || try_ipv4ll && config_ipv4_routes_rules add + ;; +- dhcp[\ -,]ipv4ll[\ -,]static) ++ dhcp[-,\ ]ipv4ll[-,\ ]static) + try_dhcp || try_ipv4ll || try_static && config_ipv4_routes_rules add + ;; + *) +diff --git a/etc/net/scripts/ifdown b/etc/net/scripts/ifdown +index 60db2df..76ccac1 100755 +--- a/etc/net/scripts/ifdown ++++ b/etc/net/scripts/ifdown +@@ -59,7 +59,7 @@ xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME" + + # Look if there is DHCP agent hanging around. + case "$BOOTPROTO" in +- dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static) ++ dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static) + stop_dhcp_client + ;; + *) +@@ -68,7 +68,7 @@ esac + + # Kill ipv4ll agent, if any. + case "$BOOTPROTO" in +- ipv4ll|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static) ++ ipv4ll|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static) + stop_ipv4ll_client + ;; + *) +diff --git a/etc/net/scripts/ifdown-ifplugd b/etc/net/scripts/ifdown-ifplugd +index b03320b..86e9a05 100755 +--- a/etc/net/scripts/ifdown-ifplugd ++++ b/etc/net/scripts/ifdown-ifplugd +@@ -46,7 +46,7 @@ fi + xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME" + + case "$BOOTPROTO" in +- dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll[\ -,]static) ++ dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll[-,\ ]static) + stop_dhcp_client + ;; + *) +diff --git a/etc/net/scripts/ifdown-removable b/etc/net/scripts/ifdown-removable +index cfe38a8..c631fab 100755 +--- a/etc/net/scripts/ifdown-removable ++++ b/etc/net/scripts/ifdown-removable +@@ -87,7 +87,7 @@ fi + is_yes "$IFDOWN_CHILDREN" && ifdown_children + xargise_file $MYIFACEDIR/ipneigh "$IP neigh del dev $NAME" + case "$BOOTPROTO" in +- dhcp|dhcp[\ -,]static|dhcp[\ -,]ipv4ll|dhcp[\ -,]ipv4ll[\ -,]static) ++ dhcp|dhcp[-,\ ]static|dhcp[-,\ ]ipv4ll|dhcp[-,\ ]ipv4ll[-,\ ]static) + stop_dhcp_client + ;; + *) +-- +1.6.6.2 + diff --git a/network/etcnet/0003-fix-use-of-VARPREFIX-in-sysctl-completion-code.patch b/network/etcnet/0003-fix-use-of-VARPREFIX-in-sysctl-completion-code.patch new file mode 100644 index 000000000..6eac4281f --- /dev/null +++ b/network/etcnet/0003-fix-use-of-VARPREFIX-in-sysctl-completion-code.patch @@ -0,0 +1,41 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../etcnet/0003-fix-use-of-VARPREFIX-in-sysctl-completion-code.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From 2f8d7bc5e3acf2a75cee38a2c2d295687b897547 Mon Sep 17 00:00:00 2001 +From: Sergey Bolshakov +Date: Sun, 17 Jan 2010 20:00:38 +0300 +Subject: [PATCH 3/4] fix use of VARPREFIX in sysctl completion code + +--- + etc/net/scripts/ifup-common | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/etc/net/scripts/ifup-common b/etc/net/scripts/ifup-common +index 5b85b73..3570077 100755 +--- a/etc/net/scripts/ifup-common ++++ b/etc/net/scripts/ifup-common +@@ -187,6 +187,8 @@ process_sysctl_conf() + print_error "Can't autocomplete sysctl variable name '$VARNAME' in file '$SRCFILE'. Please fix" + return 1 + esac ++ else ++ VARPREFIX= + fi + $SYSCTL -q -w $VARPREFIX$VARNAME=$VARVALUE + done +-- +1.6.6.2 + diff --git a/network/etcnet/0004-do-not-add-dev-xxx-suffix-when-handling-special-route-types.patch b/network/etcnet/0004-do-not-add-dev-xxx-suffix-when-handling-special-route-types.patch new file mode 100644 index 000000000..9fb739f76 --- /dev/null +++ b/network/etcnet/0004-do-not-add-dev-xxx-suffix-when-handling-special-route-types.patch @@ -0,0 +1,43 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../etcnet/0004-do-not-add-dev-xxx-suffix-when-handling-special-route-types.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +From ed74dc8cb0ba0ecd95c75b57e1907ab8c44bb5ba Mon Sep 17 00:00:00 2001 +From: Sergey Bolshakov +Date: Sun, 17 Jan 2010 21:18:17 +0300 +Subject: [PATCH 4/4] do not add 'dev xxx' suffix when handling special route types + +--- + etc/net/scripts/functions-ipv4 | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/etc/net/scripts/functions-ipv4 b/etc/net/scripts/functions-ipv4 +index 5379c68..51625ab 100644 +--- a/etc/net/scripts/functions-ipv4 ++++ b/etc/net/scripts/functions-ipv4 +@@ -157,7 +157,9 @@ config_ipv4_routes_rules() + while read FIRST REST; do + # If 'dev' is not specified, add current dev. + SUFFIX='' +- echo "$FIRST $REST" | egrep -q '[[:space:]]dev[[:space:]]' || SUFFIX="dev $NAME" ++ if ! echo "$FIRST $REST" | egrep -q '(^|[[:space:]])(throw|unreachable|prohibit|blackhole)[[:space:]]'; then ++ echo "$FIRST $REST" | egrep -q '[[:space:]]dev[[:space:]]' || SUFFIX="dev $NAME" ++ fi + # If operation is not specified, use 'append'. + case "$FIRST" in + add|change|append|replace) +-- +1.6.6.2 + diff --git a/network/etcnet/etcnet.desc b/network/etcnet/etcnet.desc index 88f704943..72afb7e89 100644 --- a/network/etcnet/etcnet.desc +++ b/network/etcnet/etcnet.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../etcnet/etcnet.desc -[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -35,7 +35,7 @@ [L] GPL [S] Stable -[V] 0.9.7 +[V] 0.9.10 [P] O -----5---9 203.000 -[D] 900094116 etcnet-0.9.7.tar.gz http://etcnet.org/files/ +[D] 695512928 etcnet-0.9.10.tar.gz !http://git.altlinux.org/people/sbolshakov/packages/?p=etcnet.git;a=snapshot;h=df3b41bff8e33a860d93fffd77b725c5145474b4;sf=tgz