Added patch for conflict with linux-headers - bug #71657

Package-Manager: portage-2.0.51-r14

4 files changed, 58 insertions, 8 deletions

diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index f3bd1d93579f..2b489a8ddd88 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nessus-libraries
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.42 2005/01/12 08:30:30 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.43 2005/01/25 14:38:20 dragonheart Exp $
+
+  26 Jan 2005; Daniel Black <dragonheart@gentoo.org> +files/linux26.patch,
+  nessus-libraries-2.3.0.ebuild:
+  Added patch for conflict with linux-headers - bug #71657 with patch by Torsten
+  Kaiser <Storklerk@ariolc.dyndns.org>
 
 *nessus-libraries-2.3.0 (12 Jan 2005)
 
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
index 7c97dc599776..6e8a1e007359 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7abe84e8406d681046884e25c2fa7efa ChangeLog 6205
+MD5 dc9ccdbba75ef8f88473e4f73cdc0431 ChangeLog 6434
 MD5 cd6d36fd1b22114e4c2b820f98341817 nessus-libraries-2.2.0.ebuild 811
-MD5 97300328cdeb7fc18f8d3909a9a3a71e nessus-libraries-2.3.0.ebuild 818
+MD5 025dfc29a541a0652b5e9dc2dda41ba0 nessus-libraries-2.3.0.ebuild 915
 MD5 fda214dc78c8ac3a9e8d50f5f0cee8aa metadata.xml 249
 MD5 b367581f95285f15943022bdf431e4ce nessus-libraries-2.0.12.ebuild 816
-MD5 62b9e702990af221c97aa2265ac4b193 files/digest-nessus-libraries-2.2.0 74
+MD5 33d8a49602ab3e7f0c037188ed7d4cb7 files/linux26.patch 1278
 MD5 0360a7b9bfd73d4f1a6156894f84bfb2 files/digest-nessus-libraries-2.3.0 74
+MD5 62b9e702990af221c97aa2265ac4b193 files/digest-nessus-libraries-2.2.0 74
 MD5 e4c0d37cf6e9bbc6b03e885ece2dd51d files/digest-nessus-libraries-2.0.12 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB5OAtmdTrptrqvGERAq/jAKCcKQ5LxxPBgJ+kdb9jt65IIeofkACfRW3R
-VbPev+6Oc+MiJAu1krfo+dE=
-=cx4/
+iD8DBQFB9lnimdTrptrqvGERAlNhAJ9iZWV1QTGfU/FUcIuqbU8/rFY/yACffr3L
+7w4jx96h/82oXdJvyB/fY4c=
+=f4GU
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nessus-libraries/files/linux26.patch b/net-analyzer/nessus-libraries/files/linux26.patch
new file mode 100644
index 000000000000..295e60aa5f04
--- /dev/null
+++ b/net-analyzer/nessus-libraries/files/linux26.patch
@@ -0,0 +1,36 @@
+--- 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.3.0.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.3.0.ebuild
index e600f1d56380..0f5e2e23ad28 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.3.0.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.3.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 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.0.ebuild,v 1.1 2005/01/12 08:30:30 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.3.0.ebuild,v 1.2 2005/01/25 14:38:20 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
 HOMEPAGE="http://www.nessus.org/"
@@ -14,6 +16,12 @@ IUSE=""
 DEPEND=">=dev-libs/openssl-0.9.6d"
 S=${WORKDIR}/${PN}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/linux26.patch || die
+}
+
 src_compile() {
 	econf --with-ssl=/usr/lib || die "econf failed"
 	emake || die "emake failed"