diff --git a/.gitignore b/.gitignore index bdcf017..273287e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /libnl-doc-3.2.21.tar.gz /libnl-3.2.22.tar.gz /libnl-doc-3.2.22.tar.gz +/libnl-3.2.24.tar.gz +/libnl-doc-3.2.24.tar.gz diff --git a/libnl-3.2.22-963111.patch b/libnl-3.2.22-963111.patch deleted file mode 100644 index 69764c8..0000000 --- a/libnl-3.2.22-963111.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur libnl-3.2.22-orig/lib/route/link.c libnl-3.2.22/lib/route/link.c ---- libnl-3.2.22-orig/lib/route/link.c 2013-02-24 11:06:54.000000000 -0500 -+++ libnl-3.2.22/lib/route/link.c 2013-09-23 15:42:29.167629304 -0400 -@@ -1743,10 +1743,11 @@ - link->l_family = family; - link->ce_mask |= LINK_ATTR_FAMILY; - -- if (link->l_af_ops) -+ if (link->l_af_ops) { - af_free(link, link->l_af_ops, - link->l_af_data[link->l_af_ops->ao_family], NULL); -- -+ link->l_af_data[link->l_af_ops->ao_family] = NULL; -+ } - link->l_af_ops = af_lookup_and_alloc(link, family); - } - diff --git a/libnl3.spec b/libnl3.spec index d37d067..325554b 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -2,12 +2,11 @@ Summary: Convenience library for kernel netlink sockets Group: Development/Libraries License: LGPLv2 Name: libnl3 -Version: 3.2.22 -Release: 2%{?dist} +Version: 3.2.24 +Release: 1%{?dist} URL: http://www.infradead.org/~tgr/libnl/ Source: http://www.infradead.org/~tgr/libnl/files/libnl-%{version}.tar.gz Source1: http://www.infradead.org/~tgr/libnl/files/libnl-doc-%{version}.tar.gz -Patch1: libnl-3.2.22-963111.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: flex bison BuildRequires: python @@ -46,7 +45,6 @@ This package contains libnl3 API documentation %prep %setup -q -n libnl-%{version} -%patch1 -p1 tar -xzf %SOURCE1 @@ -99,6 +97,9 @@ find $RPM_BUILD_ROOT -name \*.la -delete %doc libnl-doc-%{version}/api/* %changelog +* Thu Jan 23 2014 Thomas Haller - 3.2.24-1 +- Update to 3.2.24 (rhbz#963111) + * Mon Sep 23 2013 Paul Wouters - 3.2.22-2 - Update to 3.2.22 (rhbz#963111) - Add patch for double tree crasher in rtnl_link_set_address_family() diff --git a/sources b/sources index 8d47076..fe2650c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -99eb05c8a42621fa427fe4e095f95831 libnl-doc-3.2.22.tar.gz -2e1c889494d274aca24ce5f6a748e66e libnl-3.2.22.tar.gz +d1111959652bd6ad87b2071f61c8c20c libnl-doc-3.2.24.tar.gz +6e0e7bad0674749d930dd9f285343d55 libnl-3.2.24.tar.gz