From: Arkadiusz Miśkiewicz Date: Sun, 15 Sep 2019 20:38:05 +0000 (+0200) Subject: - up to 3.5.0 X-Git-Tag: auto/th/libnl-3.5.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e89d5093ae2e32d9f36ae41f48497d0e2e8db88a;p=packages%2Flibnl.git - up to 3.5.0 --- diff --git a/libnl-link.patch b/libnl-link.patch deleted file mode 100644 index 3180c7d..0000000 --- a/libnl-link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-3.2.24/src/lib/Makefile.am.orig 2013-12-20 10:58:48.000000000 +0100 -+++ libnl-3.2.24/src/lib/Makefile.am 2014-01-25 15:41:05.438891638 +0100 -@@ -5,7 +5,6 @@ - AM_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - NL_LIBADD = \ -- -L${top_builddir}/lib \ - -ldl - - #nobase_pkglib_LTLIBRARIES = cls/basic.la cls/ematch/cmp.la diff --git a/libnl-pedantic.patch b/libnl-pedantic.patch deleted file mode 100644 index 9b5d41e..0000000 --- a/libnl-pedantic.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -ur libnl-3.2.0.org/include/netlink/attr.h libnl-3.2.0/include/netlink/attr.h ---- libnl-3.2.0.org/include/netlink/attr.h 2011-08-16 16:16:01.000000000 +0200 -+++ libnl-3.2.0/include/netlink/attr.h 2011-09-17 08:56:26.044922372 +0200 -@@ -44,7 +44,7 @@ - NLA_FLAG, /**< Flag */ - NLA_MSECS, /**< Micro seconds (64bit) */ - NLA_NESTED, /**< Nested attributes */ -- __NLA_TYPE_MAX, -+ __NLA_TYPE_MAX - }; - - #define NLA_TYPE_MAX (__NLA_TYPE_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 -@@ -62,7 +62,7 @@ - /** Skip this message */ - NL_SKIP, - /** Stop parsing altogether and discard remaining messages */ -- NL_STOP, -+ NL_STOP - }; - - /** -@@ -78,7 +78,7 @@ - NL_CB_DEBUG, - /** Customized handler specified by the user */ - NL_CB_CUSTOM, -- __NL_CB_KIND_MAX, -+ __NL_CB_KIND_MAX - }; - - #define NL_CB_KIND_MAX (__NL_CB_KIND_MAX - 1) -@@ -110,7 +110,7 @@ - NL_CB_SEND_ACK, - /** Flag NLM_F_DUMP_INTR is set in message */ - NL_CB_DUMP_INTR, -- __NL_CB_TYPE_MAX, -+ __NL_CB_TYPE_MAX - }; - - #define NL_CB_TYPE_MAX (__NL_CB_TYPE_MAX - 1) -diff -ur libnl-3.2.0.org/include/netlink/netfilter/log.h libnl-3.2.0/include/netlink/netfilter/log.h ---- libnl-3.2.0.org/include/netlink/netfilter/log.h 2011-08-16 16:16:01.000000000 +0200 -+++ libnl-3.2.0/include/netlink/netfilter/log.h 2011-09-17 08:57:30.113135916 +0200 -@@ -30,12 +30,12 @@ - enum nfnl_log_copy_mode { - NFNL_LOG_COPY_NONE, - NFNL_LOG_COPY_META, -- NFNL_LOG_COPY_PACKET, -+ NFNL_LOG_COPY_PACKET - }; - - enum nfnl_log_flags { - NFNL_LOG_FLAG_SEQ = 0x1, -- NFNL_LOG_FLAG_SEQ_GLOBAL = 0x2, -+ NFNL_LOG_FLAG_SEQ_GLOBAL = 0x2 - }; - - /* General */ -diff -ur libnl-3.2.0.org/include/netlink/netfilter/queue.h libnl-3.2.0/include/netlink/netfilter/queue.h ---- libnl-3.2.0.org/include/netlink/netfilter/queue.h 2011-08-16 16:16:01.000000000 +0200 -+++ libnl-3.2.0/include/netlink/netfilter/queue.h 2011-09-17 08:57:40.600055691 +0200 -@@ -27,7 +27,7 @@ - enum nfnl_queue_copy_mode { - NFNL_QUEUE_COPY_NONE, - NFNL_QUEUE_COPY_META, -- NFNL_QUEUE_COPY_PACKET, -+ NFNL_QUEUE_COPY_PACKET - }; - - /* General */ ---- 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; - - #define RTNL_LINK_STATS_MAX (__RTNL_LINK_STATS_MAX - 1) -diff -ur libnl-3.2.0.org/include/netlink/route/nexthop.h libnl-3.2.0/include/netlink/route/nexthop.h ---- libnl-3.2.0.org/include/netlink/route/nexthop.h 2011-08-16 16:16:01.000000000 +0200 -+++ libnl-3.2.0/include/netlink/route/nexthop.h 2011-09-17 08:58:11.357465046 +0200 -@@ -24,7 +24,7 @@ - enum { - NH_DUMP_FROM_ONELINE = -2, - NH_DUMP_FROM_DETAILS = -1, -- NH_DUMP_FROM_ENV = 0, -+ NH_DUMP_FROM_ENV = 0 - /* > 0 reserved for nexthop index */ - }; - ---- libnl-3.2.24/include/netlink/route/tc.h.orig 2013-12-20 10:58:48.000000000 +0100 -+++ libnl-3.2.24/include/netlink/route/tc.h 2014-01-25 14:28:35.815740841 +0100 -@@ -28,7 +28,7 @@ - RTNL_TC_TYPE_CLASS, - RTNL_TC_TYPE_CLS, - RTNL_TC_TYPE_ACT, -- __RTNL_TC_TYPE_MAX, -+ __RTNL_TC_TYPE_MAX - }; - - #define RTNL_TC_TYPE_MAX (__RTNL_TC_TYPE_MAX - 1) -@@ -73,7 +73,7 @@ - RTNL_TC_DROPS, /**< Total number of packets dropped */ - RTNL_TC_REQUEUES, /**< Total number of requeues */ - RTNL_TC_OVERLIMITS, /**< Total number of overlimits */ -- __RTNL_TC_STATS_MAX, -+ __RTNL_TC_STATS_MAX - }; - - #define RTNL_TC_STATS_MAX (__RTNL_TC_STATS_MAX - 1) -diff -ur libnl-3.2.0.org/include/netlink/types.h libnl-3.2.0/include/netlink/types.h ---- libnl-3.2.0.org/include/netlink/types.h 2011-08-16 16:16:01.000000000 +0200 -+++ libnl-3.2.0/include/netlink/types.h 2011-09-17 08:59:11.778924754 +0200 -@@ -22,7 +22,7 @@ - NL_DUMP_LINE, /**< Dump object briefly on one line */ - NL_DUMP_DETAILS, /**< Dump all attributes but no statistics */ - NL_DUMP_STATS, /**< Dump all attributes including statistics */ -- __NL_DUMP_MAX, -+ __NL_DUMP_MAX - }; - #define NL_DUMP_MAX (__NL_DUMP_MAX - 1) - -diff -ur libnl-3.2.0.org/include/netlink/utils.h libnl-3.2.0/include/netlink/utils.h ---- libnl-3.2.0.org/include/netlink/utils.h 2011-08-16 16:16:01.000000000 +0200 -+++ libnl-3.2.0/include/netlink/utils.h 2011-09-17 08:59:19.612448026 +0200 -@@ -40,7 +40,7 @@ - - enum { - NL_BYTE_RATE, -- NL_BIT_RATE, -+ NL_BIT_RATE - }; - - /* unit pretty-printing */ diff --git a/libnl.spec b/libnl.spec index 4d40ee1..6ba40d1 100644 --- a/libnl.spec +++ b/libnl.spec @@ -6,17 +6,15 @@ Summary: Netlink sockets library Summary(pl.UTF-8): Biblioteka do obsługi gniazd netlink Name: libnl -Version: 3.2.25 -Release: 4 +Version: 3.5.0 +Release: 1 Epoch: 1 License: LGPL v2.1 Group: Libraries -Source0: http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz -# Source0-md5: 03f74d0cd5037cadc8cdfa313bbd195c -Source1: http://www.infradead.org/~tgr/libnl/files/%{name}-doc-%{version}.tar.gz -# Source1-md5: 641f73052d9f54e720efe1a476a20237 -Patch0: %{name}-link.patch -Patch1: %{name}-pedantic.patch +Source0: https://github.com/thom311/libnl/releases/download/libnl3_5_0/%{name}-%{version}.tar.gz +# Source0-md5: 74ba57b1b1d6f9f92268aa8141d8e8e4 +Source1: https://github.com/thom311/libnl/releases/download/libnl3_5_0/%{name}-doc-%{version}.tar.gz +# Source1-md5: 43a1a6f0c39f32bee05287c06c500bce URL: http://www.infradead.org/~tgr/libnl/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -109,8 +107,6 @@ Pythonowy interfejs do protokołów netlink. %prep %setup -q -a1 mv -f libnl-doc-%{version} doc -%patch0 -p1 -%patch1 -p1 %build %{__libtoolize} @@ -133,6 +129,7 @@ cd python CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags} -L$(pwd)/../lib/.libs" %py_build +cd .. %{?with_tests:%{__make} check} @@ -161,13 +158,29 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/libnl %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libnl/classid %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libnl/pktloc -%attr(755,root,root) %{_sbindir}/genl-ctrl-list -%attr(755,root,root) %{_sbindir}/nl-class-* -%attr(755,root,root) %{_sbindir}/nl-classid-lookup -%attr(755,root,root) %{_sbindir}/nl-cls-* -%attr(755,root,root) %{_sbindir}/nl-link-list -%attr(755,root,root) %{_sbindir}/nl-pktloc-lookup -%attr(755,root,root) %{_sbindir}/nl-qdisc-* +%attr(755,root,root) %{_bindir}/genl-ctrl-list +%attr(755,root,root) %{_bindir}/idiag-socket-details +%attr(755,root,root) %{_bindir}/nf-ct-* +%attr(755,root,root) %{_bindir}/nf-exp-* +%attr(755,root,root) %{_bindir}/nf-log +%attr(755,root,root) %{_bindir}/nf-monitor +%attr(755,root,root) %{_bindir}/nf-queue +%attr(755,root,root) %{_bindir}/nl-addr-* +%attr(755,root,root) %{_bindir}/nl-class-* +%attr(755,root,root) %{_bindir}/nl-classid-lookup +%attr(755,root,root) %{_bindir}/nl-cls-* +%attr(755,root,root) %{_bindir}/nl-fib-lookup +%attr(755,root,root) %{_bindir}/nl-link-* +%attr(755,root,root) %{_bindir}/nl-list-* +%attr(755,root,root) %{_bindir}/nl-monitor +%attr(755,root,root) %{_bindir}/nl-neigh-* +%attr(755,root,root) %{_bindir}/nl-neightbl-list +%attr(755,root,root) %{_bindir}/nl-pktloc-lookup +%attr(755,root,root) %{_bindir}/nl-qdisc-* +%attr(755,root,root) %{_bindir}/nl-route-* +%attr(755,root,root) %{_bindir}/nl-rule-list +%attr(755,root,root) %{_bindir}/nl-tctree-list +%attr(755,root,root) %{_bindir}/nl-util-addr %attr(755,root,root) %{_libdir}/libnl-3.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libnl-3.so.200 %attr(755,root,root) %{_libdir}/libnl-cli-3.so.*.*.* @@ -180,6 +193,8 @@ rm -rf $RPM_BUILD_ROOT %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.200 +%attr(755,root,root) %{_libdir}/libnl-xfrm-3.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libnl-xfrm-3.so.200 %dir %{_libdir}/libnl %dir %{_libdir}/libnl/cli %dir %{_libdir}/libnl/cli/cls @@ -199,18 +214,22 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libnl-idiag-3.so %attr(755,root,root) %{_libdir}/libnl-nf-3.so %attr(755,root,root) %{_libdir}/libnl-route-3.so +%attr(755,root,root) %{_libdir}/libnl-xfrm-3.so %{_libdir}/libnl-3.la %{_libdir}/libnl-cli-3.la %{_libdir}/libnl-genl-3.la %{_libdir}/libnl-idiag-3.la %{_libdir}/libnl-nf-3.la %{_libdir}/libnl-route-3.la +%{_libdir}/libnl-xfrm-3.la %{_includedir}/libnl3 %{_pkgconfigdir}/libnl-3.0.pc %{_pkgconfigdir}/libnl-cli-3.0.pc %{_pkgconfigdir}/libnl-genl-3.0.pc +%{_pkgconfigdir}/libnl-idiag-3.0.pc %{_pkgconfigdir}/libnl-nf-3.0.pc %{_pkgconfigdir}/libnl-route-3.0.pc +%{_pkgconfigdir}/libnl-xfrm-3.0.pc %files static %defattr(644,root,root,755) @@ -220,6 +239,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libnl-idiag-3.a %{_libdir}/libnl-nf-3.a %{_libdir}/libnl-route-3.a +%{_libdir}/libnl-xfrm-3.a %if %{with apidocs} %files apidocs