From c02ff7672e94e4e5574bb9b0147472fb2355e2ec Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Sep 23 2013 19:45:16 +0000 Subject: - Add patch for double tree crasher in rtnl_link_set_address_family() --- diff --git a/libnl-3.2.22-963111.patch b/libnl-3.2.22-963111.patch new file mode 100644 index 0000000..69764c8 --- /dev/null +++ b/libnl-3.2.22-963111.patch @@ -0,0 +1,17 @@ +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 1be2042..d37d067 100644 --- a/libnl3.spec +++ b/libnl3.spec @@ -3,10 +3,11 @@ Group: Development/Libraries License: LGPLv2 Name: libnl3 Version: 3.2.22 -Release: 1%{?dist} +Release: 2%{?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 @@ -45,6 +46,7 @@ This package contains libnl3 API documentation %prep %setup -q -n libnl-%{version} +%patch1 -p1 tar -xzf %SOURCE1 @@ -97,8 +99,9 @@ find $RPM_BUILD_ROOT -name \*.la -delete %doc libnl-doc-%{version}/api/* %changelog -* Mon Sep 23 2013 Paul Wouters - 3.2.22-1 +* 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() * Sat Aug 03 2013 Fedora Release Engineering - 3.2.21-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild