[packages/libnl] - updated to 3.2.21 (note: it restores pre-3.2.18 soname) - updated pedantic patch
qboosh
qboosh at pld-linux.org
Sat Jan 26 11:57:12 CET 2013
commit c808b690cd0576dbf0b40913bae389c9bb3cfab2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jan 26 11:57:55 2013 +0100
- updated to 3.2.21 (note: it restores pre-3.2.18 soname)
- updated pedantic patch
libnl-pedantic.patch | 24 ++++--------------------
libnl.spec | 20 ++++++++++----------
2 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/libnl.spec b/libnl.spec
index 8b28a0c..6732a2b 100644
--- a/libnl.spec
+++ b/libnl.spec
@@ -5,15 +5,15 @@
Summary: Netlink sockets library
Summary(pl.UTF-8): Biblioteka do obsługi gniazd netlink
Name: libnl
-Version: 3.2.19
+Version: 3.2.21
Release: 1
Epoch: 1
License: LGPL v2.1
Group: Libraries
Source0: http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
-# Source0-md5: 1795c43bde05f650a43b085438e5da21
+# Source0-md5: 6fe7136558a9071e70673dcda38545b3
Source1: http://www.infradead.org/~tgr/libnl/files/%{name}-doc-%{version}.tar.gz
-# Source1-md5: aafde3794ee6efcebfcb3b1db286095a
+# Source1-md5: 5505767f40d1e8092078fb6ee78f1fc6
Patch0: %{name}-link.patch
Patch1: %{name}-pedantic.patch
URL: http://www.infradead.org/~tgr/libnl/
@@ -27,7 +27,7 @@ BuildRequires: python-devel >= 1:2.6
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: swig-python
%if 0 && %{with apidocs}
-# no docs Makefile 3.2.18
+# no docs Makefile up to 3.2.21
BuildRequires: asciidoc >= 8.6.5
BuildRequires: asciidoc-filter-mscgen >= 1.2
BuildRequires: doxygen >= 1.8.0
@@ -119,7 +119,7 @@ mv -f libnl-doc-%{version} doc
%{__make}
%if 0
-# no docs Makefile in 3.2.18
+# no docs Makefile up to 3.2.21
%{?with_apidocs:%{__make} -j1 -C doc gendoc}
%endif
@@ -163,15 +163,15 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_sbindir}/nl-pktloc-lookup
%attr(755,root,root) %{_sbindir}/nl-qdisc-*
%attr(755,root,root) %{_libdir}/libnl-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-3.so.201
+%attr(755,root,root) %ghost %{_libdir}/libnl-3.so.200
%attr(755,root,root) %{_libdir}/libnl-cli-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-cli-3.so.201
+%attr(755,root,root) %ghost %{_libdir}/libnl-cli-3.so.200
%attr(755,root,root) %{_libdir}/libnl-genl-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-genl-3.so.201
+%attr(755,root,root) %ghost %{_libdir}/libnl-genl-3.so.200
%attr(755,root,root) %{_libdir}/libnl-nf-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-nf-3.so.201
+%attr(755,root,root) %ghost %{_libdir}/libnl-nf-3.so.200
%attr(755,root,root) %{_libdir}/libnl-route-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnl-route-3.so.201
+%attr(755,root,root) %ghost %{_libdir}/libnl-route-3.so.200
%dir %{_libdir}/libnl
%dir %{_libdir}/libnl/cli
%dir %{_libdir}/libnl/cli/cls
diff --git a/libnl-pedantic.patch b/libnl-pedantic.patch
index 5981366..964eba3 100644
--- a/libnl-pedantic.patch
+++ b/libnl-pedantic.patch
@@ -10,18 +10,6 @@ diff -ur libnl-3.2.0.org/include/netlink/attr.h libnl-3.2.0/include/netlink/attr
};
#define NLA_TYPE_MAX (__NLA_TYPE_MAX - 1)
-diff -ur libnl-3.2.0.org/include/netlink/cache-api.h libnl-3.2.0/include/netlink/cache-api.h
---- libnl-3.2.0.org/include/netlink/cache-api.h 2011-08-16 16:16:01.000000000 +0200
-+++ libnl-3.2.0/include/netlink/cache-api.h 2011-09-17 08:56:41.585298135 +0200
-@@ -115,7 +115,7 @@
- NL_ACT_GET,
- NL_ACT_SET,
- NL_ACT_CHANGE,
-- __NL_ACT_MAX,
-+ __NL_ACT_MAX
- };
-
- #define NL_ACT_MAX (__NL_ACT_MAX - 1)
diff -ur libnl-3.2.0.org/include/netlink/handlers.h libnl-3.2.0/include/netlink/handlers.h
--- libnl-3.2.0.org/include/netlink/handlers.h 2011-08-16 16:16:01.000000000 +0200
+++ libnl-3.2.0/include/netlink/handlers.h 2011-09-17 08:57:06.462565163 +0200
@@ -106,10 +94,9 @@ diff -ur libnl-3.2.0.org/include/netlink/route/nexthop.h libnl-3.2.0/include/net
/* > 0 reserved for nexthop index */
};
-diff -ur libnl-3.2.0.org/include/netlink/route/tc-api.h libnl-3.2.0/include/netlink/route/tc-api.h
---- libnl-3.2.0.org/include/netlink/route/tc-api.h 2011-08-16 16:16:01.000000000 +0200
-+++ libnl-3.2.0/include/netlink/route/tc-api.h 2011-09-17 08:58:26.867839643 +0200
-@@ -24,7 +24,7 @@
+--- libnl-3.2.21/include/netlink/route/tc.h.orig 2013-01-24 13:44:40.000000000 +0100
++++ libnl-3.2.21/include/netlink/route/tc.h 2013-01-26 11:34:19.482194536 +0100
+@@ -27,7 +27,7 @@
RTNL_TC_TYPE_QDISC,
RTNL_TC_TYPE_CLASS,
RTNL_TC_TYPE_CLS,
@@ -118,10 +105,7 @@ diff -ur libnl-3.2.0.org/include/netlink/route/tc-api.h libnl-3.2.0/include/netl
};
#define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1)
-diff -ur libnl-3.2.0.org/include/netlink/route/tc.h libnl-3.2.0/include/netlink/route/tc.h
---- libnl-3.2.0.org/include/netlink/route/tc.h 2011-08-16 16:16:01.000000000 +0200
-+++ libnl-3.2.0/include/netlink/route/tc.h 2011-09-17 08:58:36.384736091 +0200
-@@ -63,7 +63,7 @@
+@@ -72,7 +72,7 @@
RTNL_TC_DROPS, /**< Total number of packets dropped */
RTNL_TC_REQUEUES, /**< Total number of requeues */
RTNL_TC_OVERLIMITS, /**< Total number of overlimits */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libnl.git/commitdiff/c808b690cd0576dbf0b40913bae389c9bb3cfab2
More information about the pld-cvs-commit
mailing list