make libpcap link to libnl:3

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 108 insertions, 16 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 9bbb03472005..b726815d7fda 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.178 2013/01/18 14:50:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.179 2013/02/08 05:18:14 zerochaos Exp $
+
+*libpcap-1.3.0-r2 (08 Feb 2013)
+
+  08 Feb 2013; Rick Farina <zerochaos@gentoo.org>
+  +files/libpcap-1.3.0-libnl3.patch, +libpcap-1.3.0-r2.ebuild:
+  make libpcap link to libnl:3
 
 *libpcap-1.3.0-r1 (18 Jan 2013)
 
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index fc23f6f5cfff..f9df241de07c 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,31 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX libpcap-1.1-cross-linux.patch 1050 SHA256 b1b6375abe00207c4ea69d0e7150eb2ed080eff4b7a1112e69af587f2004474a SHA512 15938d432fec9c6867e8a4c899b9ad413b08ecab939f0c6d5d8eeb00acbcf53d3a09377a2d3f1e8510dbc36078f32da97189d45af27da9a53c106d8313671819 WHIRLPOOL e373e5d8fcfa1fbb38fe8c9058361db91848cc805d0d198ca793d3591d78d3c8d94029d7598f660b17ec527d9e8e7ef8687a8ea400186c4b8b2833cec0ab92c0
 AUX libpcap-1.1.1-ignore-ENODEV.patch 1363 SHA256 1fa73b0ce9552352df0024af5172433fbdd3fb856b6aa53b90ceb8a31fded00c SHA512 3fb928ed0fead6a91585823d22fe3295ec190cd41671c62662c4a900ea077949a77b5df2bc7c1abb081117c78539ddfdc273bead5f9bc3228c258b27e759200e WHIRLPOOL ab67cd9f41a4b6e7185aece951daa70f3ba54582ea4339bfc12f45f94ca66be371500793c148c833a7e47812e3ac53c898118a3ecead929181542ac25ee04cb1
 AUX libpcap-1.2.0-cross-linux.patch 583 SHA256 89344641676edfd9dc70b05569ac26a8ac79815fa5df0cf8e2ee77b3f9c5877f SHA512 4249129122f8ae382e086820ac4852d1413e3a7dd1f8db370aace1e94a1b0cf40d5f6d97213ca52e224e02472fed60b03c7f89d0ccd45e44ef0039a432595adb WHIRLPOOL 47598355e51ca3a15f1f817927aa73481c9a02ca15ca57ea487e1b42918a85b53aaa311be991dfc3362a2df3dd9ecee3059738e08760af8d6d9e4770578db3e3
 AUX libpcap-1.3.0-canusb.patch 290 SHA256 3518dc59be25c3092df6e133694b4d4372552ff8d25e2371f3fc0f587de83054 SHA512 c3d6138d58c268fcf0799bf74c65ff648f2f7c6e46d3534d3941b9ae678510463388518db3b688ca85e89d79e31dedb147a8cbc9710b8ca0ca4a766913ba8fbf WHIRLPOOL 33225aa8eea3eb74b4d81c6746034d7cf88a0b2fad352888362cf87e565935b326b5a2aa6c4f857c21c44971a0b6b616e33130dd906511ef874e16b2872c8dd1
 AUX libpcap-1.3.0-fix-systems-without-ipv6-support.patch 13183 SHA256 14973d5dc09e036281cf507ca7fead8bf352e17dcb949a90942d58e5affda29c SHA512 cdf61a8dfe2cba0a8f3bf84a749c48eb3e75e634880f86acf7225793c921577137eca7579812c0c38a6e128cca58214d0eb614b11ec47d5f6d25d53557d49185 WHIRLPOOL 49c7ac019e969bb18f384e11b77b986417da5d2e4b5986624efe8e4555982c629a68705c1a72c0761552acd7523653ffde426fcc9bbd61aa15a44bb4a38a2417
+AUX libpcap-1.3.0-libnl3.patch 567 SHA256 3952ad13a5a349f66267df9181a18b6b8b5ec7a250ef04c6a745f20fe24e792c SHA512 a2bfb4ef908499ab642a52d15c41c81b7ecb83af0c7bf8bf7053d374acd746619cefce8eb80643ca4223fd08dc56022e36383292b018e154be977492a09c2d4e WHIRLPOOL c616af5b8df95138c31c0545f6189c866666c13b1bb88be235dc5f072969104e85bcf1fe18b19e15d6d34c7984df57c838770a3382e74b424a09b3b29faa963c
 DIST libpcap-1.1.1.tar.gz 581984 SHA256 508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85 SHA512 eecdde95815575857a722176d6caf26b8e7cf6886435fa2a4bc652d83b54a1d0fcfa7f4f87075448e83874d6340619d722b49c139a61c37f2284d890789165ac WHIRLPOOL 86f49406b15bad8799302f7653b28da70dd00bbb1243d87e7843d6dd121f4bd729379d6178a2f463b78104202c852d83d772274cf999519bbb7ac9d95419af6e
 DIST libpcap-1.3.0.tar.gz 608967 SHA256 41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9 SHA512 c023abb3da7b9f62835fa04ca43b50203d7e3da7b624d09a693c8b02fd531c3845e1c86cbc587ae02816614133f5342585f6a2985fdaf92889fcfaca7bfb8908 WHIRLPOOL 774897ce4dcd1655945313a145399da9db0063967ce246e1c7beb21f038ee4c5bcfe2b4ec7b08316a013fdb33b50781f5195bf169a2ca6f84ddc2bf5bca78f15
 EBUILD libpcap-1.1.1-r1.ebuild 1521 SHA256 93673c49162ba3723aa4217a01c6a890d28791311096a8161bd95c2e9532b764 SHA512 d0e60691f4fab29ce256ad53d4e30a05bcfc9aa934244b45ca3888fe19ca38a9084131d0bd6cf24572fd835c646b7446546a641791d6ca3cca25dc02db286a59 WHIRLPOOL 8ff93463ca08ff460d7a84b66666f58fa76efd32cecb6be61b875b5b17fc7d69e8a4d1ef6c7c9850f8a3d43c98242da1e9e19819d6286bda31e226795b2d46d5
 EBUILD libpcap-1.3.0-r1.ebuild 1767 SHA256 8e3f02a3d0c4995f27f0ed92d1d3a6c7fc64b147cd3db21260c735b2b2e2517f SHA512 bb9ead8d9154cb89ed40016001f4ae445daae22ccc720c258a8e5df9baa4955da51bc44f36770810fabc595863907930045e94da3f45ecfe747d8bc878a46f27 WHIRLPOOL 5738dd2bcbf474e93df1fab990d73741490d0b98600c00cb561d06056a49f4c488e5c67fa6cfa5b27a45d8a857a219bc7921e1a399dc422a12f35f9248eeef2c
-MISC ChangeLog 24615 SHA256 9e0ec0c9c41b2e108ce7e059435b9437513242139a108d4a0a52f81639d705e6 SHA512 6a927751692817004c9ce3dbbacad0df46cb28c14f5bd5ae7e4f04321472f2521d09893ab64d91af7b5355a700874d484e5969f4d69b0a7d6fa12220d65617ee WHIRLPOOL 6c20283df99a48e31042b0e2c241c44a151369a72c88379de7faab35a28b663f508d4c00dea22326a232a9c3a115d40405f19994267cc3ab24af22a3e224a6e4
+EBUILD libpcap-1.3.0-r2.ebuild 1810 SHA256 ada4749de2c28133bda16b96cf25ce5f20b548fab05300fe3d39de973228ce64 SHA512 99c37cf2e585b95c2362904a75f8abb04c88db171f313e9e0151a04cc8e2523edf572631315a1f3e6c311b56086a6bb8521cc6e13b531de2d269f11a524e4ac5 WHIRLPOOL 4d5c9ffe79459a00ab92783e4df29c4566558a5517cdc4aa4977bc720734cd1b9d7b314e70d43fce7f4c11250f18c93a601622f923d650392209e9486939959a
+MISC ChangeLog 24790 SHA256 ef71f986ef8432ca3be2a0150c74c2378d79fc9f44c37340e060e9c2d91ea493 SHA512 9ae4f24a0240bdb9257be258da0d733aeb7e7822897f6c11a1bf7bb8e20505dd22a60762e0c65955f84fe765b0b565b649cd1b8032d83141dbae8541160edaf0 WHIRLPOOL 048562228c5a3f4fc9b69b697bc3904913956bf8238f705844f551fd886e999b444f7b49df697ea49d42ee9d1228bce6a45a26e38c87d9d855bd80a346295f44
 MISC metadata.xml 527 SHA256 ae854bbce8236ebb2fa71609841d13824535ac9effc54bafd87935b7169c05df SHA512 71e2833754bc14961297bf0fbe11d747eb663f1bb735bd0d1354db729ee989f05f47dab4acf03380f6e1490cc49f473e755ce4bf3950d109a48d1f3714dc94c7 WHIRLPOOL c54582b13fe76a3344b2a5f8d13be9b2ef25c02afc26ca01293392ae80a8346c8a238c66e0e0c13a584c904cdbd1945979e8b2c6257f01fdd05742ef5d4b21fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ+WE/AAoJEPiazRVxLXTFxdIQAL5UsEO9xBw2iIt6OFYSAfNR
-DXA1h5wJCP6qGZ25/hBes+I6OzRq9+yjR26rGrMLgiqjrDJvtwCPiaIzNOiUgzhF
-kzjLPPdPm9zRB2iOcd+fNhXruhpkUWd3dIUQjhyBbrIz+zWpNkVXoT+qdZ7COsGW
-48hLS+vTyV4PbZnuetusvALsBwB7NhY6qts1vKwaKPeXJuonSrZCcS07GThDk2/c
-VC+q9oQA7wxWiRwNzOWaKaX3w58PQR8IAAiGuPprjcrxQuCLpFmi+4s7gdorB9Dm
-Lam1i6ibDd+haTZCu0fcIPG6u+bQN0d6M6We/+3qMZWy1ya7uPvVXTKgRioJrCqo
-e5t/PFUM1XJMUvobQRKK24votX2kh3nc5UWqp9lgqvwRoN+xm+5z9d31L8fvcL23
-rbo1l7nRo+J26E0BR+Ac+md4LXsk94eE14QwGs8pxVRAGFzaEV7Nt+LYifNgJE4C
-2r+BQAl/8JWxgZOLUML1aSoVe0Z8iH1Vcj7RMiu5yHD8tOBnuUvm8vu/PcC5pQMO
-W+bBwwx1BC7jHFIrHoxVNIxiUPK9sUXp02QowJJh5vBttFU+X5drxjWwJGwG1DLR
-Z2XmvMfCRC2jd8hvgLsMqn8UNoPtEYPNgk7dcsgDl+PLBAdQV6tFjzhe9BzZ65fO
-OtrHEFXwy2BjIlK2Af5n
-=uxBj
+iQIcBAEBCgAGBQJRFIqiAAoJEKXdFCfdEflKw7sP/RfS7vVrbKgcumT2LyvspEUc
+cPP51wBavkJfJ+kARJPCc+rVJACv++yp0uWLyILiDmAIznSybGzJ9caOPsz41/J3
++lKDVq+sR8GReVWZIt3UHQSUavFQKpAQTvQAlaMLagC6AGeR+nFUDgsuUu/okFhS
+DI1IlzsWv5+4XzE2D4i18pVoafKYShsNIoWBLlngZol5iSgIXDq9mpkiVjvEJNQG
+kL/8dpcguE5JSSaJ+NqNq7u2oJtqY1yr5tjGjq4UPQfM5t+XAj2V6Vi9+UIZyTJG
+quQuji7niQF1O3KFs0jtWMkC97VeYr61/jrmJmO8FfItb5uH780EZLM5tWvESjRs
+NXLRqTkjirkftxXf0dJkiQaShmjMZK0W5RXCd2hhk5k61vD2CKWf0zZ5Njh8O2Rt
+r5rfYRwZp4tvnxTdmdbvCRokQxZURLeFeYHyhwZuZyEDVPNb/yN+XERCjKFPvCWF
+0H6m9tRBt9J02Kb31Xq8TQI4t8OXeQb5XcAjTM7d5QhtRowUCLLGMImFOEwGWhbm
+sYdlv1ylH9szLDqHuYX9rFwvhHgJLGDHKY9ut0i/b9zQrMu24N6kOXZVmUC1KJGa
+5ytJb6IFPGR5nsonmO4X+wQdE4xMeunAn7XomLgado9BaUuKjlUvEesX8B0M1LpF
+348J0uoJeef4QeUkpxHc
+=/H3n
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.3.0-libnl3.patch b/net-libs/libpcap/files/libpcap-1.3.0-libnl3.patch
new file mode 100644
index 000000000000..63b73d60c908
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.3.0-libnl3.patch
@@ -0,0 +1,20 @@
+diff -Naur libpcap-1.3.0-orig/configure.in libpcap-1.3.0/configure.in
+--- libpcap-1.3.0-orig/configure.in	2013-02-08 00:11:41.888270763 -0500
++++ libpcap-1.3.0/configure.in	2013-02-08 00:13:04.664272980 -0500
+@@ -449,14 +449,14 @@
+ 		],
+ 		[
+ 			#
+-			# No, we don't; do we have libnl 1.x?
++			# No, we don't; do we have libnl 1.x? (hijacked, linking 3.x no matter what)
+ 			#
+ 			AC_CHECK_LIB(nl, nl_handle_alloc,
+ 			[
+ 				#
+ 				# Yes.
+ 				#
+-				LIBS="-lnl $LIBS"
++				LIBS="-lnl-genl-3 -lnl-3 $LIBS"
+ 				AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
+ 			],
+ 			[
diff --git a/net-libs/libpcap/libpcap-1.3.0-r2.ebuild b/net-libs/libpcap/libpcap-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..4af6bc6c4f3f
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.3.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.3.0-r2.ebuild,v 1.1 2013/02/08 05:18:14 zerochaos Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="http://www.tcpdump.org/"
+SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
+	http://www.jp.tcpdump.org/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth ipv6 netlink static-libs canusb"
+
+RDEPEND="bluetooth? ( net-wireless/bluez )
+	netlink? ( dev-libs/libnl:3 )
+	canusb? ( virtual/libusb )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+DOCS=( CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.0-cross-linux.patch \
+		"${FILESDIR}"/${PN}-1.3.0-canusb.patch \
+		"${FILESDIR}"/${P}-fix-systems-without-ipv6-support.patch \
+		"${FILESDIR}"/${P}-libnl3.patch
+	# Prefix' Solaris uses GNU ld
+	sed -i -e 's/freebsd\*/freebsd*|solaris*/' \
+		-e 's/sparc64\*/sparc64*|sparcv9*/'  aclocal.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable ipv6) \
+		$(use_enable canusb) \
+		$(use_with netlink libnl)
+}
+
+src_compile() {
+	emake all shared
+}
+
+src_install() {
+	default
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h
+	fi
+}