Fixed broken online update, bug 207839, thank you Anton Bolshakov <anton.bugs AT gmail.com> for report and fix.

Package-Manager: portage-2.1.4_rc14

4 files changed, 84 insertions, 6 deletions

diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 4c25210906b3..625bc0b377ca 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.37 2007/12/29 11:50:59 welp Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.38 2008/01/30 11:11:06 pva Exp $
+
+*amap-5.2-r1 (30 Jan 2008)
+
+  30 Jan 2008; <pva@gentoo.org> +amap-5.2-r1.ebuild:
+  Fixed broken online update, bug 207839, thank you Anton Bolshakov <anton.bugs
+  AT gmail.com> for report and fix.
 
   29 Dec 2007; <welp@gentoo.org> amap-5.2.ebuild:
   Keyworded ~x86-fbsd; bug 203149
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index ad788e275928..3cca825ba23d 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -16,14 +16,18 @@ EBUILD amap-4.8-r1.ebuild 1469 RMD160 4184978bde04fac1ffb25dc237f9eb1f2ae93ae3 S
 MD5 a7ef9e440df41ddc5e145e15c5c970dd amap-4.8-r1.ebuild 1469
 RMD160 4184978bde04fac1ffb25dc237f9eb1f2ae93ae3 amap-4.8-r1.ebuild 1469
 SHA256 f199afe9eee9227f923c88e1a2328bacb516c2fa244a9d3b439e56142a97af43 amap-4.8-r1.ebuild 1469
+EBUILD amap-5.2-r1.ebuild 1811 RMD160 aa329829909d931738411f833887312887fc3822 SHA1 e50f1f70a3a4da3cc8197a90bfc38be22fb3ec5e SHA256 d1241517ba6ea3bf1f4425eb92b4ff51d92dc0f4b3dbb26771f5725d21527435
+MD5 3c54d7df7ccfb499897ddbcf37c6b0be amap-5.2-r1.ebuild 1811
+RMD160 aa329829909d931738411f833887312887fc3822 amap-5.2-r1.ebuild 1811
+SHA256 d1241517ba6ea3bf1f4425eb92b4ff51d92dc0f4b3dbb26771f5725d21527435 amap-5.2-r1.ebuild 1811
 EBUILD amap-5.2.ebuild 1515 RMD160 7aa09f23546a4d94cb5ec8abb1ad2fd995e43bf9 SHA1 0dedb7a0f0c3533c1f709f475a42506dd054c11a SHA256 f4a09db44a74de5d27e3b613ddf874b6838ffe1505df4d23563b92038f82b161
 MD5 2279c51177eab2c281c582f787118591 amap-5.2.ebuild 1515
 RMD160 7aa09f23546a4d94cb5ec8abb1ad2fd995e43bf9 amap-5.2.ebuild 1515
 SHA256 f4a09db44a74de5d27e3b613ddf874b6838ffe1505df4d23563b92038f82b161 amap-5.2.ebuild 1515
-MISC ChangeLog 4978 RMD160 2dfec8ad5c56eb4ed72c7ba2e90abf16b97b5527 SHA1 40c69ebfa3c3509e43b29a6b4b2e3a3514caa26b SHA256 0376cb6408f2b01edd0819718d747caa5a11f805a2982625678f2b37d2c18d30
-MD5 1233a16c85dc7458ebfe38f509ab142c ChangeLog 4978
-RMD160 2dfec8ad5c56eb4ed72c7ba2e90abf16b97b5527 ChangeLog 4978
-SHA256 0376cb6408f2b01edd0819718d747caa5a11f805a2982625678f2b37d2c18d30 ChangeLog 4978
+MISC ChangeLog 5175 RMD160 e91629f6ec56eea768970df8eca3fcefef510bec SHA1 31146645aecab3f205a9e55ccea16052a393544b SHA256 93eb18464ea631a15835bca7b76e2d69dec6ddfb7d1f1d94ba681f6bb7942559
+MD5 afc4428ad3c722219128193794758ba5 ChangeLog 5175
+RMD160 e91629f6ec56eea768970df8eca3fcefef510bec ChangeLog 5175
+SHA256 93eb18464ea631a15835bca7b76e2d69dec6ddfb7d1f1d94ba681f6bb7942559 ChangeLog 5175
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b metadata.xml 159
@@ -34,3 +38,6 @@ SHA256 3f996413511f49ebbfb32ce337f9e25318015139953a4b727b2dcaa474ea1b57 files/di
 MD5 6efdc0d754f7b117960e1080c5899981 files/digest-amap-5.2 226
 RMD160 0718493a66e3964ae97a2ef12df902b35c8d9391 files/digest-amap-5.2 226
 SHA256 98efbf35d71e0807064cda055ca741a4ea696af2c6a39171566353646108ab25 files/digest-amap-5.2 226
+MD5 6efdc0d754f7b117960e1080c5899981 files/digest-amap-5.2-r1 226
+RMD160 0718493a66e3964ae97a2ef12df902b35c8d9391 files/digest-amap-5.2-r1 226
+SHA256 98efbf35d71e0807064cda055ca741a4ea696af2c6a39171566353646108ab25 files/digest-amap-5.2-r1 226
diff --git a/net-analyzer/amap/amap-5.2-r1.ebuild b/net-analyzer/amap/amap-5.2-r1.ebuild
new file mode 100644
index 000000000000..e7e28c32f15e
--- /dev/null
+++ b/net-analyzer/amap/amap-5.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.2-r1.ebuild,v 1.1 2008/01/30 11:11:06 pva Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="http://www.thc.org/thc-amap/"
+SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl"
+
+DEPEND="dev-libs/libpcre
+		ssl? ( >=dev-libs/openssl-0.9.6j )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -rf pcre-3.9
+	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die "sed amap-lib.c failed"
+	# Above change requires below change. See sources...
+	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die "sed amap-lib.c failed"
+	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
+	# Files to be updated are at different location, bug 207839.
+	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die "sed amap.h failed"
+
+	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die "sed Makefile.am failed"
+
+	epatch "${FILESDIR}"/4.8-system-pcre.patch
+}
+
+src_compile() {
+	# has it's own stupid custom configure script
+	./configure || die "configure failed"
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		Makefile || die "pruning vars"
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
+			Makefile || die "adding ssl"
+	fi
+	emake OPT="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin amap amapcrap || die "dobin failed"
+	insinto /usr/share/amap
+	doins appdefs.* || die "doins failed"
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}
diff --git a/net-analyzer/amap/files/digest-amap-5.2-r1 b/net-analyzer/amap/files/digest-amap-5.2-r1
new file mode 100644
index 000000000000..6f7b48996620
--- /dev/null
+++ b/net-analyzer/amap/files/digest-amap-5.2-r1
@@ -0,0 +1,3 @@
+MD5 e3b1f5ebd24aac03aacb38ec183eb426 amap-5.2.tar.gz 262875
+RMD160 4ea604ecb086f8e3cac84b45caac93b4a04eba26 amap-5.2.tar.gz 262875
+SHA256 0ca1d5e9feab7d44af39dc058a688a0636f8e798315ee742847c4057e4467fb6 amap-5.2.tar.gz 262875