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 deleted file mode 100644 index b96e817..0000000 --- a/avoid-dangling-co_major_cache-reference-to-NL_AUTO_P.diff +++ /dev/null @@ -1,32 +0,0 @@ -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/libnl-3.2.3.tar.xz b/libnl-3.2.3.tar.xz deleted file mode 100644 index 97a3495..0000000 --- a/libnl-3.2.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b8cb8b8aec087fcb8b3325c5bef10845a516071e8dabc1e0195d77e21035d27 -size 863016 diff --git a/libnl-3.2.7.tar.xz b/libnl-3.2.7.tar.xz new file mode 100644 index 0000000..c9d73b5 --- /dev/null +++ b/libnl-3.2.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3996238e07211ea3186f150d26ffaa559076e4217ea09d7860edae4b55d359d +size 863732 diff --git a/libnl3.changes b/libnl3.changes index 8234d7b..5fc74c8 100644 --- a/libnl3.changes +++ b/libnl3.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Feb 8 22:34:09 UTC 2012 - jengelh@medozas.de + +- Update to new upstream release 3.2.7 +* link: fix regression in link message parser +* nl_addr_cmp: handle prefix length during address comparison +* avoid dangling co_major_cache reference to NL_AUTO_PROVIDE caches +* dsmark: Add missing declarations for + rtnl_class_dsmark_(get|set)_bitmask +* rtnl_link_bond_add: allow to allocate bond name in case NULL + is given +* link: allow to add/get linkinfo of unknown type + ------------------------------------------------------------------- Thu Jan 12 11:30:44 UTC 2012 - coolo@suse.com diff --git a/libnl3.spec b/libnl3.spec index 2239831..76ef513 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -18,7 +18,7 @@ Name: libnl3 %define lname libnl3-200 %define with_tools 1 -Version: 3.2.3 +Version: 3.2.7 Release: 0 Summary: Convenience library for working with Netlink sockets License: LGPL-2.1 and GPL-2.0 @@ -30,7 +30,6 @@ 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 BuildRequires: automake @@ -105,7 +104,7 @@ demonstrated. tar -xf "%{S:0}" --use=xz; %setup -DTqn libnl-%version %endif -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 %build # we do have patches