Hello community,
here is the log from the commit of package wicked for openSUSE:Factory checked
in at 2018-02-03 15:40:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wicked (Old)
and /work/SRC/openSUSE:Factory/.wicked.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wicked"
Sat Feb 3 15:40:15 2018 rev:66 rq:572059 version:0.6.44
Changes:
--------
--- /work/SRC/openSUSE:Factory/wicked/wicked.changes 2017-12-29
00:01:31.248805368 +0100
+++ /work/SRC/openSUSE:Factory/.wicked.new/wicked.changes 2018-02-03
15:40:17.363573299 +0100
@@ -1,0 +2,15 @@
+Fri Feb 2 15:26:32 UTC 2018 - m...@suse.de
+
+- version 0.6.44
+- dhcp4: use rfc4361 client-id as new default for ethernet on sle15
+ (fate#323576). It can be also enabled/disabled in wicked-config(5).
+- client: fixed broken wicked arp utility command (bsc#1078245)
+- cleanup: add mising/explicit designated field initializers
+- pkgconfig: fix to request libnl3 instead of libnl1
+- dbus: add missing DBUS_ERROR_FAILED type to a dbus_set_error call
+ and enforce formatting input as string when an extension did not
+ returned any error message.
+- Removed patch included in the source archive
+ [- 0001-wickedd-explicitly-unbind-slaves-on-deletion.patch]
+
+-------------------------------------------------------------------
Old:
----
0001-wickedd-explicitly-unbind-slaves-on-deletion.patch
wicked-0.6.43.tar.bz2
New:
----
wicked-0.6.44.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wicked.spec ++++++
--- /var/tmp/diff_new_pack.mJDR1I/_old 2018-02-03 15:40:18.471521551 +0100
+++ /var/tmp/diff_new_pack.mJDR1I/_new 2018-02-03 15:40:18.475521364 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wicked
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.43
+Version: 0.6.44
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
License: GPL-2.0
@@ -26,7 +26,6 @@
Url: https://github.com/openSUSE/wicked
Source0: %{name}-%{version}.tar.bz2
Source1: wicked-rpmlintrc
-Patch1: 0001-wickedd-explicitly-unbind-slaves-on-deletion.patch
#
# Upstream First - openSUSE Build Service Policy:
#
@@ -42,6 +41,11 @@
BuildRequires: make
Requires(pre): libwicked-0-6 = %{version}
+%if 0%{?suse_version} >= 1500
+%bcond_without rfc4361_cid
+%else
+%bcond_with rfc4361_cid
+%endif
%if 0%{?suse_version} >= 1230
%bcond_without systemd
%bcond_with dbusstart
@@ -173,7 +177,6 @@
%prep
%setup
-%patch1 -p1
%build
test -x ./configure || autoreconf --force --install
@@ -184,6 +187,9 @@
--with-storedir=%{wicked_storedir}\
--with-compat=suse \
--with-fillup-templatesdir=%{_fillupdir}\
+%if %{without rfc4361_cid}
+ --disable-dhcp4-rfc4361-cid \
+%endif
%if %{without use_nanny}
--disable-nanny-use \
%endif
++++++ wicked-0.6.43.tar.bz2 -> wicked-0.6.44.tar.bz2 ++++++
++++ 1634 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.43/ChangeLog new/wicked-0.6.44/ChangeLog
--- old/wicked-0.6.43/ChangeLog 2017-12-16 02:14:21.000000000 +0100
+++ new/wicked-0.6.44/ChangeLog 2018-02-02 16:30:40.000000000 +0100
@@ -1,9 +1,179 @@
-commit 91cdc7565cdc8ff46ef932e327df33aecf62e3a4
+commit 7e5b861c3160adb0437f31ec08950bed52ea808f
Author: Marius Tomaschewski <m...@suse.de>
-Date: Sat Dec 16 02:13:01 2017 +0100
+Date: Fri Feb 2 16:27:00 2018 +0100
+
+ version 0.6.44
+
+commit 3b1fed44b5f49153098f843e3bea92ae227a397b
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Thu Feb 1 15:01:28 2018 +0100
+
+ spec: conditionally disable dhcp4 rfc4361 client-id
+
+ Disable for sles12 and leap42 to preserve defaults,
+ where it needs to be enabled via wicked-config(5).
+
+commit 74e117a2797f49d53647d6f8b75c7392f8fd2dfc
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Thu Feb 1 14:30:48 2018 +0100
+
+ dhcp4: enable rfc4361 client-id for DHCPv4
+
+ Enabled DHCPv4 to use the rfc4361 client-id on ethernet interfaces.
+ When disabled via the --disable-dhcp4-rfc4361-cid configure option,
+ ethernet type interfaces will use an tratidional RFC 2132 sect 9.14
+ client id (01 type followed by the mac address) by default, the new
+ rfc4361 client-id can be enabled as default or per interface in the
+ wicked-config(5).
+ The new rfc4361 client-id (ff type followed by dhcp6 iaid and duid)
+ is mandated by infiniband RFC 4930 and required to update the A and
+ AAAA (ipv4 and ipv6) DNS records in the same zone (e.g. ISC dhcp).
+
+commit 55bf667acb2fcd17eb0f7a69c2e9accca7320f38
+Merge: 55cebabb a578bc0c
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Thu Feb 1 13:09:21 2018 +0100
+
+ Merge pull request #730 from nirmoy/1078245_fix_arputils
+
+ client: fixed wicked arp utility command (bsc#1078245)
+
+commit dc8fd3dbb02e574921490b9972d6148cc2a16871
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Wed Jan 31 15:33:29 2018 +0100
+
+ autogen: removed -Wno-missing-field-initializers
+
+commit a578bc0c82b1fd4ac8a53b4f256d12df8db08aeb
+Author: Nirmoy Das <n...@suse.de>
+Date: Tue Jan 30 13:33:47 2018 +0100
+
+ arp: fix ni_do_arp declaration(bsc#1078245)
+
+ was cause by 15e69c474b02971b63d5a177ba8bf364b2fc261c
+
+commit 390690c3017b180e97938cd7ae4d733245eac03e
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Mon Jan 8 15:17:27 2018 +0100
+
+ cleanup: add mising/explicit field initializers
+
+commit 0dcc3fbc0c296df85a4ac9736542a32e2264adf9
+Merge: 0ba93e2a 151de2e7
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Mon Jan 8 11:24:45 2018 +0100
+
+ Merge pull request #728 from Conan-Kudo/fix-pkgconfig-file
+
+ Fix wicked pkgconfig file to request libnl3 instead of libnl1
+
+commit 0ba93e2a304f1ea7a22202e09a56944c9b0d510a
+Merge: 8c7684dd 45aecd01
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Mon Jan 8 11:21:27 2018 +0100
+
+ Merge pull request #727 from Conan-Kudo/fix-broken-dbus-set-error
+
+ Add missing DBUS_ERROR_FAILED error type to dbus_set_error() call
+
+commit 151de2e7449ef9af68233058cae1928d248c0702
+Author: Neal Gompa <ngomp...@gmail.com>
+Date: Wed Dec 27 19:41:53 2017 -0500
+
+ Fix wicked pkgconfig file to request libnl3 instead of libnl1
+
+ When wicked switched from libnl1 to libnl3 in
4591b86fda9e5b1e9383eb7e1ee0190ee57f8a1e,
+ the required changes to wicked.pc were not made. This meant that the
+ modules requested to link against libwicked by external applications
+ were wrong and would lead to broken builds.
+
+commit 45aecd01a0ffda59fab3e94fadca37a418b74574
+Author: Neal Gompa <ngomp...@gmail.com>
+Date: Tue Dec 26 22:55:00 2017 -0500
+
+ Add missing DBUS_ERROR_FAILED error type to dbus_set_error() call
+
+ I'm not sure how this call ever worked, since dbus_set_error() was
+ missing necessary arguments to operate properly...
+
+commit a6d3ba81a00fef238ae7fa60baf96b889ade5f17
+Author: Neal Gompa <ngomp...@gmail.com>
+Date: Tue Dec 26 22:52:51 2017 -0500
+
+ Enforce formatting input as string
+
+ This was breaking the build of wicked in Fedora, which does
+ -Werror=format-security in the default build flags.
+
+commit b1864c1fcbedfd49ff55fb82b528ac86b0825317
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Thu Dec 21 10:16:04 2017 +0100
+
+ wickedd: explicitly unbind slaves on deletion
+
+ When a master device is deleted, explicitly clear references
+ pointing to it on slaves instead to let it perform by further
+ event, which may arrive later than an attempt to enslave them
+ into a new, recreated master device (with same name).
+
+commit f4ff93f501889426c3d9e006d5459ae2ee113395
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Sat Dec 16 02:15:43 2017 +0100
version 0.6.43
+commit 9a036e252074fbfe290dd6c8a9a21d30249c1259
+Merge: 15ed220c f018665d
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Sat Dec 16 01:57:24 2017 +0100
+
+ Merge pull request #724 from mtomaschewski/dhcp6-confirm
+
+ dhcp6: reapply confirmed addresses on any status other to not-on-link
+
+commit f018665d7c2ceca7c8a74b98baf576027e509a00
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Thu Dec 7 14:56:00 2017 +0100
+
+ dhcp: accept confirm status other than not-on-link
+
+commit 01d48380a78a09a56e7dcaf3d67b299f65bf6647
+Author: Nikola Pajkovsky <npajkov...@suse.cz>
+Date: Thu Dec 14 10:53:12 2017 +0100
+
+ ifconfig: set MTU even if device is up (bsc#1059292)
+
+ wicked should not supplement what drivers in kernel are capable. That
+ means, that if device is up, and is not capable set MTU on-fly, kernel
+ returns error. This is driver problem, not wicked and should just
+ print an error and continue.
+
+ Signed-off-by: Nikola Pajkovsky <npajkov...@suse.cz>
+
+commit 9609b1aff0ff2bf389da695616d853483799c65c
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Thu Dec 7 10:57:42 2017 +0100
+
+ dhcp6: verify lease type and family in recover
+
+commit 8c6d29c5f0faa224c24a67109efdcf9f99363cfc
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Wed Dec 6 18:14:00 2017 +0100
+
+ dhcp6: update lease addrs from ia-list on confirm
+
+commit c86b5eae0c143fbe227497117458f6177d02b3f5
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Tue Dec 5 19:47:32 2017 +0100
+
+ dhcp6: expose utility to copy ia to lease addrs
+
+commit 0892be7e73773fac5ae1b0f89048e57c17ccd75e
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Tue Dec 5 12:58:11 2017 +0100
+
+ address: add helper function to set temporary flag
+
commit 165ddb1c720088f30ba0c35c5783979170afedc3
Author: Marius Tomaschewski <m...@suse.de>
Date: Fri Dec 1 13:24:55 2017 +0100
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.43/VERSION new/wicked-0.6.44/VERSION
--- old/wicked-0.6.43/VERSION 2017-12-16 02:12:55.000000000 +0100
+++ new/wicked-0.6.44/VERSION 2018-02-02 16:08:34.000000000 +0100
@@ -1 +1 @@
-0.6.43
+0.6.44
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.43/autoip4/dbus-api.c new/wicked-0.6.44/autoip4/dbus-api.c
--- old/wicked-0.6.43/autoip4/dbus-api.c 2016-11-15 14:54:09.000000000
+0100
+++ new/wicked-0.6.44/autoip4/dbus-api.c 2018-02-01 13:24:52.000000000
+0100
@@ -245,15 +245,15 @@
* Request class and properties
*/
static ni_dbus_method_t ni_objectmodel_autoip4_methods[] = {
- { "acquire", "aya{sv}",
ni_objectmodel_autoip4_acquire_svc },
- { "drop", "ay", ni_objectmodel_autoip4_drop_svc
},
+ { "acquire", "aya{sv}", .handler =
ni_objectmodel_autoip4_acquire_svc },
+ { "drop", "ay", .handler =
ni_objectmodel_autoip4_drop_svc },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_autoip4_signals[] = {
- { NI_OBJECTMODEL_LEASE_ACQUIRED_SIGNAL },
- { NI_OBJECTMODEL_LEASE_RELEASED_SIGNAL },
- { NI_OBJECTMODEL_LEASE_LOST_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_ACQUIRED_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_RELEASED_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_LOST_SIGNAL },
{ NULL }
};
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.43/client/arputil.c new/wicked-0.6.44/client/arputil.c
--- old/wicked-0.6.43/client/arputil.c 2017-06-26 10:55:23.000000000 +0200
+++ new/wicked-0.6.44/client/arputil.c 2018-02-01 13:24:52.000000000 +0100
@@ -290,7 +290,7 @@
}
int
-ni_do_arp(int argc, char **argv)
+ni_do_arp(const char *caller, int argc, char **argv)
{
static struct option options[] = {
{ "help", no_argument, NULL, OPT_HELP },
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.43/client/main.h new/wicked-0.6.44/client/main.h
--- old/wicked-0.6.43/client/main.h 2017-12-15 11:22:12.000000000 +0100
+++ new/wicked-0.6.44/client/main.h 2018-02-01 13:24:52.000000000 +0100
@@ -24,7 +24,7 @@
#ifndef WICKED_CLIENT_MAIN_H
#define WICKED_CLIENT_MAIN_H
-extern int ni_do_arp (const char *caller, int argc, char **argv);
+extern int ni_do_arp(const char *caller, int argc, char **argv);
extern int ni_do_test(const char *caller, int argc, char **argv);
extern int ni_do_duid(const char *caller, int argc, char **argv);
extern int ni_do_iaid(const char *caller, int argc, char **argv);
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.43/client/suse/compat-suse.c
new/wicked-0.6.44/client/suse/compat-suse.c
--- old/wicked-0.6.43/client/suse/compat-suse.c 2017-12-16 02:12:40.000000000
+0100
+++ new/wicked-0.6.44/client/suse/compat-suse.c 2018-02-01 13:24:52.000000000
+0100
@@ -5621,12 +5621,12 @@
{ "wicked", { .qualify = ni_ifscript_qualify_wicked } },
{ "compat", { .qualify = ni_ifscript_qualify_compat } },
{ "systemd", { .qualify = ni_ifscript_qualify_systemd } },
- { NULL, { } },
+ { NULL, { .qualify = NULL } },
};
static const ni_ifscript_type_t ni_ifscript_types_compat[] = {
{ "suse", { .qualify = ni_ifscript_qualify_compat_suse } },
- { NULL, { } },
+ { NULL, { .qualify = NULL } },
};
static const ni_ifscript_type_t *
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.43/config.h.in new/wicked-0.6.44/config.h.in
--- old/wicked-0.6.43/config.h.in 2017-12-16 02:13:44.000000000 +0100
+++ new/wicked-0.6.44/config.h.in 2018-02-02 16:30:01.000000000 +0100
@@ -186,6 +186,9 @@
*/
#undef LT_OBJDIR
+/* Enable to use rfc4361 DHCPv4 client-id by default */
+#undef NI_DHCP4_RFC4361_CID
+
/* Enable lldp support */
#undef NI_ENABLE_LLDP
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.43/configure.ac new/wicked-0.6.44/configure.ac
--- old/wicked-0.6.43/configure.ac 2017-12-15 11:22:12.000000000 +0100
+++ new/wicked-0.6.44/configure.ac 2018-02-02 16:06:07.000000000 +0100
@@ -39,6 +39,15 @@
AC_DEFINE([NI_ENABLE_LLDP], [], [Enable lldp support])
fi
+# Whether to use rfc4361 dhcp4 client-id by default
+AC_ARG_ENABLE([dhcp4-rfc4361-cid],
+ [AS_HELP_STRING([--disable-dhcp4-rfc4361-cid],
+ [disable to not use rfc4361 DHCPv4 client-id by default])],,
+ [enable_dhcp4_rfc4361_cid=yes])
+if test "x$enable_dhcp4_rfc4361_cid" = "xyes" ; then
+ AC_DEFINE([NI_DHCP4_RFC4361_CID], [1], [Enable to use rfc4361 DHCPv4
client-id by default])
+fi
+
# Whether to enable nanny use
AC_ARG_ENABLE([nanny-use],
[AS_HELP_STRING([--disable-nanny-use],
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.43/dhcp4/dbus-api.c new/wicked-0.6.44/dhcp4/dbus-api.c
--- old/wicked-0.6.43/dhcp4/dbus-api.c 2017-12-14 14:11:37.000000000 +0100
+++ new/wicked-0.6.44/dhcp4/dbus-api.c 2018-02-01 13:24:52.000000000 +0100
@@ -237,15 +237,15 @@
}
static ni_dbus_method_t ni_objectmodel_dhcp4_methods[] = {
- { "acquire", "aya{sv}",
__ni_objectmodel_dhcp4_acquire_svc },
- { "drop", "ay",
__ni_objectmodel_dhcp4_drop_svc },
+ { "acquire", "aya{sv}", .handler =
__ni_objectmodel_dhcp4_acquire_svc },
+ { "drop", "ay", .handler =
__ni_objectmodel_dhcp4_drop_svc },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_dhcp4_signals[] = {
- { NI_OBJECTMODEL_LEASE_ACQUIRED_SIGNAL },
- { NI_OBJECTMODEL_LEASE_RELEASED_SIGNAL },
- { NI_OBJECTMODEL_LEASE_LOST_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_ACQUIRED_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_RELEASED_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_LOST_SIGNAL },
{ NULL }
};
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.43/dhcp6/dbus-api.c new/wicked-0.6.44/dhcp6/dbus-api.c
--- old/wicked-0.6.43/dhcp6/dbus-api.c 2017-12-14 14:07:13.000000000 +0100
+++ new/wicked-0.6.44/dhcp6/dbus-api.c 2018-02-01 13:24:52.000000000 +0100
@@ -260,15 +260,15 @@
}
static ni_dbus_method_t ni_objectmodel_dhcp6_methods[] = {
- { "acquire", "aya{sv}",
ni_objectmodel_dhcp6_acquire_svc },
- { "drop", "ay",
ni_objectmodel_dhcp6_drop_svc },
+ { "acquire", "aya{sv}", .handler =
ni_objectmodel_dhcp6_acquire_svc },
+ { "drop", "ay", .handler =
ni_objectmodel_dhcp6_drop_svc },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_dhcp6_signals[] = {
- { NI_OBJECTMODEL_LEASE_ACQUIRED_SIGNAL },
- { NI_OBJECTMODEL_LEASE_RELEASED_SIGNAL },
- { NI_OBJECTMODEL_LEASE_LOST_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_ACQUIRED_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_RELEASED_SIGNAL },
+ { .name = NI_OBJECTMODEL_LEASE_LOST_SIGNAL },
{ NULL }
};
@@ -278,7 +278,6 @@
*/
static ni_dbus_class_t ni_objectmodel_dhcp6_request_class = {
.name = "dhcp6-request",
- //FIXME: no .destroy ?
};
#define DHCP6REQ_STRING_PROPERTY(dbus_name, member_name, rw) \
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.43/include/wicked/address.h
new/wicked-0.6.44/include/wicked/address.h
--- old/wicked-0.6.43/include/wicked/address.h 2017-12-15 15:29:48.000000000
+0100
+++ new/wicked-0.6.44/include/wicked/address.h 2018-01-24 17:07:43.000000000
+0100
@@ -123,6 +123,7 @@
extern ni_bool_t ni_address_is_deprecated(const ni_address_t *laddr);
extern ni_bool_t ni_address_is_mngtmpaddr(const ni_address_t *laddr);
+extern void ni_address_set_temporary(ni_address_t *, ni_bool_t);
extern void ni_address_set_tentative(ni_address_t *, ni_bool_t);
extern void ni_address_set_duplicate(ni_address_t *, ni_bool_t);
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.43/nanny/nanny.c new/wicked-0.6.44/nanny/nanny.c
--- old/wicked-0.6.43/nanny/nanny.c 2017-05-04 14:50:38.000000000 +0200
+++ new/wicked-0.6.44/nanny/nanny.c 2018-02-01 13:24:52.000000000 +0100
@@ -1163,7 +1163,7 @@
}
static ni_dbus_method_t ni_objectmodel_nanny_methods[] = {
- { "getDevice", "s", ni_objectmodel_nanny_get_device
},
+ { "getDevice", "s", .handler =
ni_objectmodel_nanny_get_device },
{ "createPolicy", "s", .handler_ex =
ni_objectmodel_nanny_create_policy },
{ "deletePolicy", "s", .handler_ex =
ni_objectmodel_nanny_delete_policy },
{ "addSecret", "a{sv}ss", .handler_ex =
ni_objectmodel_nanny_set_secret },
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.43/src/address.c new/wicked-0.6.44/src/address.c
--- old/wicked-0.6.43/src/address.c 2017-12-15 15:29:48.000000000 +0100
+++ new/wicked-0.6.44/src/address.c 2018-01-24 17:07:43.000000000 +0100
@@ -288,6 +288,15 @@
laddr->flags &= ~IFA_F_DADFAILED;
}
+void
+ni_address_set_temporary(ni_address_t *laddr, ni_bool_t temporary)
+{
+ if (temporary)
+ laddr->flags |= IFA_F_TEMPORARY;
+ else
+ laddr->flags &= ~IFA_F_TEMPORARY;
+}
+
/*
* ni_address list functions
*/
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.43/src/capture.c new/wicked-0.6.44/src/capture.c
--- old/wicked-0.6.43/src/capture.c 2017-10-18 11:14:29.000000000 +0200
+++ new/wicked-0.6.44/src/capture.c 2018-02-01 13:24:52.000000000 +0100
@@ -183,16 +183,18 @@
ipudp_checksum(const struct ip *iph, const struct udphdr *uhp,
const void *data, size_t length)
{
- struct udphdr uh = {
- .uh_sport = uhp->uh_sport,
- .uh_dport = uhp->uh_dport,
- .uh_ulen = uhp->uh_ulen,
- };
+ struct udphdr uh;
uint32_t csum;
union {
uint8_t c[2];
uint16_t s;
} bs;
+
+ uh.uh_sport = uhp->uh_sport;
+ uh.uh_dport = uhp->uh_dport;
+ uh.uh_ulen = uhp->uh_ulen;
+ uh.uh_sum = 0;
+
bs.c[0] = 0;
bs.c[1] = IPPROTO_UDP;
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.43/src/dbus-object.c new/wicked-0.6.44/src/dbus-object.c
--- old/wicked-0.6.43/src/dbus-object.c 2016-07-12 10:28:25.000000000 +0200
+++ new/wicked-0.6.44/src/dbus-object.c 2018-02-01 13:24:52.000000000 +0100
@@ -27,7 +27,7 @@
static const char * __ni_dbus_object_child_path(const
ni_dbus_object_t *, const char *);
const ni_dbus_class_t ni_dbus_anonymous_class = {
- "<anonymous>"
+ .name = "<anonymous>"
};
/*
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.43/src/dbus-objects/addrconf.c
new/wicked-0.6.44/src/dbus-objects/addrconf.c
--- old/wicked-0.6.43/src/dbus-objects/addrconf.c 2017-11-28
11:34:51.000000000 +0100
+++ new/wicked-0.6.44/src/dbus-objects/addrconf.c 2018-02-01
13:24:52.000000000 +0100
@@ -749,7 +749,7 @@
if (forwarder->supplicant.client == NULL) {
forwarder->supplicant.client =
ni_create_dbus_client(forwarder->supplicant.bus_name);
if (forwarder->supplicant.client == NULL) {
- dbus_set_error(error, "unable to create call forwarder
for %s",
+ dbus_set_error(error, DBUS_ERROR_FAILED, "unable to
create call forwarder for %s",
forwarder->supplicant.bus_name);
return FALSE;
}
@@ -1521,38 +1521,38 @@
* Addrconf methods
*/
static const ni_dbus_method_t
ni_objectmodel_addrconf_ipv4_static_methods[] = {
- { "requestLease", "a{sv}",
ni_objectmodel_addrconf_ipv4_static_request },
- { "dropLease", "",
ni_objectmodel_addrconf_ipv4_static_drop },
+ { "requestLease", "a{sv}", .handler =
ni_objectmodel_addrconf_ipv4_static_request },
+ { "dropLease", "", .handler =
ni_objectmodel_addrconf_ipv4_static_drop },
{ NULL }
};
static const ni_dbus_method_t
ni_objectmodel_addrconf_ipv6_static_methods[] = {
- { "requestLease", "a{sv}",
ni_objectmodel_addrconf_ipv6_static_request },
- { "dropLease", "",
ni_objectmodel_addrconf_ipv6_static_drop },
+ { "requestLease", "a{sv}", .handler =
ni_objectmodel_addrconf_ipv6_static_request },
+ { "dropLease", "", .handler =
ni_objectmodel_addrconf_ipv6_static_drop },
{ NULL }
};
static const ni_dbus_method_t
ni_objectmodel_addrconf_ipv4_dhcp_methods[] = {
- { "requestLease", "a{sv}",
ni_objectmodel_addrconf_ipv4_dhcp_request },
- { "dropLease", "",
ni_objectmodel_addrconf_ipv4_dhcp_drop },
+ { "requestLease", "a{sv}", .handler =
ni_objectmodel_addrconf_ipv4_dhcp_request },
+ { "dropLease", "", .handler =
ni_objectmodel_addrconf_ipv4_dhcp_drop },
{ NULL }
};
static const ni_dbus_method_t
ni_objectmodel_addrconf_ipv6_dhcp_methods[] = {
- { "requestLease", "a{sv}",
ni_objectmodel_addrconf_ipv6_dhcp_request },
- { "dropLease", "",
ni_objectmodel_addrconf_ipv6_dhcp_drop },
+ { "requestLease", "a{sv}", .handler =
ni_objectmodel_addrconf_ipv6_dhcp_request },
+ { "dropLease", "", .handler =
ni_objectmodel_addrconf_ipv6_dhcp_drop },
{ NULL }
};
static const ni_dbus_method_t
ni_objectmodel_addrconf_ipv4_auto_methods[] = {
- { "requestLease", "a{sv}",
ni_objectmodel_addrconf_ipv4_auto_request },
- { "dropLease", "",
ni_objectmodel_addrconf_ipv4_auto_drop },
+ { "requestLease", "a{sv}", .handler =
ni_objectmodel_addrconf_ipv4_auto_request },
+ { "dropLease", "", .handler =
ni_objectmodel_addrconf_ipv4_auto_drop },
{ NULL }
};
static const ni_dbus_method_t
ni_objectmodel_addrconf_ipv6_auto_methods[] = {
- { "requestLease", "a{sv}",
ni_objectmodel_addrconf_ipv6_auto_request },
- { "dropLease", "",
ni_objectmodel_addrconf_ipv6_auto_drop },
+ { "requestLease", "a{sv}", .handler =
ni_objectmodel_addrconf_ipv6_auto_request },
+ { "dropLease", "", .handler =
ni_objectmodel_addrconf_ipv6_auto_drop },
{ NULL }
};
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.43/src/dbus-objects/bonding.c
new/wicked-0.6.44/src/dbus-objects/bonding.c
--- old/wicked-0.6.43/src/dbus-objects/bonding.c 2017-05-04
14:50:38.000000000 +0200
+++ new/wicked-0.6.44/src/dbus-objects/bonding.c 2018-02-01
13:24:52.000000000 +0100
@@ -700,20 +700,14 @@
static ni_dbus_method_t ni_objectmodel_bond_methods[] = {
- { "changeDevice", "a{sv}",
ni_objectmodel_bond_setup },
- { "shutdownDevice", "",
__ni_objectmodel_shutdown_bond },
- { "deleteDevice", "",
__ni_objectmodel_delete_bond },
-#if 0
- { "addSlave", DBUS_TYPE_OJECT_AS_STRING,
__ni_objectmodel_bond_add_slave },
- { "removeSlave", DBUS_TYPE_OJECT_AS_STRING,
__ni_objectmodel_bond_remove_slave },
- { "setActive", DBUS_TYPE_OJECT_AS_STRING,
__ni_objectmodel_bond_add_active },
- { "setPrimary", DBUS_TYPE_OJECT_AS_STRING,
__ni_objectmodel_bond_set_primary },
-#endif
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_bond_setup },
+ { "shutdownDevice", "", .handler =
__ni_objectmodel_shutdown_bond },
+ { "deleteDevice", "", .handler =
__ni_objectmodel_delete_bond },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_bond_factory_methods[] =
{
- { "newDevice", "sa{sv}",
ni_objectmodel_new_bond },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_new_bond },
{ NULL }
};
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.43/src/dbus-objects/bridge.c
new/wicked-0.6.44/src/dbus-objects/bridge.c
--- old/wicked-0.6.43/src/dbus-objects/bridge.c 2017-12-16 02:12:40.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/bridge.c 2018-02-01 13:24:52.000000000
+0100
@@ -397,18 +397,14 @@
};
static ni_dbus_method_t ni_objectmodel_bridge_methods[] = {
- { "changeDevice", "a{sv}",
ni_objectmodel_bridge_setup },
- { "shutdownDevice", "",
ni_objectmodel_shutdown_bridge },
- { "deleteDevice", "",
ni_objectmodel_delete_bridge },
-#if 0
- { "addPort", DBUS_TYPE_OJECT_AS_STRING,
ni_objectmodel_bridge_add_port },
- { "removePort", DBUS_TYPE_OJECT_AS_STRING,
ni_objectmodel_bridge_remove_port },
-#endif
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_bridge_setup },
+ { "shutdownDevice", "", .handler =
ni_objectmodel_shutdown_bridge },
+ { "deleteDevice", "", .handler =
ni_objectmodel_delete_bridge },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_bridge_factory_methods[]
= {
- { "newDevice", "sa{sv}",
ni_objectmodel_new_bridge },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_new_bridge },
{ NULL }
};
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.43/src/dbus-objects/dummy.c
new/wicked-0.6.44/src/dbus-objects/dummy.c
--- old/wicked-0.6.43/src/dbus-objects/dummy.c 2016-07-12 10:28:25.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/dummy.c 2018-02-01 13:24:52.000000000
+0100
@@ -244,13 +244,13 @@
};
static ni_dbus_method_t ni_objectmodel_dummy_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_dummy_change },
- { "deleteDevice", "", ni_objectmodel_dummy_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_dummy_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_dummy_delete },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_dummy_factory_methods[]
= {
- { "newDevice", "sa{sv}", ni_objectmodel_dummy_newlink },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_dummy_newlink },
{ NULL }
};
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.43/src/dbus-objects/ethernet.c
new/wicked-0.6.44/src/dbus-objects/ethernet.c
--- old/wicked-0.6.43/src/dbus-objects/ethernet.c 2017-12-15
11:22:12.000000000 +0100
+++ new/wicked-0.6.44/src/dbus-objects/ethernet.c 2018-02-01
13:24:52.000000000 +0100
@@ -892,7 +892,7 @@
};
static ni_dbus_method_t ni_objectmodel_ethernet_methods[] = {
- { "changeDevice", "a{sv}",
ni_objectmodel_ethernet_setup },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_ethernet_setup },
{ NULL }
};
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.43/src/dbus-objects/gre.c
new/wicked-0.6.44/src/dbus-objects/gre.c
--- old/wicked-0.6.43/src/dbus-objects/gre.c 2017-05-04 14:50:38.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/gre.c 2018-02-01 13:24:52.000000000
+0100
@@ -550,8 +550,8 @@
};
static ni_dbus_method_t ni_objectmodel_gre_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_gre_change },
- { "deleteDevice", "", ni_objectmodel_gre_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_gre_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_gre_delete },
{ NULL }
};
@@ -566,7 +566,7 @@
* gre tunnel factory service
*/
static ni_dbus_method_t ni_objectmodel_gre_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_gre_create },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_gre_create },
{ NULL }
};
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.43/src/dbus-objects/infiniband.c
new/wicked-0.6.44/src/dbus-objects/infiniband.c
--- old/wicked-0.6.43/src/dbus-objects/infiniband.c 2016-07-12
10:28:25.000000000 +0200
+++ new/wicked-0.6.44/src/dbus-objects/infiniband.c 2018-02-01
13:24:52.000000000 +0100
@@ -332,7 +332,7 @@
};
static ni_dbus_method_t ni_objectmodel_ibparent_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_ib_setup
},
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_ib_setup },
{ NULL }
};
@@ -347,14 +347,14 @@
};
static ni_dbus_method_t ni_objectmodel_ibchild_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_ib_setup
},
- { "deleteDevice", "",
ni_objectmodel_ib_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_ib_setup },
+ { "deleteDevice", "", .handler =
ni_objectmodel_ib_delete },
{ NULL }
};
static ni_dbus_method_t
ni_objectmodel_ibchild_factory_methods[] = {
- { "newDevice", "sa{sv}",
ni_objectmodel_ib_newchild},
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_ib_newchild},
{ NULL }
};
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.43/src/dbus-objects/interface.c
new/wicked-0.6.44/src/dbus-objects/interface.c
--- old/wicked-0.6.43/src/dbus-objects/interface.c 2017-12-15
15:29:48.000000000 +0100
+++ new/wicked-0.6.44/src/dbus-objects/interface.c 2018-02-02
16:05:48.000000000 +0100
@@ -458,9 +458,9 @@
}
static ni_dbus_method_t ni_objectmodel_netif_list_methods[] = {
- { "deviceByName", "s",
ni_objectmodel_netif_list_device_by_name },
- { "identifyDevice", "sa{sv}",
ni_objectmodel_netif_list_identify_device },
- { "getAddresses", "a{sv}",
ni_objectmodel_netif_list_get_addresses },
+ { "deviceByName", "s", .handler =
ni_objectmodel_netif_list_device_by_name },
+ { "identifyDevice", "sa{sv}", .handler =
ni_objectmodel_netif_list_identify_device },
+ { "getAddresses", "a{sv}", .handler =
ni_objectmodel_netif_list_get_addresses },
{ NULL }
};
@@ -925,20 +925,9 @@
}
}
- /*
- * MTU change on device-up interfaces quite often causes either
- * error -16 (busy) or sets all upper interfaces LOWERLAYERDOWN.
- */
- if (ni_netdev_device_is_up(dev)) {
- ni_debug_objectmodel("Skipping MTU change on %s: device
is up",
- dev->name);
- req->mtu = 0;
- }
+ if (req->mtu != dev->link.mtu)
+ ni_system_mtu_change(nc, dev, req->mtu);
- if (req->mtu != dev->link.mtu &&
- ni_system_mtu_change(nc, dev, req->mtu) < 0) {
- ni_info("Unable to set %s MTU to %u", dev->name,
req->mtu);
- }
req->mtu = 0;
}
@@ -1373,17 +1362,17 @@
}
static ni_dbus_method_t ni_objectmodel_netif_methods[] = {
- { "linkUp", "a{sv}",
ni_objectmodel_netif_link_up },
- { "linkDown", "",
ni_objectmodel_netif_link_down },
- { "installLease", "a{sv}",
ni_objectmodel_netif_install_lease },
- { "setClientControl", "a{sv}",
ni_objectmodel_netif_set_client_state_control },
- { "setClientConfig", "a{sv}",
ni_objectmodel_netif_set_client_state_config },
- { "setClientScripts", "a{sv}",
ni_objectmodel_netif_set_client_state_scripts },
- { "linkMonitor", "",
ni_objectmodel_netif_link_monitor },
- { "getNames", "",
ni_objectmodel_netif_get_names },
- { "clearEventFilters", "",
ni_objectmodel_netif_clear_event_filters },
- { "waitDeviceReady", "",
ni_objectmodel_netif_wait_device_ready },
- { "waitLinkUp", "",
ni_objectmodel_netif_wait_link_up },
+ { "linkUp", "a{sv}", .handler =
ni_objectmodel_netif_link_up },
+ { "linkDown", "", .handler =
ni_objectmodel_netif_link_down },
+ { "installLease", "a{sv}", .handler =
ni_objectmodel_netif_install_lease },
+ { "setClientControl", "a{sv}", .handler =
ni_objectmodel_netif_set_client_state_control },
+ { "setClientConfig", "a{sv}", .handler =
ni_objectmodel_netif_set_client_state_config },
+ { "setClientScripts", "a{sv}", .handler =
ni_objectmodel_netif_set_client_state_scripts },
+ { "linkMonitor", "", .handler =
ni_objectmodel_netif_link_monitor },
+ { "getNames", "", .handler =
ni_objectmodel_netif_get_names },
+ { "clearEventFilters", "", .handler =
ni_objectmodel_netif_clear_event_filters },
+ { "waitDeviceReady", "", .handler =
ni_objectmodel_netif_wait_device_ready },
+ { "waitLinkUp", "", .handler =
ni_objectmodel_netif_wait_link_up },
{ NULL }
};
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.43/src/dbus-objects/ipip.c
new/wicked-0.6.44/src/dbus-objects/ipip.c
--- old/wicked-0.6.43/src/dbus-objects/ipip.c 2017-05-04 14:50:38.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/ipip.c 2018-02-01 13:24:52.000000000
+0100
@@ -375,8 +375,8 @@
};
static ni_dbus_method_t ni_objectmodel_ipip_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_ipip_change },
- { "deleteDevice", "", ni_objectmodel_ipip_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_ipip_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_ipip_delete },
{ NULL }
};
@@ -391,7 +391,7 @@
* ipip factory service
*/
static ni_dbus_method_t ni_objectmodel_ipip_factory_methods[] =
{
- { "newDevice", "sa{sv}", ni_objectmodel_ipip_create },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_ipip_create },
{ NULL }
};
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.43/src/dbus-objects/ipv4.c
new/wicked-0.6.44/src/dbus-objects/ipv4.c
--- old/wicked-0.6.43/src/dbus-objects/ipv4.c 2016-01-29 16:56:20.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/ipv4.c 2018-02-01 13:24:52.000000000
+0100
@@ -131,7 +131,7 @@
};
static ni_dbus_method_t ni_objectmodel_ipv4_methods[] = {
- { "changeProtocol", "a{sv}",
ni_objectmodel_ipv4_change_protocol },
+ { "changeProtocol", "a{sv}", .handler =
ni_objectmodel_ipv4_change_protocol },
{ NULL }
};
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.43/src/dbus-objects/ipv6.c
new/wicked-0.6.44/src/dbus-objects/ipv6.c
--- old/wicked-0.6.43/src/dbus-objects/ipv6.c 2016-11-14 11:13:48.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/ipv6.c 2018-02-01 13:24:52.000000000
+0100
@@ -135,7 +135,7 @@
};
static ni_dbus_method_t ni_objectmodel_ipv6_methods[] = {
- { "changeProtocol", "a{sv}",
ni_objectmodel_ipv6_change_protocol },
+ { "changeProtocol", "a{sv}", .handler =
ni_objectmodel_ipv6_change_protocol },
{ NULL }
};
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.43/src/dbus-objects/lldp.c
new/wicked-0.6.44/src/dbus-objects/lldp.c
--- old/wicked-0.6.43/src/dbus-objects/lldp.c 2016-01-29 16:56:20.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/lldp.c 2018-02-01 13:24:52.000000000
+0100
@@ -654,8 +654,8 @@
static ni_dbus_method_t ni_objectmodel_lldp_methods[] = {
- { "lldpUp", "a{sv}", ni_objectmodel_lldp_up },
- { "lldpDown", "", ni_objectmodel_lldp_down },
+ { "lldpUp", "a{sv}", .handler =
ni_objectmodel_lldp_up },
+ { "lldpDown", "", .handler =
ni_objectmodel_lldp_down },
{ NULL }
};
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.43/src/dbus-objects/macvlan.c
new/wicked-0.6.44/src/dbus-objects/macvlan.c
--- old/wicked-0.6.43/src/dbus-objects/macvlan.c 2016-07-12
10:28:25.000000000 +0200
+++ new/wicked-0.6.44/src/dbus-objects/macvlan.c 2018-02-01
13:24:52.000000000 +0100
@@ -508,26 +508,26 @@
};
static ni_dbus_method_t ni_objectmodel_macvlan_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_macvlan_change },
- { "deleteDevice", "", ni_objectmodel_macvlan_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_macvlan_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_macvlan_delete },
{ NULL }
};
static ni_dbus_method_t
ni_objectmodel_macvlan_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_macvlan_newlink
},
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_macvlan_newlink },
{ NULL }
};
/* MACVTAP Methods */
static ni_dbus_method_t ni_objectmodel_macvtap_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_macvtap_change },
- { "deleteDevice", "", ni_objectmodel_macvtap_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_macvtap_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_macvtap_delete },
{ NULL }
};
static ni_dbus_method_t
ni_objectmodel_macvtap_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_macvtap_newlink
},
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_macvtap_newlink },
{ NULL }
};
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.43/src/dbus-objects/model.c
new/wicked-0.6.44/src/dbus-objects/model.c
--- old/wicked-0.6.43/src/dbus-objects/model.c 2017-05-04 14:50:38.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/model.c 2018-02-01 13:24:52.000000000
+0100
@@ -403,9 +403,9 @@
* The interface for the dbus root node. Nothing much for now.
*/
static ni_dbus_method_t ni_objectmodel_netif_root_signals[] = {
- { "resolverUpdated", "", NULL },
- { "hostnameUpdated", "", NULL },
- { "genericUpdated", "", NULL },
+ { "resolverUpdated", "", .handler = NULL },
+ { "hostnameUpdated", "", .handler = NULL },
+ { "genericUpdated", "", .handler = NULL },
{ NULL }
};
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.43/src/dbus-objects/modem.c
new/wicked-0.6.44/src/dbus-objects/modem.c
--- old/wicked-0.6.43/src/dbus-objects/modem.c 2016-07-12 10:28:25.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/modem.c 2018-02-01 13:24:52.000000000
+0100
@@ -344,7 +344,7 @@
}
static ni_dbus_method_t ni_objectmodel_modem_list_methods[] = {
- { "identifyDevice", "a{sv}",
ni_objectmodel_modem_list_identify_device },
+ { "identifyDevice", "a{sv}", .handler =
ni_objectmodel_modem_list_identify_device },
{ NULL }
};
@@ -737,10 +737,10 @@
};
static ni_dbus_method_t ni_objectmodel_modem_methods[] = {
- { "changeDevice", "a{sv}",
ni_objectmodel_modem_change_device },
- { "linkUp", "a{sv}",
ni_objectmodel_modem_connect },
- { "linkDown", "",
ni_objectmodel_modem_disconnect },
- { "setClientState", "a{sv}",
ni_objectmodel_modem_set_client_state },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_modem_change_device },
+ { "linkUp", "a{sv}", .handler =
ni_objectmodel_modem_connect },
+ { "linkDown", "", .handler =
ni_objectmodel_modem_disconnect },
+ { "setClientState", "a{sv}", .handler =
ni_objectmodel_modem_set_client_state },
{ NULL }
};
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.43/src/dbus-objects/ovs.c
new/wicked-0.6.44/src/dbus-objects/ovs.c
--- old/wicked-0.6.43/src/dbus-objects/ovs.c 2016-11-15 14:54:09.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/ovs.c 2018-02-01 13:24:52.000000000
+0100
@@ -447,14 +447,14 @@
};
static ni_dbus_method_t ni_objectmodel_ovs_bridge_methods[] = {
- { "changeDevice", "a{sv}",
__ni_objectmodel_ovs_bridge_setup },
- { "shutdownDevice", "",
__ni_objectmodel_ovs_bridge_shutdown },
- { "deleteDevice", "",
__ni_objectmodel_ovs_bridge_delete },
+ { "changeDevice", "a{sv}", .handler =
__ni_objectmodel_ovs_bridge_setup },
+ { "shutdownDevice", "", .handler =
__ni_objectmodel_ovs_bridge_shutdown },
+ { "deleteDevice", "", .handler =
__ni_objectmodel_ovs_bridge_delete },
{ NULL }
};
static ni_dbus_method_t
ni_objectmodel_ovs_bridge_factory_methods[] = {
- { "newDevice", "sa{sv}",
__ni_objectmodel_ovs_bridge_create },
+ { "newDevice", "sa{sv}", .handler =
__ni_objectmodel_ovs_bridge_create },
{ NULL }
};
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.43/src/dbus-objects/ppp.c
new/wicked-0.6.44/src/dbus-objects/ppp.c
--- old/wicked-0.6.43/src/dbus-objects/ppp.c 2017-05-04 14:50:38.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/ppp.c 2018-02-01 13:24:52.000000000
+0100
@@ -650,13 +650,13 @@
};
static ni_dbus_method_t ni_objectmodel_ppp_device_methods[] = {
- { "changeDevice", "a{sv}",
ni_objectmodel_ppp_device_change },
- { "deleteDevice", "",
ni_objectmodel_ppp_device_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_ppp_device_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_ppp_device_delete },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_ppp_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_ppp_device_new },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_ppp_device_new },
{ NULL }
};
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.43/src/dbus-objects/sit.c
new/wicked-0.6.44/src/dbus-objects/sit.c
--- old/wicked-0.6.43/src/dbus-objects/sit.c 2017-05-04 14:50:38.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/sit.c 2018-02-01 13:24:52.000000000
+0100
@@ -377,8 +377,8 @@
};
static ni_dbus_method_t ni_objectmodel_sit_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_sit_change },
- { "deleteDevice", "", ni_objectmodel_sit_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_sit_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_sit_delete },
{ NULL }
};
@@ -393,7 +393,7 @@
* sitN point-to-point tunnel factory service
*/
static ni_dbus_method_t ni_objectmodel_sit_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_sit_create },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_sit_create },
{ NULL }
};
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.43/src/dbus-objects/team.c
new/wicked-0.6.44/src/dbus-objects/team.c
--- old/wicked-0.6.43/src/dbus-objects/team.c 2016-11-15 14:54:09.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/team.c 2018-02-01 13:24:52.000000000
+0100
@@ -897,14 +897,14 @@
};
static ni_dbus_method_t ni_objectmodel_team_methods[] = {
- { "changeDevice", "a{sv}",
__ni_objectmodel_team_setup },
- { "shutdownDevice", "",
__ni_objectmodel_shutdown_team },
- { "deleteDevice", "",
__ni_objectmodel_delete_team },
+ { "changeDevice", "a{sv}", .handler =
__ni_objectmodel_team_setup },
+ { "shutdownDevice", "", .handler =
__ni_objectmodel_shutdown_team },
+ { "deleteDevice", "", .handler =
__ni_objectmodel_delete_team },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_team_factory_methods[] =
{
- { "newDevice", "sa{sv}",
ni_objectmodel_new_team },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_new_team },
{ NULL }
};
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.43/src/dbus-objects/tuntap.c
new/wicked-0.6.44/src/dbus-objects/tuntap.c
--- old/wicked-0.6.43/src/dbus-objects/tuntap.c 2016-07-12 10:28:25.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/tuntap.c 2018-02-01 13:24:52.000000000
+0100
@@ -332,18 +332,18 @@
};
static ni_dbus_method_t ni_objectmodel_tuntap_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_tuntap_change },
- { "deleteDevice", "", ni_objectmodel_tuntap_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_tuntap_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_tuntap_delete },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_tun_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_tun_newlink },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_tun_newlink },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_tap_factory_methods[] = {
- { "newDevice", "sa{sv}", ni_objectmodel_tap_newlink },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_tap_newlink },
{ NULL }
};
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.43/src/dbus-objects/vlan.c
new/wicked-0.6.44/src/dbus-objects/vlan.c
--- old/wicked-0.6.43/src/dbus-objects/vlan.c 2016-07-12 10:28:25.000000000
+0200
+++ new/wicked-0.6.44/src/dbus-objects/vlan.c 2018-02-01 13:24:52.000000000
+0100
@@ -390,14 +390,14 @@
};
static ni_dbus_method_t ni_objectmodel_vlan_methods[] = {
- { "changeDevice", "a{sv}",
ni_objectmodel_vlan_change },
- { "deleteDevice", "",
ni_objectmodel_vlan_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_vlan_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_vlan_delete },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_vlan_factory_methods[] =
{
- { "newDevice", "sa{sv}",
ni_objectmodel_vlan_newlink },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_vlan_newlink },
{ NULL }
};
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.43/src/dbus-objects/vxlan.c
new/wicked-0.6.44/src/dbus-objects/vxlan.c
--- old/wicked-0.6.43/src/dbus-objects/vxlan.c 2017-12-14 14:07:13.000000000
+0100
+++ new/wicked-0.6.44/src/dbus-objects/vxlan.c 2018-02-01 13:24:52.000000000
+0100
@@ -478,13 +478,13 @@
/* VXLAN method tables */
static ni_dbus_method_t ni_objectmodel_vxlan_methods[] = {
- { "changeDevice", "a{sv}", ni_objectmodel_vxlan_change },
- { "deleteDevice", "", ni_objectmodel_vxlan_delete },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_vxlan_change },
+ { "deleteDevice", "", .handler =
ni_objectmodel_vxlan_delete },
{ NULL }
};
static ni_dbus_method_t ni_objectmodel_vxlan_factory_methods[]
= {
- { "newDevice", "sa{sv}", ni_objectmodel_vxlan_newlink },
+ { "newDevice", "sa{sv}", .handler =
ni_objectmodel_vxlan_newlink },
{ NULL }
};
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.43/src/dbus-objects/wireless.c
new/wicked-0.6.44/src/dbus-objects/wireless.c
--- old/wicked-0.6.43/src/dbus-objects/wireless.c 2017-03-02
11:14:40.000000000 +0100
+++ new/wicked-0.6.44/src/dbus-objects/wireless.c 2018-02-01
13:24:52.000000000 +0100
@@ -540,8 +540,8 @@
};
static ni_dbus_method_t ni_objectmodel_wireless_methods[] = {
- { "setScanning", DBUS_TYPE_BOOLEAN_AS_STRING,
ni_objectmodel_wireless_set_scanning },
- { "changeDevice", "a{sv}",
ni_objectmodel_wireless_change_device },
+ { "setScanning", DBUS_TYPE_BOOLEAN_AS_STRING, .handler =
ni_objectmodel_wireless_set_scanning },
+ { "changeDevice", "a{sv}", .handler =
ni_objectmodel_wireless_change_device },
{ NULL }
};
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.43/src/dbus-server.c new/wicked-0.6.44/src/dbus-server.c
--- old/wicked-0.6.43/src/dbus-server.c 2016-04-06 14:17:15.000000000 +0200
+++ new/wicked-0.6.44/src/dbus-server.c 2018-02-01 13:24:52.000000000 +0100
@@ -279,7 +279,7 @@
}
static ni_dbus_method_t __ni_dbus_object_manager_methods[] = {
- { "GetManagedObjects", NULL,
__ni_dbus_object_manager_get_managed_objects },
+ { "GetManagedObjects", NULL, .handler =
__ni_dbus_object_manager_get_managed_objects },
{ NULL }
};
@@ -467,9 +467,9 @@
}
static ni_dbus_method_t __ni_dbus_object_properties_methods[] = {
- { "GetAll", "s",
__ni_dbus_object_properties_getall },
- { "Get", "ss", __ni_dbus_object_properties_get
},
- { "Set", "ssv", __ni_dbus_object_properties_set
},
+ { "GetAll", "s", .handler =
__ni_dbus_object_properties_getall },
+ { "Get", "ss", .handler =
__ni_dbus_object_properties_get },
+ { "Set", "ssv", .handler =
__ni_dbus_object_properties_set },
{ NULL }
};
@@ -496,7 +496,7 @@
}
static ni_dbus_method_t __ni_dbus_object_introspectable_methods[] = {
- { "Introspect", "",
__ni_dbus_object_introspectable_introspect },
+ { "Introspect", "", .handler =
__ni_dbus_object_introspectable_introspect },
{ NULL }
};
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.43/src/dbus-xml.c new/wicked-0.6.44/src/dbus-xml.c
--- old/wicked-0.6.43/src/dbus-xml.c 2017-12-14 14:07:13.000000000 +0100
+++ new/wicked-0.6.44/src/dbus-xml.c 2018-01-27 08:32:03.000000000 +0100
@@ -414,7 +414,7 @@
if ((error_name = xml_node_get_attr(node, "name")) == NULL)
error_name = DBUS_ERROR_FAILED;
- dbus_set_error(error, error_name,
+ dbus_set_error(error, error_name, "%s",
node->cdata? node->cdata : "extension call failed (no
error message returned by script)");
}
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.43/src/dhcp4/device.c new/wicked-0.6.44/src/dhcp4/device.c
--- old/wicked-0.6.43/src/dhcp4/device.c 2017-12-15 11:22:12.000000000
+0100
+++ new/wicked-0.6.44/src/dhcp4/device.c 2018-02-02 16:06:07.000000000
+0100
@@ -739,12 +739,9 @@
int
ni_dhcp4_device_send_message_unicast(ni_dhcp4_device_t *dev, unsigned int
msg_code, const ni_addrconf_lease_t *lease)
{
- struct sockaddr_in sin = {
- .sin_family = AF_INET,
- .sin_addr.s_addr = lease->dhcp4.server_id.s_addr,
- .sin_port = htons(DHCP4_SERVER_PORT),
- };
+ ni_sockaddr_t addr;
+ ni_sockaddr_set_ipv4(&addr, lease->dhcp4.server_id, DHCP4_SERVER_PORT);
dev->transmit.msg_code = msg_code;
dev->transmit.lease = lease;
@@ -757,7 +754,8 @@
if (ni_dhcp4_device_prepare_message(dev) < 0)
return -1;
- if (sendto(dev->listen_fd, ni_buffer_head(&dev->message),
ni_buffer_count(&dev->message), 0, (struct sockaddr *)&sin, sizeof(sin)) < 0)
+ if (sendto(dev->listen_fd, ni_buffer_head(&dev->message),
ni_buffer_count(&dev->message), 0,
+ &addr.sa, sizeof(addr.sin)) < 0)
ni_error("%s: sendto failed: %m", dev->ifname);
return 0;
}
@@ -872,9 +870,10 @@
*/
switch (dev->system.hwaddr.type) {
case ARPHRD_ETHER:
+#ifndef NI_DHCP4_RFC4361_CID
type = NI_CONFIG_DHCP4_CID_TYPE_HWADDR;
break;
-
+#endif
case ARPHRD_INFINIBAND:
default:
type = NI_CONFIG_DHCP4_CID_TYPE_DHCPv6;
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.43/src/dhcp6/device.c new/wicked-0.6.44/src/dhcp6/device.c
--- old/wicked-0.6.43/src/dhcp6/device.c 2017-12-15 15:29:48.000000000
+0100
+++ new/wicked-0.6.44/src/dhcp6/device.c 2017-12-19 14:44:06.000000000
+0100
@@ -816,23 +816,22 @@
return TRUE;
}
-static int
+static ni_addrconf_lease_t *
ni_dhcp6_recover_lease(ni_dhcp6_device_t *dev)
{
- ni_addrconf_lease_t *lease;
+ ni_addrconf_lease_t *lease = NULL;
- if (!dev || dev->lease)
- return 1;
+ if (!dev)
+ return NULL;
lease = ni_addrconf_lease_file_read(dev->ifname, NI_ADDRCONF_DHCP,
AF_INET6);
- if (!ni_addrconf_lease_is_valid(lease)) {
+ if (!ni_addrconf_lease_is_valid(lease) ||
+ lease->type != NI_ADDRCONF_DHCP || lease->family != AF_INET6) {
ni_addrconf_lease_free(lease);
- return -1;
+ return NULL;
}
- dev->lease = lease;
-
- return 0;
+ return lease;
}
static inline unsigned int
@@ -922,7 +921,7 @@
config->release_lease = req->release_lease;
if (!dev->lease && config->dry_run != NI_DHCP6_RUN_OFFER &&
config->recover_lease)
- ni_dhcp6_recover_lease(dev);
+ ni_dhcp6_device_set_lease(dev, ni_dhcp6_recover_lease(dev));
if (!ni_dhcp6_device_iaid(dev, &dev->iaid)) {
ni_string_printf(err, "Unable to generate a device IAID");
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.43/src/dhcp6/fsm.c new/wicked-0.6.44/src/dhcp6/fsm.c
--- old/wicked-0.6.43/src/dhcp6/fsm.c 2017-12-15 15:29:48.000000000 +0100
+++ new/wicked-0.6.44/src/dhcp6/fsm.c 2017-12-19 14:44:06.000000000 +0100
@@ -757,36 +757,51 @@
* any Reply messages that do not indicate a NotOnLink status,
the
* client can use the addresses in the IA and ignore any
messages
* that indicate a NotOnLink status.[...]"
- *
- * Basically it means we have to use best_offer here and wait
for
- * (success) message similar with solicit...
*/
if (!dev->lease) {
ni_string_printf(hint, "confirm reply without a
lease?!");
goto cleanup;
}
+
if (msg->lease->dhcp6.status == NULL) {
ni_string_printf(hint, "confirm reply without status");
goto cleanup;
- }
-
- if (dev->lease &&
- msg->lease->dhcp6.status->code == NI_DHCP6_STATUS_SUCCESS) {
- ni_dhcp6_fsm_reset(dev);
- ni_dhcp6_fsm_commit_lease(dev, dev->lease);
- rv = 0;
} else
if (msg->lease->dhcp6.status->code ==
NI_DHCP6_STATUS_NOTONLINK) {
+ ni_note("%s: link change confirmation in reply with
status %s - %s",
+ dev->ifname,
+
ni_dhcp6_status_name(msg->lease->dhcp6.status->code),
+ msg->lease->dhcp6.status->message);
+
+ ni_dhcp6_fsm_reset(dev);
ni_dhcp6_device_drop_lease(dev);
- ni_dhcp6_device_restart(dev);
+ ni_dhcp6_fsm_solicit(dev);
rv = 0;
- } else {
- ni_string_printf(hint, "status %s - %s",
-
ni_dhcp6_status_name(msg->lease->dhcp6.status->code),
- msg->lease->dhcp6.status->message);
goto cleanup;
+ } else
+ if (msg->lease->dhcp6.status->code != NI_DHCP6_STATUS_SUCCESS) {
+ ni_debug_dhcp("%s: no link change indication in reply
with status %s - %s",
+ dev->ifname,
+
ni_dhcp6_status_name(msg->lease->dhcp6.status->code),
+ msg->lease->dhcp6.status->message);
+ } else {
+ ni_note("%s: link confirmed in reply with status %s -
%s",
+ dev->ifname,
+
ni_dhcp6_status_name(msg->lease->dhcp6.status->code),
+ msg->lease->dhcp6.status->message);
+ }
+
+ ni_dhcp6_fsm_reset(dev);
+ ni_address_list_destroy(&dev->lease->addrs);
+ if (ni_dhcp6_ia_copy_to_lease_addrs(dev, dev->lease)) {
+ ni_dhcp6_fsm_commit_lease(dev, dev->lease);
+ } else {
+ /* expired in the meantime */
+ ni_dhcp6_fsm_solicit(dev);
}
+
+ rv = 0;
break;
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.43/src/dhcp6/protocol.c new/wicked-0.6.44/src/dhcp6/protocol.c
--- old/wicked-0.6.43/src/dhcp6/protocol.c 2017-12-15 15:29:48.000000000
+0100
+++ new/wicked-0.6.44/src/dhcp6/protocol.c 2017-12-19 14:44:06.000000000
+0100
@@ -2642,7 +2642,7 @@
}
static unsigned int
-__find_pinfo_prefixlen(const ni_dhcp6_device_t *dev, const ni_sockaddr_t *addr)
+ni_dhcp6_find_pinfo_prefixlen(const ni_dhcp6_device_t *dev, const
ni_sockaddr_t *addr)
{
const ni_ipv6_ra_pinfo_t *pinfo;
unsigned int prefixlen = 0;
@@ -2660,8 +2660,8 @@
return prefixlen;
}
-static unsigned int
-__copy_ia_na_to_lease_addrs(const ni_dhcp6_device_t *dev, ni_addrconf_lease_t
*lease)
+unsigned int
+ni_dhcp6_ia_copy_to_lease_addrs(const ni_dhcp6_device_t *dev,
ni_addrconf_lease_t *lease)
{
ni_address_t * ap;
ni_dhcp6_ia_t * ia;
@@ -2671,7 +2671,8 @@
unsigned int plen;
for (ia = lease->dhcp6.ia_list; ia; ia = ia->next) {
- if (ia->type != NI_DHCP6_OPTION_IA_NA)
+ if (ia->type != NI_DHCP6_OPTION_IA_NA &&
+ ia->type != NI_DHCP6_OPTION_IA_TA)
continue;
if (ia->status.code != NI_DHCP6_STATUS_SUCCESS)
@@ -2688,24 +2689,29 @@
ni_sockaddr_set_ipv6(&sadr, iadr->addr, 0);
- plen = __find_pinfo_prefixlen(dev, &sadr);
+ plen = ni_dhcp6_find_pinfo_prefixlen(dev, &sadr);
if (plen >= 4 && plen <= 128) {
- ni_debug_dhcp("%s: Using RA prefix info length
%u",
+ ni_debug_verbose(NI_LOG_DEBUG1, NI_TRACE_DHCP,
+ "%s: using RA prefix info
length %u",
dev->ifname, plen);
} else {
plen = 64;
- ni_debug_dhcp("%s: Using default prefix length
%u",
+ ni_debug_verbose(NI_LOG_DEBUG1, NI_TRACE_DHCP,
+ "%s: using default prefix
length %u",
dev->ifname, plen);
}
ap = ni_address_new(AF_INET6, plen, &sadr,
&lease->addrs);
if (ap) {
+ ap->ipv6_cache_info.acquired.tv_sec =
ia->time_acquired;
ap->ipv6_cache_info.preferred_lft =
iadr->preferred_lft;
ap->ipv6_cache_info.valid_lft = iadr->valid_lft;
- ni_debug_dhcp("%s: added IPv6 address %s/%u to
lease candidate",
- dev->ifname,
ni_sockaddr_print(&ap->local_addr),
- ap->prefixlen);
+ ni_debug_verbose(NI_LOG_DEBUG1, NI_TRACE_DHCP,
+ "%s: added %sDHCPv6 address
%s/%u to lease",
+ dev->ifname,
ni_address_is_temporary(ap) ?
+ "temporary " : "",
+
ni_sockaddr_print(&ap->local_addr), ap->prefixlen);
}
}
}
@@ -3042,7 +3048,7 @@
}
/* FIXME: too early here -- do it after parsing depending on the state?
*/
- __copy_ia_na_to_lease_addrs(dev, lease);
+ ni_dhcp6_ia_copy_to_lease_addrs(dev, lease);
ni_string_array_destroy(&nis_servers);
ni_string_array_destroy(&nis_domains);
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.43/src/dhcp6/protocol.h new/wicked-0.6.44/src/dhcp6/protocol.h
--- old/wicked-0.6.43/src/dhcp6/protocol.h 2017-12-15 15:29:48.000000000
+0100
+++ new/wicked-0.6.44/src/dhcp6/protocol.h 2017-12-19 14:44:06.000000000
+0100
@@ -262,6 +262,7 @@
extern ni_bool_t ni_dhcp6_ia_is_active(ni_dhcp6_ia_t *, struct timeval
*);
extern unsigned int ni_dhcp6_ia_list_count_active(ni_dhcp6_ia_t *, struct
timeval *now);
extern int ni_dhcp6_ia_list_copy(ni_dhcp6_ia_t **, const
ni_dhcp6_ia_t *, ni_bool_t);
+extern unsigned int ni_dhcp6_ia_copy_to_lease_addrs(const ni_dhcp6_device_t
*, ni_addrconf_lease_t *);
extern const char * ni_dhcp6_print_timeval(const struct timeval *);
extern const char * ni_dhcp6_print_time(time_t);
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.43/src/ifconfig.c new/wicked-0.6.44/src/ifconfig.c
--- old/wicked-0.6.43/src/ifconfig.c 2017-12-15 16:03:54.000000000 +0100
+++ new/wicked-0.6.44/src/ifconfig.c 2018-01-24 15:56:58.000000000 +0100
@@ -4039,6 +4039,7 @@
{
struct ifinfomsg ifi;
struct nl_msg *msg;
+ int err;
if (!dev || !mtu)
return -1;
@@ -4047,15 +4048,20 @@
ifi.ifi_family = AF_UNSPEC;
ifi.ifi_index = dev->link.ifindex;
- msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST);
+ if (!(msg = nlmsg_alloc_simple(RTM_NEWLINK, NLM_F_REQUEST)))
+ goto nla_put_failure;
+
if (nlmsg_append(msg, &ifi, sizeof(ifi), NLMSG_ALIGNTO) < 0)
goto nla_put_failure;
if (__ni_rtnl_link_put_mtu(msg, mtu) < 0)
goto nla_put_failure;
- if (ni_nl_talk(msg, NULL))
+ if ((err = ni_nl_talk(msg, NULL))) {
+ ni_error("failed to modify interface %s mtu to %u: %s",
+ dev->name, mtu, nl_geterror(err));
goto failed;
+ }
ni_debug_ifconfig("successfully modified interface %s mtu to %u",
dev->name, mtu);
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.43/src/netinfo.c new/wicked-0.6.44/src/netinfo.c
--- old/wicked-0.6.43/src/netinfo.c 2017-12-15 11:22:12.000000000 +0100
+++ new/wicked-0.6.44/src/netinfo.c 2018-01-08 11:15:10.000000000 +0100
@@ -581,6 +581,17 @@
__ni_netdev_list_append(&nc->interfaces, dev);
}
+static inline void
+ni_netconfig_device_unbind_slave_index(ni_netconfig_t *nc, unsigned int master)
+{
+ ni_netdev_t *dev;
+
+ for (dev = nc->interfaces; dev; dev = dev->next) {
+ if (dev->link.masterdev.index == master)
+ ni_netdev_ref_destroy(&dev->link.masterdev);
+ }
+}
+
void
ni_netconfig_device_remove(ni_netconfig_t *nc, ni_netdev_t *dev)
{
@@ -589,6 +600,7 @@
for (pos = &nc->interfaces; (cur = *pos) != NULL; pos = &cur->next) {
if (cur == dev) {
*pos = cur->next;
+ ni_netconfig_device_unbind_slave_index(nc,
cur->link.ifindex);
ni_netdev_put(cur);
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.43/src/teamd.c new/wicked-0.6.44/src/teamd.c
--- old/wicked-0.6.43/src/teamd.c 2017-09-13 14:19:58.000000000 +0200
+++ new/wicked-0.6.44/src/teamd.c 2018-02-01 13:24:52.000000000 +0100
@@ -118,13 +118,8 @@
static void ni_teamd_dbus_signal(ni_dbus_connection_t *,
ni_dbus_message_t *, void *);
static ni_dbus_class_t ni_objectmodel_teamd_client_class = {
- "teamd-client"
+ .name = "teamd-client"
};
-#if 0
-static ni_dbus_class_t ni_objectmodel_teamd_device_class = {
- "teamd-device"
-};
-#endif
static const ni_intmap_t ni_teamd_dbus_error_names[] = {
{ NULL, -1 }
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.43/src/wireless.c new/wicked-0.6.44/src/wireless.c
--- old/wicked-0.6.43/src/wireless.c 2017-03-02 11:14:40.000000000 +0100
+++ new/wicked-0.6.44/src/wireless.c 2018-02-01 13:24:52.000000000 +0100
@@ -439,14 +439,14 @@
{ IW_IE_CIPHER_CCMP, NI_WIRELESS_CIPHER_CCMP },
{ IW_IE_CIPHER_WRAP, NI_WIRELESS_CIPHER_WRAP },
{ IW_IE_CIPHER_WEP104, NI_WIRELESS_CIPHER_WEP104 },
- { -1 }
+ { -1, -1 }
};
static __ni_kernel_map_t __ni_wireless_key_mgmt_map[] = {
{ IW_IE_KEY_MGMT_NONE, NI_WIRELESS_KEY_MGMT_NONE },
{ IW_IE_KEY_MGMT_PSK, NI_WIRELESS_KEY_MGMT_PSK },
{ IW_IE_KEY_MGMT_802_1X,NI_WIRELESS_KEY_MGMT_802_1X },
- { -1 }
+ { -1, -1 }
};
static int
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.43/src/wpa-supplicant.c new/wicked-0.6.44/src/wpa-supplicant.c
--- old/wicked-0.6.43/src/wpa-supplicant.c 2017-03-02 11:14:40.000000000
+0100
+++ new/wicked-0.6.44/src/wpa-supplicant.c 2018-02-01 13:24:52.000000000
+0100
@@ -61,11 +61,11 @@
};
static ni_dbus_class_t ni_objectmodel_wpa_class = {
- "wpa"
+ .name = "wpa-client"
};
static ni_dbus_class_t ni_objectmodel_wpanet_class;
static ni_dbus_class_t ni_objectmodel_wpadev_class = {
- "wpa-device"
+ .name = "wpa-device"
};
static ni_dbus_service_t ni_wpa_bssid_service;
static ni_dbus_service_t ni_wpa_network_service;
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.43/wicked.pc.in new/wicked-0.6.44/wicked.pc.in
--- old/wicked-0.6.43/wicked.pc.in 2016-01-29 16:56:20.000000000 +0100
+++ new/wicked-0.6.44/wicked.pc.in 2018-01-27 08:32:03.000000000 +0100
@@ -8,5 +8,5 @@
Description: network configuration infrastructure library
Cflags: -I${includedir}
Libs: -L${libdir} -l@PACKAGE_NAME@
-Requires: dbus-1 libnl-1
+Requires: dbus-1 libnl-3.0 libnl-route-3.0
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.43/wicked.spec new/wicked-0.6.44/wicked.spec
--- old/wicked-0.6.43/wicked.spec 2017-12-16 02:13:50.000000000 +0100
+++ new/wicked-0.6.44/wicked.spec 2018-02-02 16:30:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wicked
#
-# Copyright (c) 2010-2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define release_prefix %{?snapshot:%{snapshot}}%{!?snapshot:0}
Name: wicked
-Version: 0.6.43
+Version: 0.6.44
Release: %{release_prefix}.0.0
Summary: Network configuration infrastructure
License: GPL-2.0
@@ -41,6 +41,11 @@
BuildRequires: make
Requires(pre): libwicked-0-6 = %{version}
+%if 0%{?suse_version} >= 1500
+%bcond_without rfc4361_cid
+%else
+%bcond_with rfc4361_cid
+%endif
%if 0%{?suse_version} >= 1230
%bcond_without systemd
%bcond_with dbusstart
@@ -182,6 +187,9 @@
--with-storedir=%{wicked_storedir}\
--with-compat=suse \
--with-fillup-templatesdir=%{_fillupdir}\
+%if %{without rfc4361_cid}
+ --disable-dhcp4-rfc4361-cid \
+%endif
%if %{without use_nanny}
--disable-nanny-use \
%endif
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.43/wicked.spec.in new/wicked-0.6.44/wicked.spec.in
--- old/wicked-0.6.43/wicked.spec.in 2017-12-15 11:22:12.000000000 +0100
+++ new/wicked-0.6.44/wicked.spec.in 2018-02-02 16:06:07.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package wicked
#
-# Copyright (c) 2010-2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -41,6 +41,11 @@
BuildRequires: make
Requires(pre): libwicked@LIBWICKED_PACKAGE_SUFFIX@ = %{version}
+%if 0%{?suse_version} >= 1500
+%bcond_without rfc4361_cid
+%else
+%bcond_with rfc4361_cid
+%endif
%if 0%{?suse_version} >= 1230
%bcond_without systemd
%bcond_with dbusstart
@@ -182,6 +187,9 @@
--with-storedir=%{wicked_storedir}\
--with-compat=suse \
--with-fillup-templatesdir=%{_fillupdir}\
+%if %{without rfc4361_cid}
+ --disable-dhcp4-rfc4361-cid \
+%endif
%if %{without use_nanny}
--disable-nanny-use \
%endif
