Version bump, bug #312337, thank Richard Hartmann for report. Fixes compatibility issue with autoconf-2.64, bug #281690, dropped Mike's patch for that.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 100 insertions, 12 deletions

diff --git a/net-libs/libpcap/ChangeLog b/net-libs/libpcap/ChangeLog
index 8d2280d40ff6..58ec134f7ea4 100644
--- a/net-libs/libpcap/ChangeLog
+++ b/net-libs/libpcap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/libpcap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.134 2010/02/25 21:13:07 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/ChangeLog,v 1.135 2010/04/02 05:58:19 pva Exp $
+
+*libpcap-1.1.0 (02 Apr 2010)
+
+  02 Apr 2010; Peter Volkov <pva@gentoo.org> +libpcap-1.1.0.ebuild,
+  +files/libpcap-1.1-cross-linux.patch:
+  Version bump, bug #312337, thank Richard Hartmann for report. Fixes
+  compatibility issue with autoconf-2.64, bug #281690, dropped Mike's patch
+  for that.
 
   25 Feb 2010; Fabian Groffen <grobian@gentoo.org>
   libpcap-1.0.1_pre20090812.ebuild:
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 4e01753f011b..d6de72a38533 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libpcap-0.8.1-fPIC.patch 298 RMD160 4cf97341a5da39c97553871312c9381f30457bdb SHA1 e63657730f2a1d2f04ca50947ea01485f1d5994e SHA256 cd4cbc5aa3ba94095e85cf026b015f20af9ed77c05b529b2cb902e5ba365a7c3
 AUX libpcap-0.9.3-whitespace.diff 679 RMD160 70ccf92874b1665253608ffeffa7de89c2af48d7 SHA1 a50d6467d5805a53809e9fdcc197377b76d21559 SHA256 4ff701485da6f577980048b9b91810ba7aa529c3be021dea30c8205b0a130606
 AUX libpcap-0.9.8-arptype-65534.patch 870 RMD160 be267ff32f5a59d0e8028da030131605beb50c49 SHA1 0fb37d5925b51f3beaae1dc66b5db4553d987cc9 SHA256 854e08c83f8615a4e5d12e3c2d0130ca23e38cd8216105495cf8f2968f2bb0a4
@@ -17,21 +14,17 @@ AUX libpcap-1.0.0-whitespace.patch 679 RMD160 6a62d2e5737a8627e43b853a687b31c5b4
 AUX libpcap-1.0.1-autoconf.patch 560 RMD160 84f326621b6a3de48516a449c5a9a48b95a99874 SHA1 39edc57982ea1a303d212a317f4258e909f0359f SHA256 cdd38a908723e272d834eda1d032f97e2b890949c1a24e24be6a178815258b27
 AUX libpcap-1.0.1_pre20090708-libnl-automagic.patch 1018 RMD160 75c7caeca86951426b0fc140cc8919e0215a8471 SHA1 7fb4a68bfcd1f884907ca2e71c9340eff21b4548 SHA256 8b29e765a244161545f02ea702f555303a9914ccde73548258d79900691778f5
 AUX libpcap-1.0.1_pre20090812-poll-cpu-usage.patch 1060 RMD160 b4821a0b146dda4ff8cce822e5d86f3196ab0894 SHA1 1b017ce2e2edc978b757c886326da6cc7f6898d2 SHA256 44776d07b759061f27be568f1fef7eb3400f1a10ad11fe14557f676a0dbd04b9
+AUX libpcap-1.1-cross-linux.patch 1050 RMD160 ca856c3f295752de47f3d813c324720960ba5fd0 SHA1 7b33a9ec9c65f5e108cbcb3855f0b954cfb75210 SHA256 b1b6375abe00207c4ea69d0e7150eb2ed080eff4b7a1112e69af587f2004474a
 AUX libpcap-cross-linux.patch 1114 RMD160 e76fd1ea94d34e8533416c476d95166ad13579ec SHA1 0853cb1cf102c6d9b41d22b4c62b0e1bac6d73a8 SHA256 4b3fe1e2b7ecefbf82e20120f8c3bf9c5050cb7ccc1e0be77a04af5ef7cbb459
 DIST libpcap-0.9.8.tar.gz 520526 RMD160 2f5ecbc9840d8bd646798c977b7a02abe191311e SHA1 11dfe67cfc1c279c7346d626a99ad4ba90621028 SHA256 c4158398de4411627b14f52626e4cef39443f4d5c1b9bce8c07f8526d18362f9
 DIST libpcap-1.0.0.tar.gz 524273 RMD160 20857fe6af5dc70fffb19da46e0fee908f55b3ea SHA1 9893654027ae11033d785045ff35583da43fe8fa SHA256 a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
 DIST libpcap-1.0.1-20090708.tar.gz 593985 RMD160 6c0deac196c6ec160ecbd8fa6a1f093242b79a55 SHA1 7e10c470ed6df3dce10c7ec5509378782bbf9f28 SHA256 babdd17040cf0cfc79b58121b758088639a37f84172c7a198f826dc0388ef3f7
 DIST libpcap-1.0.1-20090812.tar.gz 574616 RMD160 60cab9e2a00ec5124823958c65fc00ff760f9eb2 SHA1 f7c319e94a6504c60f2774ffae6afe6a31bbfdd4 SHA256 149d256b66f5cea5362858cdcac678f578e5d2e251b686ed8da09eb56dfaee6b
+DIST libpcap-1.1.0.tar.gz 581675 RMD160 46ded6e9ab2bc8fcdca7c2533fc928a127e53616 SHA1 386a83d34fbbcd25a4b41115603480ae3902470f SHA256 eb00b67e8c76cdf3d500cab044dc6374e93356b8f3fef1011b40d47d4ff0701c
 EBUILD libpcap-0.9.8-r2.ebuild 1893 RMD160 7eb603ca3e2cbe57ce3857536b1ecca7b8769742 SHA1 edcc59e68dc8a21036c1f5b9df87b9cb0516ef93 SHA256 f5c8ed79b684c390791df95dfaad5b2ab0a6f7108ca6048823f5101f18c24a4e
 EBUILD libpcap-1.0.0-r2.ebuild 1742 RMD160 c8cfe56d24f6ec5f36db1e5d7a78db07601067fc SHA1 8b5f1ff186e1c70d5c7fa3156bbadf71a6e5df1d SHA256 54d954551f24a905f5a1c7be53e9da380fe98f0757af51e1a7d1fd37d5e55de6
 EBUILD libpcap-1.0.1_pre20090708.ebuild 1803 RMD160 094bab78977034a4ed4b0d6e7c3fdb240fe64a59 SHA1 03aff6a3ddb8d1e95bcc88052a36eb14fe3ca970 SHA256 cf80f44afc13d3f19dacfbcd32ad45e4598c4b8a8f2f7359e650171c29c88969
 EBUILD libpcap-1.0.1_pre20090812.ebuild 1985 RMD160 674a3e2bc35b129633b9b9a926af6d0af174c48e SHA1 1912b6bfcba993ebf75ba329880539e3ede4021f SHA256 d05afaa7104e00abc5789e386ec1bf4c8c52ffaddb86c55391cbeb55633c6536
-MISC ChangeLog 17960 RMD160 bde2726e95d8065ebd1ccc774d6e5aad8ba8ed79 SHA1 9814a01ccb66e06234e75305e01fc7105875cc02 SHA256 ec5a5a8b8224de31464a357c87f7a1997f6ddc6ec7fd98d664e438ab34ffd753
+EBUILD libpcap-1.1.0.ebuild 1776 RMD160 a38ce3d3847c27474261f918650d633bc108957f SHA1 1dce5f5a87c63d94d98d195034924ca1d5088598 SHA256 3c2b8f1c142d565ae276d390e5d9101f929066cf4de1186df56839a0c8cc4c18
+MISC ChangeLog 18253 RMD160 7d95f08b1fe5c8a0dd32fa83953f6a19556d34c3 SHA1 2147e7c64b1d3d77b8df081141266b90730d048d SHA256 87049ba42417d5802688d4cd85166bd347c8b06aeda5d3fc55f69f33ad04562c
 MISC metadata.xml 388 RMD160 3b1443ce61438e34f2f95c0f5cc30a084d6f0449 SHA1 2a2b22d69ff3531819eb0fb9878bb43ee2ca93fd SHA256 0b03dfcc45267fcf74372c8a6cebe9df940147c62c8c4fb6ef47fc9e34e7dce0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuZbyQACgkQdz7hIScOURGF/wCg6xLr/mLKH4CCZz53wmHGZIB/
-0WUAniX8Y+1FY/qYb0RdrQ6bvvUn7rXo
-=MwZl
------END PGP SIGNATURE-----
diff --git a/net-libs/libpcap/files/libpcap-1.1-cross-linux.patch b/net-libs/libpcap/files/libpcap-1.1-cross-linux.patch
new file mode 100644
index 000000000000..5a35a89022d6
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.1-cross-linux.patch
@@ -0,0 +1,30 @@
+=== modified file 'configure.in'
+--- configure.in	2010-04-02 04:52:17 +0000
++++ configure.in	2010-04-02 04:52:22 +0000
+@@ -291,7 +291,12 @@
+ dnl XXX This could be done for cross-compiling, but for now it's not.
+ dnl
+ if test -z "$with_pcap" && test "$cross_compiling" = yes; then
+-	AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
++	if test -z "$with_pcap" ; then
++		case $host in
++			*-linux*) with_pcap="linux";;
++			*) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
++		esac
++	fi
+ fi
+ AC_ARG_WITH(pcap,
+ AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))
+@@ -412,8 +417,10 @@
+ linux)
+ 	AC_MSG_CHECKING(Linux kernel version)
+  	if test "$cross_compiling" = yes; then
++		dnl we could check linux/version.h here, but who runs
++		dnl versions of linux older than 2.0.x anymore to bother ?
+  		AC_CACHE_VAL(ac_cv_linux_vers,
+- 		    ac_cv_linux_vers=unknown)
++		    ac_cv_linux_vers=2)
+  	else
+  		AC_CACHE_VAL(ac_cv_linux_vers,
+  		    ac_cv_linux_vers=`uname -r 2>&1 | \
+
diff --git a/net-libs/libpcap/libpcap-1.1.0.ebuild b/net-libs/libpcap/libpcap-1.1.0.ebuild
new file mode 100644
index 000000000000..8772c5a1998c
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.1.0.ebuild,v 1.1 2010/04/02 05:58:19 pva Exp $
+
+EAPI=2
+inherit autotools versionator eutils multilib toolchain-funcs
+
+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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth ipv6 libnl"
+
+RDEPEND="!virtual/libpcap
+	bluetooth? ( || ( net-wireless/bluez net-wireless/bluez-libs ) )
+	libnl? ( dev-libs/libnl )"
+DEPEND="${RDEPEND}
+	sys-devel/flex"
+
+PROVIDE="virtual/libpcap"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.1-cross-linux.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable ipv6) \
+		$(use_with libnl) \
+		$(use_enable bluetooth)
+}
+
+src_compile() {
+	emake all shared || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-shared || die "emake install failed"
+
+	dosym libpcap$(get_libname ${PV}) /usr/$(get_libdir)/libpcap$(get_libname 1)
+	dosym libpcap$(get_libname ${PV}) /usr/$(get_libdir)/libpcap$(get_libname)
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h || die "failed to install pcap-int.h"
+	fi
+
+	# We are not installing README.{Win32,aix,hpux,tru64} (bug 183057)
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel} || die
+}