Hello community,
here is the log from the commit of package wicked for openSUSE:Factory checked
in at 2015-12-01 10:01:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wicked (Old)
and /work/SRC/openSUSE:Factory/.wicked.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wicked"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2015-11-17
14:21:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.wicked.new/wicked.changes 2015-12-01
10:01:44.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Nov 20 17:06:10 UTC 2015 - m...@suse.de
+
+- version 0.6.29
+- rpm: do not use systemctl show in scripts (bsc#955778)
+ systemctl show makes a systemd query and does not work in
+ a chroot or when systemd is not available and using it in
+ RPM scripts breaks offline update. Replaced with readlink.
+- team: fix to use proper names of ethtool delay options
+- nanny: skip recheck when no policy configured (bsc#953107)
+
+-------------------------------------------------------------------
@@ -3,0 +15 @@
+- version 0.6.28
Old:
----
wicked-0.6.28.tar.bz2
New:
----
wicked-0.6.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wicked.spec ++++++
--- /var/tmp/diff_new_pack.k5Fqjf/_old 2015-12-01 10:01:45.000000000 +0100
+++ /var/tmp/diff_new_pack.k5Fqjf/_new 2015-12-01 10:01:45.000000000 +0100
@@ -18,7 +18,7 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.28
+Version: 0.6.29
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
License: GPL-2.0
@@ -234,8 +234,8 @@
%pre service
# upgrade from sysconfig[-network] scripts
-_id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || :
-if test "x${_id#Id=}" = "xnetwork.service" -a -x /etc/init.d/network ; then
+_id=`readlink /etc/systemd/system/network.service 2>/dev/null` || :
+if test "x${_id##*/}" = "xnetwork.service" -a -x /etc/init.d/network ; then
/etc/init.d/network stop-all-dhcp-clients || :
fi
%{service_add_pre wicked.service}
@@ -244,8 +244,8 @@
%{service_add_post wicked.service}
# See bnc#843526: presets do not apply for upgrade / are not sufficient
# to handle sysconfig-network|wicked -> wicked migration
-_id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || :
-case "${_id#Id=}" in
+_id=`readlink /etc/systemd/system/network.service 2>/dev/null` || :
+case "${_id##*/}" in
""|wicked.service|network.service)
/usr/bin/systemctl --system daemon-reload || :
/usr/bin/systemctl --force enable wicked.service || :
++++++ wicked-0.6.28.tar.bz2 -> wicked-0.6.29.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/ChangeLog new/wicked-0.6.29/ChangeLog
--- old/wicked-0.6.28/ChangeLog 2015-11-12 17:24:17.000000000 +0100
+++ new/wicked-0.6.29/ChangeLog 2015-11-20 17:58:41.000000000 +0100
@@ -1,3 +1,38 @@
+commit f19ee68921b0a6b1835ce385aca6e5d2d916f741
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Nov 20 17:56:10 2015 +0100
+
+ version 0.6.29
+
+commit 4871efb643b4217b25e9bdc75ec631f98236d74b
+Merge: 22ce7ee b3a7119
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Nov 20 17:54:58 2015 +0100
+
+ Merge pull request #613 from mtomaschewski/offline-update
+
+commit b3a7119a9ee9fb267cd855683d4e7a0cded81436
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Nov 20 16:59:07 2015 +0100
+
+ rpm: do not use systemctl show in scripts (bsc#955778)
+
+ systemctl show makes a systemd query and does not work in
+ a chroot or when systemd is not available and using it in
+ RPM scripts breaks offline update. Replaced with readlink.
+
+commit e45820e987e9aca662dc21a996a82e6ad7edf251
+Author: Pawel Wieczorkiewicz <pwieczorkiew...@suse.de>
+Date: Thu Nov 19 16:56:23 2015 +0100
+
+ team: fix proper names of ethtool delay options
+
+commit 82197d2af20da2ba72ae3408e671993d522b5eeb
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Wed Nov 18 13:28:55 2015 +0100
+
+ nanny: skip recheck when no policy configured
+
commit 9f81969f91e015cfda719c878e1b32cf59366757
Author: Marius Tomaschewski <m...@suse.de>
Date: Thu Nov 12 17:22:29 2015 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/VERSION new/wicked-0.6.29/VERSION
--- old/wicked-0.6.28/VERSION 2015-11-12 17:23:03.000000000 +0100
+++ new/wicked-0.6.29/VERSION 2015-11-20 17:55:51.000000000 +0100
@@ -1 +1 @@
-0.6.28
+0.6.29
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/configure new/wicked-0.6.29/configure
--- old/wicked-0.6.28/configure 2015-11-12 17:23:33.000000000 +0100
+++ new/wicked-0.6.29/configure 2015-11-20 17:57:33.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for wicked 0.6.28.
+# Generated by GNU Autoconf 2.69 for wicked 0.6.29.
#
# Report bugs to <http://bugs.opensuse.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='wicked'
PACKAGE_TARNAME='wicked'
-PACKAGE_VERSION='0.6.28'
-PACKAGE_STRING='wicked 0.6.28'
+PACKAGE_VERSION='0.6.29'
+PACKAGE_STRING='wicked 0.6.29'
PACKAGE_BUGREPORT='http://bugs.opensuse.org'
PACKAGE_URL='https://github.com/openSUSE/wicked'
@@ -1385,7 +1385,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 wicked 0.6.28 to adapt to many kinds of systems.
+\`configure' configures wicked 0.6.29 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1455,7 +1455,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wicked 0.6.28:";;
+ short | recursive ) echo "Configuration of wicked 0.6.29:";;
esac
cat <<\_ACEOF
@@ -1609,7 +1609,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wicked configure 0.6.28
+wicked configure 0.6.29
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2208,7 +2208,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wicked $as_me 0.6.28, which was
+It was created by wicked $as_me 0.6.29, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3071,7 +3071,7 @@
# Define the identity of the package.
PACKAGE='wicked'
- VERSION='0.6.28'
+ VERSION='0.6.29'
cat >>confdefs.h <<_ACEOF
@@ -15040,7 +15040,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wicked $as_me 0.6.28, which was
+This file was extended by wicked $as_me 0.6.29, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15107,7 +15107,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-wicked config.status 0.6.28
+wicked config.status 0.6.29
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/nanny/nanny.c
new/wicked-0.6.29/nanny/nanny.c
--- old/wicked-0.6.28/nanny/nanny.c 2015-11-12 17:05:58.000000000 +0100
+++ new/wicked-0.6.29/nanny/nanny.c 2015-11-20 17:54:04.000000000 +0100
@@ -1044,7 +1044,7 @@
void
ni_nanny_recheck_policies(ni_nanny_t *mgr, const ni_string_array_t *ifnames)
{
- ni_fsm_policy_t *policy;
+ ni_fsm_policy_t *policy = NULL;
unsigned int i, count = 0;
if (!ifnames || ifnames->count == 0) {
@@ -1066,6 +1066,7 @@
if (!name || !(policy = ni_fsm_policy_by_name(mgr->fsm,
name))) {
ni_string_free(&name);
ni_debug_application("Not scheduled any recheck
for %s: no policy", ifname);
+ continue;
}
ni_string_free(&name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/src/dbus-objects/team.c
new/wicked-0.6.29/src/dbus-objects/team.c
--- old/wicked-0.6.28/src/dbus-objects/team.c 2015-11-05 09:22:39.000000000
+0100
+++ new/wicked-0.6.29/src/dbus-objects/team.c 2015-11-20 17:54:04.000000000
+0100
@@ -525,8 +525,8 @@
switch(lw->type) {
case NI_TEAM_LINK_WATCH_ETHTOOL:
- ni_dbus_dict_add_uint32(dict, "down_up", lw->ethtool.delay_up);
- ni_dbus_dict_add_uint32(dict, "down_down",
lw->ethtool.delay_down);
+ ni_dbus_dict_add_uint32(dict, "delay_up", lw->ethtool.delay_up);
+ ni_dbus_dict_add_uint32(dict, "delay_down",
lw->ethtool.delay_down);
break;
case NI_TEAM_LINK_WATCH_ARP_PING:
if (lw->arp.source_host)
@@ -580,9 +580,9 @@
switch(lw->type) {
case NI_TEAM_LINK_WATCH_ETHTOOL:
- if (ni_dbus_dict_get_uint32(dict, "down_up", &value))
+ if (ni_dbus_dict_get_uint32(dict, "delay_up", &value))
lw->ethtool.delay_up = value;
- if (ni_dbus_dict_get_uint32(dict, "down_down", &value))
+ if (ni_dbus_dict_get_uint32(dict, "delay_down", &value))
lw->ethtool.delay_down = value;
break;
case NI_TEAM_LINK_WATCH_ARP_PING:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/wicked.spec
new/wicked-0.6.29/wicked.spec
--- old/wicked-0.6.28/wicked.spec 2015-11-12 17:23:41.000000000 +0100
+++ new/wicked-0.6.29/wicked.spec 2015-11-20 17:57:43.000000000 +0100
@@ -18,7 +18,7 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.28
+Version: 0.6.29
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
License: GPL-2.0
@@ -234,8 +234,8 @@
%pre service
# upgrade from sysconfig[-network] scripts
-_id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || :
-if test "x${_id#Id=}" = "xnetwork.service" -a -x /etc/init.d/network ; then
+_id=`readlink /etc/systemd/system/network.service 2>/dev/null` || :
+if test "x${_id##*/}" = "xnetwork.service" -a -x /etc/init.d/network ; then
/etc/init.d/network stop-all-dhcp-clients || :
fi
%{service_add_pre wicked.service}
@@ -244,8 +244,8 @@
%{service_add_post wicked.service}
# See bnc#843526: presets do not apply for upgrade / are not sufficient
# to handle sysconfig-network|wicked -> wicked migration
-_id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || :
-case "${_id#Id=}" in
+_id=`readlink /etc/systemd/system/network.service 2>/dev/null` || :
+case "${_id##*/}" in
""|wicked.service|network.service)
/usr/bin/systemctl --system daemon-reload || :
/usr/bin/systemctl --force enable wicked.service || :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wicked-0.6.28/wicked.spec.in
new/wicked-0.6.29/wicked.spec.in
--- old/wicked-0.6.28/wicked.spec.in 2015-11-12 15:51:02.000000000 +0100
+++ new/wicked-0.6.29/wicked.spec.in 2015-11-20 17:54:58.000000000 +0100
@@ -234,8 +234,8 @@
%pre service
# upgrade from sysconfig[-network] scripts
-_id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || :
-if test "x${_id#Id=}" = "xnetwork.service" -a -x /etc/init.d/network ; then
+_id=`readlink /etc/systemd/system/network.service 2>/dev/null` || :
+if test "x${_id##*/}" = "xnetwork.service" -a -x /etc/init.d/network ; then
/etc/init.d/network stop-all-dhcp-clients || :
fi
%{service_add_pre wicked.service}
@@ -244,8 +244,8 @@
%{service_add_post wicked.service}
# See bnc#843526: presets do not apply for upgrade / are not sufficient
# to handle sysconfig-network|wicked -> wicked migration
-_id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || :
-case "${_id#Id=}" in
+_id=`readlink /etc/systemd/system/network.service 2>/dev/null` || :
+case "${_id##*/}" in
""|wicked.service|network.service)
/usr/bin/systemctl --system daemon-reload || :
/usr/bin/systemctl --force enable wicked.service || :
