Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 445752 - net-analyzer/nmap-6.25 - add ipv6 and nls USE flags
Summary: net-analyzer/nmap-6.25 - add ipv6 and nls USE flags
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Michal Januszewski (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-03 08:24 UTC by Alex Turbov
Modified: 2012-12-03 19:52 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
nolua patch (nmap-6.25-nolua.patch,2.32 KB, patch)
2012-12-03 08:25 UTC, Alex Turbov
Details | Diff
updated ebuild (nmap-6.25-r1.ebuild,2.57 KB, text/plain)
2012-12-03 08:27 UTC, Alex Turbov
Details
Add more linguas (nmap-6.25.ebuild.diff,1.20 KB, patch)
2012-12-03 17:45 UTC, iGentoo
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Turbov 2012-12-03 08:24:47 UTC
add USE flags for ipv6 and nls.
fix compile errors for USE=-lua


Reproducible: Always




requirement of USE=ipv6 for libpcap is optional actually (nmap can compile well w/o it).
remove some unnecessary patches and add some for compilation w/o lua.
Comment 1 Alex Turbov 2012-12-03 08:25:41 UTC
Created attachment 331280 [details, diff]
nolua patch

fix compile errors for USE=-lua
Comment 2 Alex Turbov 2012-12-03 08:27:21 UTC
Created attachment 331282 [details]
updated ebuild

updated ebuild w/ ipv6 and nls USE flags added. outdated patches are removed.
Comment 3 Jeroen Roovers (RETIRED) gentoo-dev 2012-12-03 11:27:25 UTC
Comment on attachment 331280 [details, diff]
nolua patch

Bug #445552.
Comment 4 Jeroen Roovers (RETIRED) gentoo-dev 2012-12-03 11:28:02 UTC
Comment on attachment 331282 [details]
updated ebuild

--- nmap-6.25.ebuild    2012-12-02 16:57:07.000000000 +0100
+++ -   2012-12-03 12:27:47.722039287 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.2 2012/12/02 15:57:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.1 2012/12/01 18:06:08 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk lua ncat ndiff nmap-update nping ssl"
+IUSE="gtk ipv6 lua ncat ndiff nls nmap-update nping ssl"
 
 NMAP_PYTHON_DEPEND="
 || (
@@ -32,7 +32,8 @@
 DEPEND="
        dev-libs/apr
        dev-libs/libpcre
-       net-libs/libpcap[ipv6]
+       net-libs/libpcap
+       ipv6? ( net-libs/libpcap[ipv6] )
        gtk? (  
                >=x11-libs/gtk+-2.6:2
                >=dev-python/pygtk-2.6
@@ -56,13 +57,10 @@
 }
 
 src_prepare() {
-       epatch \
-               "${FILESDIR}"/${PN}-4.75-include.patch \
-               "${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-lua.patch
+       epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
+       epatch "${FILESDIR}"/${PN}-5.21-python.patch
+       epatch "${FILESDIR}"/${PN}-6.01-make.patch
+       epatch "${FILESDIR}"/${PN}-6.25-nolua.patch
        sed -i \
                -e 's/-m 755 -s ncat/-m 755 ncat/' \
                ncat/Makefile.in || die
@@ -83,6 +81,7 @@
                $(use_with lua liblua) \
                $(use_with ncat) \
                $(use_with ndiff) \
+               $(use_enable nls) \
                $(use_with nmap-update) \
                $(use_with nping) \
                $(use_with ssl openssl) \
Comment 5 Jeroen Roovers (RETIRED) gentoo-dev 2012-12-03 12:47:00 UTC
I added USE=ipv6 and USE=nls, including LINGUAS support. Thanks for the report and the (partial) patches!
Comment 6 Alex Turbov 2012-12-03 13:34:26 UTC
(In reply to comment #5)
> I added USE=ipv6 and USE=nls, including LINGUAS support. Thanks for the
> report and the (partial) patches!

please note, that most of patches are not required anymore...
the minimum required set is:
${FILESDIR}"/${PN}-4.75-nolua.patch
${FILESDIR}"/${PN}-5.21-python.patch
${FILESDIR}"/${PN}-6.01-make.patch
${FILESDIR}"/${PN}-6.25-lua.patch
Comment 7 iGentoo 2012-12-03 17:45:41 UTC
Created attachment 331328 [details, diff]
Add more linguas

Add more linguas that are availible in the tarball?

nmap-6.25/docs/man-xlate/nmap-de.1
nmap-6.25/docs/man-xlate/nmap-es.1
nmap-6.25/docs/man-xlate/nmap-fr.1
nmap-6.25/docs/man-xlate/nmap-hr.1
nmap-6.25/docs/man-xlate/nmap-hu.1
nmap-6.25/docs/man-xlate/nmap-id.1
nmap-6.25/docs/man-xlate/nmap-it.1
nmap-6.25/docs/man-xlate/nmap-jp.1
nmap-6.25/docs/man-xlate/nmap-pl.1
nmap-6.25/docs/man-xlate/nmap-pt_BR.1
nmap-6.25/docs/man-xlate/nmap-pt_PT.1
nmap-6.25/docs/man-xlate/nmap-ro.1
nmap-6.25/docs/man-xlate/nmap-ru.1
nmap-6.25/docs/man-xlate/nmap-sk.1
nmap-6.25/docs/man-xlate/nmap-zh.1
nmap-6.25/zenmap/share/zenmap/locale/de.po
nmap-6.25/zenmap/share/zenmap/locale/fr.po
nmap-6.25/zenmap/share/zenmap/locale/hr.po
nmap-6.25/zenmap/share/zenmap/locale/it.po
nmap-6.25/zenmap/share/zenmap/locale/ja.po
nmap-6.25/zenmap/share/zenmap/locale/pt_BR.po
nmap-6.25/zenmap/share/zenmap/locale/ru.po
Comment 8 Jeroen Roovers (RETIRED) gentoo-dev 2012-12-03 18:58:15 UTC
(In reply to comment #7)
> Created attachment 331328 [details, diff] [details, diff]
> Add more linguas
> 
> Add more linguas that are availible in the tarball?

Everything in zenmap/share/zenmap/locale/ should be covered. Or is it?

> nmap-6.25/docs/man-xlate/nmap-de.1
> nmap-6.25/docs/man-xlate/nmap-es.1
> nmap-6.25/docs/man-xlate/nmap-fr.1
> nmap-6.25/docs/man-xlate/nmap-hr.1
> nmap-6.25/docs/man-xlate/nmap-hu.1
> nmap-6.25/docs/man-xlate/nmap-id.1
> nmap-6.25/docs/man-xlate/nmap-it.1
> nmap-6.25/docs/man-xlate/nmap-jp.1
> nmap-6.25/docs/man-xlate/nmap-pl.1
> nmap-6.25/docs/man-xlate/nmap-pt_BR.1
> nmap-6.25/docs/man-xlate/nmap-pt_PT.1
> nmap-6.25/docs/man-xlate/nmap-ro.1
> nmap-6.25/docs/man-xlate/nmap-ru.1
> nmap-6.25/docs/man-xlate/nmap-sk.1
> nmap-6.25/docs/man-xlate/nmap-zh.1

These I hadn't looked into yet.
Comment 9 Jeroen Roovers (RETIRED) gentoo-dev 2012-12-03 19:41:36 UTC
Comment on attachment 331328 [details, diff]
Add more linguas

"jp" isn't a valid LINGUA - that should be ja...

Also, I don't see what the FORTIFY_SORUCE stuff is doing here.
Comment 10 Jeroen Roovers (RETIRED) gentoo-dev 2012-12-03 19:52:43 UTC
OK, selecting LINGUAs for the man pages should be fixed now, too. If there is still more, then please file a new bug report for every new issue.