libnl add 1.1, remove outdated ones

8 files changed, 17 insertions, 142 deletions

diff --git a/packages/libnl/files/fix-helpers.patch b/packages/libnl/files/fix-helpers.patch
deleted file mode 100644
index b6a6ff8509..0000000000
--- a/packages/libnl/files/fix-helpers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: libnl-0.5.0/lib/helpers.c
-===================================================================
---- libnl-0.5.0.orig/lib/helpers.c
-+++ libnl-0.5.0/lib/helpers.c
-@@ -29,6 +29,7 @@
- #include <netlink/netlink.h>
- #include <netlink/helpers.h>
- #include <linux/socket.h>
-+#include <linux/if_ether.h>
- 
- int nl_debug = 0;
- 
-Index: libnl-0.5.0/lib/route/filter.c
-===================================================================
---- libnl-0.5.0.orig/lib/route/filter.c
-+++ libnl-0.5.0/lib/route/filter.c
-@@ -40,6 +40,7 @@
- #include <netlink/route/filter.h>
- #include <netlink/route/link.h>
- #include <netlink/route/rtattr.h>
-+#include <linux/if_ether.h>
- 
- static struct rtnl_filter_ops *filter_ops;
- 
-Index: libnl-0.5.0/lib/Makefile
-===================================================================
---- libnl-0.5.0.orig/lib/Makefile
-+++ libnl-0.5.0/lib/Makefile
-@@ -68,7 +68,7 @@ distclean:
- 
- install:
- 	mkdir -p $(DESTDIR)$(prefix)/lib/
--	install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib
-+	install -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib
- 	rm -f $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) ; \
- 	$(LN) -s $(DESTDIR)$(prefix)/lib/$(OUT_SLIB) $(DESTDIR)$(prefix)/lib/$(LN1_SLIB)
- 	rm -f $(DESTDIR)$(prefix)/lib/$(LN_SLIB) ; \
-Index: libnl-0.5.0/include/Makefile
-===================================================================
---- libnl-0.5.0.orig/include/Makefile
-+++ libnl-0.5.0/include/Makefile
-@@ -37,5 +37,5 @@ distclean:
- 
- install:
- 	mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/
--	install -o root -g root -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/
--	install -o root -g root -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/
-+	install -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/
-+	install -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/
diff --git a/packages/libnl/files/libnl-0.5.0-include.diff b/packages/libnl/files/libnl-0.5.0-include.diff
deleted file mode 100644
index f858953c8a..0000000000
--- a/packages/libnl/files/libnl-0.5.0-include.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-0.5.0.orig/include/netlink/route/tc.h	2005-09-08 19:13:15.000000000 -0300
-+++ libnl-0.5.0/include/netlink/route/tc.h	2005-09-08 19:32:33.000000000 -0300
-@@ -24,6 +24,7 @@
- #include <netlink/netlink.h>
- #include <netlink/cache.h>
- #include <netlink/data.h>
-+#include <linux/pkt_sched.h>
- 
- #define TCA_HAS_HANDLE    0x001
- #define TCA_HAS_PARENT    0x002
diff --git a/packages/libnl/files/linux-header.patch b/packages/libnl/files/linux-header.patch
deleted file mode 100644
index cecb38dc9e..0000000000
--- a/packages/libnl/files/linux-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: libnl-1.0-pre8/include/netlink/netlink.h
-===================================================================
---- libnl-1.0-pre8.orig/include/netlink/netlink.h	2007-11-21 18:25:39.000000000 +0100
-+++ libnl-1.0-pre8/include/netlink/netlink.h	2008-04-07 03:18:14.000000000 +0200
-@@ -24,7 +24,6 @@
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- #include <linux/genetlink.h>
--#include <linux/ip_mp_alg.h>
- #include <linux/netfilter/nfnetlink.h>
- #include <netlink/types.h>
- #include <netlink/handlers.h>
-Index: libnl-1.0-pre8/lib/route/route_obj.c
-===================================================================
---- libnl-1.0-pre8.orig/lib/route/route_obj.c	2008-04-07 03:20:25.000000000 +0200
-+++ libnl-1.0-pre8/lib/route/route_obj.c	2008-04-07 03:20:35.000000000 +0200
-@@ -33,6 +33,7 @@
-  * @{
-  */
- 
-+#include <linux/ip_mp_alg.h>
- #include <netlink-local.h>
- #include <netlink/netlink.h>
- #include <netlink/cache.h>
diff --git a/packages/libnl/files/local-includes.patch b/packages/libnl/files/local-includes.patch
deleted file mode 100644
index 5af463004b..0000000000
--- a/packages/libnl/files/local-includes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.0-pre6/Makefile.opts.in.orig	2006-08-24 14:57:42.000000000 +0200
-+++ libnl-1.0-pre6/Makefile.opts.in	2006-08-24 14:58:20.000000000 +0200
-@@ -10,7 +10,7 @@
- #
- 
- CC               := @CC@
--CFLAGS           := @CFLAGS@
-+CFLAGS           := -I./include -I. -I../include @CFLAGS@
- LDFLAGS          := @LDFLAGS@
- CPPFLAGS         := @CPPFLAGS@
- PACKAGE_NAME     := @PACKAGE_NAME@
diff --git a/packages/libnl/libnl_0.5.0.bb b/packages/libnl/libnl_0.5.0.bb
deleted file mode 100644
index 5d1e8d3fc0..0000000000
--- a/packages/libnl/libnl_0.5.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Netlink library"
-HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
-SECTION = "libraries/network"
-LICENSE = "GPLv2.1"
-PR = "r0"
-
-SRC_URI = "http://people.suug.ch/~tgr/libnl/files/libnl-0.5.0.tar.gz \
-           file://libnl-0.5.0-include.diff;patch=1 \
-           file://fix-helpers.patch;patch=1"
-
-inherit autotools
diff --git a/packages/libnl/libnl_1.0-pre6.bb b/packages/libnl/libnl_1.0-pre6.bb
deleted file mode 100644
index 2509b37c4e..0000000000
--- a/packages/libnl/libnl_1.0-pre6.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
-PRIORITY = "optional"
-PV = "0.99+1.0-pre6"
-
-inherit autotools pkgconfig gpe
-
-SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre6.tar.gz \
-           file://local-includes.patch;patch=1"
-
-S = "${WORKDIR}/${PN}-1.0-pre6"
-
-do_stage () {
-	autotools_stage_all prefix=${prefix}
-}
-
diff --git a/packages/libnl/libnl_1.0-pre8.bb b/packages/libnl/libnl_1.0-pre8.bb
deleted file mode 100644
index e80b5aa4bd..0000000000
--- a/packages/libnl/libnl_1.0-pre8.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
-SECTION = "libs/network"
-LICENSE = "LGPL"
-HOMEPAGE = "http://people.suug.ch/~tgr/libnl/"
-PRIORITY = "optional"
-PV = "0.99+1.0-pre8"
-
-inherit autotools pkgconfig gpe
-
-SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre8.tar.gz \
-          file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \
-          file://linux-header.patch;patch=1 "
-
-S = "${WORKDIR}/${PN}-1.0-pre8"
-
-do_stage () {
-	autotools_stage_all prefix=${prefix}
-}
-
diff --git a/packages/libnl/libnl_1.1.bb b/packages/libnl/libnl_1.1.bb
new file mode 100644
index 0000000000..51f4c4385b
--- /dev/null
+++ b/packages/libnl/libnl_1.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "libnl is a library for applications dealing with netlink sockets"
+SECTION = "libs/network"
+LICENSE = "LGPL"
+HOMEPAGE = "http://people.suug.ch/~tgr/libnl"
+
+inherit autotools pkgconfig
+
+CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1'
+
+SRC_URI = "\
+  http://people.suug.ch/~tgr/libnl/files/libnl-${PV}.tar.gz \
+  file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \
+"
+
+do_stage () {
+	autotools_stage_all prefix=${prefix}
+}