pool/netcontrol
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- version 0.3.0

Browse Source 
- Added libnl version configure option and detection
- Obsoletes 0002-allow-wicked.patch, 0001-use-libnl3.patch

OBS-URL: https://build.opensuse.org/package/show/network:utilities/netcontrol?expand=0&rev=18
This commit is contained in:
Marius Tomaschewski 2014-01-10 12:00:43 +00:00 committed by Git OBS Bridge
parent 48485dff3c
commit a054c372dc
6 changed files with 13 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
0001-use-libnl3.patch
View File

@ -1,50 +0,0 @@
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

26
0002-allow-wicked.patch
View File

@ -1,26 +0,0 @@
From e6d8442f1e0b83dab40b5132d086069b2610778a Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.de>
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

3
netcontrol-0.2.8.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:54dbadfab1f519af4b2e2cfa26789e0c2df362a34a893db4fd11e665912d0d14
size 360450

3
netcontrol-0.3.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:696d7b1636b066dddb617f4029777193f7b4928f7dd099d1e04c9692d27bce06
size 357489

7
netcontrol.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 10 10:55:26 UTC 2014 - mt@suse.de
- version 0.3.0
- Added libnl version configure option and detection
- Obsoletes 0002-allow-wicked.patch, 0001-use-libnl3.patch
-------------------------------------------------------------------
Tue Dec 17 16:40:46 UTC 2013 - mt@suse.de

20
netcontrol.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package netcontrol
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,8 +17,8 @@
Name: netcontrol
Version: 0.2.8
Release: 0.<RELEASE5>
Version: 0.3.0
Release: 0.<RELEASE0>
Summary: A network configuration library
License: LGPL-2.1+
Group: Productivity/Networking/System
@ -31,10 +31,6 @@ Group: Productivity/Networking/System
#
Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
# 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
@ -106,19 +102,9 @@ Authors:
%prep
%setup -q
%if 0%{?suse_version} >= 1310
%patch1 -p1
%endif
%patch2 -p1
%build
export CFLAGS="-W -Wall $RPM_OPT_FLAGS"
# patch1 modifies configure.ac
%if 0%{?suse_version} >= 1310
autoreconf -fi
%endif
%configure \
%if 0%{?suse_version} >= 1230
--enable-network-service \