Hello community,
here is the log from the commit of package netcontrol for openSUSE:Factory
checked in at 2014-01-13 12:03:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-30
10:24:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.netcontrol.new/netcontrol.changes
2014-01-13 12:03:23.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Jan 10 10:55:26 UTC 2014 - m...@suse.de
+
+- version 0.3.0
+- Added libnl version configure option and detection
+- Obsoletes 0002-allow-wicked.patch, 0001-use-libnl3.patch
+
+-------------------------------------------------------------------
Old:
----
0001-use-libnl3.patch
0002-allow-wicked.patch
netcontrol-0.2.8.tar.bz2
New:
----
netcontrol-0.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netcontrol.spec ++++++
--- /var/tmp/diff_new_pack.6SCTZd/_old 2014-01-13 12:03:24.000000000 +0100
+++ /var/tmp/diff_new_pack.6SCTZd/_new 2014-01-13 12:03:24.000000000 +0100
@@ -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 @@
#
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 @@
%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 \
++++++ netcontrol-0.2.8.tar.bz2 -> netcontrol-0.3.0.tar.bz2 ++++++
++++ 4648 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/netcontrol-0.2.8/ChangeLog.git new/netcontrol-0.3.0/ChangeLog.git
--- old/netcontrol-0.2.8/ChangeLog.git 2013-03-26 16:35:47.000000000 +0100
+++ new/netcontrol-0.3.0/ChangeLog.git 2014-01-10 12:07:30.000000000 +0100
@@ -1,3 +1,23 @@
+commit 328980d93891f10525cd17ad592380f92040740b
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Jan 10 12:06:10 2014 +0100
+
+ version 0.3.0, updated changes file
+
+commit 83f86fb636abacfcbabc69700c2ba5a5bed2b6f3
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Fri Jan 10 12:05:47 2014 +0100
+
+ Added libnl version configure option and detection
+
+ Obsoletes 0001-use-libnl3.patch in OBS for openSUSE 13.1+
+
+commit f1841ddda798839116e675ccd1d438d182c86334
+Author: Marius Tomaschewski <m...@suse.de>
+Date: Wed Sep 4 10:44:23 2013 +0200
+
+ Allow netconfig use with wicked as network.service
+
commit 21cf2bf79856f26f42dad05facbeb28fa25c5cdd
Author: Marius Tomaschewski <m...@suse.de>
Date: Tue Mar 26 16:10:38 2013 +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/netcontrol-0.2.8/configure.ac new/netcontrol-0.3.0/configure.ac
--- old/netcontrol-0.2.8/configure.ac 2013-03-26 16:00:26.000000000 +0100
+++ new/netcontrol-0.3.0/configure.ac 2014-01-10 12:06:05.000000000 +0100
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT([netcontrol], [0.2.8], [feedb...@suse.de], [],
+AC_INIT([netcontrol], [0.3.0], [feedb...@suse.de], [],
[http://www.suse.de/~mt/git/netcontrol.git/])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
AC_CONFIG_SRCDIR([src/nctest.c])
@@ -10,7 +10,7 @@
AC_PREFIX_DEFAULT(/usr)
AC_SUBST([VERSION_API], [${VERSION%.*}])
-AC_SUBST([LIBNETCONTROL_VERSION_INFO], [2:8:2])
+AC_SUBST([LIBNETCONTROL_VERSION_INFO], [3:0:3])
AC_USE_SYSTEM_EXTENSIONS
@@ -36,7 +36,22 @@
elif test "X$enable_pthreads" = "Xyes" ; then
AC_MSG_ERROR([unable to detect pthread support])
fi
-PKG_CHECK_MODULES([LIBNL], [libnl-1])
+AC_ARG_WITH([libnl], [AS_HELP_STRING([--with-libnl=VERSION],
+ [Specify libnl version to use: 1.1 or 3.0])])
+case $with_libnl in
+"")
+ PKG_CHECK_EXISTS([libnl-3.0],[with_libnl=${with_libnl:-3.0}],[
+ PKG_CHECK_EXISTS([libnl-1], [with_libnl=${with_libnl:-1.1}])])
+;;
+esac
+case $with_libnl in
+1.1) PKG_CHECK_MODULES([LIBNL],[libnl-1 >= 1.1])
+ AC_DEFINE([__NETCONTROL_LIBNL1], [1],
+ [Define to use libnl-1 handle instead socket])
+;;
+3.0) PKG_CHECK_MODULES([LIBNL],[libnl-3.0 >= 3.0 libnl-route-3.0 >= 3.0])
;;
+*) AC_MSG_ERROR([Unsupported libnl version libnl-$with_libnl])
;;
+esac
AC_ARG_ENABLE(network-service,
[AS_HELP_STRING([--enable-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/netcontrol-0.2.8/missing new/netcontrol-0.3.0/missing
--- old/netcontrol-0.2.8/missing 2013-03-26 16:32:23.000000000 +0100
+++ new/netcontrol-0.3.0/missing 2014-01-10 12:07:06.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-01-06.18; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,61 +29,33 @@
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, 'missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file 'aclocal.m4'
- autoconf touch file 'configure'
- autoheader touch file 'config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all 'Makefile.in' files
- bison create 'y.tab.[ch]', if possible, from existing .[ch]
- flex create 'lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create 'lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- yacc create 'y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
'g' are ignored when checking the name.
@@ -98,228 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown '$1' option"
+ echo 1>&2 "$0: unknown '$1' option"
echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running '$TOOL --version' or '$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'acinclude.m4' or '${configure_ac}'. You might want
- to install the Automake and Perl packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified '${configure_ac}'. You might want to install the
- Autoconf and GNU m4 packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'acconfig.h' or '${configure_ac}'. You might want
- to install the Autoconf and GNU m4 packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- automake*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
- You might want to install the Automake and Perl packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: '$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get '$1' as part of Autoconf from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: '$1' $msg. You should only need it if
- you modified a '.y' file. You may need the Bison package
- in order for those modifications to take effect. You can get
- Bison from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified a '.l' file. You may need the Flex package
- in order for those modifications to take effect. You can get
- Flex from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG=\${$#}
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- Help2man package in order for those modifications to take
- effect. You can get Help2man from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: '$1' is $msg. You should only need it if
- you modified a '.texi' or '.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy 'make' (AIX,
- DU, IRIX). You might want to install the Texinfo package or
- the GNU make package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: '$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the 'README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing '$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
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/netcontrol-0.2.8/netcontrol.changes new/netcontrol-0.3.0/netcontrol.changes
--- old/netcontrol-0.2.8/netcontrol.changes 2013-03-26 16:01:12.000000000
+0100
+++ new/netcontrol-0.3.0/netcontrol.changes 2014-01-10 12:06:05.000000000
+0100
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Fri Jan 10 10:55:26 UTC 2014 - m...@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 - m...@suse.de
+
+- Applied a minimal 0002-allow-wicked.patch to accept wicked
+ as the network service (fate#316768).
+- Renamed libnl3.patch to 0001-use-libnl3.patch
+
+-------------------------------------------------------------------
+Fri Oct 25 09:41:22 UTC 2013 - idon...@suse.com
+
+- Add libnl3.patch to build with libnl3 open openSUSE 13.1+, this
+ fixes bnc#845540
+
+-------------------------------------------------------------------
Tue Mar 26 15:01:02 UTC 2013 - m...@suse.de
- version 0.2.8
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/netcontrol-0.2.8/netcontrol.spec new/netcontrol-0.3.0/netcontrol.spec
--- old/netcontrol-0.2.8/netcontrol.spec 2013-03-26 16:32:26.000000000
+0100
+++ new/netcontrol-0.3.0/netcontrol.spec 2014-01-10 12:07:09.000000000
+0100
@@ -16,7 +16,7 @@
#
Name: netcontrol
-Version: 0.2.8
+Version: 0.3.0
Release: 0
Summary: A network configuration library
License: LGPL-2.1+
@@ -31,11 +31,18 @@
Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1310
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libnl3-devel
+BuildRequires: libtool
+%else
%if 0%{?suse_version} >= 1210
BuildRequires: libnl-1_1-devel
%else
BuildRequires: libnl-devel
%endif
+%endif
BuildRequires: pkg-config
%if 0%{?suse_version} >= 1230
Requires: sysconfig >= 0.80.0
@@ -55,6 +62,7 @@
Marius Tomaschewski <m...@suse.de>
%package -n libnetcontrol0
+
Summary: A network configuration library
Group: Productivity/Networking/System
@@ -72,6 +80,7 @@
Marius Tomaschewski <m...@suse.de>
%package -n libnetcontrol-devel
+
Summary: Development header and library files
Group: Development/Libraries/C and C++
Requires: libnetcontrol0 = %{version}
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/netcontrol-0.2.8/netcontrol.spec.in new/netcontrol-0.3.0/netcontrol.spec.in
--- old/netcontrol-0.2.8/netcontrol.spec.in 2013-03-26 15:33:51.000000000
+0100
+++ new/netcontrol-0.3.0/netcontrol.spec.in 2014-01-10 12:03:02.000000000
+0100
@@ -31,11 +31,18 @@
Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} >= 1310
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libnl3-devel
+BuildRequires: libtool
+%else
%if 0%{?suse_version} >= 1210
BuildRequires: libnl-1_1-devel
%else
BuildRequires: libnl-devel
%endif
+%endif
BuildRequires: pkg-config
%if 0%{?suse_version} >= 1230
Requires: sysconfig >= 0.80.0
@@ -55,6 +62,7 @@
Marius Tomaschewski <m...@suse.de>
%package -n libnetcontrol0
+
Summary: A network configuration library
Group: Productivity/Networking/System
@@ -72,6 +80,7 @@
Marius Tomaschewski <m...@suse.de>
%package -n libnetcontrol-devel
+
Summary: Development header and library files
Group: Development/Libraries/C and C++
Requires: libnetcontrol0 = %{version}
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/netcontrol-0.2.8/src/Makefile.am new/netcontrol-0.3.0/src/Makefile.am
--- old/netcontrol-0.2.8/src/Makefile.am 2013-03-26 13:23:55.000000000
+0100
+++ new/netcontrol-0.3.0/src/Makefile.am 2014-01-10 12:01:59.000000000
+0100
@@ -17,6 +17,7 @@
lib_LTLIBRARIES = libnetcontrol.la
+libnetcontrol_la_CFLAGS = $(LIBNL_CFLAGS)
libnetcontrol_la_LDFLAGS = $(LIBNL_LIBS) \
-Wl,--version-script=$(builddir)/netcontrol.syms \
-version-info $(LIBNETCONTROL_VERSION_INFO)
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/netcontrol-0.2.8/src/backend-suse.c new/netcontrol-0.3.0/src/backend-suse.c
--- old/netcontrol-0.2.8/src/backend-suse.c 2013-03-26 15:33:51.000000000
+0100
+++ new/netcontrol-0.3.0/src/backend-suse.c 2014-01-10 12:01:13.000000000
+0100
@@ -560,7 +560,8 @@
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);
}
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/netcontrol-0.2.8/src/config.h.in new/netcontrol-0.3.0/src/config.h.in
--- old/netcontrol-0.2.8/src/config.h.in 2013-03-26 16:32:22.000000000
+0100
+++ new/netcontrol-0.3.0/src/config.h.in 2014-01-10 12:07:06.000000000
+0100
@@ -156,6 +156,9 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
+/* Define to use libnl-1 handle instead socket */
+#undef __NETCONTROL_LIBNL1
+
/* Check network.service alias instead of NETWORKMANAGER variable */
#undef __NETCONTROL_USE_SERVICE_ALIAS
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/netcontrol-0.2.8/src/nlutils.c new/netcontrol-0.3.0/src/nlutils.c
--- old/netcontrol-0.2.8/src/nlutils.c 2013-03-26 13:44:08.000000000 +0100
+++ new/netcontrol-0.3.0/src/nlutils.c 2014-01-10 12:04:07.000000000 +0100
@@ -29,6 +29,9 @@
* You can find the wicked project at http://gitorious.org/wicked/.
*
*/
+#if defined(HAVE_CONFIG_H)
+#include <config.h>
+#endif
#include <netlink/msg.h>
#include <netlink/attr.h>
#include <netlink/netlink.h>
@@ -44,18 +47,40 @@
struct nc_netlink {
struct nl_cb * cb;
+#if defined(__NETCONTROL_LIBNL1)
struct nl_handle * handle;
+#else
+ struct nl_sock * handle;
+#endif
};
+static inline void *
+__nc_netlink_alloc_sock_handle(struct nl_cb *cb)
+{
+#if defined(__NETCONTROL_LIBNL1)
+ return nl_handle_alloc_cb(cb);
+#else
+ return nl_socket_alloc_cb(cb);
+#endif
+}
+
+static inline void
+__nc_netlink_free_sock_handle(nc_netlink_t *nl)
+{
+ if (nl && nl->handle) {
+#if defined(__NETCONTROL_LIBNL1)
+ nl_handle_destroy(nl->handle);
+#else
+ nl_socket_free(nl->handle);
+#endif
+ }
+}
+
void
nc_netlink_close(nc_netlink_t **nl)
{
- if(nl) {
- if((*nl) == NULL)
- return;
-
- if((*nl)->handle)
- nl_handle_destroy((*nl)->handle);
+ if(nl && *nl) {
+ __nc_netlink_free_sock_handle(*nl);
if((*nl)->cb)
nl_cb_put((*nl)->cb);
free(*nl);
@@ -80,9 +105,9 @@
nc_netlink_close(&nl);
}
- nl->handle = nl_handle_alloc_cb(nl->cb);
+ nl->handle = __nc_netlink_alloc_sock_handle(nl->cb);
if(!nl->handle) {
- nc_error("Cannot allocate netlink handle: %m");
+ nc_error("Cannot allocate netlink socket handle: %m");
nc_netlink_close(&nl);
return NULL;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
