commit sysconfig for openSUSE:Factory
Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Tue Jan 18 11:44:28 CET 2011. -------- --- sysconfig/sysconfig.changes 2011-01-07 17:37:56.000000000 +0100 +++ sysconfig/sysconfig.changes 2011-01-18 11:12:17.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 18 10:10:56 UTC 2011 - mt@suse.de + +- Use gawk directly as in our dependencies instead of just awk, + that is a /etc/alternatives link, that may be broken in rare + cases (bnc#664726). +- Fixed typo in doc/ifcfg.5, IPv4 autoip, not IPv6 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-Fixed-typo-in-doc-ifcfg.5-IPv4-autoip-not-IPv6.patch 0002-Use-gawk-directly-instead-of-just-awk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.yFPt6G/_old 2011-01-18 11:38:46.000000000 +0100 +++ /var/tmp/diff_new_pack.yFPt6G/_new 2011-01-18 11:38:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.74.4) +# spec file for package sysconfig # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.74.4 -Release: 1 +Release: 2 Summary: The system configuration scheme Url: http://gitorious.org/opensuse/sysconfig Group: System/Base @@ -32,6 +32,8 @@ Requires: iproute2 dbus-1 procps BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch1: 0001-Fixed-typo-in-doc-ifcfg.5-IPv4-autoip-not-IPv6.patch +Patch2: 0002-Use-gawk-directly-instead-of-just-awk.patch %description This package provides the SuSE system configuration scheme and @@ -51,6 +53,8 @@ %prep %setup -n sysconfig-%{version} +%patch1 -p1 +%patch2 -p1 %build autoreconf --force --install ++++++ 0001-Fixed-typo-in-doc-ifcfg.5-IPv4-autoip-not-IPv6.patch ++++++
From 90f06b9bea0fb203bb4beaa9a51165f1fe234fa5 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Mon, 10 Jan 2011 12:15:36 +0100 Subject: [PATCH 1/2] Fixed typo in doc/ifcfg.5, IPv4 autoip, not IPv6
--- doc/ifcfg.5 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/ifcfg.5 b/doc/ifcfg.5 index d585279..64f4e14 100644 --- a/doc/ifcfg.5 +++ b/doc/ifcfg.5 @@ -123,7 +123,7 @@ destination (network) configured by dhcp clients on this interface. .TP .B autoip dhcp+autoip .br -may be used for a IPv6 zeroconf setup or as fall back to autoip if dhcp fails. +may be used for a IPv4 zeroconf setup or as fall back to autoip if dhcp fails. .TP .BR 6to4 .br -- 1.7.1 ++++++ 0002-Use-gawk-directly-instead-of-just-awk.patch ++++++
From 09584c5bf36c7f2a2cf6d3b4cdb2637dc5426785 Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski
Date: Tue, 18 Jan 2011 10:46:20 +0100 Subject: [PATCH 2/2] Use gawk directly instead of just awk
Use gawk directly as in our dependencies instead of just awk,
that is a /etc/alternatives link, that may be broken in rare
cases (bnc#664726).
---
scripts/functions.netconfig | 6 +++---
scripts/ifup | 2 +-
scripts/ifup-802.1q | 4 ++--
scripts/ifup-dhcp | 8 ++++----
scripts/ifup-route | 4 ++--
scripts/ifup-sysctl | 2 +-
scripts/ifup-wireless | 4 ++--
scripts/oldnet2new.sh | 12 ++++++------
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/scripts/functions.netconfig b/scripts/functions.netconfig
index b53d8f6..624de67 100644
--- a/scripts/functions.netconfig
+++ b/scripts/functions.netconfig
@@ -156,7 +156,7 @@ netconfig_check_md5_and_move()
_read_erx_data()
{
test "x${1}" = x && return 1
- awk -v erx="${2}" '
+ gawk -v erx="${2}" '
{ if(length(erx) && match($0, erx) > 0) { print $0; next; } }
!/^#|^[[:space:]]*$/ { print $0; }
' "$1"
@@ -165,7 +165,7 @@ netconfig_check_md5_and_move()
# use old erx if set
OLD_ERX="${NEW_ERX}"
if test -s "$MD5FILE" ; then
- OLD_ERX=`awk -- '/^#/ { if(NR==1) print substr($0,2); }' \
+ OLD_ERX=`gawk -- '/^#/ { if(NR==1) print substr($0,2); }' \
"$MD5FILE" 2>/dev/null`
fi
SRCMD5SUM=`_read_erx_data "$SRCFILE" "$OLD_ERX" | md5sum`
@@ -242,7 +242,7 @@ netconfig_check_md5_and_move()
netconfig_kv_filter()
{
# force portable "C" locale to match valid identifiers
- LANG=C LC_ALL=C awk -- '/^[[:space:]]*$/ { next; }
+ LANG=C LC_ALL=C gawk -- '/^[[:space:]]*$/ { next; }
/^[[:space:]]*[a-zA-Z_][a-zA-Z0-9_]*='"'"'[^'"'"']*'"'"'[[:space:]]*$/ && \
!/^[[:space:]]*_+=/ {
sub("^[[:space:]]+", "", $0);
diff --git a/scripts/ifup b/scripts/ifup
index c97efeb..5c445d0 100755
--- a/scripts/ifup
+++ b/scripts/ifup
@@ -280,7 +280,7 @@ fi
######################################################################
# Normalize some values in the config
#
-BOOTPROTO=$(echo "${BOOTPROTO}" | awk '{print tolower($0);}')
+BOOTPROTO=$(echo "${BOOTPROTO}" | gawk '{print tolower($0);}')
######################################################################
diff --git a/scripts/ifup-802.1q b/scripts/ifup-802.1q
index 9bded41..66c84ba 100644
--- a/scripts/ifup-802.1q
+++ b/scripts/ifup-802.1q
@@ -96,7 +96,7 @@ fi
#
get_proc_name_type()
{
- awk -- '/^Name-Type:/ { print $2;}' /proc/net/vlan/config 2>/dev/null
+ gawk -- '/^Name-Type:/ { print $2;}' /proc/net/vlan/config 2>/dev/null
}
map_proc_to_vconfig()
{
@@ -109,7 +109,7 @@ map_proc_to_vconfig()
}
get_vlan_iface_name()
{
- awk -v vid="$1" -v dev="$2" -- 'BEGIN{ nt=0; }
+ gawk -v vid="$1" -v dev="$2" -- 'BEGIN{ nt=0; }
/^Name-Type:/ { nt=1; next; }
nt && $3 == vid && $5 == dev { print $1; }' \
/proc/net/vlan/config 2>/dev/null
diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp
index e46c6c8..1052a16 100755
--- a/scripts/ifup-dhcp
+++ b/scripts/ifup-dhcp
@@ -107,7 +107,7 @@ fi
#
explicit_dhcp4=no
explicit_dhcp6=no
-BOOTPROTO=$(echo "$BOOTPROTO" | awk '{print tolower($0);}')
+BOOTPROTO=$(echo "$BOOTPROTO" | gawk '{print tolower($0);}')
# Override with iSCSI Boot Firmware Table (feature 308283, bnc 542225)
if [ "$INTERFACE" != "all" -a "${BOOTPROTO}" = "ibft" ] ; then
IBFT=yes # not used at the moment... remember before override
@@ -367,7 +367,7 @@ start_dhcp4_dhclient() {
esac
test -n "$DHCLIENT_HOSTNAME_OPTION" && args="$args -H $DHCLIENT_HOSTNAME_OPTION"
- rm -f "$DHCPIFCONF" && awk '
+ rm -f "$DHCPIFCONF" && gawk '
/#/ { sub("#.*", ""); }
/^[ \t]*$/ { next; }
{ print $0; }
@@ -428,7 +428,7 @@ start_dhcp6_dhclient() {
esac
test -n "$DHCLIENT6_HOSTNAME_OPTION" && args="$args -H $DHCLIENT6_HOSTNAME_OPTION"
- rm -f "$DHCP6IFCONF" && awk '
+ rm -f "$DHCP6IFCONF" && gawk '
/#/ { sub("#.*", ""); }
/^[ \t]*$/ { next; }
{ print $0; }
@@ -695,7 +695,7 @@ case "$ACTION" in
(dhcp6) test -n "$DHCP6_STATUS" || MESSAGE="$MESSAGE $BOOTPROTO" ;;
esac
done
- MESSAGE=$(echo ${MESSAGE} | awk '{print toupper($0);}')
+ MESSAGE=$(echo ${MESSAGE} | gawk '{print toupper($0);}')
if [ "$RUN_FROM_RC" = "yes" ]; then
print_mesg mesg_n "Starting ${MESSAGE// /+} client"
else
diff --git a/scripts/ifup-route b/scripts/ifup-route
index ae8b496..48dabfa 100755
--- a/scripts/ifup-route
+++ b/scripts/ifup-route
@@ -110,7 +110,7 @@ test -f $EXTRAROUTECONF || EXTRAROUTECONF=""
# initialize route protos used in files we should consider
# in the ifstatus check (usually not used, see bnc#572205)
if [ "$ACTION" = status ] ; then
- ROUTE_PROTOS=`LANG=C LC_ALL=C awk -- \
+ ROUTE_PROTOS=`LANG=C LC_ALL=C gawk -- \
'$1 !~ /^(#.*)?$/ {
if(match($0,"proto ([^ ]+)",p)) {
l=length(l) > 0 ? l"|"p[1] : p[1]
@@ -124,7 +124,7 @@ fi
filter_routes()
{
- LANG=C LC_ALL=C awk -vrp="$ROUTE_PROTOS" -- \
+ LANG=C LC_ALL=C gawk -vrp="$ROUTE_PROTOS" -- \
'/proto [^ ]+/ {
if(length(rp) > 0 && match($0,"proto ("rp")")) {
print $0;
diff --git a/scripts/ifup-sysctl b/scripts/ifup-sysctl
index 1d91417..5b30dd5 100755
--- a/scripts/ifup-sysctl
+++ b/scripts/ifup-sysctl
@@ -111,7 +111,7 @@ get_interface_sysctls()
test -n "$IF" -a -n "$CF" || return 1
LANG=C LC_ALL=C \
- awk -vI="$IF" -- 'BEGIN{S=I; gsub("\\.", "/", S);}
+ gawk -vI="$IF" -- 'BEGIN{S=I; gsub("\\.", "/", S);}
{ gsub("\\$INTERFACE", I); gsub("\\$SYSCTL_IF", S); print $0; }
' `ifsysctl_files "$CF"` 10) for (i=0;i<26-length();i++) KEY=KEY"0"
for (i=1;i
participants (1)
-
root@hilbert.suse.de