From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2] nmap: Migrate to python3
Date: Sat, 15 May 2021 23:50:03 +0200 [thread overview]
Message-ID: <20210515215003.4133546-1-adolf.belka@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2186 bytes --]
- Added PYTHON=python3 prior to configure. This then builds nmap with
python3.
- ndiff is written as python2 only and currently no patches to make it
work wih python3 have been accepted by the nmap team. It looks like ndiff
will stay as it is for some time so ndiff will be removed from the nmap
package install.
- Added --without-ndiff to configure so nmap is built without ndiff
- Updated rootfile
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/nmap | 5 -----
lfs/nmap | 14 ++++++++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap
index 028408ca0..7c6b0ee83 100644
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -1,9 +1,5 @@
-usr/bin/ndiff
usr/bin/nmap
usr/bin/nping
-#usr/bin/uninstall_ndiff
-usr/lib/python2.7/site-packages/ndiff.py
-#usr/lib/python2.7/site-packages/ndiff.pyc
#usr/share/man/de/man1/nmap.1
#usr/share/man/es/man1/nmap.1
#usr/share/man/fr/man1/nmap.1
@@ -15,7 +11,6 @@ usr/lib/python2.7/site-packages/ndiff.py
#usr/share/man/hu/man1/nmap.1
#usr/share/man/it/man1/nmap.1
#usr/share/man/ja/man1/nmap.1
-#usr/share/man/man1/ndiff.1
#usr/share/man/man1/nmap.1
#usr/share/man/man1/nping.1
#usr/share/man/pl
diff --git a/lfs/nmap b/lfs/nmap
index d0d4d3428..bd2ea9b03 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nmap
-PAK_VER = 12
+PAK_VER = 13
DEPS =
@@ -78,11 +78,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --without-nmapfe \
- --without-zenmap \
- --without-ncat
+ cd $(DIR_APP) && PYTHON=python3 \
+ ./configure \
+ --prefix=/usr \
+ --without-nmapfe \
+ --without-zenmap \
+ --without-ncat \
+ --without-ndiff
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
--
2.31.1
reply other threads:[~2021-05-15 21:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210515215003.4133546-1-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox