libnl, downgrade en version 1

4 files changed, 97 insertions, 46 deletions

diff --git a/base/libnl/.footprint.x86_64 b/base/libnl/.footprint.x86_64
index 12a824ab5..82977baeb 100644
--- a/base/libnl/.footprint.x86_64
+++ b/base/libnl/.footprint.x86_64
@@ -1,7 +1,4 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/etc/
-drwxr-xr-x	root/root	usr/etc/libnl/
--rw-r--r--	root/root	usr/etc/libnl/pktloc
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/netlink/
 -rw-r--r--	root/root	usr/include/netlink/addr.h
@@ -9,7 +6,6 @@ drwxr-xr-x	root/root	usr/include/netlink/
 -rw-r--r--	root/root	usr/include/netlink/cache-api.h
 -rw-r--r--	root/root	usr/include/netlink/cache.h
 -rw-r--r--	root/root	usr/include/netlink/data.h
--rw-r--r--	root/root	usr/include/netlink/errno.h
 drwxr-xr-x	root/root	usr/include/netlink/fib_lookup/
 -rw-r--r--	root/root	usr/include/netlink/fib_lookup/lookup.h
 -rw-r--r--	root/root	usr/include/netlink/fib_lookup/request.h
@@ -21,14 +17,6 @@ drwxr-xr-x	root/root	usr/include/netlink/genl/
 -rw-r--r--	root/root	usr/include/netlink/handlers.h
 -rw-r--r--	root/root	usr/include/netlink/list.h
 -rw-r--r--	root/root	usr/include/netlink/msg.h
-drwxr-xr-x	root/root	usr/include/netlink/netfilter/
--rw-r--r--	root/root	usr/include/netlink/netfilter/ct.h
--rw-r--r--	root/root	usr/include/netlink/netfilter/log.h
--rw-r--r--	root/root	usr/include/netlink/netfilter/log_msg.h
--rw-r--r--	root/root	usr/include/netlink/netfilter/netfilter.h
--rw-r--r--	root/root	usr/include/netlink/netfilter/nfnl.h
--rw-r--r--	root/root	usr/include/netlink/netfilter/queue.h
--rw-r--r--	root/root	usr/include/netlink/netfilter/queue_msg.h
 -rw-r--r--	root/root	usr/include/netlink/netlink-compat.h
 -rw-r--r--	root/root	usr/include/netlink/netlink-kernel.h
 -rw-r--r--	root/root	usr/include/netlink/netlink.h
@@ -45,9 +33,6 @@ drwxr-xr-x	root/root	usr/include/netlink/route/cls/
 -rw-r--r--	root/root	usr/include/netlink/route/cls/police.h
 -rw-r--r--	root/root	usr/include/netlink/route/cls/u32.h
 -rw-r--r--	root/root	usr/include/netlink/route/link.h
-drwxr-xr-x	root/root	usr/include/netlink/route/link/
--rw-r--r--	root/root	usr/include/netlink/route/link/info-api.h
--rw-r--r--	root/root	usr/include/netlink/route/link/vlan.h
 -rw-r--r--	root/root	usr/include/netlink/route/neighbour.h
 -rw-r--r--	root/root	usr/include/netlink/route/neightbl.h
 -rw-r--r--	root/root	usr/include/netlink/route/nexthop.h
@@ -70,32 +55,9 @@ drwxr-xr-x	root/root	usr/include/netlink/route/sch/
 -rw-r--r--	root/root	usr/include/netlink/socket.h
 -rw-r--r--	root/root	usr/include/netlink/types.h
 -rw-r--r--	root/root	usr/include/netlink/utils.h
--rw-r--r--	root/root	usr/include/netlink/version.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libnl-cli.a
--rwxr-xr-x	root/root	usr/lib/libnl-cli.la
-lrwxrwxrwx	root/root	usr/lib/libnl-cli.so -> libnl-cli.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libnl-cli.so.2 -> libnl-cli.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libnl-cli.so.2.0.0
--rw-r--r--	root/root	usr/lib/libnl-genl.a
--rwxr-xr-x	root/root	usr/lib/libnl-genl.la
-lrwxrwxrwx	root/root	usr/lib/libnl-genl.so -> libnl-genl.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libnl-genl.so.2 -> libnl-genl.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libnl-genl.so.2.0.0
--rw-r--r--	root/root	usr/lib/libnl-nf.a
--rwxr-xr-x	root/root	usr/lib/libnl-nf.la
-lrwxrwxrwx	root/root	usr/lib/libnl-nf.so -> libnl-nf.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libnl-nf.so.2 -> libnl-nf.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libnl-nf.so.2.0.0
--rw-r--r--	root/root	usr/lib/libnl-route.a
--rwxr-xr-x	root/root	usr/lib/libnl-route.la
-lrwxrwxrwx	root/root	usr/lib/libnl-route.so -> libnl-route.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libnl-route.so.2 -> libnl-route.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libnl-route.so.2.0.0
--rw-r--r--	root/root	usr/lib/libnl.a
--rwxr-xr-x	root/root	usr/lib/libnl.la
-lrwxrwxrwx	root/root	usr/lib/libnl.so -> libnl.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libnl.so.2 -> libnl.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libnl.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libnl.so -> libnl.so.1
+lrwxrwxrwx	root/root	usr/lib/libnl.so.1 -> libnl.so.1.1
+-rw-r--r--	root/root	usr/lib/libnl.so.1.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libnl-2.0.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libnl-1.pc
diff --git a/base/libnl/.md5sum.x86_64 b/base/libnl/.md5sum.x86_64
index d3c613a3d..30941e540 100644
--- a/base/libnl/.md5sum.x86_64
+++ b/base/libnl/.md5sum.x86_64
@@ -1 +1,3 @@
-6aaf1e9802a17a7d702bb0638044ffa7  libnl-2.0.tar.gz
+d757127e7af3bd3c82cdb51b1b09d2e0  libnl-1-1-vlan-header.patch
+e1f5e82c8aa1b3ad025c7b588178de1e  libnl-1.1-fix-compilation.patch
+ae970ccd9144e132b68664f98e7ceeb1  libnl-1.1.tar.gz
diff --git a/base/libnl/Pkgfile b/base/libnl/Pkgfile
index 5a0e43f6b..5736cc7dc 100644
--- a/base/libnl/Pkgfile
+++ b/base/libnl/Pkgfile
@@ -5,13 +5,20 @@
 # Depends on: 
 
 name=libnl
-version=2.0
-release=1
-source=(http://www.infradead.org/~tgr/$name/files/$name-$version.tar.gz)
+version=1.1
+release=2
+source=(http://www.infradead.org/~tgr/$name/files/$name-$version.tar.gz
+	libnl-1-1-vlan-header.patch 
+	libnl-1.1-fix-compilation.patch)
 
 build() {
 	cd $name-$version
+	patch -Np1 -i ../libnl-1.1-fix-compilation.patch
+#	patch -Np1 -i ../libnl-1-1-vlan-header.patch  
+
 	./configure --prefix=/usr
 	make
 	make DESTDIR=$PKG install
+	mkdir -p $PKG/usr/include/netlink
+#	cp -a include/netlink/cli $PKG/usr/include/netlink/cli
 }
diff --git a/base/libnl/libnl-1-1-vlan-header.patch b/base/libnl/libnl-1-1-vlan-header.patch
new file mode 100644
index 000000000..c4c2fc638
--- /dev/null
+++ b/base/libnl/libnl-1-1-vlan-header.patch
@@ -0,0 +1,80 @@
+From: Patrick McHardy <kaber@trash.net>
+Date: Fri, 18 Jan 2008 16:55:48 +0000 (+0100)
+Subject: [LIBNL]: Add if_vlan.h
+X-Git-Url: http://git.kernel.org/?p=libs%2Fnetlink%2Flibnl.git;a=commitdiff_plain;h=e91bb2ffb090955d443e643a25b250bf3d33534a;hp=7f6b7a8eea0334b34d58dec72c66121a76f08958
+
+[LIBNL]: Add if_vlan.h
+
+vlan support needs VLAN_FLAG_REORDER_HDR, which is not available in
+older if_vlan.h versions. Add the current version from the kernel.
+
+Signed-off-by: Patrick McHardy <kaber@trash.net>
+---
+
+diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
+new file mode 100644
+index 0000000..068cd7b
+--- /dev/null
++++ include/linux/if_vlan.h
+@@ -0,0 +1,61 @@
++/*
++ * VLAN		An implementation of 802.1Q VLAN tagging.
++ *
++ * Authors:	Ben Greear <greearb@candelatech.com>
++ *
++ *		This program is free software; you can redistribute it and/or
++ *		modify it under the terms of the GNU General Public License
++ *		as published by the Free Software Foundation; either version
++ *		2 of the License, or (at your option) any later version.
++ *
++ */
++
++#ifndef _LINUX_IF_VLAN_H_
++#define _LINUX_IF_VLAN_H_
++
++
++/* VLAN IOCTLs are found in sockios.h */
++
++/* Passed in vlan_ioctl_args structure to determine behaviour. */
++enum vlan_ioctl_cmds {
++	ADD_VLAN_CMD,
++	DEL_VLAN_CMD,
++	SET_VLAN_INGRESS_PRIORITY_CMD,
++	SET_VLAN_EGRESS_PRIORITY_CMD,
++	GET_VLAN_INGRESS_PRIORITY_CMD,
++	GET_VLAN_EGRESS_PRIORITY_CMD,
++	SET_VLAN_NAME_TYPE_CMD,
++	SET_VLAN_FLAG_CMD,
++	GET_VLAN_REALDEV_NAME_CMD, /* If this works, you know it's a VLAN device, btw */
++	GET_VLAN_VID_CMD /* Get the VID of this VLAN (specified by name) */
++};
++
++enum vlan_flags {
++	VLAN_FLAG_REORDER_HDR	= 0x1,
++};
++
++enum vlan_name_types {
++	VLAN_NAME_TYPE_PLUS_VID, /* Name will look like:  vlan0005 */
++	VLAN_NAME_TYPE_RAW_PLUS_VID, /* name will look like:  eth1.0005 */
++	VLAN_NAME_TYPE_PLUS_VID_NO_PAD, /* Name will look like:  vlan5 */
++	VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD, /* Name will look like:  eth0.5 */
++	VLAN_NAME_TYPE_HIGHEST
++};
++
++struct vlan_ioctl_args {
++	int cmd; /* Should be one of the vlan_ioctl_cmds enum above. */
++	char device1[24];
++
++        union {
++		char device2[24];
++		int VID;
++		unsigned int skb_priority;
++		unsigned int name_type;
++		unsigned int bind_type;
++		unsigned int flag; /* Matches vlan_dev_info flags */
++        } u;
++
++	short vlan_qos;
++};
++
++#endif /* !(_LINUX_IF_VLAN_H_) */