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 A1B23138359 for ; Thu, 15 Oct 2020 09:53:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBD29E08A8; Thu, 15 Oct 2020 09:53:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3FBEE08A8 for ; Thu, 15 Oct 2020 09:53:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9831F340F1E for ; Thu, 15 Oct 2020 09:53:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98E003A5 for ; Thu, 15 Oct 2020 09:53:46 +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: <1602755624.d351815ce899f35f461b1be72120e34bdea52324.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/Manifest net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch net-analyzer/nmap/nmap-7.91.ebuild net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/files/ net-analyzer/nmap/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: d351815ce899f35f461b1be72120e34bdea52324 X-VCS-Branch: master Date: Thu, 15 Oct 2020 09:53:46 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a1abe222-647b-4314-afb2-8fbae4aa0eef X-Archives-Hash: 6eb4ff650a8e1320f9d7eca2551513c2 commit: d351815ce899f35f461b1be72120e34bdea52324 Author: Jeroen Roovers gentoo org> AuthorDate: Thu Oct 15 09:39:33 2020 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Oct 15 09:53:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d351815c net-analyzer/nmap: Version 7.91 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Jeroen Roovers gentoo.org> net-analyzer/nmap/Manifest | 1 + ...RCE.patch => nmap-7.91-no-FORTIFY_SOURCE.patch} | 0 .../nmap/{nmap-9999.ebuild => nmap-7.91.ebuild} | 32 ++++++++-------------- net-analyzer/nmap/nmap-9999.ebuild | 23 +++++----------- 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index e34efcfd0b5..27d71a651af 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,2 +1,3 @@ DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b +DIST nmap-7.91.tar.bz2 10503500 BLAKE2B a758e0a20f8243b33b000c23e025b87bdb712390b82982a1aca219c9b98cd55c6ababb810328c7d0cdb5c884ef9bd5b187b9e4929454278342d7ee5ef441cded SHA512 9d59f031b5f748311e9f9a0b9d05ad4a7a70fc6ac17598d7c4c81a4825c95d53817d74435d839e67b9379a052f2d37889fd634f9c75301a851f465d60fb9974d DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 diff --git a/net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch similarity index 100% rename from net-analyzer/nmap/files/nmap-9999-no-FORTIFY_SOURCE.patch rename to net-analyzer/nmap/files/nmap-7.91-no-FORTIFY_SOURCE.patch diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-7.91.ebuild similarity index 78% copy from net-analyzer/nmap/nmap-9999.ebuild copy to net-analyzer/nmap/nmap-7.91.ebuild index 053d71e8466..00d8c3c0c95 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-7.91.ebuild @@ -2,17 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -MY_P=${P/_beta/BETA} -inherit autotools desktop flag-o-matic git-r3 toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" +SRC_URI=" + https://nmap.org/dist/${P}.tar.bz2 + https://dev.gentoo.org/~jer/nmap-logo-64.png +" -EGIT_REPO_URI="https://github.com/nmap/nmap" -SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png" - -LICENSE="GPL-2" +LICENSE="NPSL" SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua" REQUIRED_USE="system-lua? ( nse )" @@ -42,10 +43,8 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-9999-netutil-else.patch - "${FILESDIR}"/${PN}-9999-no-FORTIFY_SOURCE.patch + "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch ) -S="${WORKDIR}/${MY_P}" src_prepare() { rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die @@ -57,11 +56,6 @@ src_prepare() { sed -i \ -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ Makefile.in || die - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die @@ -80,18 +74,16 @@ src_configure() { $(use_enable ipv6) \ $(use_with libssh2) \ $(use_with ncat) \ - --without-ndiff \ $(use_with nping) \ $(use_with ssl openssl) \ - --without-zenmap \ $(usex libssh2 --with-zlib) \ - $(usex nse --with-zlib) \ $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ + $(usex nse --with-zlib) \ --cache-file="${S}"/config.cache \ --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ + --with-pcre=/usr \ + --without-ndiff \ + --without-zenmap } src_compile() { diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 053d71e8466..3fa4e3e598d 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -2,8 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -MY_P=${P/_beta/BETA} -inherit autotools desktop flag-o-matic git-r3 toolchain-funcs +inherit autotools flag-o-matic git-r3 toolchain-funcs DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" @@ -11,7 +10,7 @@ HOMEPAGE="https://nmap.org/" EGIT_REPO_URI="https://github.com/nmap/nmap" SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png" -LICENSE="GPL-2" +LICENSE="NPSL" SLOT="0" IUSE="ipv6 libressl libssh2 ncat nping +nse ssl system-lua" REQUIRED_USE="system-lua? ( nse )" @@ -42,10 +41,9 @@ PATCHES=( "${FILESDIR}"/${PN}-7.25-libpcre.patch "${FILESDIR}"/${PN}-7.31-libnl.patch "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch + "${FILESDIR}"/${PN}-7.91-no-FORTIFY_SOURCE.patch "${FILESDIR}"/${PN}-9999-netutil-else.patch - "${FILESDIR}"/${PN}-9999-no-FORTIFY_SOURCE.patch ) -S="${WORKDIR}/${MY_P}" src_prepare() { rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die @@ -57,11 +55,6 @@ src_prepare() { sed -i \ -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ Makefile.in || die - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die @@ -80,18 +73,16 @@ src_configure() { $(use_enable ipv6) \ $(use_with libssh2) \ $(use_with ncat) \ - --without-ndiff \ $(use_with nping) \ $(use_with ssl openssl) \ - --without-zenmap \ $(usex libssh2 --with-zlib) \ - $(usex nse --with-zlib) \ $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ + $(usex nse --with-zlib) \ --cache-file="${S}"/config.cache \ --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ + --with-pcre=/usr \ + --without-ndiff \ + --without-zenmap } src_compile() {