commit 00466f31dc292ce0fd8c5fa69ec959b2766bd95b
Author: Jakub Bogusz <[email protected]>
Date: Sat Jan 25 15:46:57 2014 +0100
- updated to 3.2.24
- updated link,pedantic patches
- removed obsolete python patch
libnl-link.patch | 14 +++++++-------
libnl-pedantic.patch | 10 +++++-----
libnl-python.patch | 44 --------------------------------------------
libnl.spec | 12 +++++-------
4 files changed, 17 insertions(+), 63 deletions(-)
---
diff --git a/libnl.spec b/libnl.spec
index 18e11a6..cd68015 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.23
+Version: 3.2.24
Release: 1
Epoch: 1
License: LGPL v2.1
Group: Libraries
Source0:
http://www.infradead.org/~tgr/libnl/files/%{name}-%{version}.tar.gz
-# Source0-md5: 438f8f0a3d46eb90771c9aa2af41590e
+# Source0-md5: 6e0e7bad0674749d930dd9f285343d55
Source1:
http://www.infradead.org/~tgr/libnl/files/%{name}-doc-%{version}.tar.gz
-# Source1-md5: 9436f17611c258f27e51f9b37c86fc01
+# Source1-md5: d1111959652bd6ad87b2071f61c8c20c
Patch0: %{name}-link.patch
Patch1: %{name}-pedantic.patch
-Patch2: %{name}-python.patch
URL: http://www.infradead.org/~tgr/libnl/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -31,7 +30,7 @@ BuildRequires: python-devel >= 1:2.6
BuildRequires: rpmbuild(macros) >= 1.219
BuildRequires: swig-python
%if 0 && %{with apidocs}
-# no docs Makefile up to 3.2.21
+# no docs Makefile up to 3.2.24
BuildRequires: asciidoc >= 8.6.5
BuildRequires: asciidoc-filter-mscgen >= 1.2
BuildRequires: doxygen >= 1.8.0
@@ -109,7 +108,6 @@ Pythonowy interfejs do protokołów netlink.
mv -f libnl-doc-%{version} doc
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
@@ -124,7 +122,7 @@ mv -f libnl-doc-%{version} doc
%{__make}
%if 0
-# no docs Makefile up to 3.2.21
+# no docs Makefile up to 3.2.24
%{?with_apidocs:%{__make} -j1 -C doc gendoc}
%endif
diff --git a/libnl-link.patch b/libnl-link.patch
index d2e620b..3180c7d 100644
--- a/libnl-link.patch
+++ b/libnl-link.patch
@@ -1,10 +1,10 @@
---- libnl-3.2.0/src/lib/Makefile.am.orig 2011-09-13 19:15:01.000000000
+0200
-+++ libnl-3.2.0/src/lib/Makefile.am 2011-09-16 18:46:28.999115930 +0200
-@@ -2,7 +2,6 @@
-
- AM_CPPFLAGS = -Wall -I${top_srcdir}/include -I${top_builddir}/include
-D_GNU_SOURCE -DPKGLIBDIR=\"$(pkglibdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-rdynamic
+--- 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 = \
-- -L${top_builddir}/lib \
- -ldl \
-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
index 964eba3..f329a2f 100644
--- a/libnl-pedantic.patch
+++ b/libnl-pedantic.patch
@@ -94,18 +94,18 @@ diff -ur libnl-3.2.0.org/include/netlink/route/nexthop.h
libnl-3.2.0/include/net
/* > 0 reserved for nexthop index */
};
---- 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,
+--- 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)
-@@ -72,7 +72,7 @@
+@@ -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 */
diff --git a/libnl-python.patch b/libnl-python.patch
deleted file mode 100644
index 8e2e38b..0000000
--- a/libnl-python.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- libnl-3.2.23/python/netlink/utils.h.orig 1970-01-01 01:00:00.000000000
+0100
-+++ libnl-3.2.23/python/netlink/utils.h 2013-10-31 22:32:06.022059736
+0100
-@@ -0,0 +1,41 @@
-+struct list_head {
-+ struct list_head *next;
-+};
-+
-+#define LIST_HEAD(name) \
-+ struct list_head name = { &(name) }
-+
-+static inline int list_empty(const struct list_head *head)
-+{
-+ return head->next == head;
-+}
-+
-+static inline void list_add(struct list_head *new, struct list_head *head)
-+{
-+ new->next = head->next;
-+ head->next = new;
-+}
-+
-+static inline void list_del(struct list_head *entry, struct list_head *prev)
-+{
-+ prev->next = entry->next;
-+ entry->next = entry;
-+}
-+
-+#define list_for_each_safe(pos, n, head) \
-+ for (n = (head), pos = (head)->next; pos != (head); \
-+ n = pos, pos = n->next)
-+
-+#undef offsetof
-+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-+
-+#define container_of(ptr, type, member) ({ \
-+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
-+ (type *)( (char *)__mptr - offsetof(type,member) );})
-+
-+#ifdef DEBUG
-+#define pynl_dbg(fmt, ...) \
-+ fprintf(stderr, "%s: " fmt, __func__, __VA_ARGS__)
-+#else
-+#define pynl_dbg(fmt, ...)
-+#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libnl.git/commitdiff/00466f31dc292ce0fd8c5fa69ec959b2766bd95b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
