Respect LDFLAGS (bug #334405).

Package-Manager: portage-2.2_rc72/cvs/Linux i686

4 files changed, 36 insertions, 14 deletions

diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index 1d647d144ea9..63114b690b12 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nessus-libraries
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.89 2010/07/01 13:58:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.90 2010/08/31 00:57:31 jer Exp $
+
+*nessus-libraries-2.3.1-r2 (31 Aug 2010)
+
+  31 Aug 2010; Jeroen Roovers <jer@gentoo.org>
+  -nessus-libraries-2.3.1-r1.ebuild, +nessus-libraries-2.3.1-r2.ebuild,
+  files/nessus-libraries-2.3.1-ldflags.patch:
+  Respect LDFLAGS (bug #334405).
 
   01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   nessus-libraries-2.2.9.ebuild,
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
index 2116040ff41a..a9c80b2cfb22 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,10 +1,10 @@
 AUX nessus-libraries-2.2.9-asneeded.patch 444 RMD160 a0c556c14b72c253b8f47dfca7367fd1b5a49474 SHA1 5c5fb21c964bc906d33aff41530e6e1a0810d90f SHA256 db6c6b9f3eef5e03e3c37887f227d24688f812665a873abf80f2d68756685cda
-AUX nessus-libraries-2.3.1-ldflags.patch 1010 RMD160 382f930f6eec35405264f9cf0baffa29cd55a15b SHA1 a78554996cb28929aeed729b9ee088482cf99b59 SHA256 8c5cdd22850134641eee93045391f4c4566d44287cec7a7c81c6d219de3e24af
+AUX nessus-libraries-2.3.1-ldflags.patch 1424 RMD160 4cf59110cb43a73ed8f59b33b864aaf9743b5d0d SHA1 6810494fc8bef34e77ec282f8adf99cf46ec0843 SHA256 ce8b9ebff69c678f8488b2dd75240a1837a67c67dd6e3ea9aa9e7875ebfba1bb
 DIST nessus-libraries-2.2.6.tar.gz 426911 RMD160 6fd4b60515fa17657a015a3a31d380ee5d2c23ba SHA1 7552cb5c48ace2e38537d8b58a1c7968172399cc SHA256 3389d0579aa28e6c2da86682cad994976e15938fd47bcf31ef6decc2841cbc67
 DIST nessus-libraries-2.2.9.tar.gz 426560 RMD160 a3ce920ff48fcb7879f7026e2b7d271151132787 SHA1 de1ce2c522d6127a436574a96b1a5ec9873b597c SHA256 5a3c32d6eab8ccc8a22ab5bb224228152e10731c06561f679c41b92263c7ef18
 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
 EBUILD nessus-libraries-2.2.9.ebuild 905 RMD160 222421bb9d28437b05a7d95c1b29872be5166604 SHA1 8b5e4d243135b02dc93f4f2a9cc7f4fc827f8430 SHA256 43bc880b103271befc6782835bab1df6b867e2eb1a6f60da37c49cb981a9ec27
-EBUILD nessus-libraries-2.3.1-r1.ebuild 1032 RMD160 31b73fecce5e169b8f5b209e0ce51d3d12b162ce SHA1 c4d61aa03cded7a4db19e6855eb51a66a2df6ad1 SHA256 cb1daea55ba0958f9b0ed6cfdb160e6c0ab3326d169e5be461258598261102a2
-MISC ChangeLog 12733 RMD160 437e893fa7431a056e519850fc36a2146957ac93 SHA1 7de07fdfae565a9e823a068444bdbaffc18a10a3 SHA256 5d12f277d9e274183fa2e56b01136b2367c6d028359d9e50466c189ad86bab6f
+EBUILD nessus-libraries-2.3.1-r2.ebuild 1031 RMD160 65326f03fbff2da1eaddb16721461020019edbe9 SHA1 1e27d975d99ae86513d9927ac7cd84c6d3242f85 SHA256 8ea24e5b535e2c63b3aca54b165932ea844cbdae79bf55daa629699f20e5782d
+MISC ChangeLog 12968 RMD160 8d623bff5eaf303875445099f61e4e0863d1e3e7 SHA1 ec7cd9921f08239ab368497c19690368e1f30e46 SHA256 cb6b932e0436d74d890c86ec6a9383b553a0e26d69822d09dc0322ec6e57255e
 MISC metadata.xml 249 RMD160 733e7145e60c54eb0c583195b4c0c6ebb91756c0 SHA1 0a5d282d1381312bc9eaee4f4cc282811ba33a64 SHA256 14643d9de5c8caeb0c6ab8044426e00b98dab06667ef8d75472a365ef8011754
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch
index 9aca9ab9ba01..a773a6120d8e 100644
--- a/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch
+++ b/net-analyzer/nessus-libraries/files/nessus-libraries-2.3.1-ldflags.patch
@@ -1,19 +1,30 @@
-diff -ru nessus-libraries~/libnessus/Makefile nessus-libraries/libnessus/Makefile
---- nessus-libraries~/libnessus/Makefile	2007-01-21 19:49:30.000000000 +0100
-+++ nessus-libraries/libnessus/Makefile	2007-01-21 20:17:59.000000000 +0100
-@@ -101,7 +101,7 @@
+--- a/libnessus/Makefile	2004-08-31 19:15:07.000000000 +0200
++++ b/libnessus/Makefile	2010-08-31 02:47:45.000000000 +0200
+@@ -100,8 +100,8 @@
+ snprintf.o : snprintf.c
  	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
  libnessus.la: $(OBJS)
- 	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
+-	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
 -	-version-info ${PACKAGE_VERSION}
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
 +	-version-info ${PACKAGE_VERSION} ${PCAP_FLAG} ${SSL_FLAG}
  
  install : libnessus.la
  	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
-diff -ru nessus-libraries~/nessus.tmpl.in nessus-libraries/nessus.tmpl.in
---- nessus-libraries~/nessus.tmpl.in	2007-01-21 19:49:30.000000000 +0100
-+++ nessus-libraries/nessus.tmpl.in	2007-01-21 20:17:45.000000000 +0100
-@@ -61,6 +61,9 @@
+--- a/libhosts_gatherer/Makefile	2003-04-07 04:06:49.000000000 +0200
++++ b/libhosts_gatherer/Makefile	2010-08-31 02:47:45.000000000 +0200
+@@ -22,7 +22,7 @@
+ 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 	
+ libhosts_gatherer.la : $(OBJS)
+-	$(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
++	$(LIBTOOL) $(CC) $(LDFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 	        
+ hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
+--- a/nessus.tmpl.in	2003-02-17 15:52:01.000000000 +0100
++++ b/nessus.tmpl.in	2010-08-31 02:47:45.000000000 +0200
+@@ -61,10 +61,12 @@
  #
  BUILD_PCAP=@BUILD_PCAP@
  
@@ -23,3 +34,7 @@ diff -ru nessus-libraries~/nessus.tmpl.in nessus-libraries/nessus.tmpl.in
  
  # Some defines you may want to modify
  DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)
+-LDFLAGS=
+ 
+ # Your C compiler
+ CC=@CC@
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r2.ebuild
index ec57c58c8ab5..3d4b2fc4652b 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r1.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r1.ebuild,v 1.3 2010/05/26 16:26:06 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.3.1-r2.ebuild,v 1.1 2010/08/31 00:57:31 jer Exp $
 
 EAPI="3"