Merging debian version 7.94+git20230807.3be01efb1+dfsg-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

12 files changed, 172 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index c0315b5..88a0d9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nmap (7.94+git20230807.3be01efb1+dfsg-3) unstable; urgency=medium
+
+  * Re-introduce zenmap package (Closes: #1057744)
+  * Fix irregular version number for zenmap
+  * Fix make install breakage
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 24 Dec 2023 22:32:17 +0100
+
 nmap (7.94+git20230807.3be01efb1+dfsg-2~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/com.ubuntu.zenmap.policy b/debian/com.ubuntu.zenmap.policy
new file mode 100644
index 0000000..2158f2a
--- /dev/null
+++ b/debian/com.ubuntu.zenmap.policy
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+    <vendor>The Nmap Project</vendor>
+    <vendor_url>https://nmap.org/</vendor_url>
+    <icon_name>zenmap</icon_name>
+    <action id="com.ubuntu.zenmap">
+        <message gettext-domain="zenmap">Authentication is required for some Nmap features to work</message>
+        <defaults>
+            <allow_any>auth_admin</allow_any>
+            <allow_inactive>auth_admin</allow_inactive>
+            <allow_active>auth_admin</allow_active>
+        </defaults>
+        <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/zenmap</annotate>
+        <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+    </action>
+
+</policyconfig>
diff --git a/debian/control b/debian/control
index 5e68520..205e0c3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,9 +17,13 @@ Build-Depends: bison,
                libpcre2-dev,
                libssh2-1-dev,
                libssl-dev,
-               zlib1g-dev,
                lua-lpeg-dev,
                python3,
+               python3-gi, 
+               gir1.2-gtk-3.0,
+               gir1.2-pango-1.0,
+               gir1.2-glib-2.0,
+               gir1.2-gdkpixbuf-2.0,
 Build-Depends-Indep: default-jdk-headless,
                      gcc-mingw-w64-i686
 Standards-Version: 4.6.2
@@ -65,6 +69,24 @@ Description: Architecture independent files for nmap
  .
  This package contains the nmap files shared by all architectures.
 
+Package: zenmap
+Architecture: all
+Depends: ndiff,
+         nmap,
+         python3-gi, 
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gir1.2-glib-2.0,
+         gir1.2-gdkpixbuf-2.0,
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Recommends: pkexec
+Description: The Network Mapper Front End
+ Zenmap is an Nmap frontend. It is meant to be useful for advanced users
+ and to make Nmap easy to use by beginners. It was originally derived
+ from Umit, an Nmap GUI created as part of the Google Summer of Code.
+
 Package: ndiff
 Architecture: all
 Recommends: nmap
diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 0000000..2f8f3f2
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,2 @@
+/usr/bin/uninstall_*
+/usr/lib/python3*/dist-packages/__pycache__/*.pyc
diff --git a/debian/patches/0001-use-su-to-root.patch b/debian/patches/0001-use-su-to-root.patch
new file mode 100644
index 0000000..1f06979
--- /dev/null
+++ b/debian/patches/0001-use-su-to-root.patch
@@ -0,0 +1,23 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Fri, 25 Apr 2014 09:51:17 +0200
+Subject: use su-to-root
+
+---
+ zenmap/install_scripts/unix/zenmap-root.desktop | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/zenmap/install_scripts/unix/zenmap-root.desktop b/zenmap/install_scripts/unix/zenmap-root.desktop
+index c5f4c10..f50029d 100644
+--- a/zenmap/install_scripts/unix/zenmap-root.desktop
++++ b/zenmap/install_scripts/unix/zenmap-root.desktop
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Name=Zenmap (as root)
+ GenericName=GUI Port Scanner
+-TryExec=su-to-zenmap.sh
+-Exec=su-to-zenmap.sh %F
++TryExec=pkexec
++Exec=pkexec /usr/bin/zenmap %F
+ Terminal=false
+ Icon=zenmap
+ Type=Application
diff --git a/debian/patches/0003-Make-uninstaller-not-fail-on-unparseable-versions.patch b/debian/patches/0003-Make-uninstaller-not-fail-on-unparseable-versions.patch
new file mode 100644
index 0000000..6bb0016
--- /dev/null
+++ b/debian/patches/0003-Make-uninstaller-not-fail-on-unparseable-versions.patch
@@ -0,0 +1,16 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Sun, 24 Dec 2023 20:04:19 +0100
+Subject: Make uninstaller not fail on unparseable versions
+
+... such as 7.94SVN
+---
+ zenmap/zenmapCore/Version.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/zenmap/zenmapCore/Version.py b/zenmap/zenmapCore/Version.py
+index b3fede4..89ccbfe 100644
+--- a/zenmap/zenmapCore/Version.py
++++ b/zenmap/zenmapCore/Version.py
+@@ -1 +1 @@
+-VERSION = "7.94SVN"
++VERSION = "7.94+SVN"
diff --git a/debian/patches/0004-Ignore-errors-of-install-d-invocations.patch b/debian/patches/0004-Ignore-errors-of-install-d-invocations.patch
new file mode 100644
index 0000000..f4e0e62
--- /dev/null
+++ b/debian/patches/0004-Ignore-errors-of-install-d-invocations.patch
@@ -0,0 +1,64 @@
+From: Hilko Bengen <bengen@debian.org>
+Date: Sun, 24 Dec 2023 20:35:03 +0100
+Subject: Ignore errors of "install -d" invocations
+
+---
+ Makefile.in       | 10 +++++-----
+ nping/Makefile.in |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a924301..020be52 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -314,7 +314,7 @@ distclean-%: clean-%
+ 	-cd $* && $(MAKE) distclean
+ 
+ install-nmap: $(TARGET)
+-	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
++	-$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
+ 	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
+ # Use strip -x to avoid stripping dynamically loaded NSE functions. See
+ # http://seclists.org/nmap-dev/2007/q4/0272.html.
+@@ -368,7 +368,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py
+ 	cd $(ZENMAPDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
+ 
+ install-zenmap: $(ZENMAPDIR)/setup.py
+-	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
++	-$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+ 	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
+ 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+ # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
+@@ -392,8 +392,8 @@ NSE_FILES = scripts/script.db scripts/*.nse
+ NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc
+ 
+ install-nse: $(TARGET)
+-	$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/scripts
+-	$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib
++	-$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/scripts
++	-$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib
+ 
+ # Remove obsolete scripts from a previous installation.
+ 	(cd $(DESTDIR)$(nmapdatadir)/scripts && rm -f $(OLD_SCRIPT_NAMES))
+@@ -401,7 +401,7 @@ install-nse: $(TARGET)
+ 	$(INSTALL) -c -m 644 nse_main.lua $(DESTDIR)$(nmapdatadir)/
+ 	$(INSTALL) -c -m 644 $(NSE_FILES) $(DESTDIR)$(nmapdatadir)/scripts
+ 	$(INSTALL) -c -m 644 $(NSE_LIB_LUA_FILES) $(DESTDIR)$(nmapdatadir)/nselib
+-	$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib/data
++	-$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/nselib/data
+ 	for f in `find nselib/data -name .svn -prune -o -type d -print`; do \
+ 		$(INSTALL) -d $(DESTDIR)$(nmapdatadir)/$$f; \
+ 	done
+diff --git a/nping/Makefile.in b/nping/Makefile.in
+index 3cf9c55..0db9ea5 100644
+--- a/nping/Makefile.in
++++ b/nping/Makefile.in
+@@ -124,7 +124,7 @@ distclean: clean
+ 	stamp-h.in config.cache config.log config.status
+ 
+ install-nping: $(TARGET)
+-	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
++	-$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) -c -m 755 nping $(DESTDIR)$(bindir)/nping
+ # Use strip -x to avoid stripping dynamically loaded NSE functions. See
+ # http://seclists.org/nmap-dev/2007/q4/0272.html.
diff --git a/debian/patches/series b/debian/patches/series
index acae44b..35fb731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
+0001-use-su-to-root.patch
 0002-Use-Debian-s-ca-certificates.patch
+0003-Make-uninstaller-not-fail-on-unparseable-versions.patch
+0004-Ignore-errors-of-install-d-invocations.patch
diff --git a/debian/rules b/debian/rules
index 5151523..3b85558 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 override_dh_auto_clean:
 	dh_auto_clean
 	dh_auto_clean --sourcedir=ndiff --buildsystem=pybuild
+	dh_auto_clean --sourcedir=zenmap --buildsystem=pybuild
 	rm -f nselib/data/jdwp-class/*.class nselib/data/psexec/nmap_service.ex*
 
 override_dh_auto_configure:
@@ -19,10 +20,12 @@ override_dh_auto_configure:
 		--enable-ipv6 \
 		STRIP=/bin/true
 	dh_auto_configure --sourcedir=ndiff --buildsystem=pybuild
+	dh_auto_configure --sourcedir=zenmap --buildsystem=pybuild
 
 override_dh_auto_build-indep:
 	dh_auto_build
 	dh_auto_build --sourcedir=ndiff --buildsystem=pybuild
+	dh_auto_build --sourcedir=zenmap --buildsystem=pybuild
 	cd nselib/data/jdwp-class && /usr/lib/jvm/default-java/bin/javac *.java
 	cd nselib/data/psexec && \
 		i686-w64-mingw32-gcc ${CPPFLAGS} ${CFLAGS} -o nmap_service.exe nmap_service.c && \
@@ -30,14 +33,10 @@ override_dh_auto_build-indep:
 
 override_dh_auto_test:
 	dh_auto_test --sourcedir=ndiff --buildsystem=pybuild
+	dh_auto_test --sourcedir=zenmap --buildsystem=pybuild
 
 override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install --sourcedir=ndiff --buildsystem=pybuild
+	dh_auto_install --sourcedir=zenmap --buildsystem=pybuild
 	mv debian/tmp/usr/share/man/pt_PT debian/tmp/usr/share/man/pt
-
-override_dh_missing:
-	dh_missing -X/usr/bin/uninstall_ -Xca-bundle.crt -X.pyc -Xnmap_service.exe --fail-missing
-
-override_dh_install:
-	dh_install -X/usr/bin/uninstall_ -Xca-bundle.crt -X.pyc -Xnmap_service.exe
diff --git a/debian/zenmap.install b/debian/zenmap.install
new file mode 100644
index 0000000..ef39826
--- /dev/null
+++ b/debian/zenmap.install
@@ -0,0 +1,6 @@
+usr/bin/zenmap
+usr/lib/python3*/dist-packages/radialnet
+usr/lib/python3*/dist-packages/zenmap*
+usr/share/applications/zenmap*
+usr/share/zenmap
+debian/com.ubuntu.zenmap.policy usr/share/polkit-1/actions
diff --git a/debian/zenmap.lintian-overrides b/debian/zenmap.lintian-overrides
index 1dad655..7980d06 100644
--- a/debian/zenmap.lintian-overrides
+++ b/debian/zenmap.lintian-overrides
@@ -3,4 +3,4 @@ description-synopsis-starts-with-article
 # pkexec is used to provide the root version of zenmap
 # while pkexec isn't provided in this package we declare a
 # dependency on it.
-desktop-command-not-in-package usr/share/applications/zenmap-root.desktop pkexec
+desktop-command-not-in-package pkexec [usr/share/applications/zenmap-root.desktop]
diff --git a/debian/zenmap.manpages b/debian/zenmap.manpages
new file mode 100644
index 0000000..379c62f
--- /dev/null
+++ b/debian/zenmap.manpages
@@ -0,0 +1 @@
+docs/zenmap.1