jer 15/05/14 08:45:02 Modified: nmap-9999.ebuild ChangeLog nmap-6.47-r3.ebuild Log: Revert fcaps changes. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.11 net-analyzer/nmap/nmap-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?r1=1.10&r2=1.11 Index: nmap-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nmap-9999.ebuild 13 May 2015 05:51:15 -0000 1.10 +++ nmap-9999.ebuild 14 May 2015 08:45:02 -0000 1.11 @@ -1,13 +1,13 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.10 2015/05/13 05:51:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.11 2015/05/14 08:45:02 jer Exp $ EAPI=5 DISABLE_AUTOFORMATTING=true PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,xml" -inherit eutils fcaps flag-o-matic python-single-r1 readme.gentoo toolchain-funcs user +inherit eutils flag-o-matic python-single-r1 toolchain-funcs user MY_P=${P/_beta/BETA} @@ -61,13 +61,6 @@ S="${WORKDIR}/${MY_P}" -DOC_CONTENTS=" -To run nmap as unprivileged user you: - - add yourself to the nmap group - - pass --privileged on the command line or set the NMAP_PRIVILEGED variable in - your environment. -" - pkg_setup() { if use ndiff || use zenmap; then python-single-r1_pkg_setup @@ -161,17 +154,4 @@ doicon "${DISTDIR}/nmap-logo-64.png" python_optimize fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - # Add group for users allowed to run nmap. - enewgroup nmap - - fcaps -o 0 -g nmap -m 4755 -M 0755 \ - cap_net_raw,cap_net_admin,cap_net_bind_service+eip \ - "${EROOT}"/usr/bin/nmap - - readme.gentoo_print_elog } 1.343 net-analyzer/nmap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.343&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.343&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.342&r2=1.343 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- ChangeLog 13 May 2015 05:51:15 -0000 1.342 +++ ChangeLog 14 May 2015 08:45:02 -0000 1.343 @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.342 2015/05/13 05:51:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.343 2015/05/14 08:45:02 jer Exp $ + + 14 May 2015; Jeroen Roovers <[email protected]> nmap-6.47-r3.ebuild, + nmap-9999.ebuild: + Revert fcaps changes. 13 May 2015; Jeroen Roovers <[email protected]> nmap-6.47-r3.ebuild, nmap-9999.ebuild: 1.3 net-analyzer/nmap/nmap-6.47-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild?r1=1.2&r2=1.3 Index: nmap-6.47-r3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nmap-6.47-r3.ebuild 13 May 2015 05:51:15 -0000 1.2 +++ nmap-6.47-r3.ebuild 14 May 2015 08:45:02 -0000 1.3 @@ -1,34 +1,25 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild,v 1.2 2015/05/13 05:51:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.47-r3.ebuild,v 1.3 2015/05/14 08:45:02 jer Exp $ EAPI=5 -DISABLE_AUTOFORMATTING=true PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,xml" -inherit eutils fcaps flag-o-matic python-single-r1 readme.gentoo toolchain-funcs user +inherit eutils flag-o-matic python-single-r1 toolchain-funcs MY_P=${P/_beta/BETA} DESCRIPTION="A utility for network discovery and security auditing" HOMEPAGE="http://nmap.org/"; - -if [[ ${PV} == "9999" ]] ; then - inherit subversion - ESVN_REPO_URI="https://svn.nmap.org/nmap"; - SRC_URI="http://dev.gentoo.org/~jer/nmap-logo-64.png"; - #FORCE_PRINT_ELOG="true" -else - SRC_URI=" - http://nmap.org/dist/${MY_P}.tar.bz2 - http://dev.gentoo.org/~jer/nmap-logo-64.png - " - 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" -fi +SRC_URI=" + http://nmap.org/dist/${MY_P}.tar.bz2 + http://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 +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" NMAP_LINGUAS=( de fr hr it ja pl pt_BR ru ) @@ -61,19 +52,17 @@ S="${WORKDIR}/${MY_P}" -DOC_CONTENTS=" -To run nmap as unprivileged user you: - - add yourself to the nmap group - - pass --privileged on the command line or set the NMAP_PRIVILEGED variable in - your environment. -" - 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 \ @@ -82,7 +71,8 @@ "${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-libnl.patch \ + "${FILESDIR}"/${PN}-6.47-no-FORTIFY_SOURCE.patch if use nls; then local lingua='' @@ -160,17 +150,4 @@ doicon "${DISTDIR}/nmap-logo-64.png" python_optimize fi - - readme.gentoo_create_doc -} - -pkg_postinst() { - # Add group for users allowed to run nmap. - enewgroup nmap - - fcaps -o 0 -g nmap -m 4755 -M 0755 \ - cap_net_raw,cap_net_admin,cap_net_bind_service+eip \ - "${EROOT}"/usr/bin/nmap - - readme.gentoo_print_elog }
![http://dev.gentoo.org/~jer/nmap-logo-64.png"](http://dev.gentoo.org/~jer/nmap-logo-64.png"){kind=link}
