Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2012-04-12 09:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2012-03-19 10:07:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2012-04-12 09:52:57.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 10 11:22:02 UTC 2012 - [email protected] + +- version 0.76.2 +- ifup-bridge: apply stp contstrains when STP is on (bnc#753387) +- ifup-route: fixed use of -4/6 option for ip route (bnc#745252) + and do not require dummy gateway for ipv4 multicast routes. +- Added tests to the 77-network.rules rule file if the /sbin/ifup + and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775), + disabled ipw3945d.sh script run and updated 81-mount.rules file + to work with more actual udev versions. Thanks to Robert Milasan, + who proposed these changes. + +------------------------------------------------------------------- Old: ---- sysconfig-0.76.1.dif sysconfig-0.76.1.tar.bz2 New: ---- sysconfig-0.76.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.COwIPp/_old 2012-04-12 09:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.COwIPp/_new 2012-04-12 09:52:59.000000000 +0200 @@ -16,9 +16,8 @@ # - Name: sysconfig -Version: 0.76.1 +Version: 0.76.2 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ @@ -27,11 +26,15 @@ PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep # we may create these automatically from rpm later Provides: sysvinit(network) -Requires: iproute2 dbus-1 procps vlan bridge-utils tunctl +Requires: bridge-utils +Requires: dbus-1 +Requires: iproute2 +Requires: procps +Requires: tunctl +Requires: vlan BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 -Patch: %name-%version.dif %description This package provides the SuSE system configuration scheme and the @@ -51,7 +54,6 @@ %prep %setup -n sysconfig-%{version} -%patch %build autoreconf --force --install ++++++ sysconfig-0.76.1.tar.bz2 -> sysconfig-0.76.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/ChangeLog new/sysconfig-0.76.2/ChangeLog --- old/sysconfig-0.76.1/ChangeLog 2012-02-15 20:36:45.000000000 +0100 +++ new/sysconfig-0.76.2/ChangeLog 2012-04-10 13:27:25.000000000 +0200 @@ -1,4 +1,60 @@ -commit 9e303d30189ff34d2d2216c305146b5d23e0d6b6 (HEAD, master) +commit 37d231fd2118c241da16ba183b25779f8ac23bb3 (HEAD, tag: version-0.76.2, origin/master, master) +Author: Marius Tomaschewski <[email protected]> +Date: Tue Apr 10 13:24:45 2012 +0200 + + version 0.76.2, updated changes file + +commit 6f1ba34d41d0962bccf3a8a75ec594f5b82ce5a0 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Apr 4 17:33:08 2012 +0200 + + ifup-bridge: apply stp contstrains when STP is on (bnc#753387) + +commit a4b93ca1031b4975262b226f93132d2770d9e53b +Author: Marius Tomaschewski <[email protected]> +Date: Mon Apr 2 14:10:36 2012 +0200 + + Fixed use of -4/6 option for ip route (bnc#745252) + +commit 3e7824b71e4c58d3a1eea5c3d39f6e6b5e0971b7 +Author: Marius Tomaschewski <[email protected]> +Date: Mon Apr 2 14:08:23 2012 +0200 + + Do not force dummy gateway for multicast routes + +commit 354c753d0bc0abeb99ffc669477d80457219b37f +Author: Werner Fink <[email protected]> +Date: Mon Feb 27 10:46:45 2012 +0000 + + poll.tcpip: avoid fetchmail ownership warnings + + In poll.tcpip avoid warnings messages of fetchmail by using the + ownership of the system wide configuration file /etc/fechmailrc + which should be owned by the user and group mail. + +commit dbd5ec643b2f117f3d2efccc6b60f2ba149930f9 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Mar 14 13:50:53 2012 +0100 + + Corrected IMPORT in hardware/81-mount.rules + + Use IMPORT{program}="udevmountd" instead of IMPORT="udevmountd" + as needed by more actual udev versions (>= udev-128, udev-181 + does not understand it rules without {program} any more). + Thanks to Robert Milasan, who proposed these changes. + +commit 5962731ea2cfaa92f76e0841ff241a198327ba99 +Author: Marius Tomaschewski <[email protected]> +Date: Wed Mar 14 13:50:03 2012 +0100 + + Test if scripts used in 77-network.rules exists + + Added tests to the 77-network.rules rule file if the /sbin/ifup + and /etc/sysconfig/network/scripts/ifup-sysctl exist (bnc#724775). + Also disabled the IMO obsolete ipw3945d.sh script run completely. + Thanks to Robert Milasan, who proposed these changes. + +commit 9e303d30189ff34d2d2216c305146b5d23e0d6b6 (tag: version-0.76.1) Author: Marius Tomaschewski <[email protected]> Date: Wed Feb 15 20:35:59 2012 +0100 @@ -80,7 +136,7 @@ Fixed ipv6 dad / link ready wait time calculation (bnc#697929) -commit bde2672deff775c775b4ad6e331a9721b0bb5db3 (origin/master) +commit bde2672deff775c775b4ad6e331a9721b0bb5db3 Author: Marius Tomaschewski <[email protected]> Date: Wed Jan 4 20:12:25 2012 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/VERSION new/sysconfig-0.76.2/VERSION --- old/sysconfig-0.76.1/VERSION 2012-02-15 20:35:28.000000000 +0100 +++ new/sysconfig-0.76.2/VERSION 2012-04-10 13:17:30.000000000 +0200 @@ -1 +1 @@ -0.76.1 +0.76.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/config/77-network.rules new/sysconfig-0.76.2/config/77-network.rules --- old/sysconfig-0.76.1/config/77-network.rules 2010-11-16 13:37:09.000000000 +0100 +++ new/sysconfig-0.76.2/config/77-network.rules 2012-04-10 13:13:15.000000000 +0200 @@ -1,11 +1,12 @@ # Driver module ipw3945 requires an userspace daemon to register network -# interfaces. -SUBSYSTEM=="drivers", ACTION=="add", DEVPATH=="/bus/pci/drivers/ipw3945", RUN+="ipw3945d.sh" +# interfaces. +# Commented it out -- looks like something old & obsolete. +#SUBSYSTEM=="drivers", ACTION=="add", DEVPATH=="/bus/pci/drivers/ipw3945", TEST=="ipw3945d.sh", RUN+="ipw3945d.sh" # # Apply per interface sysctl settings before setup (see man 5 ifsysctl): # -SUBSYSTEM=="net", ACTION=="add", RUN+="/etc/sysconfig/network/scripts/ifup-sysctl $env{INTERFACE} -o hotplug" +SUBSYSTEM=="net", ACTION=="add", TEST=="/etc/sysconfig/network/scripts/ifup-sysctl", RUN+="/etc/sysconfig/network/scripts/ifup-sysctl $env{INTERFACE} -o hotplug" # # The following rules are to: @@ -21,6 +22,7 @@ # We do it here name based for the well known/default interface names, # ifup makes it again by interface type to catch also custom names. # +SUBSYSTEM=="net", TEST!="/sbin/ifup", GOTO="skip_ifup" SUBSYSTEM=="net", ENV{INTERFACE}=="lo*|dummy*|vif*.*|br*|bond*|vlan*|gre*|sit*|tap*|tun*|ipip*|ip6tnl*|ipsec*|ppp*|ippp*|isdn*|modem*|dsl*|plip*|irda*", GOTO="skip_ifup" SUBSYSTEM=="net", ACTION=="add", RUN+="/sbin/ifup $env{INTERFACE} -o hotplug" SUBSYSTEM=="net", ACTION=="remove", RUN+="/sbin/ifdown %k -o hotplug" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/config/hardware/81-mount.rules new/sysconfig-0.76.2/config/hardware/81-mount.rules --- old/sysconfig-0.76.1/config/hardware/81-mount.rules 2011-06-09 17:44:59.000000000 +0200 +++ new/sysconfig-0.76.2/config/hardware/81-mount.rules 2012-04-10 13:13:15.000000000 +0200 @@ -5,7 +5,7 @@ ACTION=="add", SUBSYSTEM=="block", KERNEL=="md*", GOTO="skip_mount" # don't handle crypto devices, boot.crypto does that already (bnc#569942) ACTION=="change", SUBSYSTEM=="block", KERNEL=="dm-*", ENV{DM_TARGET_TYPES}=="crypt", GOTO="skip_mount" -ACTION=="add|change", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*", IMPORT="udevmountd" +ACTION=="add|change", SUBSYSTEM=="block", ENV{FSTAB_OPTS}=="*nofail*", IMPORT{program}="udevmountd" ACTION=="add|change", ENV{FSCK_STATE}=="unknown|clean", RUN+="udevmountd add" ACTION=="remove", ENV{FSTAB_OPTS}=="*nofail*", RUN+="udevmountd remove" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/configure new/sysconfig-0.76.2/configure --- old/sysconfig-0.76.1/configure 2012-02-15 20:36:33.000000000 +0100 +++ new/sysconfig-0.76.2/configure 2012-04-10 13:27:15.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for sysconfig 0.76.1. +# Generated by GNU Autoconf 2.68 for sysconfig 0.76.2. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.76.1' -PACKAGE_STRING='sysconfig 0.76.1' +PACKAGE_VERSION='0.76.2' +PACKAGE_STRING='sysconfig 0.76.2' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' PACKAGE_URL='' @@ -1301,7 +1301,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.76.1 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.76.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1371,7 +1371,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.76.1:";; + short | recursive ) echo "Configuration of sysconfig 0.76.2:";; esac cat <<\_ACEOF @@ -1473,7 +1473,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.76.1 +sysconfig configure 0.76.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1842,7 +1842,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.76.1, which was +It was created by sysconfig $as_me 0.76.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2661,7 +2661,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.76.1' + VERSION='0.76.2' cat >>confdefs.h <<_ACEOF @@ -12079,7 +12079,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.76.1, which was +This file was extended by sysconfig $as_me 0.76.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12136,7 +12136,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysconfig config.status 0.76.1 +sysconfig config.status 0.76.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/scripts/ifup-bridge new/sysconfig-0.76.2/scripts/ifup-bridge --- old/sysconfig-0.76.1/scripts/ifup-bridge 2012-02-15 19:57:57.000000000 +0100 +++ new/sysconfig-0.76.2/scripts/ifup-bridge 2012-04-10 13:17:06.000000000 +0200 @@ -89,6 +89,28 @@ SYSFS="/sys/class/net" ###################################################################### +apply_constraints() +{ + local var=$1 + local -i min=$(($2)) + local -i max=$(($3)) + local def=$4 + + test -n "${!var}" || return + if test $((${!var})) -lt $min ; then + def=${def:-$min} + message_if_not_run_from_rc \ + "Warning: Correcting $var from ${!var} to $def" + eval "${var}=$def" + elif test $((${!var})) -gt $max ; then + def=${def:-$max} + message_if_not_run_from_rc \ + "Warning: Correcting $var from ${!var} to $def" + eval "${var}=$def" + fi +} + +###################################################################### case $ACTION in up) @@ -175,6 +197,13 @@ # Set flags [ -n "$BRIDGE_AGEINGTIME" ] && brctl setageing "$INTERFACE" "$BRIDGE_AGEINGTIME" [ -n "$BRIDGE_STP" ] && brctl stp "$INTERFACE" "$BRIDGE_STP" + case $BRIDGE_STP in + on) + apply_constraints BRIDGE_FORWARDDELAY 4 30 + apply_constraints BRIDGE_HELLOTIME 1 6 + apply_constraints BRIDGE_MAXAGE 6 40 + ;; + esac [ -n "$BRIDGE_PRIORITY" ] && brctl setbridgeprio "$INTERFACE" "$BRIDGE_PRIORITY" [ -n "$BRIDGE_FORWARDDELAY" ] && brctl setfd "$INTERFACE" "$BRIDGE_FORWARDDELAY" [ -n "$BRIDGE_HELLOTIME" ] && brctl sethello "$INTERFACE" "$BRIDGE_HELLOTIME" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/scripts/ifup-route new/sysconfig-0.76.2/scripts/ifup-route --- old/sysconfig-0.76.1/scripts/ifup-route 2012-02-15 20:33:34.000000000 +0100 +++ new/sysconfig-0.76.2/scripts/ifup-route 2012-04-10 13:13:15.000000000 +0200 @@ -464,6 +464,7 @@ case "$DEST-$INET" in 224.0.0.0*-4|224/4-4) + GWAY=${GWAY:-0.0.0.0} # We are doing multicast if [ -e /proc/net/igmp -a "$GWAY" = 0.0.0.0 \ -a \( "$PFXL" = 4 -o "$DEST" = 224/4 \) ] ; then @@ -502,17 +503,15 @@ fi ;; *) - FOPT="" case "$GWAY" in 0.0.0.0|\*|::) # Add/Delete a local network / device route GWAY="" - FOPT="-$INET" ;; $DEST) test "$PFXL" = 32 -o "$PFXL" = 128 && GWAY="" ;; esac - run_iproute $FOPT $ACTION to $TYPE $DEST ${GWAY:+via $GWAY} $IFACE $IPOPTS + run_iproute -$INET $ACTION to $TYPE $DEST ${GWAY:+via $GWAY} $IFACE $IPOPTS ;; esac ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/scripts/poll.tcpip new/sysconfig-0.76.2/scripts/poll.tcpip --- old/sysconfig-0.76.1/scripts/poll.tcpip 2010-01-20 17:57:54.000000000 +0100 +++ new/sysconfig-0.76.2/scripts/poll.tcpip 2012-04-10 13:13:15.000000000 +0200 @@ -86,13 +86,22 @@ # # Do we get mails with fetchmail over pop3/imap? # We support only a system wide configuration -# file /etc/fetchmailrc. +# file /etc/fetchmailrc. Use the user id of the +# system wide configuration file, e.g. `mail'. +# For this the file /etc/fetchmailrc should have +# the permisssions 0600 and be owned by the user +# and the group `mail' # while true ; do test -x /usr/bin/fetchmail || break test -r /etc/fetchmailrc || break + mailid=$(stat -c '%U' /etc/fetchmailrc) checkproc /usr/bin/fetchmail && break - /usr/bin/fetchmail -f /etc/fetchmailrc + if test -n "$mailid" -a "$mailid" != root && type -p sudo > /dev/null 2>&1 ; then + sudo -u $mailid /usr/bin/fetchmail -f /etc/fetchmailrc + else + /usr/bin/fetchmail -f /etc/fetchmailrc + fi break done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.76.1/sysconfig.spec new/sysconfig-0.76.2/sysconfig.spec --- old/sysconfig-0.76.1/sysconfig.spec 2012-02-15 20:36:37.000000000 +0100 +++ new/sysconfig-0.76.2/sysconfig.spec 2012-04-10 13:27:19.000000000 +0200 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.76.1 +Version: 0.76.2 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
