* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2024-04-27 4:20 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-04-27 4:20 UTC (permalink / raw
To: gentoo-commits
commit: bae33e2d2aafdf4713ebd7497be221961e0359d3
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Wed Nov 29 22:33:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 04:19:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae33e2d
net-analyzer/nmap: fix segv with large --top-ports argument
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/918874
Closes: https://github.com/gentoo/gentoo/pull/34055
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/nmap/files/nmap-7.94-topport.patch | 26 ++++
net-analyzer/nmap/nmap-7.94-r1.ebuild | 189 ++++++++++++++++++++++++
2 files changed, 215 insertions(+)
diff --git a/net-analyzer/nmap/files/nmap-7.94-topport.patch b/net-analyzer/nmap/files/nmap-7.94-topport.patch
new file mode 100644
index 000000000000..7b62c18b8cc7
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.94-topport.patch
@@ -0,0 +1,26 @@
+From edad9c059ca45bccab8c0f41fe6fc6546c60153a Mon Sep 17 00:00:00 2001
+From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
+Date: Thu, 20 Jul 2023 16:21:23 +0000
+Subject: [PATCH] Add missing braces. Fixes #2679
+
+---
+ services.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/services.cc b/services.cc
+index a0899c7509..2a709dca97 100644
+--- a/services.cc
++++ b/services.cc
+@@ -496,9 +496,10 @@ void gettoppts(double level, const char *portlist, struct scan_lists * ports, co
+ if (sctpmax && strcmp(current->s_proto, "sctp") == 0
+ && (!ptsdata_initialized ||
+ is_port_member(ptsdata.sctp_ports, ptsdata.sctp_count, current))
+- )
++ ) {
+ ports->sctp_ports[ports->sctp_count++] = current->s_port;
+- sctpmax--;
++ sctpmax--;
++ }
+ break;
+ default:
+ break;
diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
new file mode 100644
index 000000000000..9050bebb7efe
--- /dev/null
+++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+LUA_REQ_USE="deprecated"
+PYTHON_COMPAT=( python3_{10..11} )
+PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
+PLOCALE_BACKUP="en"
+inherit autotools lua-single plocale python-single-r1 toolchain-funcs
+
+DESCRIPTION="Network exploration tool and security / port scanner"
+HOMEPAGE="https://nmap.org/"
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/nmap/nmap"
+
+else
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
+ inherit verify-sig
+
+ SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
+ SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
+
+# https://github.com/nmap/nmap/issues/2199
+LICENSE="NPSL-0.95"
+SLOT="0"
+IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ nse? ( ${LUA_REQUIRED_USE} )
+ symlink? ( ncat )
+"
+
+RDEPEND="
+ dev-libs/liblinear:=
+ dev-libs/libpcre
+ net-libs/libpcap
+ ndiff? ( ${PYTHON_DEPS} )
+ libssh2? (
+ net-libs/libssh2[zlib]
+ sys-libs/zlib
+ )
+ nls? ( virtual/libintl )
+ nse? (
+ ${LUA_DEPS}
+ sys-libs/zlib
+ )
+ ssl? ( dev-libs/openssl:= )
+ symlink? (
+ ncat? (
+ !net-analyzer/netcat
+ !net-analyzer/openbsd-netcat
+ )
+ )
+ zenmap? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ )
+"
+DEPEND="${RDEPEND}"
+# Python is always needed at build time for some scripts
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+if [[ ${PV} != *9999* ]] ; then
+ BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
+fi
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-7.94-patches
+ "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch
+ "${FILESDIR}"/${PN}-7.94-topport.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ use nse && lua-single_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]] ; then
+ git-r3_src_unpack
+ elif use verify-sig ; then
+ # Needed for downloaded patch (which is unsigned, which is fine)
+ verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+ fi
+
+ default
+}
+
+src_prepare() {
+ default
+
+ # Drop bundled libraries
+ rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
+
+ cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
+ delete_disabled_locale() {
+ # Force here as PLOCALES contains supported locales for man
+ # pages and zenmap doesn't have all of those
+ rm -rf zenmap/share/zenmap/locale/${1} || die
+ rm -f zenmap/share/zenmap/locale/${1}.po || die
+ }
+ plocale_for_each_disabled_locale delete_disabled_locale
+
+ sed -i \
+ -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+ Makefile.in || die
+
+ cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
+
+ eautoreconf
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # We need the original for a Darwin-specific fix, bug #604432
+ mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
+ fi
+}
+
+src_configure() {
+ export ac_cv_path_PYTHON="${PYTHON}"
+ export am_cv_pathless_PYTHON="${EPYTHON}"
+
+ local myeconfargs=(
+ $(use_enable ipv6)
+ $(use_enable nls)
+ $(use_with libssh2)
+ $(use_with ncat)
+ $(use_with ndiff)
+ $(use_with nping)
+ $(use_with nse liblua)
+ $(use_with ssl openssl)
+ $(use_with zenmap)
+ $(usex libssh2 --with-zlib)
+ $(usex nse --with-zlib)
+ --cache-file="${S}"/config.cache
+ # The bundled libdnet is incompatible with the version available in the
+ # tree, so we cannot use the system library here.
+ --with-libdnet=included
+ --with-pcre="${ESYSROOT}"/usr
+ --without-dpdk
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ local directory
+ for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do
+ emake -C "${directory}" makefile.dep
+ done
+
+ emake \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+ # See bug #831713 for return of -j1
+ LC_ALL=C emake \
+ -j1 \
+ DESTDIR="${D}" \
+ STRIP=: \
+ nmapdatadir="${EPREFIX}"/usr/share/nmap \
+ install
+
+ dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+ if use ndiff || use zenmap ; then
+ python_optimize
+ fi
+
+ use symlink && dosym /usr/bin/ncat /usr/bin/nc
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2024-10-03 10:11 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-10-03 10:11 UTC (permalink / raw
To: gentoo-commits
commit: b07a3b6f58052c81f936add07c57eae64e831afa
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 3 10:10:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 3 10:10:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07a3b6f
net-analyzer/nmap: drop 7.94, 7.94-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/nmap/Manifest | 3 -
.../nmap/files/nmap-7.94-autoconf-2.72.patch | 33 ----
net-analyzer/nmap/files/nmap-7.94-topport.patch | 31 ----
net-analyzer/nmap/nmap-7.94-r1.ebuild | 189 ---------------------
net-analyzer/nmap/nmap-7.94.ebuild | 188 --------------------
5 files changed, 444 deletions(-)
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 633b02eaf585..110ce5fadf78 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,6 +1,3 @@
-DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5
-DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c
-DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec
DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b SHA512 e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd
DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c SHA512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e
DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71 SHA512 ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092
diff --git a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
deleted file mode 100644
index bf6affb516d0..000000000000
--- a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/nmap/nmap/pull/2763
-https://bugs.gentoo.org/920712
---- a/libdnet-stripped/config/acinclude.m4
-+++ b/libdnet-stripped/config/acinclude.m4
-@@ -201,6 +201,8 @@
- dnl
- AC_DEFUN(AC_DNET_IOCTL_ARP,
- [AC_MSG_CHECKING(for arp(7) ioctls)
-+ AC_PROG_EGREP
-+ AC_PROG_CPP
- AC_CACHE_VAL(ac_cv_dnet_ioctl_arp,
- AC_EGREP_CPP(werd, [
- # include <sys/types.h>
---- a/libdnet-stripped/configure.in
-+++ b/libdnet-stripped/configure.in
-@@ -211,7 +211,7 @@
- AC_REPLACE_FUNCS(err strlcpy strsep)
-
- dnl Checks for other system-specific jonks.
--if test "$CYGWIN" != yes ; then
-+AS_IF([test "$CYGWIN" != yes], [
- AC_DNET_BSD_BPF
- AC_DNET_LINUX_PROCFS
- AC_DNET_LINUX_PF_PACKET
-@@ -221,7 +221,7 @@
- AC_DNET_RAWIP_HOST_OFFLEN
- AC_DNET_RAWIP_COOKED
- AC_DNET_GETKERNINFO
--fi
-+])
-
- dnl Check for arp interface.
- if test "$ac_cv_header_Iphlpapi_h" = yes ; then
diff --git a/net-analyzer/nmap/files/nmap-7.94-topport.patch b/net-analyzer/nmap/files/nmap-7.94-topport.patch
deleted file mode 100644
index 0ba568d317e3..000000000000
--- a/net-analyzer/nmap/files/nmap-7.94-topport.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/918874
-https://github.com/nmap/nmap/issues/2655
-https://github.com/nmap/nmap/issues/2679
-https://github.com/nmap/nmap/commit/edad9c059ca45bccab8c0f41fe6fc6546c60153a
-
-From edad9c059ca45bccab8c0f41fe6fc6546c60153a Mon Sep 17 00:00:00 2001
-From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
-Date: Thu, 20 Jul 2023 16:21:23 +0000
-Subject: [PATCH] Add missing braces. Fixes #2679
-
----
- services.cc | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/services.cc b/services.cc
-index a0899c7509..2a709dca97 100644
---- a/services.cc
-+++ b/services.cc
-@@ -496,9 +496,10 @@ void gettoppts(double level, const char *portlist, struct scan_lists * ports, co
- if (sctpmax && strcmp(current->s_proto, "sctp") == 0
- && (!ptsdata_initialized ||
- is_port_member(ptsdata.sctp_ports, ptsdata.sctp_count, current))
-- )
-+ ) {
- ports->sctp_ports[ports->sctp_count++] = current->s_port;
-- sctpmax--;
-+ sctpmax--;
-+ }
- break;
- default:
- break;
diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild
deleted file mode 100644
index e4867f6940bf..000000000000
--- a/net-analyzer/nmap/nmap-7.94-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10..11} )
-PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
-PLOCALE_BACKUP="en"
-inherit autotools lua-single plocale python-single-r1 toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/nmap/nmap"
-
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
- inherit verify-sig
-
- SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
- SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
-
-# https://github.com/nmap/nmap/issues/2199
-LICENSE="NPSL-0.95"
-SLOT="0"
-IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- nse? ( ${LUA_REQUIRED_USE} )
- symlink? ( ncat )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap
- ndiff? ( ${PYTHON_DEPS} )
- libssh2? (
- net-libs/libssh2[zlib]
- sys-libs/zlib
- )
- nls? ( virtual/libintl )
- nse? (
- ${LUA_DEPS}
- sys-libs/zlib
- )
- ssl? ( dev-libs/openssl:= )
- symlink? (
- ncat? (
- !net-analyzer/netcat
- !net-analyzer/openbsd-netcat
- )
- )
- zenmap? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- )
-"
-DEPEND="${RDEPEND}"
-# Python is always needed at build time for some scripts
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
-fi
-
-PATCHES=(
- "${WORKDIR}"/${PN}-7.94-patches
- "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch
- "${FILESDIR}"/${PN}-7.94-topport.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-
- use nse && lua-single_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # Needed for downloaded patch (which is unsigned, which is fine)
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- # Drop bundled libraries
- rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
- cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
- delete_disabled_locale() {
- # Force here as PLOCALES contains supported locales for man
- # pages and zenmap doesn't have all of those
- rm -rf zenmap/share/zenmap/locale/${1} || die
- rm -f zenmap/share/zenmap/locale/${1}.po || die
- }
- plocale_for_each_disabled_locale delete_disabled_locale
-
- sed -i \
- -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
- Makefile.in || die
-
- cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # We need the original for a Darwin-specific fix, bug #604432
- mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
- fi
-}
-
-src_configure() {
- export ac_cv_path_PYTHON="${PYTHON}"
- export am_cv_pathless_PYTHON="${EPYTHON}"
-
- local myeconfargs=(
- $(use_enable ipv6)
- $(use_enable nls)
- $(use_with libssh2)
- $(use_with ncat)
- $(use_with ndiff)
- $(use_with nping)
- $(use_with nse liblua)
- $(use_with ssl openssl)
- $(use_with zenmap)
- $(usex libssh2 --with-zlib)
- $(usex nse --with-zlib)
- --cache-file="${S}"/config.cache
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- --with-libdnet=included
- --with-pcre="${ESYSROOT}"/usr
- --without-dpdk
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local directory
- for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do
- emake -C "${directory}" makefile.dep
- done
-
- emake \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
- # See bug #831713 for return of -j1
- LC_ALL=C emake \
- -j1 \
- DESTDIR="${D}" \
- STRIP=: \
- nmapdatadir="${EPREFIX}"/usr/share/nmap \
- install
-
- dodoc CHANGELOG HACKING docs/README docs/*.txt
-
- if use ndiff || use zenmap ; then
- python_optimize
- fi
-
- use symlink && dosym /usr/bin/ncat /usr/bin/nc
-}
diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild
deleted file mode 100644
index fe616810614b..000000000000
--- a/net-analyzer/nmap/nmap-7.94.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-LUA_REQ_USE="deprecated"
-PYTHON_COMPAT=( python3_{10..11} )
-PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh"
-PLOCALE_BACKUP="en"
-inherit autotools lua-single plocale python-single-r1 toolchain-funcs
-
-DESCRIPTION="Network exploration tool and security / port scanner"
-HOMEPAGE="https://nmap.org/"
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/nmap/nmap"
-
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc
- inherit verify-sig
-
- SRC_URI="https://nmap.org/dist/${P}.tar.bz2"
- SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )"
-
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz"
-
-# https://github.com/nmap/nmap/issues/2199
-LICENSE="NPSL-0.95"
-SLOT="0"
-IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- nse? ( ${LUA_REQUIRED_USE} )
- symlink? ( ncat )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap
- ndiff? ( ${PYTHON_DEPS} )
- libssh2? (
- net-libs/libssh2[zlib]
- sys-libs/zlib
- )
- nls? ( virtual/libintl )
- nse? (
- ${LUA_DEPS}
- sys-libs/zlib
- )
- ssl? ( dev-libs/openssl:= )
- symlink? (
- ncat? (
- !net-analyzer/netcat
- !net-analyzer/openbsd-netcat
- )
- )
- zenmap? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- )
-"
-DEPEND="${RDEPEND}"
-# Python is always needed at build time for some scripts
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-if [[ ${PV} != *9999* ]] ; then
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )"
-fi
-
-PATCHES=(
- "${WORKDIR}"/${PN}-7.94-patches
- "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-
- use nse && lua-single_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- git-r3_src_unpack
- elif use verify-sig ; then
- # Needed for downloaded patch (which is unsigned, which is fine)
- verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
- fi
-
- default
-}
-
-src_prepare() {
- default
-
- # Drop bundled libraries
- rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
-
- cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
-
- delete_disabled_locale() {
- # Force here as PLOCALES contains supported locales for man
- # pages and zenmap doesn't have all of those
- rm -rf zenmap/share/zenmap/locale/${1} || die
- rm -f zenmap/share/zenmap/locale/${1}.po || die
- }
- plocale_for_each_disabled_locale delete_disabled_locale
-
- sed -i \
- -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
- Makefile.in || die
-
- cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
-
- eautoreconf
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # We need the original for a Darwin-specific fix, bug #604432
- mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die
- fi
-}
-
-src_configure() {
- export ac_cv_path_PYTHON="${PYTHON}"
- export am_cv_pathless_PYTHON="${EPYTHON}"
-
- local myeconfargs=(
- $(use_enable ipv6)
- $(use_enable nls)
- $(use_with libssh2)
- $(use_with ncat)
- $(use_with ndiff)
- $(use_with nping)
- $(use_with nse liblua)
- $(use_with ssl openssl)
- $(use_with zenmap)
- $(usex libssh2 --with-zlib)
- $(usex nse --with-zlib)
- --cache-file="${S}"/config.cache
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- --with-libdnet=included
- --with-pcre="${ESYSROOT}"/usr
- --without-dpdk
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- local directory
- for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do
- emake -C "${directory}" makefile.dep
- done
-
- emake \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)"
-}
-
-src_install() {
- # See bug #831713 for return of -j1
- LC_ALL=C emake \
- -j1 \
- DESTDIR="${D}" \
- STRIP=: \
- nmapdatadir="${EPREFIX}"/usr/share/nmap \
- install
-
- dodoc CHANGELOG HACKING docs/README docs/*.txt
-
- if use ndiff || use zenmap ; then
- python_optimize
- fi
-
- use symlink && dosym /usr/bin/ncat /usr/bin/nc
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2020-10-15 9:53 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2020-10-15 9:53 UTC (permalink / raw
To: gentoo-commits
commit: d351815ce899f35f461b1be72120e34bdea52324
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 09:39:33 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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 <jer <AT> 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() {
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2020-09-17 16:25 Rick Farina
0 siblings, 0 replies; 15+ messages in thread
From: Rick Farina @ 2020-09-17 16:25 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2020-02-05 12:28 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2020-02-05 12:28 UTC (permalink / raw
To: gentoo-commits
commit: 2ba4a5ba2151f6960d6a2c7c5df318ecc6994075
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 12:28:26 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 12:28:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba4a5ba
net-analyzer/nmap: Drop obsolete patch
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Fixes: 4db35b3a2131c1973835b865106d3034d2e0635a
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../nmap/files/nmap-9999-constify-continued.patch | 22 ----------------------
net-analyzer/nmap/nmap-9999.ebuild | 3 +--
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
deleted file mode 100644
index 04738f40823..00000000000
--- a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libnetutil/EthernetHeader.cc
-+++ b/libnetutil/EthernetHeader.cc
-@@ -284,7 +284,7 @@ int EthernetHeader::setEtherType(u16 val){
-
-
- /** Returns destination port in HOST byte order */
--u16 EthernetHeader::getEtherType() const {
-+const u16 EthernetHeader::getEtherType() const {
- return ntohs(this->h.eth_type);
- } /* End of getEtherType() */
-
---- a/scan_engine.cc
-+++ b/scan_engine.cc
-@@ -166,7 +166,7 @@ extern "C" int g_has_npcap_loopback;
- #endif
-
-
--int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const {
-+const int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const {
- const struct sockaddr_storage *lss, *rss;
- lss = (lhs) ? lhs->target->TargetSockAddr() : ss;
- rss = (rhs) ? rhs->target->TargetSockAddr() : ss;
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index c45c2c6b4ce..e5440fa3e63 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -66,7 +66,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.25-libpcre.patch
"${FILESDIR}"/${PN}-7.31-libnl.patch
"${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch
- "${FILESDIR}"/${PN}-9999-constify-continued.patch
"${FILESDIR}"/${PN}-9999-netutil-else.patch
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2019-12-26 13:10 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2019-12-26 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 4db35b3a2131c1973835b865106d3034d2e0635a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 13:09:45 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 13:09:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4db35b3a
net-analyzer/nmap: Patch live ebuild
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../nmap/files/nmap-9999-constify-continued.patch | 22 ++++++++++++++++++++++
.../nmap/files/nmap-9999-netutil-else.patch | 20 ++++++++++++++++++++
net-analyzer/nmap/nmap-9999.ebuild | 2 ++
3 files changed, 44 insertions(+)
diff --git a/net-analyzer/nmap/files/nmap-9999-constify-continued.patch b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
new file mode 100644
index 00000000000..04738f40823
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-constify-continued.patch
@@ -0,0 +1,22 @@
+--- a/libnetutil/EthernetHeader.cc
++++ b/libnetutil/EthernetHeader.cc
+@@ -284,7 +284,7 @@ int EthernetHeader::setEtherType(u16 val){
+
+
+ /** Returns destination port in HOST byte order */
+-u16 EthernetHeader::getEtherType() const {
++const u16 EthernetHeader::getEtherType() const {
+ return ntohs(this->h.eth_type);
+ } /* End of getEtherType() */
+
+--- a/scan_engine.cc
++++ b/scan_engine.cc
+@@ -166,7 +166,7 @@ extern "C" int g_has_npcap_loopback;
+ #endif
+
+
+-int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const {
++const int HssPredicate::operator() (const HostScanStats *lhs, const HostScanStats *rhs) const {
+ const struct sockaddr_storage *lss, *rss;
+ lss = (lhs) ? lhs->target->TargetSockAddr() : ss;
+ rss = (rhs) ? rhs->target->TargetSockAddr() : ss;
diff --git a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
new file mode 100644
index 00000000000..a96a04b7a87
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch
@@ -0,0 +1,20 @@
+--- a/libnetutil/netutil.cc
++++ b/libnetutil/netutil.cc
+@@ -2571,7 +2571,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
+
+ /* CASE 4: where we (finally!) have a full 20 byte TCP header so we can
+ * safely print all fields */
+- else { /* if (datalen >= 20) */
++ else if (datalen >= 20) {
+
+ /* TCP Flags */
+ p = tflags;
+@@ -2633,7 +2633,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) {
+ (tcpoptinfo[0]!='\0') ? " " : "",
+ tcpoptinfo, ipinfo);
+ }
+- } else{
++ } else {
+ /* If the packet does not fall into any other category, then we have a
+ really screwed-up packet. */
+ /* This ought to be unreachable; if static analysis flags it as such, delete it. */
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 4c5cd498f49..c45c2c6b4ce 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -66,6 +66,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-constify-continued.patch
+ "${FILESDIR}"/${PN}-9999-netutil-else.patch
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2019-01-25 14:13 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2019-01-25 14:13 UTC (permalink / raw
To: gentoo-commits
commit: b58e9ab433da5a8629d049ff3a73b348a27b5528
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 14:13:37 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 14:13:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58e9ab4
net-analyzer/nmap: nmap_error.cc: include time.h
Fixes: https://bugs.gentoo.org/676206
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/nmap/files/nmap-7.70-time.patch | 10 ++++++++++
net-analyzer/nmap/nmap-7.70.ebuild | 5 ++---
net-analyzer/nmap/nmap-9999.ebuild | 3 ++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch
new file mode 100644
index 00000000000..6d12ea8f96f
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.70-time.patch
@@ -0,0 +1,10 @@
+--- a/nmap_error.cc
++++ b/nmap_error.cc
+@@ -135,6 +135,7 @@
+ #include "xml.h"
+
+ #include <errno.h>
++#include <time.h>
+
+ extern NmapOps o;
+
diff --git a/net-analyzer/nmap/nmap-7.70.ebuild b/net-analyzer/nmap/nmap-7.70.ebuild
index 692e3cb1290..e9bc260c7a9 100644
--- a/net-analyzer/nmap/nmap-7.70.ebuild
+++ b/net-analyzer/nmap/nmap-7.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -25,13 +25,11 @@ IUSE="
zenmap
"
NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
-
REQUIRED_USE="
system-lua? ( nse )
ndiff? ( ${PYTHON_REQUIRED_USE} )
zenmap? ( ${PYTHON_REQUIRED_USE} )
"
-
RDEPEND="
dev-libs/liblinear:=
dev-libs/libpcre
@@ -66,6 +64,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
"${FILESDIR}"/${PN}-7.25-libpcre.patch
"${FILESDIR}"/${PN}-7.31-libnl.patch
+ "${FILESDIR}"/${PN}-7.70-time.patch
)
S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index a54dd5819b1..c282246d451 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
"${FILESDIR}"/${PN}-7.25-libpcre.patch
"${FILESDIR}"/${PN}-7.31-libnl.patch
+ "${FILESDIR}"/${PN}-7.70-time.patch
)
S="${WORKDIR}/${MY_P}"
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2017-11-18 12:44 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2017-11-18 12:44 UTC (permalink / raw
To: gentoo-commits
commit: 445a53409e17b1fb837b851510a708d07d90f091
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 12:44:12 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 12:44:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=445a5340
net-analyzer/nmap: Establish sys-libs/zlib dependency by Daniel M. Weeks (bug #637514).
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-analyzer/nmap/files/nmap-9999-zlib.patch | 11 +++++++++++
net-analyzer/nmap/nmap-9999.ebuild | 13 ++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-9999-zlib.patch b/net-analyzer/nmap/files/nmap-9999-zlib.patch
new file mode 100644
index 00000000000..3f260ae48f4
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-9999-zlib.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,7 +105,7 @@
+ NSE_HDRS+=nse_libssh2.h
+ NSE_OBJS+=nse_libssh2.o
+ endif
+-ifneq (@LIBZLIB_LIBS@,)
++ifneq (@ZLIB_LIBS@,)
+ NSE_SRC+=nse_zlib.cc
+ NSE_HDRS+=nse_zlib.h
+ NSE_OBJS+=nse_zlib.o
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index d78311ad1c1..f92eba2649f 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
@@ -24,24 +23,26 @@ IUSE="
"
NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh )
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
REQUIRED_USE="
system-lua? ( nse )
ndiff? ( ${PYTHON_REQUIRED_USE} )
zenmap? ( ${PYTHON_REQUIRED_USE} )
"
-
RDEPEND="
dev-libs/liblinear:=
dev-libs/libpcre
net-libs/libpcap
- libssh2? ( net-libs/libssh2[zlib] )
+ libssh2? (
+ net-libs/libssh2[zlib]
+ sys-libs/zlib
+ )
ndiff? ( ${PYTHON_DEPS} )
nls? ( virtual/libintl )
nmap-update? (
dev-libs/apr
dev-vcs/subversion
)
+ nse? ( sys-libs/zlib )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:= )
@@ -65,6 +66,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
"${FILESDIR}"/${PN}-7.25-libpcre.patch
"${FILESDIR}"/${PN}-7.31-libnl.patch
+ "${FILESDIR}"/${PN}-9999-zlib.patch
)
S="${WORKDIR}/${MY_P}"
@@ -75,7 +77,7 @@ pkg_setup() {
}
src_prepare() {
- rm -r libpcap/ || die
+ rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die
cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
@@ -135,6 +137,7 @@ src_configure() {
$(use_with ssl openssl) \
$(use_with zenmap) \
$(usex libssh2 --with-zlib) \
+ $(usex nse --with-zlib) \
$(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
--cache-file="${S}"/config.cache \
--with-libdnet=included \
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2017-03-11 4:57 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2017-03-11 4:57 UTC (permalink / raw
To: gentoo-commits
commit: f99119030f75bb1cf942c0cbc9eb702c388aaa8a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 04:57:03 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 04:57:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9911903
net-analyzer/nmap: Include nls.m4 in acinclude.m4 (bug #612092 by Aaron Jones).
Package-Manager: Portage-2.3.4, Repoman-2.3.2
net-analyzer/nmap/files/nls.m4 | 32 ++++++++++++++++++++++++++++++++
net-analyzer/nmap/nmap-7.31.ebuild | 2 ++
net-analyzer/nmap/nmap-7.40.ebuild | 2 ++
net-analyzer/nmap/nmap-9999.ebuild | 2 ++
4 files changed, 38 insertions(+)
diff --git a/net-analyzer/nmap/files/nls.m4 b/net-analyzer/nmap/files/nls.m4
new file mode 100644
index 00000000000..93df8d3b3f0
--- /dev/null
+++ b/net-analyzer/nmap/files/nls.m4
@@ -0,0 +1,32 @@
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
+])
diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index feb242cab36..236ceeceafc 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -68,6 +68,8 @@ src_unpack() {
src_prepare() {
rm -r libpcap/ || die
+ cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
epatch \
"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
"${FILESDIR}"/${PN}-5.21-python.patch \
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index a53f7387fa8..4b2f5e5a57c 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -78,6 +78,8 @@ src_unpack() {
src_prepare() {
rm -r libpcap/ || die
+ cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
default
if use nls; then
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index d2122aa939e..431ae56c880 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -71,6 +71,8 @@ pkg_setup() {
src_prepare() {
rm -r libpcap/ || die
+ cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die
+
default
if use nls; then
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2017-02-11 13:48 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2017-02-11 13:48 UTC (permalink / raw
To: gentoo-commits
commit: 4fe08fcda67f750031cebce148a99bb11a1f324d
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 13:47:56 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 13:47:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe08fcd
net-analyzer/nmap: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/nmap/Manifest | 1 -
net-analyzer/nmap/files/nmap-4.75-nolua.patch | 9 --
net-analyzer/nmap/files/nmap-6.47-no-libnl.patch | 70 ---------
.../nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch | 71 ---------
net-analyzer/nmap/nmap-7.12.ebuild | 169 ---------------------
5 files changed, 320 deletions(-)
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index da4382c6b4..ec28c225d1 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,4 +1,3 @@
-DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
DIST nmap-7.31.tar.bz2 9000848 SHA256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 SHA512 891593dfa13f235a97c2cebfd8f557d7f8c1c9edacf62c460c7ee8ee7bf5f4df1805da903ee031985b8cc91293c739b025ebe4c5fa9d66a3580b2da2f3b4870c WHIRLPOOL a0f3ad25d70bb8db440c4a4d631dd5324216b5a9310a3f59d13cb64c235ac6e8ab922ff517a6938e1b06b6ef85b98b93864ad8236074046eaab2b2a13f9cebad
DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
deleted file mode 100644
index 21f0e1fa49..0000000000
--- a/net-analyzer/nmap/files/nmap-4.75-nolua.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -258,5 +258,5 @@
- ./config.status --recheck
-
- makefile.dep:
-- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
-+ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
- include makefile.dep
diff --git a/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch b/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch
deleted file mode 100644
index 0e0c6b70be..0000000000
--- a/net-analyzer/nmap/files/nmap-6.47-no-libnl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-nping does not call anything nl_* related so it should not link against libnl (bug #529244)
-Patching configure.ac would be best but eautoreconf does not handle the subdirs very well.
-
---- a/nping/configure
-+++ b/nping/configure
-@@ -4865,64 +4865,6 @@
- fi
-
-
--# libpcap can require libnl
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nl_handle_alloc" >&5
--$as_echo_n "checking for library containing nl_handle_alloc... " >&6; }
--if ${ac_cv_search_nl_handle_alloc+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- ac_func_search_save_LIBS=$LIBS
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char nl_handle_alloc ();
--int
--main ()
--{
--return nl_handle_alloc ();
-- ;
-- return 0;
--}
--_ACEOF
--for ac_lib in '' nl; do
-- if test -z "$ac_lib"; then
-- ac_res="none required"
-- else
-- ac_res=-l$ac_lib
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- fi
-- if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_search_nl_handle_alloc=$ac_res
--fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext
-- if ${ac_cv_search_nl_handle_alloc+:} false; then :
-- break
--fi
--done
--if ${ac_cv_search_nl_handle_alloc+:} false; then :
--
--else
-- ac_cv_search_nl_handle_alloc=no
--fi
--rm conftest.$ac_ext
--LIBS=$ac_func_search_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nl_handle_alloc" >&5
--$as_echo "$ac_cv_search_nl_handle_alloc" >&6; }
--ac_res=$ac_cv_search_nl_handle_alloc
--if test "$ac_res" != no; then :
-- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
--
--fi
--
--
- # We test whether they specified openssl desires explicitly
- use_openssl="yes"
- specialssldir=""
diff --git a/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch
deleted file mode 100644
index 383975493b..0000000000
--- a/net-analyzer/nmap/files/nmap-6.49-no-FORTIFY_SOURCE.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -41,7 +41,6 @@
- # 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
- # 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/nsock/src/Makefile.in
-+++ b/nsock/src/Makefile.in
-@@ -13,7 +13,6 @@
- CCOPT =
- DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\"
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
- INCLS = -I../include
- CFLAGS = @CFLAGS@ $(CCOPT)
- # CFLAGS = -g -Wall $(DEFS) $(INCLS)
---- a/nping/Makefile.in
-+++ b/nping/Makefile.in
-@@ -38,7 +38,6 @@
- # 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
- # 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,6 @@
- CXXFLAGS = @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@ $(DEFS)
- DEFS = @DEFS@
--DEFS += -D_FORTIFY_SOURCE=2
- AR = ar
- RANLIB = @RANLIB@
-
---- a/ncat/Makefile.in
-+++ b/ncat/Makefile.in
-@@ -53,7 +53,6 @@
- LIBS = @LIBS@
- DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\""
- # With GCC, add extra security checks to source code.
--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
-@@ -12,7 +12,6 @@
- CCOPT =
- DEFS = @DEFS@
- # With GCC, add extra security checks to source code.
--DEFS += -D_FORTIFY_SOURCE=2
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
- STATIC =
---- a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -11,7 +11,7 @@
- CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR)
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@ $(NBASELIB)
--DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
-+DEFS = @DEFS@
- APR_LIBS = @APR_LIBS@
- SVN_LIBS = @SVN_LIBS@
-
diff --git a/net-analyzer/nmap/nmap-7.12.ebuild b/net-analyzer/nmap/nmap-7.12.ebuild
deleted file mode 100644
index b36e279bcf..0000000000
--- a/net-analyzer/nmap/nmap-7.12.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-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/"
-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 hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
- system-lua? ( nse )
- ndiff? ( ${PYTHON_REQUIRED_USE} )
- zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap
- zenmap? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- system-lua? ( >=dev-lang/lua-5.2:*[deprecated] )
- ndiff? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use ndiff || use zenmap; then
- python-single-r1_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.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-
- if use nls; then
- local lingua=''
- for lingua in ${NMAP_LINGUAS[@]}; do
- if ! use linguas_${lingua}; then
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- fi
- done
- else
- # configure/make ignores --disable-nls
- for lingua in ${NMAP_LINGUAS[@]}; do
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- done
- fi
-
- sed -i \
- -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' \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- epatch_user
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_with zenmap) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(use_with ncat) \
- $(use_with ndiff) \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --with-libdnet=included \
- --with-pcre=/usr
- # --with-liblinear=/usr \
- # Commented because configure does weird things, while autodetection works
-}
-
-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
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- 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
-
- if use zenmap; then
- doicon "${DISTDIR}/nmap-logo-64.png"
- python_optimize
- fi
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2017-01-22 11:40 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2017-01-22 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 69de1ee4995efdb9e0e5561a42565a0fb8051dfa
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 11:38:13 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 11:40:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69de1ee4
net-analyzer/nmap: Old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/nmap/Manifest | 3 -
net-analyzer/nmap/files/nmap-6.01-make.patch | 20 ---
.../nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch | 77 ---------
net-analyzer/nmap/nmap-6.47-r1.ebuild | 153 ------------------
net-analyzer/nmap/nmap-7.01.ebuild | 169 --------------------
net-analyzer/nmap/nmap-7.30.ebuild | 172 ---------------------
6 files changed, 594 deletions(-)
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 30335f8..da4382c 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,7 +1,4 @@
-DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
-DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
DIST nmap-7.12.tar.bz2 8960599 SHA256 63df082a87c95a189865d37304357405160fc6333addcf5b84204c95e0539b04 SHA512 91156499c6f903fb565fa2b0faa74043d078493312f9489071fafc687301017afc16c7eb26c092f1fa142e78c98a436833f56a9f015cb2a17aa6f6220b6a0b98 WHIRLPOOL ed4f3b00dc5e71f841133026c9b40aa285a9e47c6fd4ee012d235c22c6193039d19256b42708b5e38fe94840d7b4535cc78a4e6681f66a2fed3eb251070d0fde
-DIST nmap-7.30.tar.bz2 9003761 SHA256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f SHA512 effef6d1d3f333a8c9a628a2acc0d0faec5967ef09a7d831a4d8d287f224167305e54f575e571eebb0f30544675bf27c834fdaf468db00cdb3fcad14e392303c WHIRLPOOL d20627c806131fcec6583f8d2eb3504f669d2165391d5ba17bdf86be3417cc5ca783ff5d1552735bbeb75ac34d236ca36cfe754c29596ec8703a6b669a91aa55
DIST nmap-7.31.tar.bz2 9000848 SHA256 cb9f4e03c0771c709cd47dc8fc6ac3421eadbdd313f0aae52276829290583842 SHA512 891593dfa13f235a97c2cebfd8f557d7f8c1c9edacf62c460c7ee8ee7bf5f4df1805da903ee031985b8cc91293c739b025ebe4c5fa9d66a3580b2da2f3b4870c WHIRLPOOL a0f3ad25d70bb8db440c4a4d631dd5324216b5a9310a3f59d13cb64c235ac6e8ab922ff517a6938e1b06b6ef85b98b93864ad8236074046eaab2b2a13f9cebad
DIST nmap-7.40.tar.bz2 9043221 SHA256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 SHA512 98e37bf1c29789ea19ee4542d719ed6970c8bcc1bf92af4948a52a75273c2403329149f6b5df6368c23840d1bb3f47af9e5ce543f7a36596a33896609574f02d WHIRLPOOL 735133455aec227149478cb273e41d33b7dbd77a6998682b6d80bdc72c77555cd745895adfcde1c194281c258131e7fce49254e79349fe112a5f146768fd1c51
DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
diff --git a/net-analyzer/nmap/files/nmap-6.01-make.patch b/net-analyzer/nmap/files/nmap-6.01-make.patch
deleted file mode 100644
index 2711b31..00000000
--- a/net-analyzer/nmap/files/nmap-6.01-make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -119,6 +119,8 @@
- rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
-
-+$(NBASEDIR)/libnbase.a: nbase_build
-+
- build-%: %/Makefile
- cd $* && $(MAKE)
-
-@@ -152,7 +154,7 @@
- liblinear_build: $(LIBLINEARDIR)/Makefile
- @echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)"
-
--build-nmap-update: nmap-update/default_channel.h
-+build-nmap-update: nbase_build nmap-update/default_channel.h
-
- #$(LIBPCAPDIR)/Makefile:
- # @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure
diff --git a/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch
deleted file mode 100644
index 9b2993f..00000000
--- a/net-analyzer/nmap/files/nmap-6.47-no-FORTIFY_SOURCE.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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.
--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/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 += -D_FORTIFY_SOURCE=2
- 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 @@
- CXXFLAGS = @CXXFLAGS@
- CPPFLAGS = @CPPFLAGS@ $(DEFS)
- DEFS = @DEFS@
--DEFS += -D_FORTIFY_SOURCE=2
-+#DEFS += -D_FORTIFY_SOURCE=2
- 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.
--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 += -D_FORTIFY_SOURCE=2
-+#DEFS += -D_FORTIFY_SOURCE=2
- CPPFLAGS = @CPPFLAGS@
- CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS)
- STATIC =
---- a/nmap-update/Makefile.in
-+++ b/nmap-update/Makefile.in
-@@ -10,7 +10,7 @@
- CPPFLAGS = @CPPFLAGS@ $(DEFS) -I$(NBASEDIR)
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@ $(NBASELIB)
--DEFS = @DEFS@ -D_FORTIFY_SOURCE=2
-+DEFS = @DEFS@
-
- INSTALL = @INSTALL@
- STRIP = @STRIP@
diff --git a/net-analyzer/nmap/nmap-6.47-r1.ebuild b/net-analyzer/nmap/nmap-6.47-r1.ebuild
deleted file mode 100644
index f52aa60..00000000
--- a/net-analyzer/nmap/nmap-6.47-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-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/"
-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 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 +lua system-lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
- system-lua? ( lua )
- ndiff? ( ${PYTHON_REQUIRED_USE} )
- zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap[ipv6?]
- zenmap? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- system-lua? ( >=dev-lang/lua-5.2[deprecated] )
- ndiff? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use ndiff || use zenmap; then
- python-single-r1_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.01-make.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch
-
- if use nls; then
- local lingua=''
- for lingua in ${NMAP_LINGUAS}; do
- if ! use linguas_${lingua}; then
- rm -rf zenmap/share/zenmap/locale/${lingua}
- rm -f zenmap/share/zenmap/locale/${lingua}.po
- fi
- done
- else
- # configure/make ignores --disable-nls
- for lingua in ${NMAP_LINGUAS}; do
- rm -rf zenmap/share/zenmap/locale/${lingua}
- rm -f zenmap/share/zenmap/locale/${lingua}.po
- done
- fi
-
- sed -i \
- -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
- Makefile.in || die
-
- # Fix desktop files wrt bug #432714
- sed -i \
- -e '/^Encoding/d' \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- epatch_user
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_with zenmap) \
- $(usex lua --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(use_with ncat) \
- $(use_with ndiff) \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --with-libdnet=included \
- --with-pcre=/usr
- # --with-liblinear=/usr \
- # Commented because configure does weird things, while autodetection works
-}
-
-src_compile() {
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- 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
-
- if use zenmap; then
- doicon "${DISTDIR}/nmap-logo-64.png"
- python_optimize
- fi
-}
diff --git a/net-analyzer/nmap/nmap-7.01.ebuild b/net-analyzer/nmap/nmap-7.01.ebuild
deleted file mode 100644
index 1010116..00000000
--- a/net-analyzer/nmap/nmap-7.01.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-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/"
-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 hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
- system-lua? ( nse )
- ndiff? ( ${PYTHON_REQUIRED_USE} )
- zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- net-libs/libpcap[ipv6?]
- zenmap? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- system-lua? ( >=dev-lang/lua-5.2[deprecated] )
- ndiff? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use ndiff || use zenmap; then
- python-single-r1_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.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.49-no-FORTIFY_SOURCE.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-
- if use nls; then
- local lingua=''
- for lingua in ${NMAP_LINGUAS[@]}; do
- if ! use linguas_${lingua}; then
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- fi
- done
- else
- # configure/make ignores --disable-nls
- for lingua in ${NMAP_LINGUAS[@]}; do
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- done
- fi
-
- sed -i \
- -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' \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- epatch_user
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_with zenmap) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(use_with ncat) \
- $(use_with ndiff) \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --with-libdnet=included \
- --with-pcre=/usr
- # --with-liblinear=/usr \
- # Commented because configure does weird things, while autodetection works
-}
-
-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
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- 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
-
- if use zenmap; then
- doicon "${DISTDIR}/nmap-logo-64.png"
- python_optimize
- fi
-}
diff --git a/net-analyzer/nmap/nmap-7.30.ebuild b/net-analyzer/nmap/nmap-7.30.ebuild
deleted file mode 100644
index 1fe61b5..00000000
--- a/net-analyzer/nmap/nmap-7.30.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools 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/"
-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 hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
- system-lua? ( nse )
- ndiff? ( ${PYTHON_REQUIRED_USE} )
- zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- || ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
- zenmap? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- system-lua? ( >=dev-lang/lua-5.2[deprecated] )
- ndiff? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use ndiff || use zenmap; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- # prevent unpacking the logo
- unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
- "${FILESDIR}"/${PN}-5.21-python.patch \
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
- "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
- "${FILESDIR}"/${PN}-7.25-libpcre.patch
-
- if use nls; then
- local lingua=''
- for lingua in ${NMAP_LINGUAS[@]}; do
- if ! use linguas_${lingua}; then
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- fi
- done
- else
- # configure/make ignores --disable-nls
- for lingua in ${NMAP_LINGUAS[@]}; do
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- done
- fi
-
- sed -i \
- -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' \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_with zenmap) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(use_with ncat) \
- $(use_with ndiff) \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --with-libdnet=included \
- --with-pcre=/usr
- # --with-liblinear=/usr \
- # Commented because configure does weird things, while autodetection works
-}
-
-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
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- 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
-
- if use zenmap; then
- doicon "${DISTDIR}/nmap-logo-64.png"
- python_optimize
- fi
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2017-01-21 11:04 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2017-01-21 11:04 UTC (permalink / raw
To: gentoo-commits
commit: d3c5298c0c05243b79396f77fa43b0e949064122
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 11:01:49 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 11:04:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c5298c
net-analyzer/nmap: Fix bug #529244 again.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-analyzer/nmap/files/nmap-7.31-libnl.patch | 15 ++++++++++++++
net-analyzer/nmap/nmap-7.31.ebuild | 6 ++++--
net-analyzer/nmap/nmap-7.40.ebuild | 28 ++++++++++++++-------------
net-analyzer/nmap/nmap-9999.ebuild | 28 ++++++++++++++-------------
4 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-7.31-libnl.patch b/net-analyzer/nmap/files/nmap-7.31-libnl.patch
new file mode 100644
index 00000000..c16d829
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.31-libnl.patch
@@ -0,0 +1,15 @@
+nping does not call anything nl_* related so it should not link against libnl (bug #529244)
+Patching configure.ac would be best but eautoreconf does not handle the subdirs very well.
+
+--- a/nping/configure.ac
++++ b/nping/configure.ac
+@@ -114,9 +114,6 @@
+ # OpenSSL and NSE C modules can require dlopen
+ AC_SEARCH_LIBS(dlopen, dl)
+
+-# libpcap can require libnl
+-AC_SEARCH_LIBS(nl_handle_alloc, nl)
+-
+ # We test whether they specified openssl desires explicitly
+ use_openssl="yes"
+ specialssldir=""
diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 1bdcbae..e89f0e6 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.ebuild
@@ -67,15 +67,17 @@ src_unpack() {
}
src_prepare() {
+ rm -r libpcap/ || die
+
epatch \
"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
"${FILESDIR}"/${PN}-5.21-python.patch \
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
"${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
- "${FILESDIR}"/${PN}-7.25-libpcre.patch
+ "${FILESDIR}"/${PN}-7.25-libpcre.patch \
+ "${FILESDIR}"/${PN}-7.31-libnl.patch
if use nls; then
local lingua=''
diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 28b7751..4ea8959 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
-inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+inherit autotools flag-o-matic python-single-r1 toolchain-funcs
MY_P=${P/_beta/BETA}
@@ -54,6 +54,16 @@ DEPEND="
"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.10_beta1-string.patch
+ "${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.25-CXXFLAGS.patch
+ "${FILESDIR}"/${PN}-7.25-libpcre.patch
+ "${FILESDIR}"/${PN}-7.31-libnl.patch
+)
pkg_setup() {
if use ndiff || use zenmap; then
@@ -67,15 +77,9 @@ src_unpack() {
}
src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
- "${FILESDIR}"/${PN}-5.21-python.patch \
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
- "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
- "${FILESDIR}"/${PN}-7.25-libpcre.patch
+ rm -r libpcap/ || die
+
+ default
if use nls; then
local lingua=''
@@ -109,8 +113,6 @@ src_prepare() {
zenmap/install_scripts/unix/zenmap-root.desktop \
zenmap/install_scripts/unix/zenmap.desktop || die
- epatch_user
-
cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
eautoreconf
if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index b7315c6..ff1ea85 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
-inherit autotools eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
+inherit autotools flag-o-matic git-r3 python-single-r1 toolchain-funcs user
MY_P=${P/_beta/BETA}
@@ -52,6 +52,16 @@ DEPEND="
"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${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}-7.25-CXXFLAGS.patch
+ "${FILESDIR}"/${PN}-7.25-libpcre.patch
+ "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+ "${FILESDIR}"/${PN}-7.31-libnl.patch
+)
pkg_setup() {
if use ndiff || use zenmap; then
@@ -60,15 +70,9 @@ pkg_setup() {
}
src_prepare() {
- epatch \
- "${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-CXXFLAGS.patch \
- "${FILESDIR}"/${PN}-7.25-libpcre.patch \
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+ rm -r libpcap/ || die
+
+ default
if use nls; then
local lingua=''
@@ -97,8 +101,6 @@ src_prepare() {
zenmap/install_scripts/unix/zenmap-root.desktop \
zenmap/install_scripts/unix/zenmap.desktop || die
- epatch_user
-
cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die
eautoreconf
if [[ ${CHOST} == *-darwin* ]] ; then
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2016-09-30 9:15 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2016-09-30 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 75f050b5a4f4a5050e94e872a2fdea93e92f9174
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 09:15:18 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 09:15:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f050b5
net-analyzer/nmap: Old.
Package-Manager: portage-2.3.1
net-analyzer/nmap/Manifest | 2 -
net-analyzer/nmap/files/nmap-7.25-EC.patch | 38 -------
net-analyzer/nmap/nmap-7.25_beta1.ebuild | 172 -----------------------------
net-analyzer/nmap/nmap-7.25_beta2.ebuild | 172 -----------------------------
4 files changed, 384 deletions(-)
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 1a19fab..99a27b4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,7 +1,5 @@
DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
DIST nmap-7.01.tar.bz2 8922697 SHA256 cf1fcd2643ba2ef52f47acb3c18e52fa12a4ae4b722804da0e54560704627705 SHA512 8b37616c2af2134a5a3bb292f25f2bc0232e20e08405620734c07d84bbc9070a87db4d4b14e8a10c67a3684960035ed202be5dd6feddfb613c134208fc62a2a7 WHIRLPOOL 612ad1e98fb0e52b4a85305ab4a1ef21b225a6457d6af09747651eae82c2601edb2b817add01e46c7f4831ed30353917d699b6cc82e67f30a2494dc41fee1d31
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-7.25BETA2.tar.bz2 8874592 SHA256 6c66a150c9e346ccdca0aa16ef8c2a5310449444fe15cf5ec3f3a151978378d0 SHA512 0a40267d578ac7ff461783a4b22e584a7c3fee42c321843fce24dd6cddabc068cc7acd0fc8fd85f3952ed05033792adcb28e2919ed70f5fb30826a81c4777fe0 WHIRLPOOL 4c165d45afe0295f5cdb68cd90e7e7d5951ffb31115b3aedc37722872b130adab088cae851c12db0d213aabecfbdcda2b1dae48c6a01bdd8e5d98148c084c98d
DIST nmap-7.30.tar.bz2 9003761 SHA256 ba38a042ec67e315d903d28a4976b74999da94c646667c0c63f31e587d6d8d0f SHA512 effef6d1d3f333a8c9a628a2acc0d0faec5967ef09a7d831a4d8d287f224167305e54f575e571eebb0f30544675bf27c834fdaf468db00cdb3fcad14e392303c WHIRLPOOL d20627c806131fcec6583f8d2eb3504f669d2165391d5ba17bdf86be3417cc5ca783ff5d1552735bbeb75ac34d236ca36cfe754c29596ec8703a6b669a91aa55
DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
diff --git a/net-analyzer/nmap/files/nmap-7.25-EC.patch b/net-analyzer/nmap/files/nmap-7.25-EC.patch
deleted file mode 100644
index fff5679..00000000
--- a/net-analyzer/nmap/files/nmap-7.25-EC.patch
+++ /dev/null
@@ -1,38 +0,0 @@
- - Check for EVP_PKEY_get1_EC_KEY
- - Comment out inappropriate AC_CONFIG_SUBDIRS
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -387,6 +387,12 @@
- AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument]) ],
- [ -lcrypto ])
- fi
-+
-+ if test "$use_openssl" = "yes"; then
-+ AC_CHECK_LIB(crypto, EVP_PKEY_get1_EC_KEY,
-+ [AC_DEFINE(HAVE_EVP_PKEY_EC, 1, [Have EVP_PKEY_get1_EC_KEY])],
-+ [AC_MSG_WARN([Disabling support for EC crypto])])
-+ fi
- fi
-
- OPENSSL_LIBS=
-@@ -516,7 +522,7 @@
-
- # If we still don't have it, we use our own
- if test $have_pcre != yes ; then
-- AC_CONFIG_SUBDIRS( libpcre )
-+# AC_CONFIG_SUBDIRS( libpcre )
- CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
- LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
- PCRE_BUILD="build-pcre"
---- a/nse_ssl_cert.cc
-+++ b/nse_ssl_cert.cc
-@@ -434,7 +434,7 @@
- }
-
- int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
--#ifdef EVP_PKEY_EC
-+#ifdef HAVE_EVP_PKEY_EC
- EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(pubkey);
- const EC_GROUP *group = EC_KEY_get0_group(ec_key);
- int nid;
diff --git a/net-analyzer/nmap/nmap-7.25_beta1.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
deleted file mode 100644
index 2005f65..00000000
--- a/net-analyzer/nmap/nmap-7.25_beta1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools 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/"
-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 hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
- system-lua? ( nse )
- ndiff? ( ${PYTHON_REQUIRED_USE} )
- zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- || ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
- zenmap? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- system-lua? ( >=dev-lang/lua-5.2[deprecated] )
- ndiff? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use ndiff || use zenmap; then
- python-single-r1_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.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
- "${FILESDIR}"/${PN}-7.25-EC.patch
-
- if use nls; then
- local lingua=''
- for lingua in ${NMAP_LINGUAS[@]}; do
- if ! use linguas_${lingua}; then
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- fi
- done
- else
- # configure/make ignores --disable-nls
- for lingua in ${NMAP_LINGUAS[@]}; do
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- done
- fi
-
- sed -i \
- -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' \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_with zenmap) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(use_with ncat) \
- $(use_with ndiff) \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --with-libdnet=included \
- --with-pcre=/usr
- # --with-liblinear=/usr \
- # Commented because configure does weird things, while autodetection works
-}
-
-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
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- 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
-
- if use zenmap; then
- doicon "${DISTDIR}/nmap-logo-64.png"
- python_optimize
- fi
-}
diff --git a/net-analyzer/nmap/nmap-7.25_beta2.ebuild b/net-analyzer/nmap/nmap-7.25_beta2.ebuild
deleted file mode 100644
index 1fe61b5..00000000
--- a/net-analyzer/nmap/nmap-7.25_beta2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit autotools 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/"
-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 hi hr it ja pl pt_BR ru zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-REQUIRED_USE="
- system-lua? ( nse )
- ndiff? ( ${PYTHON_REQUIRED_USE} )
- zenmap? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- dev-libs/liblinear:=
- dev-libs/libpcre
- || ( >=net-libs/libpcap-1.8.0 <net-libs/libpcap-1.8.0[ipv6?] )
- zenmap? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )
- system-lua? ( >=dev-lang/lua-5.2[deprecated] )
- ndiff? ( ${PYTHON_DEPS} )
- nls? ( virtual/libintl )
- nmap-update? ( dev-libs/apr dev-vcs/subversion )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use ndiff || use zenmap; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_unpack() {
- # prevent unpacking the logo
- unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
- "${FILESDIR}"/${PN}-5.21-python.patch \
- "${FILESDIR}"/${PN}-6.46-uninstaller.patch \
- "${FILESDIR}"/${PN}-6.47-no-libnl.patch \
- "${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
- "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch \
- "${FILESDIR}"/${PN}-7.25-libpcre.patch
-
- if use nls; then
- local lingua=''
- for lingua in ${NMAP_LINGUAS[@]}; do
- if ! use linguas_${lingua}; then
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- fi
- done
- else
- # configure/make ignores --disable-nls
- for lingua in ${NMAP_LINGUAS[@]}; do
- rm -r zenmap/share/zenmap/locale/${lingua} || die
- rm zenmap/share/zenmap/locale/${lingua}.po || die
- done
- fi
-
- sed -i \
- -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' \
- -e 's|^Categories=.*|Categories=Network;System;Security;|g' \
- zenmap/install_scripts/unix/zenmap-root.desktop \
- zenmap/install_scripts/unix/zenmap.desktop || die
-
- epatch_user
-
- eautoreconf
-}
-
-src_configure() {
- # The bundled libdnet is incompatible with the version available in the
- # tree, so we cannot use the system library here.
- econf \
- $(use_enable ipv6) \
- $(use_enable nls) \
- $(use_with zenmap) \
- $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \
- $(use_with ncat) \
- $(use_with ndiff) \
- $(use_with nmap-update) \
- $(use_with nping) \
- $(use_with ssl openssl) \
- --with-libdnet=included \
- --with-pcre=/usr
- # --with-liblinear=/usr \
- # Commented because configure does weird things, while autodetection works
-}
-
-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
- done
-
- emake \
- AR=$(tc-getAR) \
- RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- LC_ALL=C emake -j1 \
- DESTDIR="${D}" \
- 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
-
- if use zenmap; then
- doicon "${DISTDIR}/nmap-logo-64.png"
- python_optimize
- fi
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2016-08-31 5:17 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2016-08-31 5:17 UTC (permalink / raw
To: gentoo-commits
commit: 5178bbd6abf67512cf7dfc89193b69902b2051ed
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 05:16:51 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> 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=''
^ permalink raw reply related [flat|nested] 15+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/
@ 2016-07-29 8:12 Jeroen Roovers
0 siblings, 0 replies; 15+ messages in thread
From: Jeroen Roovers @ 2016-07-29 8:12 UTC (permalink / raw
To: gentoo-commits
commit: ee08f602190ef809dda2cd38fc422b7611fe186a
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 08:12:29 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 08:12:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee08f602
net-analyzer/nmap: Detect EC support in dev-libs/openssl (bug #589658).
Package-Manager: portage-2.3.0
net-analyzer/nmap/files/nmap-7.25-EC.patch | 38 ++++++++++++++++++++++++++++++
net-analyzer/nmap/nmap-7.25_beta1.ebuild | 7 ++++--
net-analyzer/nmap/nmap-9999.ebuild | 7 ++++--
3 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/nmap/files/nmap-7.25-EC.patch b/net-analyzer/nmap/files/nmap-7.25-EC.patch
new file mode 100644
index 0000000..fff5679
--- /dev/null
+++ b/net-analyzer/nmap/files/nmap-7.25-EC.patch
@@ -0,0 +1,38 @@
+ - Check for EVP_PKEY_get1_EC_KEY
+ - Comment out inappropriate AC_CONFIG_SUBDIRS
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -387,6 +387,12 @@
+ AC_MSG_WARN([Failed to find libssl so OpenSSL will not be used. If it is installed you can try the --with-openssl=DIR argument]) ],
+ [ -lcrypto ])
+ fi
++
++ if test "$use_openssl" = "yes"; then
++ AC_CHECK_LIB(crypto, EVP_PKEY_get1_EC_KEY,
++ [AC_DEFINE(HAVE_EVP_PKEY_EC, 1, [Have EVP_PKEY_get1_EC_KEY])],
++ [AC_MSG_WARN([Disabling support for EC crypto])])
++ fi
+ fi
+
+ OPENSSL_LIBS=
+@@ -516,7 +522,7 @@
+
+ # If we still don't have it, we use our own
+ if test $have_pcre != yes ; then
+- AC_CONFIG_SUBDIRS( libpcre )
++# AC_CONFIG_SUBDIRS( libpcre )
+ CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS"
+ LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a"
+ PCRE_BUILD="build-pcre"
+--- a/nse_ssl_cert.cc
++++ b/nse_ssl_cert.cc
+@@ -434,7 +434,7 @@
+ }
+
+ int lua_push_ecdhparams(lua_State *L, EVP_PKEY *pubkey) {
+-#ifdef EVP_PKEY_EC
++#ifdef HAVE_EVP_PKEY_EC
+ EC_KEY *ec_key = EVP_PKEY_get1_EC_KEY(pubkey);
+ const EC_GROUP *group = EC_KEY_get0_group(ec_key);
+ int nid;
diff --git a/net-analyzer/nmap/nmap-7.25_beta1.ebuild b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
index ff216a8..2005f65 100644
--- a/net-analyzer/nmap/nmap-7.25_beta1.ebuild
+++ b/net-analyzer/nmap/nmap-7.25_beta1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,xml"
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
MY_P=${P/_beta/BETA}
@@ -74,7 +74,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-6.46-uninstaller.patch \
"${FILESDIR}"/${PN}-6.47-no-libnl.patch \
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
- "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch
+ "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch \
+ "${FILESDIR}"/${PN}-7.25-EC.patch
if use nls; then
local lingua=''
@@ -109,6 +110,8 @@ src_prepare() {
zenmap/install_scripts/unix/zenmap.desktop || die
epatch_user
+
+ eautoreconf
}
src_configure() {
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 40c25d6..83ebe88 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -6,7 +6,7 @@ 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 autotools eutils flag-o-matic git-r3 python-single-r1 toolchain-funcs user
MY_P=${P/_beta/BETA}
@@ -67,7 +67,8 @@ src_prepare() {
"${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-no-FORTIFY_SOURCE.patch \
+ "${FILESDIR}"/${PN}-7.25-EC.patch
if use nls; then
local lingua=''
@@ -97,6 +98,8 @@ src_prepare() {
zenmap/install_scripts/unix/zenmap.desktop || die
epatch_user
+
+ eautoreconf
}
src_configure() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-10-03 10:11 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-27 4:20 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/files/, net-analyzer/nmap/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-10-03 10:11 Sam James
2020-10-15 9:53 Jeroen Roovers
2020-09-17 16:25 Rick Farina
2020-02-05 12:28 Jeroen Roovers
2019-12-26 13:10 Jeroen Roovers
2019-01-25 14:13 Jeroen Roovers
2017-11-18 12:44 Jeroen Roovers
2017-03-11 4:57 Jeroen Roovers
2017-02-11 13:48 Jeroen Roovers
2017-01-22 11:40 Jeroen Roovers
2017-01-21 11:04 Jeroen Roovers
2016-09-30 9:15 Jeroen Roovers
2016-08-31 5:17 Jeroen Roovers
2016-07-29 8:12 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox