Commit a1f3a4fe authored by Hilko Bengen's avatar Hilko Bengen Committed by Sophie Brun
Browse files

Import Debian changes 7.80+dfsg1-2

nmap (7.80+dfsg1-2) unstable; urgency=medium

  [ Samuel Henrique ]
  * Add salsa-ci.yml
  * d/rules: Pass some hardening flags to nmap_service.exe
  * salsa-ci: Disable BLHC test

  [ Hilko Bengen ]
  * Drop zenmap package due to python2 and pygtk removal (Closes: #885498)
  * Use Python3 for ndiff, using Bryan Quigley's patch (PR #1807).
    Closes: #883161
parent 7f8c1a46
nmap (7.80+dfsg1-2) unstable; urgency=medium
[ Samuel Henrique ]
* Add salsa-ci.yml
* d/rules: Pass some hardening flags to nmap_service.exe
* salsa-ci: Disable BLHC test
[ Hilko Bengen ]
* Drop zenmap package due to python2 and pygtk removal (Closes: #885498)
* Use Python3 for ndiff, using Bryan Quigley's patch (PR #1807).
Closes: #883161
-- Hilko Bengen <bengen@debian.org> Fri, 08 Nov 2019 12:41:14 +0100
nmap (7.80+dfsg1-1) unstable; urgency=medium
* New upstream version 7.80+dfsg1 (Closes: #934728)
......
<?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>
......@@ -8,15 +8,15 @@ Build-Depends: bison,
debhelper (>=12~),
dh-python,
flex,
libgtk2.0-dev,
liblinear-dev,
liblua5.3-dev,
libpcap0.8-dev,
libpcre3-dev,
libssh2-1-dev,
libssl-dev,
zlib1g-dev,
lua-lpeg-dev,
python
python3,
Build-Depends-Indep: default-jdk-headless,
gcc-mingw-w64-i686
Standards-Version: 4.4.0
......@@ -28,8 +28,7 @@ Package: nmap
Architecture: any
Depends: nmap-common (= ${source:Version}),
${misc:Depends},
${python:Depends},
${shlibs:Depends}
${shlibs:Depends},
Suggests: ncat, ndiff, zenmap
Description: The Network Mapper
Nmap is a utility for network exploration or security auditing. It
......@@ -62,34 +61,15 @@ Description: Architecture independent files for nmap
.
This package contains the nmap files shared by all architectures.
Package: zenmap
Architecture: all
Depends: ndiff,
nmap,
python-gobject-2 | python-gobject,
python-gtk2,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Provides: nmapfe
Conflicts: nmapfe
Replaces: nmapfe
Recommends: policykit-1,
python-pysqlite2
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
Breaks: nmap (<< ${source:Version}),
zenmap (<< 6.47-5~)
Replaces: zenmap (<< 6.47-5~)
Depends: python-lxml,
Depends: python3-lxml,
${misc:Depends},
${python:Depends}
${python3:Depends},
Description: The Network Mapper - result compare utility
Ndiff is a tool to aid in the comparison of Nmap scans. It takes two
Nmap XML output files and prints the differences between them them:
......
usr/bin/ndiff
usr/lib/python2.7/*/ndiff.py
usr/lib/python3*/dist-packages/ndiff.py
usr/share/man/man1/ndiff.1
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
This diff is collapsed.
0001-use-su-to-root.patch
0002-Use-Debian-s-ca-certificates.patch
0003-Link-against-lua-lpeg.patch
0005-ncat-manpage-self-reference.patch
0004-Python3-port-of-ndiff.patch
......@@ -8,24 +8,35 @@ ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
endif
%:
dh $@ --with=python2
dh $@ --with=python3
override_dh_auto_clean:
dh_auto_clean
dh_auto_clean --sourcedir=ndiff --buildsystem=pybuild
rm -f nselib/data/jdwp-class/*.class nselib/data/psexec/*.exe
override_dh_auto_configure:
dh_auto_configure -- --with-liblua --with-liblinear --enable-ipv6 STRIP=/bin/true $(VENDOR_CONFIGURE_OPTIONS)
dh_auto_configure -- \
--with-liblua \
--with-liblinear \
--without-zenmap \
--without-ndiff \
--enable-ipv6 \
STRIP=/bin/true $(VENDOR_CONFIGURE_OPTIONS)
dh_auto_configure --sourcedir=ndiff --buildsystem=pybuild
override_dh_auto_build-indep:
dh_auto_build
dh_auto_build --sourcedir=ndiff --buildsystem=pybuild
cd nselib/data/jdwp-class && /usr/lib/jvm/default-java/bin/javac *.java
cd nselib/data/psexec && i686-w64-mingw32-gcc -o nmap_service.exe nmap_service.c
cd nselib/data/psexec && i686-w64-mingw32-gcc ${CPPFLAGS} ${CFLAGS} -o nmap_service.exe nmap_service.c
override_dh_auto_test:
dh_auto_test --sourcedir=ndiff --buildsystem=pybuild
override_dh_auto_install:
dh_auto_install
dh_auto_install --sourcedir=ndiff --buildsystem=pybuild
mv debian/tmp/usr/share/man/pt_PT debian/tmp/usr/share/man/pt
override_dh_missing:
......
---
include:
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
variables:
SALSA_CI_DISABLE_BLHC: 1
usr/bin/nmapfe
usr/bin/xnmap
usr/bin/zenmap
usr/lib/python2.7/site-packages/radialnet
usr/lib/python2.7/site-packages/zenmap*
usr/share/applications/zenmap*
usr/share/man/man1/zenmap.1
usr/share/zenmap
debian/com.ubuntu.zenmap.policy usr/share/polkit-1/actions
usr/share/man/man1/zenmap.1.gz usr/share/man/man1/nmapfe.1.gz
usr/share/man/man1/zenmap.1.gz usr/share/man/man1/xnmap.1.gz
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment