From patchwork Sat May 15 21:50:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4280 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FjJwL5spLz3wbf for ; Sat, 15 May 2021 21:50:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FjJwL3JRZz6YL; Sat, 15 May 2021 21:50:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FjJwL2KDBz2xd2; Sat, 15 May 2021 21:50:10 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FjJwK4CR0z2xNt for ; Sat, 15 May 2021 21:50:09 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FjJwK1Bpjzcb; Sat, 15 May 2021 21:50:09 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621115409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RxSxqDFkAMeK+wNDTV4anO/T9mCjmb9xl7xsz7uhRXk=; b=4NzPZuS2NBiDtuOB7UTtxsfuLlkCqlwjlAjy3FfnBKNyUO4llAM/52LgD3Y3Nypok0MmA5 POS3isnTKqMSYIBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621115409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RxSxqDFkAMeK+wNDTV4anO/T9mCjmb9xl7xsz7uhRXk=; b=lWMxMvSV1qpextvcrqUox0p7RNDk+h6BA8M4wftcDV5FCvVDvjIMqJHZpT3NYS65CA4KHn J4muCeJ5d5lpRDuafqL48yFtqkFTdRFEehQcSKOJ/NzU1trVmmCWFte+m42wuDdReQv+3o iUwZisQhPbu2Ef+Ve/R+2FzOnw4yIIK4xqvp8DCjaZYXMiiwBqLXK4Xsmj07P9GoQoYSAD DWpcB4IsktyqjfAmUAlX5l/NCIfnLGBoq42vn2/GvBurHWL1Ro7c9igeMI32XxkylnUEzL 0GCARM2PUHS+UWX/5xpx/zr4punFnuERA8oXuIcjBfCGX/IvaLqYGVog0L3rgg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2] nmap: Migrate to python3 Date: Sat, 15 May 2021 23:50:03 +0200 Message-Id: <20210515215003.4133546-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 --- 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)