[packages/nmap] Up to 7.99; merge java subpackage back (these java files don't require local java and shouldn't requ
arekm
arekm at pld-linux.org
Thu May 14 23:54:40 CEST 2026
commit 11badb3abb492d1620902449dc0b86934e840799
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu May 14 23:54:26 2026 +0200
Up to 7.99; merge java subpackage back (these java files don't require local java and shouldn't require local java)
nmap-desktop.patch | 40 +++++++++++++++----------------
nmap-python.patch | 18 +++++++-------
nmap-zenmap-drop-ndiff.patch | 20 ++++++++++++++++
nmap.spec | 56 ++++++++++----------------------------------
4 files changed, 61 insertions(+), 73 deletions(-)
---
diff --git a/nmap.spec b/nmap.spec
index ab10a4d..63a6531 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -11,15 +11,16 @@ Summary(pt_BR.UTF-8): Ferramenta de exploração da rede e segurança
Summary(ru.UTF-8): Утилита сканирования сети и аудита безопасности
Summary(uk.UTF-8): Утиліта сканування мережі та аудиту безпеки
Name: nmap
-Version: 7.97
+Version: 7.99
Release: 1
License: Nmap Public Source License
Group: Networking/Utilities
Source0: https://nmap.org/dist/%{name}-%{version}.tar.bz2
-# Source0-md5: e4ac67fa85b4c2a93b49c811b1f0d163
+# Source0-md5: 187db52073c5a1bcbc579e0efbc2c0bd
Patch0: %{name}-desktop.patch
Patch1: ncat-system-ssl.patch
Patch2: %{name}-python.patch
+Patch3: %{name}-zenmap-drop-ndiff.patch
URL: https://nmap.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -39,9 +40,11 @@ BuildRequires: sed >= 4.0
%if %{with python}
BuildRequires: python3-build
BuildRequires: python3-setuptools
+BuildRequires: python3-setuptools-gettext
BuildRequires: python3-installer
Suggests: %{name}-ndiff = %{version}-%{release}
%endif
+Obsoletes: nmap-java < 7.99
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
#java code is run on target
@@ -102,18 +105,6 @@ Nmap також підтримує гнучке задання цілі та п
сканування (decoy scanning), визначення характеристик передбачуваності
TCP sequence, сканування sunRPC, reverse-identd сканування та інше.
-%package java
-Summary: NSE scripts that require Java
-Summary(pl.UTF-8): Skrypty NSE wykorzystujące Javę
-Group: Applications/Networking
-Requires: %{name} = %{version}-%{release}
-
-%description java
-NSE scripts that require Java.
-
-%description java -l pl.UTF-8
-Skrypty NSE wykorzystujące Javę.
-
%package ncat
Summary: Nmap's Netcat replacement
Summary(pl.UTF-8): Zamiennik Netcata z pakietu Nmap
@@ -178,6 +169,7 @@ Ten pakiet zawiera zenmap, czyli graficzny frontend dla nmapa.
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1 -b .orig
+%patch -P 3 -p1
# use system provided libraries
%{__rm} -r liblinear liblua libpcap libpcre libssh2 libz
@@ -205,16 +197,12 @@ install -d $RPM_BUILD_ROOT%{_pixmapsdir}
DESTDIR=$RPM_BUILD_ROOT
%if %{with python}
-#cp -p docs/zenmap.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-#py3_ocomp $RPM_BUILD_ROOT%{py3_sitescriptdir}
-
-# missing in intermediate python wheel (why???)
-cp -pr zenmap/zenmapCore/data/locale/{??,??_??} $RPM_BUILD_ROOT%{py3_sitescriptdir}/zenmapCore/data/locale
install zenmap/install_scripts/unix/su-to-zenmap.sh $RPM_BUILD_ROOT%{_bindir}
# unify locale names
-%{__mv} $RPM_BUILD_ROOT%{py3_sitescriptdir}/zenmapCore/data/locale/zh{,_CN}
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/zh{,_CN}
+
+%find_lang zenmap
%endif
# unify locale names
@@ -230,8 +218,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/nmap
%attr(755,root,root) %{_bindir}/nping
%{_datadir}/nmap
-%exclude %{_datadir}/nmap/nselib/data/jdwp-class
-%exclude %{_datadir}/nmap/scripts/jdwp-*
%{_mandir}/man1/nmap.1*
%{_mandir}/man1/nping.1*
%lang(de) %{_mandir}/de/man1/nmap.1*
@@ -249,11 +235,6 @@ rm -rf $RPM_BUILD_ROOT
%lang(sk) %{_mandir}/sk/man1/nmap.1*
%lang(zh_CN) %{_mandir}/zh_CN/man1/nmap.1*
-%files java
-%defattr(644,root,root,755)
-%{_datadir}/nmap/nselib/data/jdwp-class
-%{_datadir}/nmap/scripts/jdwp-*
-
%files ncat
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ncat
@@ -266,9 +247,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ndiff.1*
%{py3_sitescriptdir}/__pycache__/ndiff.cpython-*.py[co]
%{py3_sitescriptdir}/ndiff.py
-%{py3_sitescriptdir}/ndiff-7.96.dist-info
+%{py3_sitescriptdir}/ndiff-%{version}.dist-info
-%files zenmap
+%files zenmap -f zenmap.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/nmapfe
%attr(755,root,root) %{_bindir}/su-to-zenmap.sh
@@ -298,20 +279,7 @@ rm -rf $RPM_BUILD_ROOT
%{py3_sitescriptdir}/zenmapCore/data/config
%{py3_sitescriptdir}/zenmapCore/data/docs
%{py3_sitescriptdir}/zenmapCore/data/misc
-%dir %{py3_sitescriptdir}/zenmapCore/data/locale
-%{py3_sitescriptdir}/zenmapCore/data/locale/xgettext-profile_editor.py
-%{py3_sitescriptdir}/zenmapCore/data/locale/__pycache__
-%lang(de) %{py3_sitescriptdir}/zenmapCore/data/locale/de
-%lang(es) %{py3_sitescriptdir}/zenmapCore/data/locale/es
-%lang(fr) %{py3_sitescriptdir}/zenmapCore/data/locale/fr
-%lang(hi) %{py3_sitescriptdir}/zenmapCore/data/locale/hi
-%lang(hr) %{py3_sitescriptdir}/zenmapCore/data/locale/hr
-%lang(it) %{py3_sitescriptdir}/zenmapCore/data/locale/it
-%lang(ja) %{py3_sitescriptdir}/zenmapCore/data/locale/ja
-%lang(pl) %{py3_sitescriptdir}/zenmapCore/data/locale/pl
-%lang(pt_BR) %{py3_sitescriptdir}/zenmapCore/data/locale/pt_BR
-%lang(ru) %{py3_sitescriptdir}/zenmapCore/data/locale/ru
-%lang(zh_CN) %{py3_sitescriptdir}/zenmapCore/data/locale/zh_CN
+%{py3_sitescriptdir}/zenmapCore/data/locale
%{py3_sitescriptdir}/zenmapCore/data/pixmaps
%{py3_sitescriptdir}/zenmapGUI/__pycache__
%{py3_sitescriptdir}/zenmapGUI/*.py
diff --git a/nmap-desktop.patch b/nmap-desktop.patch
index 6eb1caa..0c4af8f 100644
--- a/nmap-desktop.patch
+++ b/nmap-desktop.patch
@@ -1,20 +1,18 @@
-diff -ruN nmap-7.40.orig/zenmap/install_scripts/unix/zenmap-root.desktop nmap-7.40/zenmap/install_scripts/unix/zenmap-root.desktop
---- nmap-7.40.orig/zenmap/install_scripts/unix/zenmap-root.desktop 2016-12-03 07:08:10.000000000 +0100
-+++ nmap-7.40/zenmap/install_scripts/unix/zenmap-root.desktop 2017-01-27 19:56:12.796011585 +0100
-@@ -1,11 +1,18 @@
+diff -ruN nmap-7.99.orig/zenmap/install_scripts/unix/zenmap.desktop nmap-7.99/zenmap/install_scripts/unix/zenmap.desktop
+--- nmap-7.99.orig/zenmap/install_scripts/unix/zenmap.desktop 2026-05-14 21:48:22.893033177 +0200
++++ nmap-7.99/zenmap/install_scripts/unix/zenmap.desktop 2026-05-14 21:48:46.933033159 +0200
+@@ -1,11 +1,17 @@
[Desktop Entry]
--Name=Zenmap (as root)
-+Name=Zenmap as root
-+Name[pl]=Zenmap jako root
+ Name=Zenmap
GenericName=GUI Port Scanner
+GenericName[pl]=Skaner portów z GUI
- TryExec=su-to-zenmap.sh
- Exec=su-to-zenmap.sh %F
+ TryExec=zenmap
+ Exec=zenmap %F
Terminal=false
Icon=zenmap
Type=Application
--Categories=Application;Network;Security;
-+Categories=GTK;Network;Security
+-Categories=Network;Security;
++Categories=GTK;Network;Security;
Comment=A cross-platform GUI for the Nmap Security Scanner.
+Comment[es]=Herramienta de exploración de la rede y seguridad
+Comment[pl]=Graficzny interfejs do skanera bezpieczeństwa Nmap
@@ -22,21 +20,23 @@ diff -ruN nmap-7.40.orig/zenmap/install_scripts/unix/zenmap-root.desktop nmap-7.
+Comment[ru]=Утилита сканирования сети и аудита безопасности
+Comment[uk]=Утиліта сканування мережі та аудиту безпеки
Keywords=network;scan;scanner;IP;security;
-diff -ruN nmap-7.40.orig/zenmap/install_scripts/unix/zenmap.desktop nmap-7.40/zenmap/install_scripts/unix/zenmap.desktop
---- nmap-7.40.orig/zenmap/install_scripts/unix/zenmap.desktop 2016-12-03 07:08:10.000000000 +0100
-+++ nmap-7.40/zenmap/install_scripts/unix/zenmap.desktop 2017-01-27 19:53:47.649553629 +0100
-@@ -1,11 +1,17 @@
+diff -ruN nmap-7.99.orig/zenmap/install_scripts/unix/zenmap-root.desktop nmap-7.99/zenmap/install_scripts/unix/zenmap-root.desktop
+--- nmap-7.99.orig/zenmap/install_scripts/unix/zenmap-root.desktop 2026-05-14 21:48:22.896366510 +0200
++++ nmap-7.99/zenmap/install_scripts/unix/zenmap-root.desktop 2026-05-14 21:48:44.183033159 +0200
+@@ -1,11 +1,18 @@
[Desktop Entry]
- Name=Zenmap
+-Name=Zenmap (as root)
++Name=Zenmap as root
++Name[pl]=Zenmap jako root
GenericName=GUI Port Scanner
+GenericName[pl]=Skaner portów z GUI
- TryExec=zenmap
- Exec=zenmap %F
+ TryExec=su-to-zenmap.sh
+ Exec=su-to-zenmap.sh %F
Terminal=false
Icon=zenmap
Type=Application
--Categories=Application;Network;Security;
-+Categories=GTK;Network;Security
+-Categories=Network;Security;
++Categories=GTK;Network;Security;
Comment=A cross-platform GUI for the Nmap Security Scanner.
+Comment[es]=Herramienta de exploración de la rede y seguridad
+Comment[pl]=Graficzny interfejs do skanera bezpieczeństwa Nmap
diff --git a/nmap-python.patch b/nmap-python.patch
index 47bb2af..0a3f8ad 100644
--- a/nmap-python.patch
+++ b/nmap-python.patch
@@ -1,23 +1,23 @@
---- nmap-7.97/Makefile.in.orig 2025-05-03 20:05:46.000000000 +0200
-+++ nmap-7.97/Makefile.in 2025-07-07 06:18:45.828271472 +0200
-@@ -359,11 +359,11 @@ tests/%: tests/%.cc $(OBJS)
- DEFAULT_PYTHON_PATH = /usr/bin/env python3
+--- nmap-7.99/Makefile.in.orig
++++ nmap-7.99/Makefile.in
+@@ -352,11 +352,11 @@
+ $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) $<
build-zenmap: $(ZENMAPDIR)/pyproject.toml $(ZENMAPDIR)/zenmapCore/Version.py
- $(PYTHON) -m build $(ZENMAPDIR)/
+ $(PYTHON) -m build --no-isolation --wheel $(ZENMAPDIR)/
install-zenmap: $(ZENMAPDIR)/pyproject.toml
- $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(deskdir)
+ mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(deskdir)
- $(PYTHON) -m pip install $(ZENMAPDIR)/ $(if $(DESTDIR),--root "$(DESTDIR)")
+ $(PYTHON) -m installer $(if $(DESTDIR),--destdir="$(DESTDIR)") --prefix=$(prefix) --compile-bytecode=2 $(ZENMAPDIR)/dist/zenmap*.whl
$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
$(INSTALL) -c -m 644 $(ZENMAPDIR)/install_scripts/unix/*.desktop $(DESTDIR)$(deskdir)
# Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
-@@ -375,14 +375,14 @@ install-zenmap: $(ZENMAPDIR)/pyproject.t
- ln -sf zenmap $(DESTDIR)$(bindir)/xnmap
+@@ -371,14 +371,14 @@
+ cp $^ $@
- build-ndiff:
+ build-ndiff: $(NDIFFDIR)/pyproject.toml $(NDIFFDIR)/Version.py
- $(PYTHON) -m build $(NDIFFDIR)/
+ $(PYTHON) -m build --no-isolation --wheel $(NDIFFDIR)/
@@ -25,7 +25,7 @@
@cd $(NPINGDIR) && $(MAKE)
install-ndiff:
- $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+ mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
- $(PYTHON) -m pip install $(NDIFFDIR)/ $(if $(DESTDIR),--root "$(DESTDIR)")
+ $(PYTHON) -m installer $(if $(DESTDIR),--destdir="$(DESTDIR)") --prefix=$(prefix) --compile-bytecode=2 $(NDIFFDIR)/dist/ndiff*.whl
$(INSTALL) -c -m 644 $(NDIFFDIR)/docs/ndiff.1 $(DESTDIR)$(mandir)/man1/
diff --git a/nmap-zenmap-drop-ndiff.patch b/nmap-zenmap-drop-ndiff.patch
new file mode 100644
index 0000000..6614b78
--- /dev/null
+++ b/nmap-zenmap-drop-ndiff.patch
@@ -0,0 +1,20 @@
+--- nmap-7.99/zenmap/pyproject.toml.orig
++++ nmap-7.99/zenmap/pyproject.toml
+@@ -24,9 +24,6 @@
+ [project.gui-scripts]
+ zenmap = "zenmapGUI.App:run"
+
+-[project.scripts]
+-ndiff = "ndiff:run_main"
+-
+ [tool.setuptools]
+ packages = [
+ "zenmapCore",
+@@ -44,7 +41,6 @@
+ "radialnet.gui",
+ "radialnet.util",
+ ]
+-py-modules = ["ndiff"]
+
+ [tool.setuptools.dynamic]
+ version = {attr = "zenmapCore.Version.VERSION"}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nmap.git/commitdiff/11badb3abb492d1620902449dc0b86934e840799
More information about the pld-cvs-commit
mailing list