Bug#862043: unblock: fwsnort/1.6.5-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package fwsnort 1.6.5-3.
It fixes two bug reports (1 RC, 1 important) and fixes the DEP-5
debian/copyright syntax (lintian warning
dep5-copyright-license-name-not-unique).
My patch for the RC bug already has been accepted upstream and
triggered a new upstream release (1.6.7).
Additionally it contains the following changes:
* Adding a debian/gbp.conf to declare the non-standard git branch
being used. This should be a no-op for building the package from
source, but fixes building the package from git.
* Updating Vcs-Git to declare the non-standard branch, too.
* Update the Maintainer field as the package has been orphaned due to
Franck Joncourt's retirement.
diff -Nru fwsnort-1.6.5/debian/changelog fwsnort-1.6.5/debian/changelog
--- fwsnort-1.6.5/debian/changelog 2014-08-30 19:11:55.000000000 +0200
+++ fwsnort-1.6.5/debian/changelog 2017-05-07 11:47:15.000000000 +0200
@@ -1,3 +1,23 @@
+fwsnort (1.6.5-3) unstable; urgency=medium
+
+ * QA upload.
+ * Remove all fwsnort generated firewall rules upon purge.
+ (Closes: #861999)
+ * Fix debian/copyright syntax by using a separate License stanza.
+
+ -- Axel Beckert <abe@debian.org> Sun, 07 May 2017 11:47:15 +0200
+
+fwsnort (1.6.5-2) unstable; urgency=medium
+
+ * Orphan the package. (See #831274.)
+ + Set Maintainer to Debian QA Group.
+ * Add a debian/gbp.conf and "-b debian" to Vcs-Git to reflect the git
+ repository layout.
+ * Add patch to also remove square brackets from single port definitions.
+ (Closes: #860164)
+
+ -- Axel Beckert <abe@debian.org> Sat, 06 May 2017 16:17:38 +0200
+
fwsnort (1.6.5-1) unstable; urgency=low
* Imported Upstream version 1.6.5
diff -Nru fwsnort-1.6.5/debian/control fwsnort-1.6.5/debian/control
--- fwsnort-1.6.5/debian/control 2014-08-30 19:11:55.000000000 +0200
+++ fwsnort-1.6.5/debian/control 2017-05-07 11:12:59.000000000 +0200
@@ -3,9 +3,9 @@
Priority: optional
Build-Depends: debhelper (>= 8)
Build-Depends-Indep: po-debconf
-Maintainer: Franck Joncourt <franck@debian.org>
+Maintainer: Debian QA Group <packages@qa.debian.org>
Standards-Version: 3.9.5
-Vcs-git: git://anonscm.debian.org/collab-maint/fwsnort.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/fwsnort.git -b debian
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/fwsnort.git;a=summary
Homepage: http://www.cipherdyne.org/fwsnort/
diff -Nru fwsnort-1.6.5/debian/copyright fwsnort-1.6.5/debian/copyright
--- fwsnort-1.6.5/debian/copyright 2014-08-30 19:11:55.000000000 +0200
+++ fwsnort-1.6.5/debian/copyright 2017-05-07 11:43:40.000000000 +0200
@@ -6,14 +6,17 @@
Files: *
Copyright: Copyright 2003-2012 by Michael B. Rash <mbr@cipherdyne.com>
License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version. You can find a copy of it in your
- Debian system under /usr/share/common-licenses/
Files: debian/*
Copyright: Copyright 2008-2012 by Franck Joncourt <franck@debian.org>
License: GPL-2+
+Comment:
Debian packaging is licensed under the same terms as the software itself
(see above).
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version. You can find a copy of it in your
+ Debian system under /usr/share/common-licenses/
diff -Nru fwsnort-1.6.5/debian/fwsnort.postrm fwsnort-1.6.5/debian/fwsnort.postrm
--- fwsnort-1.6.5/debian/fwsnort.postrm 2014-08-30 19:11:55.000000000 +0200
+++ fwsnort-1.6.5/debian/fwsnort.postrm 2017-05-07 11:43:40.000000000 +0200
@@ -5,6 +5,11 @@
# In case the user wants to purge the fwsnort package, we must manually remove
# some files.
if [ "$1" = "purge" ]; then
+ # Remove all fwsnort generated firewall rules
+ if [ -f /var/lib/fwsnort/fwsnort.save ]; then
+ echo "[+] Reverting to original iptables policy..."
+ grep -Fv FWSNORT /var/lib/fwsnort/fwsnort.save | iptables-restore
+ fi
# Remove old log files (default directory)
if [ -d /var/log/fwsnort ]; then
diff -Nru fwsnort-1.6.5/debian/gbp.conf fwsnort-1.6.5/debian/gbp.conf
--- fwsnort-1.6.5/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100
+++ fwsnort-1.6.5/debian/gbp.conf 2017-05-06 12:18:38.000000000 +0200
@@ -0,0 +1,4 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+debian-branch = debian
diff -Nru fwsnort-1.6.5/debian/patches/fix-dport-bracket-usage.patch fwsnort-1.6.5/debian/patches/fix-dport-bracket-usage.patch
--- fwsnort-1.6.5/debian/patches/fix-dport-bracket-usage.patch 1970-01-01 01:00:00.000000000 +0100
+++ fwsnort-1.6.5/debian/patches/fix-dport-bracket-usage.patch 2017-05-07 11:12:59.000000000 +0200
@@ -0,0 +1,28 @@
+Description: Also remove square brackets from single port definitions
+Bug-Debian: https://bugs.debian.org/860164
+Forwarded: https://github.com/mrash/fwsnort/pull/14
+
+--- a/fwsnort
++++ b/fwsnort
+@@ -1137,10 +1137,10 @@
+ }
+
+ for my $var (qw(sport dport)) {
++ $hsh{$var} =~ s/\[//;
++ $hsh{$var} =~ s/\]//;
+ next unless $hsh{$var} =~ /,/;
+ if ($ipt_have_multiport_match) {
+- $hsh{$var} =~ s/\[//;
+- $hsh{$var} =~ s/\]//;
+ my $ctr = 1;
+ my @ports = split /\s*,\s*/, $hsh{$var};
+ my $ports_str = '';
+@@ -1162,8 +1162,6 @@
+ "$hsh{$var} until the $ipt_str multiport match is supported " .
+ "at line: $line_num.");
+ $hsh{$var} =~ s/,.*//;
+- $hsh{$var} =~ s/\[//;
+- $hsh{$var} =~ s/\]//;
+ }
+ }
+
diff -Nru fwsnort-1.6.5/debian/patches/series fwsnort-1.6.5/debian/patches/series
--- fwsnort-1.6.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ fwsnort-1.6.5/debian/patches/series 2017-05-07 11:12:59.000000000 +0200
@@ -0,0 +1 @@
+fix-dport-bracket-usage.patch
So please...
unblock fwsnort/1.6.5-3
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (990, 'unstable'), (980, 'unstable-debug'), (600, 'testing'), (111, 'buildd-unstable'), (111, 'buildd-experimental'), (110, 'experimental'), (105, 'experimental-debug')
Architecture: amd64
(x86_64)
Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: