Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2013-01-12 14:53:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-28 17:02:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2013-01-12 14:53:46.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Jan 11 22:38:46 UTC 2013 - [email protected] + +- Fixed to correctly apply STP constrains also to float time + values with a 1/100 sec precision (bnc#753387,bnc#794720). + [0002-ifup-bridge-handle-1-100-sec-precision-stp-times.patch] +- Updated bridge documentation link in ifcfg-bridge.5 (bnc#791553). + [0001-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch] + +------------------------------------------------------------------- New: ---- 0001-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch 0002-ifup-bridge-handle-1-100-sec-precision-stp-times.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.5ctmYN/_old 2013-01-12 14:53:47.000000000 +0100 +++ /var/tmp/diff_new_pack.5ctmYN/_new 2013-01-12 14:53:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sysconfig # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,8 @@ %define udevdir /lib/udev %endif Source: %name-%version.tar.bz2 +Patch1: 0001-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch +Patch2: 0002-ifup-bridge-handle-1-100-sec-precision-stp-times.patch %description This package provides the SuSE system configuration scheme and the @@ -59,6 +61,8 @@ %prep %setup -n sysconfig-%{version} +%patch1 -p1 +%patch2 -p1 %build autoreconf --force --install ++++++ 0001-Updated-bridge-documentation-link-in-ifcfg-bridge.5.patch ++++++ >From 122abfa7b7142079e911645937a9d8fb78faf37c Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Mon, 7 Jan 2013 11:38:11 +0100 Subject: [PATCH] Updated bridge documentation link in ifcfg-bridge.5 References: bnc#791553 Upstream: yes --- doc/ifcfg-bridge.5 | 2 +- 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/doc/ifcfg-bridge.5 b/doc/ifcfg-bridge.5 index 5610262..f14c9a7 100644 --- a/doc/ifcfg-bridge.5 +++ b/doc/ifcfg-bridge.5 @@ -86,7 +86,7 @@ Minimal example for a bridge interface on eth0 and eth1, the bridge interface it .SH ADDITIONAL INFORMATION For additional and more general information have a look into -.BR <http://linux-net.osdl.org/index.php/Bridge>. +.BR <http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge>. .SH BUGS Please report bugs at <https://bugzilla.novell.com/index.cgi> -- 1.7.10.4 ++++++ 0002-ifup-bridge-handle-1-100-sec-precision-stp-times.patch ++++++ >From b01baa692de64a53dd57438f4677dcf34973fbec Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Tue, 8 Jan 2013 15:38:59 +0100 Subject: [PATCH] ifup-bridge: handle 1/100 sec precision stp times References: bnc#753387,bnc#794720 Upstream: yes --- scripts/ifup-bridge | 14 +++++++++++--- 1 Datei geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) diff --git a/scripts/ifup-bridge b/scripts/ifup-bridge index 47e8993..ea717af 100755 --- a/scripts/ifup-bridge +++ b/scripts/ifup-bridge @@ -95,19 +95,27 @@ apply_constraints() local -i min=$(($2)) local -i max=$(($3)) local def=$4 + local val=${!var} + local tmp - test -n "${!var}" || return - if test $((${!var})) -lt $min ; then + case $val in + "") return 0 ;; + *[,.]*) tmp=${val##*[.,]} + val=$((${val%%[.,]*} * 100 + ${tmp:0:2})) ;; + *) val=$(($val * 100)) ;; + esac + if test $((${val})) -lt $(($min * 100)) ; 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 + elif test $((${val})) -gt $(($max * 100)) ; then def=${def:-$max} message_if_not_run_from_rc \ "Warning: Correcting $var from ${!var} to $def" eval "${var}=$def" fi + return 0 } ###################################################################### -- 1.7.10.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
