From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3B5F13832E for ; Fri, 22 Jul 2016 05:52:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4231E0B76; Fri, 22 Jul 2016 05:52:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60B78E0B76 for ; Fri, 22 Jul 2016 05:52:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 553C3340E31 for ; Fri, 22 Jul 2016 05:52:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3EE0878D for ; Fri, 22 Jul 2016 05:47:31 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1469166444.19a1f1fcc468d7918ed66b54f14701c8d80b7454.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/, net-analyzer/nmap/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/Manifest net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch net-analyzer/nmap/nmap-7.25_beta1.ebuild net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/ net-analyzer/nmap/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 19a1f1fcc468d7918ed66b54f14701c8d80b7454 X-VCS-Branch: master Date: Fri, 22 Jul 2016 05:47:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e1ad2bf5-cb72-4216-899e-168b4f992158 X-Archives-Hash: 275854e7519d47ecabd0950667bae4c1 commit: 19a1f1fcc468d7918ed66b54f14701c8d80b7454 Author: Jeroen Roovers gentoo org> AuthorDate: Fri Jul 22 05:46:11 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Jul 22 05:47:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a1f1fc net-analyzer/nmap: Version bump. Package-Manager: portage-2.3.0 net-analyzer/nmap/Manifest | 1 + ...RCE.patch => nmap-7.25-no-FORTIFY_SOURCE.patch} | 96 +++++++++++----------- .../{nmap-9999.ebuild => nmap-7.25_beta1.ebuild} | 40 ++++++--- net-analyzer/nmap/nmap-9999.ebuild | 4 +- 4 files changed, 78 insertions(+), 63 deletions(-) diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index ae87397..fb8f011 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -2,4 +2,5 @@ DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1 DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31 DIST nmap-7.11.tar.bz2 8960056 SHA256 13fa971555dec00e495a5b72c1f9efa1363b8e6c7388a2f05117cb0778c0954a SHA512 d64481afaa1cb1e70261a21ccff935bb7d45966f78f03a653d0cd32719bd7b13c05938716f906eb9f4b12d80ac772fb7e4dd434048fb947712267d73073f69f5 WHIRLPOOL e22b6bf9019f45d1c2017be0ca7f129bdc40d09df597b3ae50280dd6c9c67839b989fb562520d1c46f617c5280e7e10f35d0e42f8be4a033cc0f0250e0dd999e DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde +DIST nmap-7.25BETA1.tar.bz2 8580974 SHA256 6866457809b598f8e85c9e8c79773f1821de29cc1b6f574cc7fed4ad8c01c178 SHA512 6d2fc83186086ea8d01003b8d79af0b45788378ef32c5e8f9b14561db5adfc407e388df044f1e3420f4f3d21115bc1623da0b6a926bd3d20816265cb10efe092 WHIRLPOOL 18bfca4d494c59fa6625ecb1e5ad7a7f838236c73269c9e0b2094e57d047ba1095284e26d4cbfb1a85a797af4b7f4abf02ffbc89c4664c6a5aea3912d4c3fb94 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313 diff --git a/net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch similarity index 85% rename from net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch rename to net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch index 5f79238..8559403 100644 --- a/net-analyzer/nmap/files/nmap-no-FORTIFY_SOURCE.patch +++ b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch @@ -1,14 +1,25 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -40,7 +40,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. +--- 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 += -D_FORTIFY_SOURCE=2 - # 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 ++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 @@ @@ -16,21 +27,10 @@ DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" # With GCC, add extra security checks to source code. -DEFS += -D_FORTIFY_SOURCE=2 -+#DEFS += -D_FORTIFY_SOURCE=2 ++DEFS += INCLS = -I../include CFLAGS = @CFLAGS@ $(CCOPT) # CFLAGS = -g -Wall $(DEFS) $(INCLS) ---- a/nping/Makefile.in -+++ b/nping/Makefile.in -@@ -37,7 +37,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 += -D_FORTIFY_SOURCE=2 - # 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/libnetutil/Makefile.in +++ b/libnetutil/Makefile.in @@ -5,7 +5,7 @@ @@ -38,40 +38,40 @@ CPPFLAGS = @CPPFLAGS@ $(DEFS) DEFS = @DEFS@ -DEFS += -D_FORTIFY_SOURCE=2 -+#DEFS += -D_FORTIFY_SOURCE=2 ++DEFS += AR = ar RANLIB = @RANLIB@ ---- a/ncat/Makefile.in -+++ b/ncat/Makefile.in -@@ -52,7 +52,7 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" - # With GCC, add extra security checks to source code. +--- 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 += -D_FORTIFY_SOURCE=2 - INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) - RM = rm -f - STRIP = @STRIP@ ---- a/nbase/Makefile.in -+++ b/nbase/Makefile.in -@@ -11,7 +11,7 @@ - CCOPT = - DEFS = @DEFS@ - # With GCC, add extra security checks to source code. ++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 += -D_FORTIFY_SOURCE=2 - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) - STATIC = ++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/nmap-update/Makefile.in +++ b/nmap-update/Makefile.in -@@ -10,7 +10,7 @@ - CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR) +@@ -12,7 +12,7 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ $(NBASELIB) + MAC_FLAGS = + LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS) -DEFS = @DEFS@ -D_FORTIFY_SOURCE=2 -+DEFS = @DEFS@ ++DEFS = @DEFS@ APR_LIBS = @APR_LIBS@ SVN_LIBS = @SVN_LIBS@ - + diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild similarity index 79% copy from net-analyzer/nmap/nmap-9999.ebuild copy to net-analyzer/nmap/nmap-7.25_beta1.ebuild index 813a279..979b7b5 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-7.25_beta1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,21 +6,23 @@ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,xml" -inherit eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user +inherit eutils flag-o-matic python-single-r1 toolchain-funcs MY_P=${P/_beta/BETA} DESCRIPTION="A utility for network discovery and security auditing" HOMEPAGE="http://nmap.org/" - -EGIT_REPO_URI="https://github.com/nmap/nmap" -SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png" +SRC_URI=" + http://nmap.org/dist/${MY_P}.tar.bz2 + https://dev.gentoo.org/~jer/nmap-logo-64.png +" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" -NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru zh ) +NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" @@ -59,15 +61,20 @@ pkg_setup() { fi } +src_unpack() { + # prevent unpacking the logo + unpack ${MY_P}.tar.bz2 +} + src_prepare() { epatch \ "${FILESDIR}"/${PN}-4.75-nolua.patch \ "${FILESDIR}"/${PN}-5.10_beta1-string.patch \ "${FILESDIR}"/${PN}-5.21-python.patch \ - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ "${FILESDIR}"/${PN}-6.46-uninstaller.patch \ "${FILESDIR}"/${PN}-6.47-no-libnl.patch \ - "${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch + "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ + "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch if use nls; then local lingua='' @@ -89,6 +96,11 @@ src_prepare() { -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ Makefile.in || die + sed -i \ + -e '/rm -f $@/d' \ + $(find . -name Makefile.in) \ + || die + # Fix desktop files wrt bug #432714 sed -i \ -e '/^Encoding/d' \ @@ -119,11 +131,13 @@ src_configure() { } src_compile() { - local dep deps="build-dnet build-nbase build-nsock build-netutil" - use system-lua || deps="build-lua ${deps}" - - for dep in ${deps}; do - emake makefile.dep ${dep} + 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 done emake \ diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 813a279..bfeb1ee 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -67,7 +67,7 @@ src_prepare() { "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \ "${FILESDIR}"/${PN}-6.46-uninstaller.patch \ "${FILESDIR}"/${PN}-6.47-no-libnl.patch \ - "${FILESDIR}"/${PN}-no-FORTIFY_SOURCE.patch + "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch if use nls; then local lingua=''