zerochaos 15/05/12 17:27:40 Modified: nmap-9999.ebuild ChangeLog Log: use readme.gentoo with some minor custom to support 9999 better (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Revision Changes Path 1.6 net-analyzer/nmap/nmap-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild?r1=1.5&r2=1.6 Index: nmap-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nmap-9999.ebuild 12 May 2015 16:43:07 -0000 1.5 +++ nmap-9999.ebuild 12 May 2015 17:27:40 -0000 1.6 @@ -1,12 +1,12 @@ # 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.5 2015/05/12 16:43:07 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-9999.ebuild,v 1.6 2015/05/12 17:27:40 zerochaos Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,xml" -inherit eutils fcaps flag-o-matic python-single-r1 toolchain-funcs user +inherit eutils fcaps flag-o-matic python-single-r1 readme.gentoo toolchain-funcs user MY_P=${P/_beta/BETA} @@ -18,6 +18,7 @@ ESVN_REPO_URI="https://svn.nmap.org/nmap"; SRC_URI="http://dev.gentoo.org/~jer/nmap-logo-64.png"; KEYWORDS="" + #FORCE_PRINT_ELOG="true" else SRC_URI=" http://nmap.org/dist/${MY_P}.tar.bz2 @@ -60,6 +61,13 @@ S="${WORKDIR}/${MY_P}" +DOC_CONTENTS="To run nmap as normal user you have to add yourself to the \ +nmap group AND pass --privileged on the command line. This security \ +measure ensures that only trusted users are allowed to run nmap. \ +To avoid passing --privileged every time, add \ +'export NMAP_PRIVILEGED=\"\"' to your user environment (eg ~/.bashrc)." + + pkg_setup() { if use ndiff || use zenmap; then python-single-r1_pkg_setup @@ -153,6 +161,8 @@ doicon "${DISTDIR}/nmap-logo-64.png" python_optimize fi + + readme.gentoo_create_doc } pkg_postinst() { @@ -163,10 +173,16 @@ cap_net_raw,cap_net_admin,cap_net_bind_service+eip \ "${EROOT}"/usr/bin/nmap - ewarn "NOTE: To run nmap as normal user you have to add yourself to the" - ewarn "nmap group AND pass --privileged on the command line. This security" - ewarn "measure ensures that only trusted users are allowed to run nmap." - ewarn "To avoid passing --privileged every time, add" - ewarn "'export NMAP_PRIVILEGED=\"\"' to your user environment (eg ~/.bashrc)." + if [[ ${PV} == "9999" ]] ; then + einfo "To run nmap as normal user you have to add yourself to the nmap group" + einfo "AND pass --privileged on the command line. This security measure" + einfo "ensures that only trusted users are allowed to run nmap. To avoid" + einfo "passing --privileged every time, add 'export NMAP_PRIVILEGED=\"\"' to" + einfo "your user environment (eg ~/.bashrc)." + else + if [[ ${REPLACING_VERSIONS} < 6.48 ]]; then + FORCE_PRINT_ELOG="true" + fi + readme.gentoo_print_elog + fi } - 1.338 net-analyzer/nmap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.338&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.338&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.337&r2=1.338 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v retrieving revision 1.337 retrieving revision 1.338 diff -u -r1.337 -r1.338 --- ChangeLog 12 May 2015 16:43:07 -0000 1.337 +++ ChangeLog 12 May 2015 17:27:40 -0000 1.338 @@ -1,6 +1,9 @@ # 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.337 2015/05/12 16:43:07 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.338 2015/05/12 17:27:40 zerochaos Exp $ + + 12 May 2015; Rick Farina <[email protected]> nmap-9999.ebuild: + use readme.gentoo with some minor custom to support 9999 better 12 May 2015; Rick Farina <[email protected]> nmap-9999.ebuild: improve postinst message for fcaps
![http://dev.gentoo.org/~jer/nmap-logo-64.png"](http://dev.gentoo.org/~jer/nmap-logo-64.png"){kind=link}