Commit 9da07021 authored by Samuel Henrique's avatar Samuel Henrique Committed by Sophie Brun
Browse files

Import Debian changes 7.70+dfsg1-5

nmap (7.70+dfsg1-5) unstable; urgency=medium

  * d/control: zenmap: move polkit from Depends to Recommends, note
    that the desktop entry of zenmap as root won't work without polkit
    (closes: #912452)

nmap (7.70+dfsg1-4) unstable; urgency=medium

  [ Samuel Henrique ]
  * Bump Standards-Version to 4.2.1
  * Update my email to @debian.org
  * d/p/0005: remove ncat's manpage self-reference (closes: #765999)
  * d/control: better ndiff extended description
  * lintian-overrides:
    - ndiff: add description lintian (as nmap and zenmap does)
    - nmap: add false positive lintians
    - nmap-common: add two overrides for READMEs
    - zenmap: add override for pkexec

  [ Christian Ehrhardt ]
  * Fix "zenmap as root" using polkit instead of menu
    (closes: #890728) (LP: #1263311)
parent 07f71036
nmap (7.70+dfsg1-5) unstable; urgency=medium
* d/control: zenmap: move polkit from Depends to Recommends, note
that the desktop entry of zenmap as root won't work without polkit
(closes: #912452)
-- Samuel Henrique <samueloph@debian.org> Wed, 31 Oct 2018 20:02:43 -0300
nmap (7.70+dfsg1-4) unstable; urgency=medium
[ Samuel Henrique ]
* Bump Standards-Version to 4.2.1
* Update my email to @debian.org
* d/p/0005: remove ncat's manpage self-reference (closes: #765999)
* d/control: better ndiff extended description
* lintian-overrides:
- ndiff: add description lintian (as nmap and zenmap does)
- nmap: add false positive lintians
- nmap-common: add two overrides for READMEs
- zenmap: add override for pkexec
[ Christian Ehrhardt ]
* Fix "zenmap as root" using polkit instead of menu
(closes: #890728) (LP: #1263311)
-- Samuel Henrique <samueloph@debian.org> Wed, 31 Oct 2018 03:26:50 -0300
nmap (7.70+dfsg1-3) unstable; urgency=medium
* Make ncat Architecture: any
......@@ -118,7 +145,7 @@ nmap (7.50-1) unstable; urgency=medium
* Bump Standards-Version to 4.0.0.
* Remove unused lintian overrides.
-- Samuel Henrique <samueloph@gmail.com> Sat, 17 Jun 2017 21:04:49 -0300
-- Samuel Henrique <samueloph@debian.org> Sat, 17 Jun 2017 21:04:49 -0300
nmap (7.40-1) unstable; urgency=medium
......@@ -128,7 +155,7 @@ nmap (7.40-1) unstable; urgency=medium
- 0004-zenmap-desktop.patch: Remove patch, applied upstream.
* debian/watch: Bump to v4.
-- Samuel Henrique <samueloph@gmail.com> Thu, 22 Dec 2016 00:52:47 -0200
-- Samuel Henrique <samueloph@debian.org> Thu, 22 Dec 2016 00:52:47 -0200
nmap (7.31-2) unstable; urgency=medium
......
<?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>
......@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
Uploaders: Hilko Bengen <bengen@debian.org>,
Samuel Henrique <samueloph@gmail.com>
Samuel Henrique <samueloph@debian.org>
Build-Depends: bison,
debhelper (>=11),
dh-python,
......@@ -19,7 +19,7 @@ Build-Depends: bison,
python
Build-Depends-Indep: default-jdk-headless,
gcc-mingw-w64-i686
Standards-Version: 4.1.3
Standards-Version: 4.2.1
Homepage: https://nmap.org/
Vcs-Git: https://salsa.debian.org/pkg-security-team/nmap.git
Vcs-Browser: https://salsa.debian.org/pkg-security-team/nmap
......@@ -74,7 +74,8 @@ Depends: ndiff,
Provides: nmapfe
Conflicts: nmapfe
Replaces: nmapfe
Recommends: python-pysqlite2
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
......@@ -91,7 +92,9 @@ Depends: python-lxml,
${python: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.
Nmap XML output files and prints the differences between them them:
hosts coming up and down, ports becoming open or closed, and things like that.
It can produce output in human-readable text or machine-readable XML formats.
Package: ncat
Architecture: any
......
......@@ -22,7 +22,7 @@ Files: debian/*
Copyright: 1997-1999, Bdale Garbee <bdale@gag.com>
1999-2010, LaMont Jones <lamont@debian.org>
2012-2018, Hilko Bengen <bengen@debian.org>
2016-2018, Samuel Henrique <samueloph@gmail.com>
2016-2018, Samuel Henrique <samueloph@debian.org>
2017, Lukas Schwaighofer <lukas@schwaighofer.name>
2018, Raphaël Hertzog <hertzog@debian.org>
License: nmap-GPL-2
......
# The Network Mapper - result compare utility is a good and concise short
# description
# The Network Mapper - result compare utility is a good and concise
# short description
description-synopsis-starts-with-article
......@@ -3,3 +3,6 @@ windows-devel-file-in-package usr/share/nmap/nselib/data/psexec/nmap_service.vcp
# .class files are used by NSE scripts jdwp-exec.nse
package-installs-java-bytecode usr/share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class
package-installs-java-bytecode usr/share/nmap/nselib/data/jdwp-class/JDWPSystemInfo.class
# Describes contents/purpose of directory
package-contains-documentation-outside-usr-share-doc usr/share/nmap/nselib/data/psexec/README
package-contains-documentation-outside-usr-share-doc usr/share/nmap/nselib/data/jdwp-class/README.txt
# The Network Mapper is a good and concise short description
description-synopsis-starts-with-article
# false positives
spelling-error-in-binary usr/bin/nping ment meant
spelling-error-in-binary usr/bin/nmap ment meant
......@@ -16,8 +16,8 @@ index c5f4c10..f50029d 100644
GenericName=GUI Port Scanner
-TryExec=su-to-zenmap.sh
-Exec=su-to-zenmap.sh %F
+TryExec=su-to-root
+Exec=su-to-root -X -c zenmap %F
+TryExec=pkexec
+Exec=pkexec /usr/bin/zenmap %F
Terminal=false
Icon=zenmap
Type=Application
Description: Remove ncat's manpage self-reference (closes: #765999)
manpage is generated dynamicaly on upstream, so it is needed to
patch their script instead of the file like this.
Author: Samuel Henrique <samueloph@debian.org>
Forwarded: no
Index: nmap/ncat/docs/ncat.1
===================================================================
--- nmap.orig/ncat/docs/ncat.1
+++ nmap/ncat/docs/ncat.1
@@ -95,7 +95,6 @@ Options taking a time assume seconds\&.
\-\-ssl\-alpn ALPN protocol list to use\&.
\-\-version Display Ncat\*(Aqs version information and exit
-See the ncat(1) manpage for full options, descriptions and usage examples
.fi
.if n \{\
.RE
......@@ -2,3 +2,4 @@
0002-Use-Debian-s-ca-certificates.patch
0003-Link-against-lua-lpeg.patch
0004-library-versions.patch
0005-ncat-manpage-self-reference.patch
......@@ -6,3 +6,4 @@ 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
# The Network Mapper Front End is a good and concise short description
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
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