Respect LDFLAGS, #343337; Added crash patch when updateing feeds, #190912 thanks Marcin Deranek for the patch

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

6 files changed, 167 insertions, 6 deletions

diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index 8e719a59d9fb..3ed53dcd0ead 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nessus-core
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.113 2010/09/06 18:31:45 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.114 2011/04/20 11:08:27 jlec Exp $
+
+*nessus-core-2.2.9-r1 (20 Apr 2011)
+
+  20 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/2.2.9-crash.patch,
+  +files/2.2.9-gentoo.patch, +nessus-core-2.2.9-r1.ebuild:
+  Respect LDFLAGS, #343337; Added crash patch when updateing feeds, #190912
+  thanks Marcin Deranek for the patch
 
   06 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   -nessus-core-2.2.6.ebuild:
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index e6bb94b2f1c7..1140c3ac6b77 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.2.9-crash.patch 418 RMD160 de57908f176d631c823e597fb75fc0f2cfc798be SHA1 c53e667f12ce6871b9dc1681395ecbbdf6d9287d SHA256 52a43e9d16005d2150f96885e0d91dc6992dc086288e7cf665d77d0ee7758baf
+AUX 2.2.9-gentoo.patch 1470 RMD160 4a21d14edba9690a01ff5bc9bf518498b2696280 SHA1 bc20beea692c649339f6e79dc22f0effe46eb481 SHA256 be28f8be6f36e5e7214c9053827d76a45bda40256a54ae6c8ce627914556ffbf
 AUX nessus-core-2.3.1-gcc4.diff 325 RMD160 595f11acb9b5a83ecff75924f50b3de4c51526a0 SHA1 b7e089d1fa575287ef1b945077d938d0f1cdda3f SHA256 020a160721bcf23142f38b4fe8d914ae7cfae830b8dafaa654604091017363e1
 AUX nessusd-r7 647 RMD160 35dffe93c92db49d5e32df848461813c7387d091 SHA1 7b5cd47b7251444fe80a6f98eeb72a72e8438ca0 SHA256 36ecfe6a2f71490e6123b1fbdae8a71cb3a24d503adb92ee50dd602b649b5262
 AUX nessusd-r8 655 RMD160 5aa32dccd94763954dff77dc55bdef711ff8a1b8 SHA1 703d74e2ee19ba7ab5e51618b6e3d4c6c35f6709 SHA256 634741d3cae1bec7a9eec6a0e04f086d71b5e13685e8c43a6583684ef01994fc
 DIST nessus-core-2.2.9.tar.gz 674390 RMD160 ba911192a78ee1c6ae1a5d64badff9d18ef666a8 SHA1 25385fd1cece40fd57e26afd42c88515b069c2ba SHA256 b725ace4ef619bc19b372eac9a60db7b083a3e155e11c65443618e52b56c847e
 DIST nessus-core-2.3.1.tar.gz 1280142 RMD160 e2b34c6f7879e0db8ff08a0e2e30cd4ee300d74a SHA1 0d324f0b66a31aa70e423a769a0699c641111d4f SHA256 16f7cfaa34e224362933a7d95fc7a73c1e04823db29eea52fc78e742adec0580
+EBUILD nessus-core-2.2.9-r1.ebuild 1335 RMD160 d67716003213d0640ed4adf66a81193346595bfc SHA1 2c5a45f2d8c0ebcdb1e9cdd4f465a62b44b28126 SHA256 ed68086ab55a2e23e79e97700a3a62d0c4c92d12ca8e951fd29ef76869351d83
 EBUILD nessus-core-2.2.9.ebuild 1358 RMD160 78381fef8b45e5f9c78a2e8d58290238b36d83d4 SHA1 cb0e6de3f1c364cc194256b4df012d08c5066b5f SHA256 c7de3b480de2bb4679d3964b1055487345080135af4c316a95c2d1e0b030519a
 EBUILD nessus-core-2.3.1.ebuild 1407 RMD160 61ce6dd6f982a00ce11b5a150751fbe467b5a6af SHA1 bf8a7a25cc260f6b99d170938fd02c725a859fed SHA256 d071fc4070b52d678c83497e787a4d8056e89bafcd0379ea97d4f6f5700222c8
-MISC ChangeLog 17227 RMD160 a258721e359adb4170326925f4ce9c33a108e679 SHA1 468edd38c2362607281ad71d162aaebf4fb8abde SHA256 46a027b02021401dcc9378da5e50b4ddee764d66ef254b4ae423a48fa30b238e
+MISC ChangeLog 17506 RMD160 182d6476d2708d761bbb1c9f40f65a7ab128a07d SHA1 67061858a255a3d398fc3c1556e7d3b2ddf81f8f SHA256 dd2e80b384d31624fd72d33f4ea49ba2ba5cab52f04ad00057fe436cdead8a7f
 MISC metadata.xml 244 RMD160 dcd2bcdadd5f72b4674006adb8241495d91e23b7 SHA1 33de92ec7574e4f3d3b4c5bd0a368b42f80996be SHA256 ffab1a869f9dad1f7e917015ad31e5c00a2047997e76ba050a6898c71e11b991
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2uvrEACgkQgAnW8HDreRYcigCgnUQyWtgFeMLXExCiDYUha2rb
+cK8Aninpv6bNrjx/zJBNhpGgyD9eKt0y
+=CD1K
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nessus-core/files/2.2.9-crash.patch b/net-analyzer/nessus-core/files/2.2.9-crash.patch
new file mode 100644
index 000000000000..d95c28404de2
--- /dev/null
+++ b/net-analyzer/nessus-core/files/2.2.9-crash.patch
@@ -0,0 +1,15 @@
+--- nessus-core/nessus/auth.c	2007-08-31 23:12:36.000000000 +0200
++++ nessus-core/nessus/auth.c	2007-08-31 23:12:52.000000000 +0200
+@@ -92,11 +92,11 @@
+   char * buffer = emalloc(s);
+   int len, n = 0;
+   signal(SIGPIPE, sighand_pipe);
+-  va_start(param, data);
+ 
+  
+   for(;;)
+   {
++   va_start(param, data);
+    r = vsnprintf(buffer, s - 1, data, param);
+    if(r >= 0 && r < s)break;
+    s = r > s ? r + 2 : s * 2;
diff --git a/net-analyzer/nessus-core/files/2.2.9-gentoo.patch b/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
new file mode 100644
index 000000000000..c97f6979340d
--- /dev/null
+++ b/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
@@ -0,0 +1,58 @@
+ Makefile              |   10 +++++-----
+ nessus-fetch/Makefile |    2 +-
+ ssl/Makefile          |    2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b1485b3..382900a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -86,17 +86,17 @@ client-install : client
+ 	$(INSTALL) -m $(CLIENTMODE) ${make_bindir}/nessus $(DESTDIR)${bindir}
+ 
+ client : 
+-	cd nessus && $(MAKE)
++	$(MAKE) -C nessus
+ 
+-server : 
+-	cd nessusd && $(MAKE)
++server : client
++	$(MAKE) -C nessusd
+ 
+ sslstuff : 
+-	cd ssl && $(MAKE)
++	$(MAKE) -C ssl
+ 
+ 
+ fetchtool:
+-	cd nessus-fetch && $(MAKE)
++	$(MAKE) -C nessus-fetch
+ 
+ 
+ doc : $(MAN_NESSUS_1) $(MAN_NESSUSD_8)
+diff --git a/nessus-fetch/Makefile b/nessus-fetch/Makefile
+index 63439bc..89fd8c9 100644
+--- a/nessus-fetch/Makefile
++++ b/nessus-fetch/Makefile
+@@ -5,7 +5,7 @@ include ../nessus.tmpl
+ all: nessus-fetch
+ 
+ nessus-fetch: nessus-fetch.o
+-	$(CC) nessus-fetch.o -o nessus-fetch $(LIBS)
++	$(CC) $(LDFLAGS) nessus-fetch.o -o nessus-fetch $(LIBS)
+ 
+ nessus-fetch.o: nessus-fetch.c
+ 	$(CC) $(NESSUS_CFLAGS) ${include} $(DEFS) $(NESSUS_DEFS) -c nessus-fetch.c
+diff --git a/ssl/Makefile b/ssl/Makefile
+index 738a692..5e51426 100644
+--- a/ssl/Makefile
++++ b/ssl/Makefile
+@@ -6,7 +6,7 @@ OBJS = nessus-mkrand.o
+ all : nessus-mkrand
+ 
+ nessus-mkrand: $(OBJS)
+-	$(CC) $(OBJS) -o nessus-mkrand -lm
++	$(CC) $(LDFLAGS) $(OBJS) -o nessus-mkrand -lm
+ 
+ nessus-mkrand.o: nessus-mkrand.c
+ 	$(CC) $(CFLAGS) -c nessus-mkrand.c 
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
new file mode 100644
index 000000000000..5f5dd30d3cba
--- /dev/null
+++ b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild,v 1.1 2011/04/20 11:08:27 jlec Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A remote security scanner for Linux (nessus-core)"
+HOMEPAGE="http://www.nessus.org/"
+SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug gtk prelude tcpd"
+
+DEPEND="
+	~net-analyzer/nessus-libraries-${PV}
+	~net-analyzer/libnasl-${PV}
+	tcpd? ( sys-apps/tcp-wrappers )
+	gtk? ( x11-libs/gtk+:2 )
+	prelude? ( dev-libs/libprelude )
+	!net-analyzer/nessus-client"
+
+S="${WORKDIR}"/${PN}
+
+DOCS="README* UPGRADE_README CHANGES doc/*.txt doc/ntp/*"
+
+src_prepare() {
+	tc-export CC
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-crash.patch
+	sed \
+		-e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
+		-i nessus.tmpl.in
+}
+
+src_configure() {
+	econf \
+		$(use_enable tcpd tcpwrappers) \
+		$(use_enable debug) \
+		$(use_enable gtk)
+}
+
+src_compile() {
+	emake -C nessus cflags
+	emake -C nessusd cflags
+	default
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/nessusd-r7 nessusd
+	keepdir /var/lib/nessus/logs
+	keepdir /var/lib/nessus/users
+}
diff --git a/net-analyzer/nessus/Manifest b/net-analyzer/nessus/Manifest
index 85f3174a2c58..d1394b97eb69 100644
--- a/net-analyzer/nessus/Manifest
+++ b/net-analyzer/nessus/Manifest
@@ -1,4 +1,14 @@
-EBUILD nessus-2.2.9.ebuild 926 RMD160 77a7e7907dfc8504f58995580561e90968fba254 SHA1 dbe6c9b5d8c842fe68038ae8393f3ffa5e66e02a SHA256 8a850f974af16af708035c73ce896d4def189ee1bcac9c9e1c5cf39fd7f93011
-EBUILD nessus-2.3.1.ebuild 776 RMD160 4556c78798d16f1a04cd767ecc516299844e1aee SHA1 07446c92ab70e8394b63e503a13893549581e68b SHA256 aa246bd39e293ff160370844124ae436fd052f89e641cc6fa8b00723c0a52733
-MISC ChangeLog 11878 RMD160 82201ed53abbd69400a200fddaeed1e3236cdd8e SHA1 0535cd8ec9f3ebdecfdecd7d50262f2f2e90a60d SHA256 f3f4ffb18d862e1b4d6b6c963f0fa04f41b167fff915bd27758e75c91fa2ec23
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD nessus-2.2.9.ebuild 937 RMD160 eb923dfe448a80af78f865c851bf556b9900d1c3 SHA1 3f590d6fbb0daac436267984ec919c8ef35f7f25 SHA256 aa44a51921d4d63fa5cf6b3896555aa9f5d59a1adbb4598ed3ca53242ba4baf2
+EBUILD nessus-2.3.1.ebuild 927 RMD160 ad9c2c5cf4abb49cf373583009cb205a4bcf0df0 SHA1 dfd1bfc2479b079950504ead6f55f8f2e0bc34bb SHA256 01be90c1eb86d97265d9bef51d00a69d6a6ce575aaa7eb9f25e0721ab2152c81
+MISC ChangeLog 11989 RMD160 cd48d804c8a492805caaf4cb142688cfcf0da628 SHA1 fe34e10a5db240d82547059d59a64072212e289f SHA256 741f62bb9d5f73ad57ef6b2639e5c7aaeb7a7cf4293e62cc1e4044b6f32cfeda
 MISC metadata.xml 230 RMD160 d2b42cc4a1f23bdc47b0d7fbd00f6b5da0887726 SHA1 912ac3ed9c9389f18e0d154a358c3a3cfc33a742 SHA256 ca6db48cc0b51c9d0cde223b5da8fe2678478a7a706381908a32880ac6b85a1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2uvusACgkQgAnW8HDreRaSKACdHKmV0siRrjx8xhcJ6k8658Kh
+GVMAn2o2gX3WDVBs+YPqBlz5AnILhqvM
+=tVDI
+-----END PGP SIGNATURE-----