Added a patch to avoid stripping during install.

Package-Manager: portage-2.1_pre5-r4

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 0525f9517a9d0d3c30afa3e58d0563dd34c8c1e8..5a7331f3789b48186d328c67a2ff6f4d48da2169 100644 (file)
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.110 2006/02/14 22:08:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.111 2006/03/11 18:36:01 spock Exp $
+
+  11 Mar 2006; Michał Januszewski <spock@gentoo.org>
+  +files/nmap-4.01-nostrip.patch, nmap-4.01.ebuild:
+  Added a patch to avoid stripping during install (bug #125547).
 
 *nmap-4.01 (14 Feb 2006)
 

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 0254003b89a2b8c58f864149b5d281e2e5ed4825..6e5014c3e0d6aa34299b6396ca8e5403213ade70 100644 (file)
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dae743fdadf57b80c0c94fe91a9dc124 ChangeLog 13658
-RMD160 08b38d60297965276c4053eefce3623a6d79f8d8 ChangeLog 13658
-SHA256 86c68a0af39495e66cb2e5f99e397d095268065acf8f811fec3581be75bd7277 ChangeLog 13658
+MD5 614c02cad7e53ba0fe4b20936f19114f ChangeLog 13830
+RMD160 7df5957f81dc5722f4d78087a7f716aa3042720e ChangeLog 13830
+SHA256 d6a764d565dc5043edeb6b7809ec6a8e0034bdfa8ff058cc10949d85fbfe4a79 ChangeLog 13830
 MD5 a9321c7613a34f902b2bcf53af008bc3 files/digest-nmap-3.81 63
 RMD160 59c0542d85625ef904c3a5dc6fc00facbe17daca files/digest-nmap-3.81 63
 SHA256 13e6f15240eb5897e6d3d85660dd47e51f925220f45ca8cc104dea62c893a5bb files/digest-nmap-3.81 63
@@ -22,6 +22,9 @@ SHA256 5cf7ce78ce267d75d7932e6294fb62e35233ea65ba7ae057f391aae701b1b5d9 files/di
 MD5 f11df4ebd589496ea60cc97aa86ca934 files/digest-nmap-4.01 235
 RMD160 9715790b052612fdcc9aebe5e653a471307f2bcd files/digest-nmap-4.01 235
 SHA256 2e1851330b312dd079362d55f504dfb6beea04164294fce325b3891f08f31a1d files/digest-nmap-4.01 235
+MD5 6b3a7e3c4c595baed7770f09ee8b4c33 files/nmap-4.01-nostrip.patch 1776
+RMD160 643efbf516bf48af90c82c6e9c4c8bf587673053 files/nmap-4.01-nostrip.patch 1776
+SHA256 8ad526d6766d93ff5b76410982b18fd4f47fe504afe8e7e087cab072331b3de0 files/nmap-4.01-nostrip.patch 1776
 MD5 4ff03e23202e625a51391b37b3724964 files/nmap-logo-64.png 3289
 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 files/nmap-logo-64.png 3289
 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa files/nmap-logo-64.png 3289
@@ -46,13 +49,13 @@ SHA256 88cef81571b81325fbf2985bd134c7f0fc27e5c1606ad912275202a17d89d03a nmap-3.9
 MD5 062153bf21cde73403a5dd587a0520d4 nmap-4.00.ebuild 1250
 RMD160 ac9304f8aae19f0b06c6cf72edfc5e6e148fe89d nmap-4.00.ebuild 1250
 SHA256 a6f795f89c4d0b35bfa04e21cdd4f0d607719b57faa887af7ea5a5fb9e991d98 nmap-4.00.ebuild 1250
-MD5 61d2164a76ca86110a34022358a458e0 nmap-4.01.ebuild 1250
-RMD160 b814cf9ab1a01d1cca399c2adc7ab1f81dccfa03 nmap-4.01.ebuild 1250
-SHA256 975ad8f0681491b93942e6d163f542fb5483c9e5c4b62ac4ea555c31ae8d5070 nmap-4.01.ebuild 1250
+MD5 96adde4a40e1a44675d5f7353ad8dabb nmap-4.01.ebuild 1294
+RMD160 c6451f574b828c7bb1558be4e68bca248f2d0345 nmap-4.01.ebuild 1294
+SHA256 0949c57bbec34f61d3f8969c1e5b9109fe66dcfc2952c08f9e439823300bb305 nmap-4.01.ebuild 1294
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD8lUHchej4aZK9/cRApJKAJ4u37ofo9IP3gsuuhs5AifxtFPCdgCdE42K
-lVvp8JzWMCMZhSb2W8xBkVg=
-=8jKz
+iD8DBQFEExi8chej4aZK9/cRAocBAJ9uuFa/pWn0nqQoa7HkmhhU9GYFNACfd4cq
+X8X0PiUFrqHxCZcRNWsK0co=
+=ymxc
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/nmap/files/nmap-4.01-nostrip.patch b/net-analyzer/nmap/files/nmap-4.01-nostrip.patch
new file mode 100644 (file)
index 0000000..c8894fa
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-4.01-nostrip.patch
@@ -0,0 +1,22 @@
+Index: nmap-4.01/Makefile.in
+===================================================================
+--- nmap-4.01.orig/Makefile.in
++++ nmap-4.01/Makefile.in
+@@ -144,7 +144,7 @@ depend:
+ 
+ install-nmap: $(TARGET)
+       $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
+-      $(INSTALL) -c -m 755 -s nmap $(DESTDIR)$(bindir)/nmap
++      $(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
+       $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1
+       $(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/
+       $(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/
+@@ -158,7 +158,7 @@ install-nmap: $(TARGET)
+ install-nmapfe: $(TARGETNMAPFE)
+       $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir) $(DESTDIR)$(deskdir)
+       @echo "If the next command fails -- you cannot use the X front end"
+-      -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 -s nmapfe/nmapfe $(DESTDIR)$(bindir)/nmapfe && rm -f $(DESTDIR)$(bindir)/xnmap && $(SHTOOL) mkln -f -s $(DESTDIR)$(bindir)/nmapfe $(DESTDIR)$(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(DESTDIR)$(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(DESTDIR)$(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(DESTDIR)$(mandir)/man1/xnmap.1
++      -test -f nmapfe/nmapfe && $(INSTALL) -c -m 755 nmapfe/nmapfe $(DESTDIR)$(bindir)/nmapfe && rm -f $(DESTDIR)$(bindir)/xnmap && $(SHTOOL) mkln -f -s $(DESTDIR)$(bindir)/nmapfe $(DESTDIR)$(bindir)/xnmap && $(INSTALL) -c -m 644 nmapfe.desktop $(DESTDIR)$(deskdir)/nmapfe.desktop && $(INSTALL) -c -m 644 docs/nmapfe.1 $(DESTDIR)$(mandir)/man1/nmapfe.1 && $(INSTALL) -c -m 644 docs/xnmap.1 $(DESTDIR)$(mandir)/man1/xnmap.1
+ 
+ install: install-nmap $(INSTALLNMAPFE)
+ 

diff --git a/net-analyzer/nmap/nmap-4.01.ebuild b/net-analyzer/nmap/nmap-4.01.ebuild
index 7012ec48eb5317f7f5be3e941a651f8eddb88fff..04f907caaafe35a504998ab92983ecd96cbe5491 100644 (file)
--- a/net-analyzer/nmap/nmap-4.01.ebuild
+++ b/net-analyzer/nmap/nmap-4.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.01.ebuild,v 1.1 2006/02/14 22:08:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.01.ebuild,v 1.2 2006/03/11 18:36:01 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -24,6 +24,7 @@ src_unpack() {
        sed 's:Icon=icon-network:Icon=nmap-logo-64.png:' -i nmapfe.desktop
        echo ";" >> nmapfe.desktop
        epatch ${FILESDIR}/nmap-shtool-nls.patch
+       epatch ${FILESDIR}/nmap-4.01-nostrip.patch
 }
 
 src_compile() {