diff -Nru ike-scan-1.9.4/debian/changelog ike-scan-1.9.4/debian/changelog --- ike-scan-1.9.4/debian/changelog 2018-02-05 16:50:00.000000000 +0000 +++ ike-scan-1.9.4/debian/changelog 2021-02-15 13:19:39.000000000 +0000 @@ -1,3 +1,36 @@ +ike-scan (1.9.4-3ubuntu1) hirsute; urgency=medium + + * Merge with Debian; remaining changes: + - Ignore malformed test comparison, fails on s390x. See LP #1699072. + + -- Matthias Klose Mon, 15 Feb 2021 14:19:39 +0100 + +ike-scan (1.9.4-3) unstable; urgency=medium + + * Team Upload + * Bump DH to 13 + * Bump Standards-Version to 4.5.1 + * Bump d/watch to v4 + * Add salsa-ci.yml + * Configure git-buildpackage for Debian + * d/changelog: Remove trailing whitespace + * d/control: + - Add Rules-Requires-Root: no + - Add VCS-* field + - Fix description by removing a broken empty line (tab + dot) + * d/rules: Export 'hardening=+all' flag + * d/watch: Remove dh-template boilerplate + + -- Samuel Henrique Sun, 31 Jan 2021 23:07:59 +0000 + +ike-scan (1.9.4-2) unstable; urgency=medium + + * Adopt the package in the pkg-security team (Closes: #698994) + * Switch to debhelper compat level 11 + * Bump Standards-Version to 4.2.1 + + -- Raphaël Hertzog Sun, 02 Sep 2018 14:35:05 +0200 + ike-scan (1.9.4-1ubuntu2) bionic; urgency=high * No change rebuild against openssl1.1. @@ -72,19 +105,19 @@ * moved check-* programs from /usr/bin to /usr/share/ike-scan/checks. * Corrected short debian description. - + -- Benoit Mortier Mon, 14 Mar 2005 00:17:00 +0200 ike-scan (1.7-2) unstable; urgency=low * Corrected debian copyright file. - + -- Benoit Mortier Sat, 06 Mar 2005 14:12:00 +0200 ike-scan (1.7-1) unstable; urgency=low * New upstream release. - + -- Benoit Mortier Mon, 21 Feb 2005 10:48:00 +0200 ike-scan (1.6-1) unstable; urgency=low @@ -98,4 +131,3 @@ * Initial Release. -- Benoit Mortier Sat, 13 Dec 2003 12:30:54 +0100 - diff -Nru ike-scan-1.9.4/debian/compat ike-scan-1.9.4/debian/compat --- ike-scan-1.9.4/debian/compat 2016-07-18 20:35:56.000000000 +0000 +++ ike-scan-1.9.4/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru ike-scan-1.9.4/debian/control ike-scan-1.9.4/debian/control --- ike-scan-1.9.4/debian/control 2017-06-20 09:12:58.000000000 +0000 +++ ike-scan-1.9.4/debian/control 2021-02-15 13:19:39.000000000 +0000 @@ -2,13 +2,14 @@ Section: net Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian QA Group -Build-Depends: autotools-dev, - debhelper (>= 9), - dh-autoreconf, - libssl-dev -Standards-Version: 3.9.8 +XSBC-Original-Maintainer: Debian Security Tools +Uploaders: Raphaël Hertzog +Build-Depends: debhelper-compat (= 13), libssl-dev +Standards-Version: 4.5.1 +Rules-Requires-Root: no Homepage: https://github.com/royhills/ike-scan +Vcs-Browser: https://salsa.debian.org/pkg-security-team/ike-scan +Vcs-Git: https://salsa.debian.org/pkg-security-team/ike-scan.git Package: ike-scan Architecture: any @@ -23,12 +24,12 @@ a) Discovery: Determine which hosts are running IKE. This is done by displaying those hosts which respond to the IKE requests sent by ike-scan. - . + . b) Fingerprinting: Determine which IKE implementation the hosts are using. This is done by recording the times of the IKE response packets from the target hosts and comparing the observed retransmission backoff pattern against known patterns. - . + . The retransmission backoff fingerprinting concept is discussed in more detail in the UDP backoff fingerprinting paper which should be included in the ike-scan kit as udp-backoff-fingerprinting-paper.txt. diff -Nru ike-scan-1.9.4/debian/gbp.conf ike-scan-1.9.4/debian/gbp.conf --- ike-scan-1.9.4/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ ike-scan-1.9.4/debian/gbp.conf 2021-01-31 22:20:27.000000000 +0000 @@ -0,0 +1,15 @@ +[DEFAULT] +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 diff -Nru ike-scan-1.9.4/debian/rules ike-scan-1.9.4/debian/rules --- ike-scan-1.9.4/debian/rules 2016-07-18 20:38:39.000000000 +0000 +++ ike-scan-1.9.4/debian/rules 2021-01-31 23:01:49.000000000 +0000 @@ -1,7 +1,9 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: - dh $@ --with autoreconf + dh $@ override_dh_auto_configure: dh_auto_configure -- --with-openssl diff -Nru ike-scan-1.9.4/debian/salsa-ci.yml ike-scan-1.9.4/debian/salsa-ci.yml --- ike-scan-1.9.4/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ ike-scan-1.9.4/debian/salsa-ci.yml 2021-01-31 22:20:27.000000000 +0000 @@ -0,0 +1,4 @@ +--- +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 diff -Nru ike-scan-1.9.4/debian/watch ike-scan-1.9.4/debian/watch --- ike-scan-1.9.4/debian/watch 2016-07-18 20:34:05.000000000 +0000 +++ ike-scan-1.9.4/debian/watch 2021-01-31 22:52:29.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/-$1\.tar\.gz/ \ +version=4 +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/ike-scan-$1\.tar\.gz/ \ https://github.com/royhills/ike-scan/tags .*/v?(\d\S*)\.tar\.gz