[packages/libnl] - updated to 3.2.25 - updated pedantic patch - removed obsolete old_kernels patch

[qboosh]

commit e49bc2c64570467d71752dafa46c6043c6c73773
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 19 08:39:21 2014 +0200

    - updated to 3.2.25
    - updated pedantic patch
    - removed obsolete old_kernels patch

 libnl-pedantic.patch | 13 ++++++-------
 libnl.spec           | 12 +++++-------
 old_kernels.patch    | 25 -------------------------
 3 files changed, 11 insertions(+), 39 deletions(-)
---
diff --git a/libnl.spec b/libnl.spec
index 5e47bc6..d6778b7 100644
--- a/libnl.spec
+++ b/libnl.spec
@@ -6,18 +6,17 @@
 Summary:	Netlink sockets library
 Summary(pl.UTF-8):	Biblioteka do obsługi gniazd netlink
 Name:		libnl
-Version:	3.2.24
-Release:	3
+Version:	3.2.25
+Release:	1
 Epoch:		1
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
-# Source0-md5:	6e0e7bad0674749d930dd9f285343d55
+# Source0-md5:	03f74d0cd5037cadc8cdfa313bbd195c
 Source1:	http://www.infradead.org/~tgr/libnl/files/%{name}-doc-%{version}.tar.gz
-# Source1-md5:	d1111959652bd6ad87b2071f61c8c20c
+# Source1-md5:	641f73052d9f54e720efe1a476a20237
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-pedantic.patch
-Patch2:		old_kernels.patch
 URL:		http://www.infradead.org/~tgr/libnl/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -112,7 +111,6 @@ Pythonowy interfejs do protokołów netlink.
 mv -f libnl-doc-%{version} doc
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -127,7 +125,7 @@ mv -f libnl-doc-%{version} doc
 %{__make}
 
 %if 0
-# no docs Makefile up to 3.2.24
+# no docs Makefile up to 3.2.25
 %{?with_apidocs:%{__make} -j1 -C doc gendoc}
 %endif
 
diff --git a/libnl-pedantic.patch b/libnl-pedantic.patch
index f329a2f..9b5d41e 100644
--- a/libnl-pedantic.patch
+++ b/libnl-pedantic.patch
@@ -70,13 +70,12 @@ diff -ur libnl-3.2.0.org/include/netlink/netfilter/queue.h libnl-3.2.0/include/n
  };
  
  /* General */
-diff -ur libnl-3.2.0.org/include/netlink/route/link.h libnl-3.2.0/include/netlink/route/link.h
---- libnl-3.2.0.org/include/netlink/route/link.h	2011-09-09 10:31:41.000000000 +0200
-+++ libnl-3.2.0/include/netlink/route/link.h	2011-09-17 08:58:02.583919807 +0200
-@@ -92,7 +92,7 @@
- 	RTNL_LINK_ICMP6_INERRORS,	/*!< ICMPv6 SNMP InErrors */
- 	RTNL_LINK_ICMP6_OUTMSGS,	/*!< ICMPv6 SNMP OutMsgs */
- 	RTNL_LINK_ICMP6_OUTERRORS,	/*!< ICMPv6 SNMP OutErrors */
+--- libnl-3.2.25/include/netlink/route/link.h.orig	2014-07-19 07:53:57.189749709 +0200
++++ libnl-3.2.25/include/netlink/route/link.h	2014-07-19 08:24:18.749673265 +0200
+@@ -99,7 +99,7 @@
+ 	RTNL_LINK_IP6_ECT1PKTS,		/*!< IPv6 SNMP InECT1Pkts */
+ 	RTNL_LINK_IP6_ECT0PKTS,		/*!< IPv6 SNMP InECT0Pkts */
+ 	RTNL_LINK_IP6_CEPKTS,		/*!< IPv6 SNMP InCEPkts */
 -	__RTNL_LINK_STATS_MAX,
 +	__RTNL_LINK_STATS_MAX
  } rtnl_link_stat_id_t;
diff --git a/old_kernels.patch b/old_kernels.patch
deleted file mode 100644
index 690a13c..0000000
--- a/old_kernels.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/lib/route/addr.c b/lib/route/addr.c
-index 97905f0..e6e91d2 100644
---- a/lib/route/addr.c
-+++ b/lib/route/addr.c
-@@ -598,7 +598,19 @@ static int build_addr_msg(struct rtnl_addr *tmpl, int cmd, int flags,
- 		NLA_PUT(msg, IFA_CACHEINFO, sizeof(ca), &ca);
- 	}
- 
--	NLA_PUT_U32(msg, IFA_FLAGS, tmpl->a_flags);
-+	if (tmpl->a_flags & ~0xFF) {
-+		/* only set the IFA_FLAGS attribute, if they actually contain additional
-+		 * flags that are not already set to am.ifa_flags.
-+		 *
-+		 * Older kernels refuse RTM_NEWADDR and RTM_NEWROUTE messages with EINVAL
-+		 * if they contain unknown netlink attributes. See net/core/rtnetlink.c, which
-+		 * was fixed by kernel commit 661d2967b3f1b34eeaa7e212e7b9bbe8ee072b59.
-+		 *
-+		 * With this workaround, libnl will function correctly with older kernels,
-+		 * unless there is a new libnl user that wants to set these flags. In this
-+		 * case it's up to the user to workaround this issue. */
-+		NLA_PUT_U32(msg, IFA_FLAGS, tmpl->a_flags);
-+	}
- 
- 	*result = msg;
- 	return 0;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libnl.git/commitdiff/e49bc2c64570467d71752dafa46c6043c6c73773