Hello community, here is the log from the commit of package netcontrol for openSUSE:Factory checked in at 2013-12-30 10:24:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcontrol (Old) and /work/SRC/openSUSE:Factory/.netcontrol.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcontrol" Changes: -------- --- /work/SRC/openSUSE:Factory/netcontrol/netcontrol.changes 2013-10-25 18:53:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netcontrol.new/netcontrol.changes 2013-12-30 10:24:11.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 17 16:40:46 UTC 2013 - [email protected] + +- Applied a minimal 0002-allow-wicked.patch to accept wicked + as the network service (fate#316768). +- Renamed libnl3.patch to 0001-use-libnl3.patch + +------------------------------------------------------------------- Old: ---- libnl3.patch New: ---- 0001-use-libnl3.patch 0002-allow-wicked.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcontrol.spec ++++++ --- /var/tmp/diff_new_pack.gn03uE/_old 2013-12-30 10:24:12.000000000 +0100 +++ /var/tmp/diff_new_pack.gn03uE/_new 2013-12-30 10:24:12.000000000 +0100 @@ -31,8 +31,10 @@ # Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf -# PATCH-FIX-UPSTREAM libnl3.patch -- Fixes bnc#845540 -Patch1: libnl3.patch +# PATCH-FIX-UPSTREAM 0001-use-libnl3.patch -- Fixes bnc#845540 +Patch1: 0001-use-libnl3.patch +# PATCH-FIX-UPSTREAM 0002-allow-wicked.patch -- fate#316768 +Patch2: 0002-allow-wicked.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1310 BuildRequires: autoconf @@ -107,6 +109,7 @@ %if 0%{?suse_version} >= 1310 %patch1 -p1 %endif +%patch2 -p1 %build export CFLAGS="-W -Wall $RPM_OPT_FLAGS" ++++++ 0001-use-libnl3.patch ++++++ Index: netcontrol-0.2.8/src/nlutils.c =================================================================== --- netcontrol-0.2.8.orig/src/nlutils.c +++ netcontrol-0.2.8/src/nlutils.c @@ -55,7 +55,7 @@ nc_netlink_close(nc_netlink_t **nl) return; if((*nl)->handle) - nl_handle_destroy((*nl)->handle); + nl_socket_free((*nl)->handle); if((*nl)->cb) nl_cb_put((*nl)->cb); free(*nl); @@ -80,7 +80,7 @@ nc_netlink_open() nc_netlink_close(&nl); } - nl->handle = nl_handle_alloc_cb(nl->cb); + nl->handle = nl_socket_alloc_cb(nl->cb); if(!nl->handle) { nc_error("Cannot allocate netlink handle: %m"); nc_netlink_close(&nl); Index: netcontrol-0.2.8/configure.ac =================================================================== --- netcontrol-0.2.8.orig/configure.ac +++ netcontrol-0.2.8/configure.ac @@ -36,7 +36,8 @@ if test "X$ax_pthread_ok" = "Xyes" ; the elif test "X$enable_pthreads" = "Xyes" ; then AC_MSG_ERROR([unable to detect pthread support]) fi -PKG_CHECK_MODULES([LIBNL], [libnl-1]) +PKG_CHECK_MODULES([LIBNL], [libnl-3.0]) +PKG_CHECK_MODULES([LIBNL_ROUTE], [libnl-route-3.0]) AC_ARG_ENABLE(network-service, [AS_HELP_STRING([--enable-network-service], Index: netcontrol-0.2.8/src/Makefile.am =================================================================== --- netcontrol-0.2.8.orig/src/Makefile.am +++ netcontrol-0.2.8/src/Makefile.am @@ -17,7 +17,8 @@ nctest_DEPENDENCIES = $(nctest_LDADD) lib_LTLIBRARIES = libnetcontrol.la -libnetcontrol_la_LDFLAGS = $(LIBNL_LIBS) \ +libnetcontrol_la_CFLAGS = $(LIBNL_CFLAGS) +libnetcontrol_la_LDFLAGS = $(LIBNL_LIBS) $(LIBNL_ROUTE_LIBS) \ -Wl,--version-script=$(builddir)/netcontrol.syms \ -version-info $(LIBNETCONTROL_VERSION_INFO) libnetcontrol_la_DEPENDENCIES = netcontrol.syms ++++++ 0002-allow-wicked.patch ++++++ >From e6d8442f1e0b83dab40b5132d086069b2610778a Mon Sep 17 00:00:00 2001 From: Marius Tomaschewski <[email protected]> Date: Wed, 4 Sep 2013 10:44:23 +0200 Subject: [PATCH] Allow netconfig use with wicked as network.service --- src/backend-suse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend-suse.c b/src/backend-suse.c index d335816..dff529a 100644 --- a/src/backend-suse.c +++ b/src/backend-suse.c @@ -560,7 +560,8 @@ __netcontrol_enabled(nc_handle_t *nh) int enabled = 0; if( __nc_suse_config_get_network_service(nh, &service) == 0) { - if (service && strcmp(service, "network.service") == 0) + if (nc_string_eq(service, "wicked.service") || + nc_string_eq(service, "network.service")) enabled = 1; nc_string_free(&service); } -- 1.8.1.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
