[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Anthony G. Basile]

commit:     95a3f26f7b3f176527803b398f21fc2d097c6ab7
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 15:37:11 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 15:50:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95a3f26f

net-analyzer/amap: add libressl support

Package-Manager: portage-2.2.28

 net-analyzer/amap/amap-5.4-r1.ebuild | 76 ++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
new file mode 100644
index 0000000..5042c17
--- /dev/null
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A network scanning tool for pentesters"
+HOMEPAGE="https://www.thc.org/thc-amap/"
+SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="libressl ssl"
+
+DEPEND="
+	dev-libs/libpcre
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+RDEPEND="
+	${DEPEND}
+	!sci-biology/amap
+"
+
+src_prepare() {
+	rm -r pcre-3.9 || die
+	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
+	# Above change requires below change. See sources...
+	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
+	sed -i 's:/usr/local:/usr:' amap.h || die
+	# Files to be updated are at different location, bug 207839.
+	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
+
+	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
+
+	epatch "${FILESDIR}"/4.8-system-pcre.patch
+}
+
+src_configure() {
+	# non-autotools configure script
+	./configure || die
+	sed -i \
+		-e '/^XDEFINES=/s:=.*:=:' \
+		-e '/^XLIBS=/s:=.*:=:' \
+		-e '/^XLIBPATHS/s:=.*:=:' \
+		-e '/^XIPATHS=/s:=.*:=:' \
+		-e "/^CC=/d" \
+		Makefile || die
+	if use ssl ; then
+		sed -i \
+			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
+			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
+			Makefile || die
+	fi
+	sed -i Makefile \
+		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
+		|| die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) OPT="${CFLAGS}"
+}
+
+src_install() {
+	dobin amap amapcrap
+	insinto /usr/share/amap
+	doins appdefs.*
+
+	doman ${PN}.1
+	dodoc README TODO CHANGES
+}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Sam James]

commit:     5a2d0ee5d2468a1894098de973c8159d0f8bd59c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 20:13:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 20:13:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a2d0ee5

net-analyzer/amap: port to EAPI 7

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/amap/amap-5.4-r1.ebuild | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 9848a4c18f2..71868935cdb 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A network scanning tool for pentesters"
 HOMEPAGE="https://www.thc.org/thc-amap/"
@@ -26,23 +26,31 @@ RDEPEND="
 	!sci-biology/amap
 "
 
+PATCHES=(
+	"${FILESDIR}"/4.8-system-pcre.patch
+)
+
 src_prepare() {
 	rm -r pcre-3.9 || die
+
 	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
+
 	# Above change requires below change. See sources...
 	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
 	sed -i 's:/usr/local:/usr:' amap.h || die
+
 	# Files to be updated are at different location, bug 207839.
 	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
 
 	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
 
-	epatch "${FILESDIR}"/4.8-system-pcre.patch
+	default
 }
 
 src_configure() {
 	# non-autotools configure script
 	./configure || die
+
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
@@ -50,12 +58,14 @@ src_configure() {
 		-e '/^XIPATHS=/s:=.*:=:' \
 		-e "/^CC=/d" \
 		Makefile || die
+
 	if use ssl ; then
 		sed -i \
 			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
 			Makefile || die
 	fi
+
 	sed -i Makefile \
 		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
 		|| die

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Sam James]

commit:     d4ab4937e3410359e907cb28ec22a91f2fe5193b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:16:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:18:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ab4937

net-analyzer/amap: Stabilize 5.4-r1 x86, #776505

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/amap/amap-5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 71868935cdb..1708711380c 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Sam James]

commit:     275b07bac065a894725465b86fac00408e5bfaa9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:20:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:21:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275b07ba

net-analyzer/amap: Stabilize 5.4-r1 amd64, #776505

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/amap/amap-5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 1708711380c..03dfa1959b4 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Sam James]

commit:     0663aad396c6060116c1b5a027c41fa01464d7ea
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:24:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:24:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0663aad3

net-analyzer/amap: Stabilize 5.4-r1 ppc, #776505

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/amap/amap-5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 03dfa1959b4..179c4aeb13f 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Sam James]

commit:     3d72b84ecf0e54a98947e30423bc4408ddde89c4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 21:55:29 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 21:55:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d72b84e

net-analyzer/amap: Stabilize 5.4-r1 ppc64, #776505

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/amap/amap-5.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 179c4aeb13f..2703bd6e4bd 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="libressl ssl"
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Sam James]

commit:     6c9b3eddfee95a0fd06e279643434f1af9ec5e8f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 22:01:10 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 22:01:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9b3edd

net-analyzer/amap: drop 5.4

Bug: https://bugs.gentoo.org/776505
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/amap/amap-5.4.ebuild | 72 ---------------------------------------
 1 file changed, 72 deletions(-)

diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
deleted file mode 100644
index ef97cd2aec1..00000000000
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A network scanning tool for pentesters"
-HOMEPAGE="https://www.thc.org/thc-amap/"
-SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="ssl"
-
-DEPEND="
-	dev-libs/libpcre
-	ssl? ( >=dev-libs/openssl-0.9.6j )
-"
-RDEPEND="
-	${DEPEND}
-	!sci-biology/amap
-"
-
-src_prepare() {
-	rm -r pcre-3.9 || die
-	sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die
-	# Above change requires below change. See sources...
-	sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die
-	sed -i 's:/usr/local:/usr:' amap.h || die
-	# Files to be updated are at different location, bug 207839.
-	sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die
-
-	sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die
-
-	epatch "${FILESDIR}"/4.8-system-pcre.patch
-}
-
-src_configure() {
-	# non-autotools configure script
-	./configure || die
-	sed -i \
-		-e '/^XDEFINES=/s:=.*:=:' \
-		-e '/^XLIBS=/s:=.*:=:' \
-		-e '/^XLIBPATHS/s:=.*:=:' \
-		-e '/^XIPATHS=/s:=.*:=:' \
-		-e "/^CC=/d" \
-		Makefile || die
-	if use ssl ; then
-		sed -i \
-			-e '/^XDEFINES=/s:=:=-DOPENSSL:' \
-			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
-			Makefile || die
-	fi
-	sed -i Makefile \
-		-e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \
-		|| die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-	dobin amap amapcrap
-	insinto /usr/share/amap
-	doins appdefs.*
-
-	doman ${PN}.1
-	dodoc README TODO CHANGES
-}

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/amap/

[Mikle Kolyada]

commit:     38a35024daa8b30190cdc2c864b80db42e94f07f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 10:09:03 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 10:09:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a35024

net-analyzer/amap: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-analyzer/amap/amap-5.4-r1.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 2703bd6e4bd..17fd129b9fa 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.4-r1.ebuild
@@ -12,14 +12,11 @@ SRC_URI="https://www.thc.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="libressl ssl"
+IUSE="ssl"
 
 DEPEND="
 	dev-libs/libpcre
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="
 	${DEPEND}