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 9CB45138330 for ; Wed, 31 Aug 2016 05:17:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6C5EE0B0D; Wed, 31 Aug 2016 05:17:26 +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 45968E0B0D for ; Wed, 31 Aug 2016 05:17:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8953E3407E6 for ; Wed, 31 Aug 2016 05:17:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1911246D for ; Wed, 31 Aug 2016 05:17:19 +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: <1472620611.5178bbd6abf67512cf7dfc89193b69902b2051ed.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/files/nmap-4.75-nolua.patch net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch net-analyzer/nmap/files/nmap-7.25-libpcre.patch 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: 5178bbd6abf67512cf7dfc89193b69902b2051ed X-VCS-Branch: master Date: Wed, 31 Aug 2016 05:17:19 +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: 0e393d1c-c3fe-44a1-a9ff-154e6d40e3a4 X-Archives-Hash: 51dbfaa9fec6a8f3f616b029b3600e26 commit: 5178bbd6abf67512cf7dfc89193b69902b2051ed Author: Jeroen Roovers gentoo org> AuthorDate: Wed Aug 31 05:16:51 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Wed Aug 31 05:16:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5178bbd6 net-analyzer/nmap: Fix live ebuild (maybe bug #592490). Package-Manager: portage-2.3.0 net-analyzer/nmap/files/nmap-4.75-nolua.patch | 5 ++--- net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch | 11 +++++++++++ net-analyzer/nmap/files/nmap-7.25-libpcre.patch | 10 ++++++++++ net-analyzer/nmap/nmap-9999.ebuild | 4 ++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch index 30bb1e0..21f0e1f 100644 --- a/net-analyzer/nmap/files/nmap-4.75-nolua.patch +++ b/net-analyzer/nmap/files/nmap-4.75-nolua.patch @@ -1,6 +1,5 @@ -diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in ---- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200 -+++ nmap-4.75/Makefile.in 2008-09-09 16:34:38.000000000 +0200 +--- a/Makefile.in ++++ b/Makefile.in @@ -258,5 +258,5 @@ ./config.status --recheck diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch new file mode 100644 index 00000000..91caad1 --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -477,7 +477,7 @@ + ./docs/style/lua-format -i scripts/*.nse + + makefile.dep: +- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ ++ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@ + -include makefile.dep + + # These the old names of scripts that have been renamed or deleted. Any diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch new file mode 100644 index 00000000..9296dab --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -522,7 +522,6 @@ + + # If we still don't have it, we use our own + if test $have_pcre != yes ; then +- AC_CONFIG_SUBDIRS( libpcre ) + CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" + LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" + PCRE_BUILD="build-pcre" diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 83ebe88..ca472d6 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -61,14 +61,14 @@ pkg_setup() { 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}-7.25-no-FORTIFY_SOURCE.patch \ - "${FILESDIR}"/${PN}-7.25-EC.patch + "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \ + "${FILESDIR}"/${PN}-7.25-libpcre.patch if use nls; then local lingua=''