libnl 3.2.9-1 màj port

7 files changed, 45 insertions, 123 deletions

diff --git a/libnl/.footprint.i686 b/libnl/.footprint.i686
index b3c1bc439..372d29f5d 100644
--- a/libnl/.footprint.i686
+++ b/libnl/.footprint.i686
@@ -82,6 +82,7 @@ drwxr-xr-x	root/root	usr/include/libnl3/netlink/route/qdisc/
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/fifo.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/htb.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/netem.h
+-rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/plug.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/prio.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/red.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/sfq.h
@@ -98,29 +99,29 @@ drwxr-xr-x	root/root	usr/include/libnl3/netlink/route/qdisc/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libnl-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-3.so -> libnl-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-3.so.200 -> libnl-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-3.so -> libnl-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-3.so.200 -> libnl-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-cli-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-cli-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so -> libnl-cli-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so.200 -> libnl-cli-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-cli-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so -> libnl-cli-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so.200 -> libnl-cli-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-cli-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-genl-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-genl-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so -> libnl-genl-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so.200 -> libnl-genl-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-genl-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so -> libnl-genl-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so.200 -> libnl-genl-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-genl-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-nf-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-nf-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so -> libnl-nf-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so.200 -> libnl-nf-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-nf-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so -> libnl-nf-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so.200 -> libnl-nf-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-nf-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-route-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-route-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so -> libnl-route-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so.200 -> libnl-route-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-route-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so -> libnl-route-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so.200 -> libnl-route-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-route-3.so.200.7.0
 drwxr-xr-x	root/root	usr/lib/libnl/
 drwxr-xr-x	root/root	usr/lib/libnl/cli/
 drwxr-xr-x	root/root	usr/lib/libnl/cli/cls/
@@ -143,6 +144,9 @@ drwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/
 -rw-r--r--	root/root	usr/lib/libnl/cli/qdisc/pfifo.a
 -rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/pfifo.la
 -rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/pfifo.so
+-rw-r--r--	root/root	usr/lib/libnl/cli/qdisc/plug.a
+-rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/plug.la
+-rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/plug.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-3.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-cli-3.0.pc
@@ -150,6 +154,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-nf-3.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-route-3.0.pc
 drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/genl-ctrl-list
 -rwxr-xr-x	root/root	usr/sbin/nl-class-add
 -rwxr-xr-x	root/root	usr/sbin/nl-class-delete
 -rwxr-xr-x	root/root	usr/sbin/nl-class-list
@@ -165,6 +170,7 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/genl-ctrl-list.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nl-classid-lookup.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nl-pktloc-lookup.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nl-qdisc-add.8.gz
diff --git a/libnl/.footprint.x86_64 b/libnl/.footprint.x86_64
index b3c1bc439..372d29f5d 100644
--- a/libnl/.footprint.x86_64
+++ b/libnl/.footprint.x86_64
@@ -82,6 +82,7 @@ drwxr-xr-x	root/root	usr/include/libnl3/netlink/route/qdisc/
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/fifo.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/htb.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/netem.h
+-rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/plug.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/prio.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/red.h
 -rw-r--r--	root/root	usr/include/libnl3/netlink/route/qdisc/sfq.h
@@ -98,29 +99,29 @@ drwxr-xr-x	root/root	usr/include/libnl3/netlink/route/qdisc/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libnl-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-3.so -> libnl-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-3.so.200 -> libnl-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-3.so -> libnl-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-3.so.200 -> libnl-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-cli-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-cli-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so -> libnl-cli-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so.200 -> libnl-cli-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-cli-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so -> libnl-cli-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-cli-3.so.200 -> libnl-cli-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-cli-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-genl-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-genl-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so -> libnl-genl-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so.200 -> libnl-genl-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-genl-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so -> libnl-genl-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-genl-3.so.200 -> libnl-genl-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-genl-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-nf-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-nf-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so -> libnl-nf-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so.200 -> libnl-nf-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-nf-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so -> libnl-nf-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-nf-3.so.200 -> libnl-nf-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-nf-3.so.200.7.0
 -rw-r--r--	root/root	usr/lib/libnl-route-3.a
 -rwxr-xr-x	root/root	usr/lib/libnl-route-3.la
-lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so -> libnl-route-3.so.200.5.2
-lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so.200 -> libnl-route-3.so.200.5.2
--rwxr-xr-x	root/root	usr/lib/libnl-route-3.so.200.5.2
+lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so -> libnl-route-3.so.200.7.0
+lrwxrwxrwx	root/root	usr/lib/libnl-route-3.so.200 -> libnl-route-3.so.200.7.0
+-rwxr-xr-x	root/root	usr/lib/libnl-route-3.so.200.7.0
 drwxr-xr-x	root/root	usr/lib/libnl/
 drwxr-xr-x	root/root	usr/lib/libnl/cli/
 drwxr-xr-x	root/root	usr/lib/libnl/cli/cls/
@@ -143,6 +144,9 @@ drwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/
 -rw-r--r--	root/root	usr/lib/libnl/cli/qdisc/pfifo.a
 -rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/pfifo.la
 -rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/pfifo.so
+-rw-r--r--	root/root	usr/lib/libnl/cli/qdisc/plug.a
+-rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/plug.la
+-rwxr-xr-x	root/root	usr/lib/libnl/cli/qdisc/plug.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-3.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-cli-3.0.pc
@@ -150,6 +154,7 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-nf-3.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libnl-route-3.0.pc
 drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/genl-ctrl-list
 -rwxr-xr-x	root/root	usr/sbin/nl-class-add
 -rwxr-xr-x	root/root	usr/sbin/nl-class-delete
 -rwxr-xr-x	root/root	usr/sbin/nl-class-list
@@ -165,6 +170,7 @@ drwxr-xr-x	root/root	usr/sbin/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/genl-ctrl-list.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nl-classid-lookup.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nl-pktloc-lookup.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/nl-qdisc-add.8.gz
diff --git a/libnl/.md5sum.i686 b/libnl/.md5sum.i686
index c88a2a20e..a5a15100a 100644
--- a/libnl/.md5sum.i686
+++ b/libnl/.md5sum.i686
@@ -1 +1 @@
-6a233a9dffa0ee3a7f6110c95c5410ab  libnl-3.2.7.tar.gz
+c13adec0239b266207fff07d79e5ce9e  libnl-3.2.9.tar.gz
diff --git a/libnl/.md5sum.x86_64 b/libnl/.md5sum.x86_64
index c88a2a20e..a5a15100a 100644
--- a/libnl/.md5sum.x86_64
+++ b/libnl/.md5sum.x86_64
@@ -1 +1 @@
-6a233a9dffa0ee3a7f6110c95c5410ab  libnl-3.2.7.tar.gz
+c13adec0239b266207fff07d79e5ce9e  libnl-3.2.9.tar.gz
diff --git a/libnl/Pkgfile b/libnl/Pkgfile
index 63ff63aad..ec8451525 100644
--- a/libnl/Pkgfile
+++ b/libnl/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: 
 
 name=libnl
-version=3.2.7
+version=3.2.9
 release=1
 source=(http://www.infradead.org/~tgr/$name/files/$name-$version.tar.gz)
 
diff --git a/libnl/libnl-1-1-vlan-header.patch b/libnl/libnl-1-1-vlan-header.patch
deleted file mode 100644
index c4c2fc638..000000000
--- a/libnl/libnl-1-1-vlan-header.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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_) */
diff --git a/libnl/libnl-1.1-fix-compilation.patch b/libnl/libnl-1.1-fix-compilation.patch
deleted file mode 100644
index 891562a39..000000000
--- a/libnl/libnl-1.1-fix-compilation.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libnl-1.1.orig/include/netlink-local.h	2008-01-14 16:48:45.000000000 +0100
-+++ libnl-1.1/include/netlink-local.h	2009-06-26 11:15:33.186011844 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
- 
- #include <arpa/inet.h>
- #include <netdb.h>