From 41dc8d1886deef20da8a9d8b6a66296ba8c8bef9d2a12f02337131894d77119f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 31 Dec 2011 21:27:46 +0000 Subject: [PATCH 1/4] Updates to BuildRequires OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=13 --- libnl3.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libnl3.spec b/libnl3.spec index 165b302..45680d4 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -33,7 +33,8 @@ Source: libnl-%version.tar.xz Source2: baselibs.conf Patch1: libdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: bison fdupes flex libtool pkgconfig python-devel xz +BuildRequires: autoconf automaek bison fdupes flex libtool +BuildRequires: pkgconfig >= 0.23 python-devel xz %description The libnl suite is a collection of libraries providing APIs to @@ -135,7 +136,6 @@ rm -Rf "$b/%_sbindir" "$b/%_mandir/man8"; %_libdir/pkgconfig/* %if %with_tools -# %files -n libnl-config %defattr(-,root,root) @@ -146,7 +146,6 @@ rm -Rf "$b/%_sbindir" "$b/%_mandir/man8"; %defattr(-,root,root) %_mandir/man*/* %_sbindir/* - %endif %changelog From cf1e35c072050c65229a01fa6a7d848321a1c0578d5a15bd76977149747a7049 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 31 Dec 2011 22:02:58 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=C3=A6=20ftw?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=14 --- libnl3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libnl3.spec b/libnl3.spec index 45680d4..87495b3 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -33,7 +33,7 @@ Source: libnl-%version.tar.xz Source2: baselibs.conf Patch1: libdir.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf automaek bison fdupes flex libtool +BuildRequires: autoconf automake bison fdupes flex libtool BuildRequires: pkgconfig >= 0.23 python-devel xz %description From 4d2509abcab99afc4f217d35a870cfb1c058d8fd81b60ee149b76c745e8677e8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Jan 2012 16:15:02 +0000 Subject: [PATCH 3/4] Submission 98625 from adrianSUSE OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=15 --- ...co_major_cache-reference-to-NL_AUTO_P.diff | 32 +++++++++++++++++++ libnl3.changes | 6 ++++ libnl3.spec | 5 +-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff diff --git a/avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff b/avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff new file mode 100644 index 0000000..b96e817 --- /dev/null +++ b/avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff @@ -0,0 +1,32 @@ +From 8525e3a4082f88bc93f70c996577e2e48eb57d79 Mon Sep 17 00:00:00 2001 +From: Alexander Sack +Date: Fri, 21 Oct 2011 00:31:39 +0200 +Subject: [PATCH] avoid dangling co_major_cache reference to NL_AUTO_PROVIDE + caches + +--- + lib/cache_mngr.c | 7 +++++-- + 1 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/lib/cache_mngr.c b/lib/cache_mngr.c +index cfa676b..69fd4aa 100644 +--- a/lib/cache_mngr.c ++++ b/lib/cache_mngr.c +@@ -372,9 +372,12 @@ void nl_cache_mngr_free(struct nl_cache_mngr *mngr) + if (mngr->cm_handle) + nl_close(mngr->cm_handle); + +- for (i = 0; i < mngr->cm_nassocs; i++) +- if (mngr->cm_assocs[i].ca_cache) ++ for (i = 0; i < mngr->cm_nassocs; i++) { ++ if (mngr->cm_assocs[i].ca_cache) { ++ nl_cache_mngt_unprovide(mngr->cm_assocs[i].ca_cache); + nl_cache_free(mngr->cm_assocs[i].ca_cache); ++ } ++ } + + free(mngr->cm_assocs); + free(mngr); +-- +1.7.5.4 + diff --git a/libnl3.changes b/libnl3.changes index d46314d..00eda01 100644 --- a/libnl3.changes +++ b/libnl3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 3 13:23:24 UTC 2012 - adrian@suse.de + +- add dangling-co_major_cache-reference fix required by ntrack +- use original upstream tar ball including url + ------------------------------------------------------------------- Sat Nov 19 20:44:32 UTC 2011 - coolo@suse.com diff --git a/libnl3.spec b/libnl3.spec index 87495b3..1cf5c55 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -1,7 +1,7 @@ # # spec file for package libnl3 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -32,6 +32,7 @@ Url: http://people.suug.ch/~tgr/libnl/ Source: libnl-%version.tar.xz Source2: baselibs.conf Patch1: libdir.diff +Patch2: avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf automake bison fdupes flex libtool BuildRequires: pkgconfig >= 0.23 python-devel xz @@ -98,7 +99,7 @@ demonstrated. tar -xf "%{S:0}" --use=xz; %setup -DTqn libnl-%version %endif -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build # we do have patches From e2c23a6a25514462fef099b7b0c255102570a2f0f632b8731ed7ec5e80ba2cc3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 4 Jan 2012 18:36:57 +0000 Subject: [PATCH 4/4] Remove bogus clog entry OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnl3?expand=0&rev=16 --- libnl3.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/libnl3.changes b/libnl3.changes index 00eda01..11cc551 100644 --- a/libnl3.changes +++ b/libnl3.changes @@ -2,7 +2,6 @@ Tue Jan 3 13:23:24 UTC 2012 - adrian@suse.de - add dangling-co_major_cache-reference fix required by ntrack -- use original upstream tar ball including url ------------------------------------------------------------------- Sat Nov 19 20:44:32 UTC 2011 - coolo@suse.com