Fix pcap dependency issue wrt bug #163928

Package-Manager: portage-2.1.2-r1

9 files changed, 37 insertions, 134 deletions

diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index 40c1e0317077..4e226ade2719 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nessus-libraries
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.83 2007/01/21 19:26:27 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.84 2007/02/01 16:26:07 jokey Exp $
+
+*nessus-libraries-2.3.1-r1 (01 Feb 2007)
+
+  01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -files/linux26.patch,
+  -nessus-libraries-2.2.7.ebuild, -nessus-libraries-2.2.8.ebuild,
+  -nessus-libraries-2.3.1.ebuild, +nessus-libraries-2.3.1-r1.ebuild:
+  Fix pcap dependency issue wrt bug #163928
 
   21 Jan 2007; Cedric Krier <cedk@gentoo.org>
   +files/nessus-libraries-2.3.1-ldflags.patch,
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
index 8d2f077daec2..b864bd520144 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,35 +1,24 @@
-AUX linux26.patch 1278 RMD160 9ee5a9f371480c1b2ae903bf585dcb94197b8dac SHA1 97c65f4b15222e743a8e6e1332087ef2acd66899 SHA256 2a07d9c07799bed57085cd77abe4c0ea19ce46e69297bdcc433e90011c74a649
-MD5 33d8a49602ab3e7f0c037188ed7d4cb7 files/linux26.patch 1278
-RMD160 9ee5a9f371480c1b2ae903bf585dcb94197b8dac files/linux26.patch 1278
-SHA256 2a07d9c07799bed57085cd77abe4c0ea19ce46e69297bdcc433e90011c74a649 files/linux26.patch 1278
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nessus-libraries-2.3.1-ldflags.patch 1010 RMD160 382f930f6eec35405264f9cf0baffa29cd55a15b SHA1 a78554996cb28929aeed729b9ee088482cf99b59 SHA256 8c5cdd22850134641eee93045391f4c4566d44287cec7a7c81c6d219de3e24af
 MD5 13e18f8d0f4c2a8ee8db0253a2b724f6 files/nessus-libraries-2.3.1-ldflags.patch 1010
 RMD160 382f930f6eec35405264f9cf0baffa29cd55a15b files/nessus-libraries-2.3.1-ldflags.patch 1010
 SHA256 8c5cdd22850134641eee93045391f4c4566d44287cec7a7c81c6d219de3e24af files/nessus-libraries-2.3.1-ldflags.patch 1010
 DIST nessus-libraries-2.2.6.tar.gz 426911 RMD160 6fd4b60515fa17657a015a3a31d380ee5d2c23ba SHA1 7552cb5c48ace2e38537d8b58a1c7968172399cc SHA256 3389d0579aa28e6c2da86682cad994976e15938fd47bcf31ef6decc2841cbc67
-DIST nessus-libraries-2.2.7.tar.gz 426429 RMD160 08f0602635cd9ca5f2bc4513067c0c5251249a97 SHA256 5aefd97c5a400088ddbf793cd4b2b688a5a9b7aec51c1403be316453f86f1834
-DIST nessus-libraries-2.2.8.tar.gz 426546 RMD160 9f498c04c6084c9b27b799c2af6dfad26060dd83 SHA256 ed3e072d241352e5cc941d9b5b9acc2f38858c7d806b7a0e4a865c854193aa03
 DIST nessus-libraries-2.3.1.tar.gz 424748 RMD160 c219015f13e5b7ccba3856823605b2aa71d680d3 SHA1 f62214122bfd42db8057b87b357d7ed8f35b8d70 SHA256 04528fe8882b51da65860ab4fe823fada56f4009d7961ca92970ace32a796c27
 EBUILD nessus-libraries-2.2.6.ebuild 866 RMD160 8acf16d9583df4cfe17e445d39fde3f0308ab50d SHA1 4a0e68bd21c3ba4fecb6aba0cc9b385f982ebb56 SHA256 421fb52d3e3800636f1970d7d13eb6a7356f264b6fcfb372dbd8a55ba6cf6df7
 MD5 d0678dcb72fb35fa7adfce5efe45bfa7 nessus-libraries-2.2.6.ebuild 866
 RMD160 8acf16d9583df4cfe17e445d39fde3f0308ab50d nessus-libraries-2.2.6.ebuild 866
 SHA256 421fb52d3e3800636f1970d7d13eb6a7356f264b6fcfb372dbd8a55ba6cf6df7 nessus-libraries-2.2.6.ebuild 866
-EBUILD nessus-libraries-2.2.7.ebuild 877 RMD160 f897f4055c2b59efc9d03592fbfd387c260f2e03 SHA1 99fefebe984033d01a147d533142132536ed296c SHA256 cff012248a930a96501eeb88695c33e05433965ccd17efbad835bcf51c6f658c
-MD5 5b35a63d60f660cb738dd50b38c383b1 nessus-libraries-2.2.7.ebuild 877
-RMD160 f897f4055c2b59efc9d03592fbfd387c260f2e03 nessus-libraries-2.2.7.ebuild 877
-SHA256 cff012248a930a96501eeb88695c33e05433965ccd17efbad835bcf51c6f658c nessus-libraries-2.2.7.ebuild 877
-EBUILD nessus-libraries-2.2.8.ebuild 872 RMD160 14ee74104248474bfc1dc874c60bc9658c7a86fd SHA1 31f91caa5900a6780c67e6b2deaa41f82784cc74 SHA256 79c6b180bd892c20862efce6d2750fa9fdd870d72f529ab78651cca7b2cb2ebd
-MD5 6e9b32437dcafa53a44202d418dd8075 nessus-libraries-2.2.8.ebuild 872
-RMD160 14ee74104248474bfc1dc874c60bc9658c7a86fd nessus-libraries-2.2.8.ebuild 872
-SHA256 79c6b180bd892c20862efce6d2750fa9fdd870d72f529ab78651cca7b2cb2ebd nessus-libraries-2.2.8.ebuild 872
-EBUILD nessus-libraries-2.3.1.ebuild 980 RMD160 c104e6ca76a964e8a68a706aec68bf119149c512 SHA1 bd0a90f3deb97e7f4be9c4d55318cac2fe7c48be SHA256 c469062d37c65df2762e47a55db380ec770706c674f83f901ab832bf35a32be9
-MD5 b1194ccd81171f4b25028969f15a46da nessus-libraries-2.3.1.ebuild 980
-RMD160 c104e6ca76a964e8a68a706aec68bf119149c512 nessus-libraries-2.3.1.ebuild 980
-SHA256 c469062d37c65df2762e47a55db380ec770706c674f83f901ab832bf35a32be9 nessus-libraries-2.3.1.ebuild 980
-MISC ChangeLog 11631 RMD160 6f74ef08e917c96de77dccf7b696d000b789f215 SHA1 972dfc86fecd9f31b04df22454e56a7d8fac3c6c SHA256 dc1f630e6f81368ae154c1992c940fd1ad7fe566aeb8322d60a74060289394b9
-MD5 f363e0ebbd0894fa4b78331af6aecb01 ChangeLog 11631
-RMD160 6f74ef08e917c96de77dccf7b696d000b789f215 ChangeLog 11631
-SHA256 dc1f630e6f81368ae154c1992c940fd1ad7fe566aeb8322d60a74060289394b9 ChangeLog 11631
+EBUILD nessus-libraries-2.3.1-r1.ebuild 1036 RMD160 ce1d1f1ecb9e5190bd061666fa5f8788c9f41a86 SHA1 0d8d9e5e53397ab00f28d04cf9f0e964b6ef668f SHA256 1f4b47910850be58836ac06a4544bf005c6fb176d0d36b6e723ec1cf563a09cf
+MD5 ad71ceb9c29ca2d35ce32dc848849285 nessus-libraries-2.3.1-r1.ebuild 1036
+RMD160 ce1d1f1ecb9e5190bd061666fa5f8788c9f41a86 nessus-libraries-2.3.1-r1.ebuild 1036
+SHA256 1f4b47910850be58836ac06a4544bf005c6fb176d0d36b6e723ec1cf563a09cf nessus-libraries-2.3.1-r1.ebuild 1036
+MISC ChangeLog 11925 RMD160 2dce04b4b27256d71c8e0fa7186155fbc77fa7f1 SHA1 5308ae87b89c16e715ba433b170b985ac7d248a1 SHA256 22e36fb3b2aa2435cb2de9157dd7310a970aa04a460a60b767aa4765f19f5440
+MD5 f57d49b79cfaa2eb109c08d1d2780738 ChangeLog 11925
+RMD160 2dce04b4b27256d71c8e0fa7186155fbc77fa7f1 ChangeLog 11925
+SHA256 22e36fb3b2aa2435cb2de9157dd7310a970aa04a460a60b767aa4765f19f5440 ChangeLog 11925
 MISC metadata.xml 249 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 SHA1 0a5d282d1381312bc9eaee4f4cc282811ba33a64 SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754
 MD5 fda214dc78c8ac3a9e8d50f5f0cee8aa metadata.xml 249
 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 metadata.xml 249
@@ -37,12 +26,13 @@ SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754 metadata
 MD5 6396708bbb488cbae4d7f3171cc7549c files/digest-nessus-libraries-2.2.6 268
 RMD160 1d8b7831566019bdcda7c6596186b7c24877a498 files/digest-nessus-libraries-2.2.6 268
 SHA256 3e9083a90f57291bb2da00cbadf6ab8a3cbea2a0e288e9f007bc2233b86878c3 files/digest-nessus-libraries-2.2.6 268
-MD5 b26453e877d7c0a213489c737930e2b7 files/digest-nessus-libraries-2.2.7 268
-RMD160 72878950cd5a9472da1188fe5ea03e7e3c8aca32 files/digest-nessus-libraries-2.2.7 268
-SHA256 4d1cfd44fab3213e884703b56f23f2590c66cc13d36ba499a765bce55ae12afb files/digest-nessus-libraries-2.2.7 268
-MD5 b0b4373161b7b0f3754aa0c4bb801048 files/digest-nessus-libraries-2.2.8 268
-RMD160 49eca31fb28fc2d18c0369a320eadc8ac83778e4 files/digest-nessus-libraries-2.2.8 268
-SHA256 575758d8f374f9fd5bafc30521ebd3b551fac1c0d547ad5afd7c40ff40bb3248 files/digest-nessus-libraries-2.2.8 268
-MD5 d7021bafc902079e801dc40d97e85858 files/digest-nessus-libraries-2.3.1 268
-RMD160 73d53a535e90a5865c2c3ecaee0c74451f0dcafc files/digest-nessus-libraries-2.3.1 268
-SHA256 b3d0daf5dbf1eb09c10359b5e05fce821c135e2fb3b6e829b1cf62499f8195df files/digest-nessus-libraries-2.3.1 268
+MD5 d7021bafc902079e801dc40d97e85858 files/digest-nessus-libraries-2.3.1-r1 268
+RMD160 73d53a535e90a5865c2c3ecaee0c74451f0dcafc files/digest-nessus-libraries-2.3.1-r1 268
+SHA256 b3d0daf5dbf1eb09c10359b5e05fce821c135e2fb3b6e829b1cf62499f8195df files/digest-nessus-libraries-2.3.1-r1 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFwhSMz974XjDVpbkRAlzCAJ4jJNHjhznOSftyhSsIhj+vm6JB2gCfQBtb
+/gKNJK1QWReJ0NSi0C1+bfU=
+=ifl/
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.7 b/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.7
deleted file mode 100644
index 8700f96199d9..000000000000
--- a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 740d9f2d97c495a52663a15a0fe5e6cd nessus-libraries-2.2.7.tar.gz 426429
-RMD160 08f0602635cd9ca5f2bc4513067c0c5251249a97 nessus-libraries-2.2.7.tar.gz 426429
-SHA256 5aefd97c5a400088ddbf793cd4b2b688a5a9b7aec51c1403be316453f86f1834 nessus-libraries-2.2.7.tar.gz 426429
diff --git a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.8 b/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.8
deleted file mode 100644
index 62a789bd4afa..000000000000
--- a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.2.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 257048b54b767f54f224bd9440d2b215 nessus-libraries-2.2.8.tar.gz 426546
-RMD160 9f498c04c6084c9b27b799c2af6dfad26060dd83 nessus-libraries-2.2.8.tar.gz 426546
-SHA256 ed3e072d241352e5cc941d9b5b9acc2f38858c7d806b7a0e4a865c854193aa03 nessus-libraries-2.2.8.tar.gz 426546
diff --git a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.3.1 b/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.3.1-r1
index 92d3f439d389..92d3f439d389 100644
--- a/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.3.1
+++ b/net-analyzer/nessus-libraries/files/digest-nessus-libraries-2.3.1-r1
diff --git a/net-analyzer/nessus-libraries/files/linux26.patch b/net-analyzer/nessus-libraries/files/linux26.patch
deleted file mode 100644
index 295e60aa5f04..000000000000
--- a/net-analyzer/nessus-libraries/files/linux26.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- nessus-libraries/libnessus/scanners_utils.c~	2004-12-18 21:11:06.320320160 +0100
-+++ nessus-libraries/libnessus/scanners_utils.c	2004-12-18 21:11:06.319320312 +0100
-@@ -28,11 +28,11 @@
-  */
- ExtFunc
- int 
--comm_send_status(globals, hostname, action, current,max)
-+comm_send_status(globals, hostname, action, current_nessus,max)
-   struct arglist * globals;
-   char * hostname;
-   char * action;
--  int current, max;
-+  int current_nessus, max;
- {
-  struct arglist * prefs = arg_get_value(globals,"preferences");
-  char * pref = arg_get_value(prefs, "ntp_short_status");
-@@ -61,16 +61,16 @@
-     {
-     if(short_status)
-       {
--      snprintf(buffer, sizeof(buffer), "s:%c:%s:%d:%d\n", action[0], hostname, current, max);
-+      snprintf(buffer, sizeof(buffer), "s:%c:%s:%d:%d\n", action[0], hostname, current_nessus, max);
-       }
-     else
-      snprintf(buffer, sizeof(buffer),
- 		"SERVER <|> STATUS <|> %s <|> %s <|> %d/%d <|> SERVER\n",
--		hostname, action, current, max);
-+		hostname, action, current_nessus, max);
-     }
-   else
-    snprintf(buffer, sizeof(buffer), "SERVER <|> STAT <|> %s <|> %d/%d <|> SERVER\n",
--	      hostname, current, max);
-+	      hostname, current_nessus, max);
- 	      
- 	      
-  internal_send(soc, buffer, INTERNAL_COMM_MSG_TYPE_DATA);
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.7.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.7.ebuild
deleted file mode 100644
index b5e1324018fa..000000000000
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.7.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.7.ebuild,v 1.1 2006/03/09 17:46:42 vanquirius Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
-DEPEND=">=dev-libs/openssl-0.9.6d"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf --with-ssl=/usr/lib || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "failed to install"
-	dodoc README*
-}
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.8.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.8.ebuild
deleted file mode 100644
index fb781f50a2c6..000000000000
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.8.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.8.ebuild,v 1.1 2006/06/01 21:34:57 jokey Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
-DEPEND=">=dev-libs/openssl-0.9.6d"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	econf --with-ssl=/usr/lib || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "failed to install"
-	dodoc README*
-}
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r1.ebuild
index 1fade84cde25..0b5162f5c817 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r1.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild,v 1.3 2007/01/21 19:26:27 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r1.ebuild,v 1.1 2007/02/01 16:26:07 jokey Exp $
 
 inherit toolchain-funcs eutils
 
 DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
 HOMEPAGE="http://www.nessus.org/"
 SRC_URI="ftp://ftp.nessus.org/pub/nessus/experimental/nessus-${PV}/src/${P}.tar.gz"
+
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
-DEPEND=">=dev-libs/openssl-0.9.6d"
+DEPEND="dev-libs/openssl
+	net-libs/libpcap"
+RDEPEND=${DEPEND}
+
 S=${WORKDIR}/${PN}
 
 src_unpack() {
@@ -25,11 +29,11 @@ src_unpack() {
 
 src_compile() {
 	export CC=$(tc-getCC)
-	econf --with-ssl=/usr/lib || die "econf failed"
+	econf --disable-nessuspcap --with-ssl=/usr/lib || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "failed to install"
+	make DESTDIR="${D}" install || die "failed to install"
 	dodoc README*
 }