From 41db567455a283a26e9fda82a5da3d44288122f3 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Tue, 3 Apr 2012 16:51:28 +0200
Subject: update libnl to 3.2

---
 package/libnl/Makefile                | 23 ++++++++++++++++-------
 package/libnl/patches/patch-ltmain_sh | 11 -----------
 2 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 package/libnl/patches/patch-ltmain_sh

(limited to 'package/libnl')

diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 3261a50ec..b9c487913 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnl
-PKG_VERSION:=		2.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		6aaf1e9802a17a7d702bb0638044ffa7
+PKG_VERSION:=		3.2.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6a233a9dffa0ee3a7f6110c95c5410ab
 PKG_DESCR:=		Netlink library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.infradead.org/~tgr/libnl/
@@ -23,11 +23,20 @@ $(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,LIBNL_DEV,libnl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNL_DEV},${PKGSC_LIBNL_DEV}))
 
 libnl-install:
+	${INSTALL_DIR} ${IDIR_LIBNL}/etc/libnl
+	$(CP) ${WRKINST}/etc/libnl/* ${IDIR_LIBNL}/etc/libnl
 	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libnl.so* ${IDIR_LIBNL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libnl-genl.so* ${IDIR_LIBNL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libnl-cli.so* ${IDIR_LIBNL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libnl-route.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-3.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-genl-3.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-cli-3.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-route-3.so* ${IDIR_LIBNL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libnl-nf-3.so* ${IDIR_LIBNL}/usr/lib
+	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib/libnl/cli/cls
+	$(CP) ${WRKINST}/usr/lib/libnl/cli/cls/*.so \
+		${IDIR_LIBNL}/usr/lib/libnl/cli/cls
+	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib/libnl/cli/qdisc
+	$(CP) ${WRKINST}/usr/lib/libnl/cli/qdisc/*.so \
+		${IDIR_LIBNL}/usr/lib/libnl/cli/qdisc
 
 libnl-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBNL_DEV}/usr/include
diff --git a/package/libnl/patches/patch-ltmain_sh b/package/libnl/patches/patch-ltmain_sh
deleted file mode 100644
index 2058e0c78..000000000
--- a/package/libnl/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-2.0.orig/ltmain.sh	2010-10-13 16:43:44.000000000 +0200
-+++ libnl-2.0/ltmain.sh	2011-01-15 21:22:48.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
-- 
cgit v1.2.3