[gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/

[Rick Farina]

commit:     c75af5c1d308a9e32868191a8f7f2b1d9b8fac39
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 16:25:14 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 16:25:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75af5c1

net-analyzer/nmap: nmap-update removed

upstream has removed nmap-update
https://github.com/nmap/nmap/commit/210adf941ece00a6f1e0f4dbe89861c10f12c33d

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 .../files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch     | 66 ++++++++++++++++++++++
 net-analyzer/nmap/nmap-9999.ebuild                 | 18 +-----
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/net-analyzer/nmap/files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch 
b/net-analyzer/nmap/files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch
new file mode 100644
index 00000000000..b4c06be942e
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.80SVN-no-FORTIFY_SOURCE.patch
@@ -0,0 +1,66 @@
+--- a/nbase/Makefile.in
++++ b/nbase/Makefile.in
+@@ -12,7 +12,7 @@
+ CCOPT = 
+ DEFS = @DEFS@
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
+ STATIC = 
+--- a/ncat/Makefile.in
++++ b/ncat/Makefile.in
+@@ -53,7 +53,7 @@
+ LIBS = @LIBS@
+ DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR)
+ RM = rm -f
+ STRIP = @STRIP@
+--- a/nsock/src/Makefile.in
++++ b/nsock/src/Makefile.in
+@@ -13,7 +13,7 @@
+ CCOPT = 
+ DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
+ # With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ INCLS = -I../include
+ CFLAGS = @CFLAGS@ $(CCOPT)
+ # CFLAGS = -g -Wall $(DEFS) $(INCLS)
+--- a/libnetutil/Makefile.in
++++ b/libnetutil/Makefile.in
+@@ -5,7 +5,7 @@
+ CXXFLAGS = @CXXFLAGS@
+ CPPFLAGS = @CPPFLAGS@ $(DEFS)
+ DEFS = @DEFS@
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ AR = ar
+ RANLIB = @RANLIB@
+ 
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -41,7 +41,7 @@
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1
+--- a/nping/Makefile.in
++++ b/nping/Makefile.in
+@@ -38,7 +38,7 @@
+ # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
+ # Level 1 only makes changes that don't affect "conforming" programs,
+ # while level 2 enforces additional restrictions.
+-DEFS += -D_FORTIFY_SOURCE=2
++DEFS += 
+ # For mtrace debugging -- see MTRACE define in main.cc for instructions
+ # Should only be enabled during debugging and not in any real release.
+ # DEFS += -DMTRACE=1

diff --git a/net-analyzer/nmap/nmap-9999.ebuild 
b/net-analyzer/nmap/nmap-9999.ebuild
index f45ed83d38a..9334acee75c 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ipv6 libressl libssh2 ncat nmap-update nping +nse ssl system-lua"
+IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua"
 REQUIRED_USE="system-lua? ( nse )"
 
 RDEPEND="
@@ -25,10 +25,6 @@ RDEPEND="
                net-libs/libssh2[zlib]
                sys-libs/zlib
        )
-       nmap-update? (
-               dev-libs/apr
-               dev-vcs/subversion
-       )
        nse? ( sys-libs/zlib )
        ssl? (
                !libressl? ( dev-libs/openssl:0= )
@@ -43,7 +39,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-5.21-python.patch
        "${FILESDIR}"/${PN}-6.46-uninstaller.patch
        "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-       "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+       "${FILESDIR}"/${PN}-7.80SVN-no-FORTIFY_SOURCE.patch
        "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
        "${FILESDIR}"/${PN}-7.25-libpcre.patch
        "${FILESDIR}"/${PN}-7.31-libnl.patch
@@ -86,7 +82,6 @@ src_configure() {
                $(use_with libssh2) \
                $(use_with ncat) \
                --without-ndiff \
-               $(use_with nmap-update) \
                $(use_with nping) \
                $(use_with ssl openssl) \
                --without-zenmap \
@@ -104,7 +99,6 @@ src_compile() {
        local directory
        for directory in . libnetutil nsock/src \
                $(usex ncat ncat '') \
-               $(usex nmap-update nmap-update '') \
                $(usex nping nping '')
        do
                emake -C "${directory}" makefile.dep
@@ -121,14 +115,6 @@ src_install() {
                STRIP=: \
                nmapdatadir="${EPREFIX}"/usr/share/nmap \
                install
-       if use nmap-update;then
-               LC_ALL=C emake -j1 \
-                       -C nmap-update \
-                       DESTDIR="${D}" \
-                       STRIP=: \
-                       nmapdatadir="${EPREFIX}"/usr/share/nmap \
-                       install
-       fi
 
        dodoc CHANGELOG HACKING docs/README docs/*.txt
 }