Fix a race condition in the make file (bug #235995).

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26 x86_64

4 files changed, 25 insertions, 7 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index d48641ac3c57..886e832e33f0 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.181 2008/08/28 21:38:01 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.182 2008/08/30 21:23:40 spock Exp $
+
+  30 Aug 2008; Michał Januszewski <spock@gentoo.org>
+  +files/nmap-4.68-concurrent-make-fix.patch, nmap-4.68.ebuild:
+  Fix a race condition in the make file (bug #235995).
 
   28 Aug 2008; Michał Januszewski <spock@gentoo.org> nmap-4.68.ebuild:
   Remove forced -j1 as it doesn't seem to be necessary anymore (bug
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 36bc030927c1..c02229f68617 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX nmap-4.01-nostrip.patch 1776 RMD160 643efbf516bf48af90c82c6e9c4c8bf587673053 SHA1 6e8e6bca94ce7bfcf83175ab58ab2c5bbfa56a31 SHA256 8ad526d6766d93ff5b76410982b18fd4f47fe504afe8e7e087cab072331b3de0
 AUX nmap-4.20-osscan.patch 728 RMD160 b8b78c31941a37d0ffce1a193c41beae4a90ea16 SHA1 563c11bd67f3810b61b275be0f7da04f9dabd6f6 SHA256 3d525248f414504712f8cb25ea4bed1e6330882c1e69fb176629cb731d811101
+AUX nmap-4.68-concurrent-make-fix.patch 454 RMD160 b892c1d6be072c6ba3922fb0f9fc9907a870e7a2 SHA1 903d63c562a9664e34fec02a224938f3b508a6c0 SHA256 3d04269e56225093994cfc584912e4300c87b662f6c23b965deea95b4a7c6a25
 AUX nmap-4.68-nolua.patch 2929 RMD160 be3cf17c4f3dffe9139189f860c8168c1a4a34ef SHA1 96e81abb565ae585302ba9c4bc22addfbf15e1e8 SHA256 32be40197422d56fd3c273fc59ec777e1cb25c3bbf89fe735f6ac1c16e5e5fb8
 AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
 AUX nmap-shtool-nls.patch 646 RMD160 308bf5925393716ccb01d914c6b06c63144bbdfd SHA1 ae013892b7c13974cf905bfc58d36ffaf9a345ee SHA256 639749d61339186fe16e8302e601b74f0aec1121140968e015ac9dd833855bb4
@@ -17,13 +18,13 @@ EBUILD nmap-4.53.ebuild 1692 RMD160 91fdbf435136029f019d1e4e4b1f971bc12b732a SHA
 EBUILD nmap-4.60.ebuild 1683 RMD160 c9576c1f9f7b1ecc1adb8856cdbc074749ac95ce SHA1 85d33c73133d73c39f5a51d5221ff22ca737b46e SHA256 4149066d6b4c18262034610b43537ba0cd22b56e353198c9d069e28e0d3048f1
 EBUILD nmap-4.62.ebuild 1684 RMD160 608d5171ffe6a1f129f2a3ffac91605618dce9c2 SHA1 fdba5b3a63d9fdb2718f4942a70240bc1201e26f SHA256 e68448b01871ed3c29efb9df0b7579727326c98c7f1a230299bb14b80fb7679b
 EBUILD nmap-4.65.ebuild 1686 RMD160 2c4ea5a3d490b8c070b835ac4db66e89e74319e6 SHA1 aa5f4cda221fa76ae3385099b1123cb304a7899b SHA256 76abd1a282192e608a308ea4a04f7e2c8c159b90fe18d3b29993299ed77d3741
-EBUILD nmap-4.68.ebuild 1809 RMD160 3d83e6fb6c5a48a1abe381cdaefa9aed4bee997e SHA1 ba83f6171de5e8fa63556d48fa731dc53563594d SHA256 979d670445a188f94340ea5e2772c071a84b124b043fc08821eb7e2ac4aa6865
-MISC ChangeLog 21679 RMD160 c05cec71673e285855a39362bd19f2901258aa2e SHA1 bc7c8f7d9fc40dad33076650b8ea49c88041164c SHA256 e81f31a6950885257c642148d78f7b1148ef39881b34ad5233019e43458d9e83
+EBUILD nmap-4.68.ebuild 1862 RMD160 52d8d9d7040f829fc3703405328a097cff752263 SHA1 2ed6e0c744999ff093ce8eef3ca408688e61c038 SHA256 5b51fd7ee91a405797394f343b50c7527072b3364158b17adc163c3abd8fe275
+MISC ChangeLog 21853 RMD160 73593faf1585f07e163a188a45461384d3ed4c74 SHA1 2552dc40be67ee480acee2ea268d4ef30f97befa SHA256 6a438f3a86756a9c66b4d44826e6e45758d677aa10243ad2b9cbc9c2c48ac42a
 MISC metadata.xml 220 RMD160 e546581ce5539acad3af6c34d9aa3cf620d7f3a8 SHA1 6a6d5d3526e99d62e789655226cdda4b343a913f SHA256 acc28d2b0a26781492524b195565470457168bd704c817430d76770844b5d42a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki3Gq8ACgkQchej4aZK9/fNiQCgh8I3KhV5HZvgG/fiU1vXFVNO
-tnsAmgL+2TGvvEp4MbapGW86TU1J8HoW
-=QKBl
+iEYEARECAAYFAki5uk4ACgkQchej4aZK9/cvaQCfdd6CX65O7fUi4VHUOtWWMiY1
+OJsAoIKfzV2Eh22Y2feWOAGY7NeYtbeM
+=NuuJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-4.68-concurrent-make-fix.patch b/net-analyzer/nmap/files/nmap-4.68-concurrent-make-fix.patch
new file mode 100644
index 000000000000..4cc8acb21114
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-4.68-concurrent-make-fix.patch
@@ -0,0 +1,12 @@
+diff -Naurp nmap-4.68-orig/Makefile.in nmap-4.68/Makefile.in
+--- nmap-4.68-orig/Makefile.in	2008-08-30 01:04:10.000000000 +0200
++++ nmap-4.68/Makefile.in	2008-08-30 01:04:45.000000000 +0200
+@@ -101,7 +101,7 @@ nbase_build: $(NBASEDIR)/Makefile
+ 	@echo Compiling libnbase;
+ 	cd $(NBASEDIR) && $(MAKE)
+ 
+-nsock_build: $(NSOCKDIR)/src/Makefile
++nsock_build: $(NSOCKDIR)/src/Makefile nbase_build
+ 	@echo Compiling libnsock;
+ 	cd $(NSOCKDIR)/src && $(MAKE)
+ 
diff --git a/net-analyzer/nmap/nmap-4.68.ebuild b/net-analyzer/nmap/nmap-4.68.ebuild
index a7d49e2273ce..ed19ca0034bd 100644
--- a/net-analyzer/nmap/nmap-4.68.ebuild
+++ b/net-analyzer/nmap/nmap-4.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.68.ebuild,v 1.6 2008/08/28 21:38:01 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.68.ebuild,v 1.7 2008/08/30 21:23:40 spock Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -26,6 +26,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-nolua.patch"
+	epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
 	AT_NO_RECURSIVE=1 eautoreconf
 }