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

Import Debian changes 7.80+dfsg1-5

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

  * Make nmap_service.ex_ reproducible, thanks to Chris Lamb for the patch
    (Closes: #964369)

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

  * Revert "Enable running all tests" as this caused network activity and
    FTBFS on some autobuilders.

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

  [ Hilko Bengen ]
  * Enable running all tests
  * Ship obfuscated nmap_service.ex_ instead of nmap_service.exe (Closes:
    #929272)

  [ Samuel Henrique ]
  * Configure git-buildpackage for Debian
  * d/control: Add Rules-Requires-Root: no
  * Bump DH to 13
  * d/p/upstream/signing-key.asc: Remove extra signature
  * Bump Standards Version to 4.5.0

  [ Automatic changes ]
  * Trim trailing whitespace.
  * Wrap long lines in changelog entries: 6.25-0.2, 4.76-0ubuntu1.
  * Set debhelper-compat version in Build-Depends.
  * Fix field name typos in debian/copyright.
parent a1f3a4fe
nmap (7.80+dfsg1-5) unstable; urgency=medium
* Make nmap_service.ex_ reproducible, thanks to Chris Lamb for the patch
(Closes: #964369)
-- Hilko Bengen <bengen@debian.org> Mon, 06 Jul 2020 23:01:39 +0200
nmap (7.80+dfsg1-4) unstable; urgency=medium
* Revert "Enable running all tests" as this caused network activity and
FTBFS on some autobuilders.
-- Hilko Bengen <bengen@debian.org> Sat, 04 Jul 2020 17:00:00 +0200
nmap (7.80+dfsg1-3) unstable; urgency=medium
[ Hilko Bengen ]
* Enable running all tests
* Ship obfuscated nmap_service.ex_ instead of nmap_service.exe (Closes:
#929272)
[ Samuel Henrique ]
* Configure git-buildpackage for Debian
* d/control: Add Rules-Requires-Root: no
* Bump DH to 13
* d/p/upstream/signing-key.asc: Remove extra signature
* Bump Standards Version to 4.5.0
[ Automatic changes ]
* Trim trailing whitespace.
* Wrap long lines in changelog entries: 6.25-0.2, 4.76-0ubuntu1.
* Set debhelper-compat version in Build-Depends.
* Fix field name typos in debian/copyright.
-- Hilko Bengen <bengen@debian.org> Sat, 04 Jul 2020 15:34:56 +0200
nmap (7.80+dfsg1-2) unstable; urgency=medium
[ Samuel Henrique ]
......@@ -373,7 +409,8 @@ nmap (6.40-0.1) unstable; urgency=low
nmap (6.25-0.2) unstable; urgency=low
* Non-maintainer upload.
* debian/rules: Make sure zenmap is built again (tabs vs. spaces), other cleanups
* debian/rules: Make sure zenmap is built again (tabs vs. spaces), other
cleanups
-- Hilko Bengen <bengen@debian.org> Mon, 27 May 2013 22:02:16 +0200
......@@ -437,7 +474,7 @@ nmap (5.51.6-0.2) unstable; urgency=low
nmap (5.51.6-0.1) unstable; urgency=low
* Non-maintainer upload
* New upstream version (Closes: #630144)
* New upstream version (Closes: #630144)
* Added watch file
* Simplified debian/*.files, added translated manpages (Closes: #358336)
* Added Python dependency for ndiff to nmap package
......@@ -498,7 +535,7 @@ nmap (5.00-3) unstable; urgency=low
nmap (5.00-2) unstable; urgency=low
* rules: fix dependencies for -j. Closes: #541984
* Conflicts: ndiff. Different enough to not warrant Replaces.
* Conflicts: ndiff. Different enough to not warrant Replaces.
Closes: #542054
* new config.guess, updated rules for same. Closes: #542079
......@@ -536,7 +573,8 @@ nmap (4.76-0ubuntu2) jaunty; urgency=low
nmap (4.76-0ubuntu1) jaunty; urgency=low
* New upstream release (LP: #268996)
* Edit broken links in debian/nmap.files, debian/zenmap.dirs, debian/zenmap.files
* Edit broken links in debian/nmap.files, debian/zenmap.dirs,
debian/zenmap.files
* Edit path to pixmaps in debian/rules
-- Petr E. Antonov <Petr.E.Antonov@gmail.com> Mon, 19 Jan 2009 10:24:39 +0100
......@@ -1106,5 +1144,3 @@ nmap (1.30-1) unstable; urgency=low
* initial release
-- Bdale Garbee <bdale@gag.com> Tue, 16 Dec 1997 00:40:01 -0700
......@@ -5,7 +5,7 @@ Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
Uploaders: Hilko Bengen <bengen@debian.org>,
Samuel Henrique <samueloph@debian.org>
Build-Depends: bison,
debhelper (>=12~),
debhelper-compat (= 13),
dh-python,
flex,
liblinear-dev,
......@@ -19,7 +19,8 @@ Build-Depends: bison,
python3,
Build-Depends-Indep: default-jdk-headless,
gcc-mingw-w64-i686
Standards-Version: 4.4.0
Standards-Version: 4.5.0
Rules-Requires-Root: no
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
......
......@@ -44,8 +44,8 @@ Copyright: 2001-2008, Insecure.Com LLC
License: retain-copyright-cisco
Files: docs/style/*
copyright: 2011, Patrick Joseph Donnelly
License: unlimited-retain-copyright
Copyright: 2011, Patrick Joseph Donnelly
Files: libdnet-stripped/*
Copyright: 2000-2006, Dug Song <dugsong@monkey.org>
......
[DEFAULT]
debian-branch=debian/master
debian-branch = debian/master
pristine-tar = True
[buildpackage]
sign-tags = True
[import-orig]
filter-pristine-tar = True
[pq]
patch-numbers = False
[dch]
multimaint-merge = True
#!/bin/sh
set -e
case "$1" in
configure)
tac /usr/share/nmap/nselib/data/psexec/nmap_service.ex_ | base64 -d | zcat > /usr/share/nmap/nselib/data/psexec/nmap_service.exe ;;
abort-upgrade|abort-remove|abort-deconfigure) ;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0
#!/bin/sh
set -e
case "$1" in
remove|upgrade|deconfigure)
rm -f /usr/share/nmap/nselib/data/psexec/nmap_service.exe ;;
failed-upgrade) ;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0
......@@ -13,7 +13,7 @@ endif
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
rm -f nselib/data/jdwp-class/*.class nselib/data/psexec/nmap_service.ex*
override_dh_auto_configure:
dh_auto_configure -- \
......@@ -29,7 +29,9 @@ 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 ${CPPFLAGS} ${CFLAGS} -o nmap_service.exe nmap_service.c
cd nselib/data/psexec && \
i686-w64-mingw32-gcc ${CPPFLAGS} ${CFLAGS} -o nmap_service.exe nmap_service.c && \
gzip -c -n9 nmap_service.exe | base64 | tac > nmap_service.ex_
override_dh_auto_test:
dh_auto_test --sourcedir=ndiff --buildsystem=pybuild
......@@ -40,8 +42,7 @@ override_dh_auto_install:
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 --fail-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
dh_install -X/usr/bin/uninstall_ -Xca-bundle.crt -X.pyc -Xnmap_service.exe
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.1 (GNU/Linux)
mQGiBEJrBfgRBADogo5DEoGsm2C3OC3NoKBQ0J7Ixp/cymuMeGQmDhqP6Vfmxmso
BGln4nhDr3WMDW76Q2p6dHTZEbWx3NAna8q3wa3PrPTVRcmEgEgUd8y086I33NqW
......@@ -12,20 +11,19 @@ vlZkLggRXQrig6aHgVva3WC+gSYMk+SPtzYNrjWiDE+v+DoEFdNEuO8DXScTMGmB
pmUtZNWGoK9ewo9kE/ccGDl6lmrxfC9x2nYFHlCvV/PJrbTbfLQzTm1hcCBQcm9q
ZWN0IFNpZ25pbmcgS2V5IChodHRwOi8vd3d3Lmluc2VjdXJlLm9yZy8piF4EExEC
AB4FAkJrBfgCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQAa+fA2uTVdBGbACf
e4qpukKV23yZjlbjEzJeCN8Gyh4AniXrbP7M+ul6zzWTFBgB6heYjKT8iEYEEBEC
AAYFAkJrGVAACgkQGvbsUDNZm1+kXgCfbBGI8UxrwiKRbtgYHOUYd6u5qdwAnRFZ
ryKFEzkuQGBQWfd6ys6ygjgtuQINBEJrBfoQCADUNWhc7n68jANoWAWl38itVGqI
qZEEvchV3m/uslVD0BSn/KRSY9/cZbMTX2hV8eemlGV2suJW4jWB0cQXjZQap4OL
WmMexeFA+q1YE803k0X4XgzRuJXkLaX3isCJGbgFRF6IfWmK38/gXz4YVBQXFQXy
4M2Y/o2GBsq8cQVgRAZNTQvN5oh2u8WN0wANk+iKySKqBG3Twgh4BbTaoajidSFR
hv3xFPw6dQFTd3fYyDlMcOQQcAdzzlS6hTyZuZLOXLdWckilnlP2/orQ5wUs6nXd
QeWuxME56z2vwNNeufoLWqNUlR1/IyRAfownDuvdjxYeIgsDd4DP+jInCpPzAAMG
CACZ8ewQdpWJ/4CgC7OT865DurNIQH0udm/CSB0mb3v0IxuuXMJml2yMi2NkJh8X
KMaluTznz2x8kpPXgmhu+qosAi+YUbdbP+/ilY6+WqLVQewSr7GmxJy6EWW5s2+S
3V7yneiDQXBUBMr4WwjfOxX7m/+Io7RSLQaWNq82C2fSukqpootVgLV7CaVJMHvZ
iA+3AL32N1d6O6h8bUqEyfOw3kIr19e0OhqWSpQrZs3tkUpwH7/vn/4NkAxjodkP
JChf1Y89pU98GBC9JxF+mc2mnDVUnUs31S8kQ/6PhZP8ldn47W2CakHSA3S/M99A
gltKiG6MR2z018fqD8FJC3tLiEkEGBECAAkFAkJrBfoCGwwACgkQAa+fA2uTVdBM
QgCfciVPJeohzn5mJ4WGE/6B1CyCOIYAn2ghTW1IKTP+tfOgxVg/p8HJOoiz
=18Dk
e4qpukKV23yZjlbjEzJeCN8Gyh4AniXrbP7M+ul6zzWTFBgB6heYjKT8uQINBEJr
BfoQCADUNWhc7n68jANoWAWl38itVGqIqZEEvchV3m/uslVD0BSn/KRSY9/cZbMT
X2hV8eemlGV2suJW4jWB0cQXjZQap4OLWmMexeFA+q1YE803k0X4XgzRuJXkLaX3
isCJGbgFRF6IfWmK38/gXz4YVBQXFQXy4M2Y/o2GBsq8cQVgRAZNTQvN5oh2u8WN
0wANk+iKySKqBG3Twgh4BbTaoajidSFRhv3xFPw6dQFTd3fYyDlMcOQQcAdzzlS6
hTyZuZLOXLdWckilnlP2/orQ5wUs6nXdQeWuxME56z2vwNNeufoLWqNUlR1/IyRA
fownDuvdjxYeIgsDd4DP+jInCpPzAAMGCACZ8ewQdpWJ/4CgC7OT865DurNIQH0u
dm/CSB0mb3v0IxuuXMJml2yMi2NkJh8XKMaluTznz2x8kpPXgmhu+qosAi+YUbdb
P+/ilY6+WqLVQewSr7GmxJy6EWW5s2+S3V7yneiDQXBUBMr4WwjfOxX7m/+Io7RS
LQaWNq82C2fSukqpootVgLV7CaVJMHvZiA+3AL32N1d6O6h8bUqEyfOw3kIr19e0
OhqWSpQrZs3tkUpwH7/vn/4NkAxjodkPJChf1Y89pU98GBC9JxF+mc2mnDVUnUs3
1S8kQ/6PhZP8ldn47W2CakHSA3S/M99AgltKiG6MR2z018fqD8FJC3tLiEkEGBEC
AAkFAkJrBfoCGwwACgkQAa+fA2uTVdBMQgCfciVPJeohzn5mJ4WGE/6B1CyCOIYA
n2ghTW1IKTP+tfOgxVg/p8HJOoiz
=zXNT
-----END PGP PUBLIC KEY BLOCK-----
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