Hello community,
here is the log from the commit of package wicked for openSUSE:Factory checked
in at 2018-11-20 22:24:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wicked (Old)
and /work/SRC/openSUSE:Factory/.wicked.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wicked"
Tue Nov 20 22:24:29 2018 rev:73 rq:649574 version:0.6.52
Changes:
--------
--- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2018-11-08
09:39:18.457742117 +0100
+++ /work/SRC/openSUSE:Factory/.wicked.new.19453/wicked.changes 2018-11-20
22:24:40.730871813 +0100
@@ -1,0 +2,7 @@
+Fri Nov 16 11:38:24 UTC 2018 - m...@suse.de
+
+- version 0.6.52
+- wickedd: fix netdev detection bootstrap race (bsc#1107579)
+- compat: fix ifcfg parsing crash if network/config is missed
+
+-------------------------------------------------------------------
Old:
----
wicked-0.6.51.tar.bz2
New:
----
wicked-0.6.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wicked.spec ++++++
--- /var/tmp/diff_new_pack.5t879D/_old 2018-11-20 22:24:42.310870919 +0100
+++ /var/tmp/diff_new_pack.5t879D/_new 2018-11-20 22:24:42.314870917 +0100
@@ -18,10 +18,10 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.51
+Version: 0.6.52
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
-License: GPL-2.0-only
+License: GPL-2.0
Group: System/Management
Url: https://github.com/openSUSE/wicked
Source0: %{name}-%{version}.tar.bz2
++++++ wicked-0.6.51.tar.bz2 -> wicked-0.6.52.tar.bz2 ++++++
++++ 24604 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/ChangeLog new/wicked-0.6.52/ChangeLog
--- old/wicked-0.6.51/ChangeLog 2018-10-26 14:40:39.000000000 +0200
+++ new/wicked-0.6.52/ChangeLog 2018-11-16 12:30:11.000000000 +0100
@@ -1,3 +1,21 @@
+commit 9d4a7c7b2c2cba06fe1ba4b8523b7a1abe456b99
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Nov 16 12:19:09 2018 +0100
+
+ version 0.6.52
+
+commit e60f6f68c8424755829c446c3565f2a6bad2c418
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Wed Nov 14 11:15:42 2018 +0100
+
+ compat: fix ifcfg parsing crash if network/config is missed
+
+commit 66d6350bf028f2c0941add35f5d8d8f8b24cf832
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Nov 2 12:35:51 2018 +0100
+
+ wickedd: fix netdev bootstrap race (bsc#1107579)
+
commit e8c1ac65b2e2bb5452640d74b518f00669d1809e
Author: Marius Tomaschewski <m...@suse.de>
Date: Fri Oct 26 14:31:10 2018 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/VERSION new/wicked-0.6.52/VERSION
--- old/wicked-0.6.51/VERSION 2018-10-26 14:39:36.000000000 +0200
+++ new/wicked-0.6.52/VERSION 2018-11-16 12:21:32.000000000 +0100
@@ -1 +1 @@
-0.6.51
+0.6.52
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/client/suse/compat-suse.c
new/wicked-0.6.52/client/suse/compat-suse.c
--- old/wicked-0.6.51/client/suse/compat-suse.c 2018-10-26 12:55:25.000000000
+0200
+++ new/wicked-0.6.52/client/suse/compat-suse.c 2018-11-16 11:56:53.000000000
+0100
@@ -1613,7 +1613,7 @@
ni_sysconfig_get_integer(sc, "IFPLUGD_PRIORITY",
&control->link_priority);
}
- if (!(value = ni_sysconfig_get_value(sc, "LINK_REQUIRED")))
+ if (!(value = ni_sysconfig_get_value(sc, "LINK_REQUIRED")) &&
__ni_suse_config_defaults)
value =
ni_sysconfig_get_value(__ni_suse_config_defaults, "LINK_REQUIRED");
if (value) {
/* otherwise assume "auto" */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/compile new/wicked-0.6.52/compile
--- old/wicked-0.6.51/compile 2018-10-26 14:40:32.000000000 +0200
+++ new/wicked-0.6.52/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,348 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2016-01-11.22; # UTC
-
-# Copyright (C) 1999-2017 Free Software Foundation, Inc.
-# Written by Tom Tromey <tro...@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-autom...@gnu.org> or send patches to
-# <automake-patc...@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" "" $nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
- file=$1
- case $file in
- / | /[!/]*) # absolute file, and not a UNC file
- if test -z "$file_conv"; then
- # lazily determine how to convert abs files
- case `uname -s` in
- MINGW*)
- file_conv=mingw
- ;;
- CYGWIN*)
- file_conv=cygwin
- ;;
- *)
- file_conv=wine
- ;;
- esac
- fi
- case $file_conv/,$2, in
- *,$file_conv,*)
- ;;
- mingw/*)
- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- ;;
- cygwin/*)
- file=`cygpath -m "$file" || echo "$file"`
- ;;
- wine/*)
- file=`winepath -w "$file" || echo "$file"`
- ;;
- esac
- ;;
- esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
- func_file_conv "$1"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
- lib=$1
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- lib=$dir/$lib.dll.lib
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- lib=$dir/$lib.lib
- break
- fi
- if test -f "$dir/lib$lib.a"; then
- found=yes
- lib=$dir/lib$lib.a
- break
- fi
- done
- IFS=$save_IFS
-
- if test "$found" != yes; then
- lib=$lib.lib
- fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
- # Assume a capable shell
- lib_path=
- shared=:
- linker_opts=
- for arg
- do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as 'compile cc -o foo foo.c'.
- eat=1
- case $2 in
- *.o | *.[oO][bB][jJ])
- func_file_conv "$2"
- set x "$@" -Fo"$file"
- shift
- ;;
- *)
- func_file_conv "$2"
- set x "$@" -Fe"$file"
- shift
- ;;
- esac
- ;;
- -I)
- eat=1
- func_file_conv "$2" mingw
- set x "$@" -I"$file"
- shift
- ;;
- -I*)
- func_file_conv "${1#-I}" mingw
- set x "$@" -I"$file"
- shift
- ;;
- -l)
- eat=1
- func_cl_dashl "$2"
- set x "$@" "$lib"
- shift
- ;;
- -l*)
- func_cl_dashl "${1#-l}"
- set x "$@" "$lib"
- shift
- ;;
- -L)
- eat=1
- func_cl_dashL "$2"
- ;;
- -L*)
- func_cl_dashL "${1#-L}"
- ;;
- -static)
- shared=false
- ;;
- -Wl,*)
- arg=${1#-Wl,}
- save_ifs="$IFS"; IFS=','
- for flag in $arg; do
- IFS="$save_ifs"
- linker_opts="$linker_opts $flag"
- done
- IFS="$save_ifs"
- ;;
- -Xlinker)
- eat=1
- linker_opts="$linker_opts $2"
- ;;
- -*)
- set x "$@" "$1"
- shift
- ;;
- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
- func_file_conv "$1"
- set x "$@" -Tp"$file"
- shift
- ;;
- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
- func_file_conv "$1" mingw
- set x "$@" "$file"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
- done
- if test -n "$linker_opts"; then
- linker_opts="-link$linker_opts"
- fi
- exec "$@" $linker_opts
- exit 1
-}
-
-eat=
-
-case $1 in
- '')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-autom...@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
- icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
- func_cl_wrapper "$@" # Doesn't return...
- ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as 'compile cc -o foo foo.c'.
- # So we strip '-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no '-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # '.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/config.h.in new/wicked-0.6.52/config.h.in
--- old/wicked-0.6.51/config.h.in 2018-10-26 14:40:38.000000000 +0200
+++ new/wicked-0.6.52/config.h.in 2018-11-16 12:30:04.000000000 +0100
@@ -182,7 +182,8 @@
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
#undef LT_OBJDIR
/* Enable to use rfc4361 DHCPv4 client-id by default */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/missing new/wicked-0.6.52/missing
--- old/wicked-0.6.51/missing 2018-10-26 14:40:32.000000000 +0200
+++ new/wicked-0.6.52/missing 2018-11-16 12:30:04.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2016-01-11.22; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996-2017 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'autom4te' program to be rebuilt."
+ echo "the 'automa4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
@@ -210,6 +210,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/server/main.c new/wicked-0.6.52/server/main.c
--- old/wicked-0.6.51/server/main.c 2018-10-23 17:09:56.000000000 +0200
+++ new/wicked-0.6.52/server/main.c 2018-11-16 11:56:53.000000000 +0100
@@ -304,14 +304,22 @@
void
discover_udev_netdev_state(ni_netdev_t *dev)
{
- if (!dev || ni_netdev_device_is_ready(dev))
+ if (!dev)
return;
- if (ni_netdev_device_always_ready(dev))
- dev->link.ifflags |= NI_IFF_DEVICE_READY;
- else
- if (ni_udev_netdev_is_ready(dev))
- dev->link.ifflags |= NI_IFF_DEVICE_READY;
+ if (!ni_netdev_device_is_ready(dev)) {
+ if (ni_netdev_device_always_ready(dev))
+ dev->link.ifflags |= NI_IFF_DEVICE_READY;
+ else
+ if (ni_udev_netdev_is_ready(dev))
+ dev->link.ifflags |= NI_IFF_DEVICE_READY;
+ }
+
+ /* query ethtool settings which are guarded by ready
+ * flag (rules processed / already renamed by udev)
+ * as ethtool is a query by ifname...
+ */
+ ni_system_ethtool_refresh(dev);
}
void
@@ -340,8 +348,6 @@
for (modem = ni_netconfig_modem_list(nc); modem; modem =
modem->list.next)
ni_objectmodel_register_modem(server, modem);
#endif
- /* refresh to get all (also is_ready only) properties */
- ni_global_state_handle(1);
}
}
@@ -405,7 +411,7 @@
if (!object) {
/* usually a "bad event", e.g. when the underlying
netdev
* does not exists any more, but events still arrive
... */
- ni_debug_events("cannot handle %s event for model
\"%s\" - no dbus object",
+ ni_error("cannot handle %s event for model \"%s\" - no
dbus object",
ni_event_type_to_name(event),
dev->name);
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/wicked-0.6.51/wicked.spec new/wicked-0.6.52/wicked.spec
--- old/wicked-0.6.51/wicked.spec 2018-10-26 14:40:38.000000000 +0200
+++ new/wicked-0.6.52/wicked.spec 2018-11-16 12:30:10.000000000 +0100
@@ -18,7 +18,7 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.51
+Version: 0.6.52
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
License: GPL-2.0
