On 2013-04-19 12:18, Jerome BENOIT wrote:
| Hello Jari,
|
| I have just uploaded my last version of the firehol debian package
| which your recent bug report.
Good. I went through all the closed bug reports and updated Debian BTS
for missing "patch" tags.
Here are couple of minor updates:
1. Patch: a small gesture to mention people that have helped.
2. Patch: clean up whitespaces
Thanks,
Jari
>From 042d7ba3f193f65cf67b274d357bd5b305ea05dd Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 19 Apr 2013 15:56:17 +0300
Subject: [PATCH 1/2] debian/changelog: Credit people that have helped by
sending patches
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/changelog | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0fd5a26..7e912dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,15 @@ firehol (1.296-1) unstable; urgency=low
* New maintainer (Closes: #660524).
* New upstream version (Closes: #607785).
- Removed depedency to get-iana.sh and to RESERVED_IPS
- (Closes: #583176, #565737, #574458, #598324, #455754, #536609, #558288)
+ (Closes: #583176, #565737, #574458, #598324, #455754, #536609, #558288).
+ For #536609 patch thanks to Cristian Ionescu-Idbohrn
+ <[email protected]>. For #583176 patch thanks to
+ Adrian Bridgett <[email protected]>.
- Updated documentations (Closes: #571727)
- Improved kernel modules management (Closes: #610249)
- Simplified quoting in log prefix (Closes: #443051) (LP: #253843)
- - Minor improvements and fixes (Closes: #563655)
+ - Passive FTP fix (Closes: #563655). Patch thanks to
+ Toni Mueller <[email protected]>.
* Update to source format 3.0 (quilt).
* Bump debhelper build-dep to >= 9.
* Bump Standards Version to 3.9.4.
@@ -30,9 +34,10 @@ firehol (1.296-1) unstable; urgency=low
thanks to Phil Whineray for hardening the original RedHat patch.
* Temporary files are now left behind in case of error (Closes: #703341),
thanks to Phil Whineray who backported the sanewall patch to FireHOL.
- * `panic' option has been rationalized (Closes: #536675),
- thanks to Andrew Schulman and Phil Whineray.
- * Standard patch naming (Closes: #705731).
+ * `panic' option has been rationalized (Closes: #536675). Patch
+ thanks to Andrew Schulman. Also thanks to Phil Whineray.
+ * Use standard *.patch naming suffix (Closes: #705731). Patch thanks to
+ Jari Aalto <[email protected]>.
-- Jerome Benoit <[email protected]> Fri, 19 Apr 2013 10:01:21 +0000
--
1.7.10.4
>From 4a7c6196ae337b9933fec96cb55fec391656b31d Mon Sep 17 00:00:00 2001
From: Jari Aalto <[email protected]>
Date: Fri, 19 Apr 2013 16:03:51 +0300
Subject: [PATCH 2/2] Clean up whitespaces
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <[email protected]>
---
debian/NEWS | 2 +-
debian/README.Debian | 8 ++++----
debian/README.Services | 7 +++----
debian/changelog | 28 ++++++++++++++--------------
debian/firehol.init | 2 +-
debian/get-iana.1 | 6 +++---
debian/get-iana.1.txt | 12 ++++++------
7 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
index 80afd77..de0f391 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -18,6 +18,6 @@ firehol (1.256-1) unstable; urgency=low
the lib. That will make updates much easier in the future.
get-iana (a script for updating the list of reserved ips) is now available
you can run it regulary to update your ip list. Its recommended to install
- the aggregate package to aggregate the ip ranges from the iana.
+ the aggregate package to aggregate the ip ranges from the iana.
-- Alexander Wirt <[email protected]> Thu, 30 Aug 2007 17:18:22 +0200
diff --git a/debian/README.Debian b/debian/README.Debian
index 3349b1d..b78d6f4 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,13 +1,13 @@
firehol for Debian GNU/Linux
----------------------------
-You have to enable firehol in /etc/default/firehol to
+You have to enable firehol in /etc/default/firehol to
get firehol starting. To enable it set START_FIREHOL to anything
-else than NO/no.
+else than NO/no.
You should also give firehol-wizard a try for generating
-a starting configuration. To launch firehol-wizard just start /sbin/firehol
-with the wizard parameter (/sbin/firehol wizard).
+a starting configuration. To launch firehol-wizard just start /sbin/firehol
+with the wizard parameter (/sbin/firehol wizard).
If you want to have firehol waiting until a device is up before
it proceeds the firewall rules you can add it in WAIT_FOR_IFACE
diff --git a/debian/README.Services b/debian/README.Services
index ed224c3..b454eb4 100644
--- a/debian/README.Services
+++ b/debian/README.Services
@@ -2,15 +2,15 @@ Adding additional services to firehol
=====================================
Since version 1.214 it is possible to define new
-services with extra config files dropped into
+services with extra config files dropped into
/etc/firehol/services. Every file with the ending
-.conf gets parsed.
+.conf gets parsed.
Any config file should start with a specical header:
#FHVER: 1:213
-1 is the API version and 213 the minimum version of FireHOL
+1 is the API version and 213 the minimum version of FireHOL
the service is expected to work with.
Inside the configfile you could use any service defintion
as described at: http://firehol.sourceforge.net/adding.html?
@@ -30,4 +30,3 @@ You could find this file under the
examples dir in /usr/share/doc/firehol.
-- Alexander Wirt <[email protected]> Thu, 23 Dec 2004 15:33:52 +0100
-
diff --git a/debian/changelog b/debian/changelog
index 7e912dd..565cccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,7 +46,7 @@ firehol (1.273-1) unstable; urgency=low
* New upstream release
- support /proc/config.gz (Closes: #465319)
- works without less (Closes: #494941)
- * Update RESERVED_IPS
+ * Update RESERVED_IPS
* fix comment in /etc/default/firehol (Closes: #521873)
* Suggest ulogd (Closes: #555528)
@@ -54,7 +54,7 @@ firehol (1.273-1) unstable; urgency=low
firehol (1.256-4) unstable; urgency=low
- * Update list of reserved IPs (Closes: #455752, #479897)
+ * Update list of reserved IPs (Closes: #455752, #479897)
* Move get-iana to /usr/sbin
* Make get-iana working again (Closes: #470879)
* Fix get-iana name in firehol output (Closes: #475352)
@@ -73,8 +73,8 @@ firehol (1.256-3) unstable; urgency=low
firehol (1.256-2) unstable; urgency=low
* Add OpenVPN support (Closes: #440916)
- * Allow lower and mixed case for START_FIREHOL.
- Old logic (start if != NO) got also restored.
+ * Allow lower and mixed case for START_FIREHOL.
+ Old logic (start if != NO) got also restored.
(Closes: #440919)
-- Alexander Wirt <[email protected]> Wed, 05 Sep 2007 22:54:53 +0200
@@ -95,14 +95,14 @@ firehol (1.256-1) unstable; urgency=low
firehol (1.231-7) unstable; urgency=low
- * Remove bashism from init script (Closes: #390726)
+ * Remove bashism from init script (Closes: #390726)
-- Alexander Wirt <[email protected]> Tue, 3 Oct 2006 12:52:57 +0200
firehol (1.231-6) unstable; urgency=low
* Remove simple dhcp config (Closes: #390178)
- * Switch initfile to LSB conformance
+ * Switch initfile to LSB conformance
-- Alexander Wirt <[email protected]> Fri, 29 Sep 2006 18:44:27 +0200
@@ -117,17 +117,17 @@ firehol (1.231-5) unstable; urgency=low
* Updates description (Closes: #359221)
* Changed client range to 1000:65535 (Closes: #357034)
* Fixed some spelling error in the package description (Closes: #363413)
- * Backported some fix the nfs service
+ * Backported some fix the nfs service
* Backported service ospf from cvs
* Backported a fix for the spf client from cvs
* Backported a fix for the sip service
- * Backported recent feature
+ * Backported recent feature
-- Alexander Wirt <[email protected]> Fri, 21 Jul 2006 17:52:29 +0200
firehol (1.231-4) unstable; urgency=low
- * Cleaned up tempdir creation and removal in firehol-wizard
+ * Cleaned up tempdir creation and removal in firehol-wizard
(Closes: #324598). Thanks to Javier Fernández-Sanguino Peña for the patch
-- Alexander Wirt <[email protected]> Tue, 23 Aug 2005 07:23:29 +0200
@@ -146,7 +146,7 @@ firehol (1.231-2) unstable; urgency=medium
firehol (1.231-1) unstable; urgency=low
- * New upstream release (Closes: #303560)
+ * New upstream release (Closes: #303560)
-- Alexander Wirt <[email protected]> Fri, 8 Apr 2005 20:40:43 +0200
@@ -162,7 +162,7 @@ firehol (1.214-2) unstable; urgency=high
* Fixed wrong named variable in the lan-gateway.conf example
(Closes: #289211)
* Added the possibility to wait for an interface if set in
- /etc/default/firehol. See README.Debian for more infos
+ /etc/default/firehol. See README.Debian for more infos
(Closes: #291667) Thanks again to Sam Couter for the patch.
-- Alexander Wirt <[email protected]> Sat, 22 Jan 2005 15:11:18 +0100
@@ -190,7 +190,7 @@ firehol (1.191-1) unstable; urgency=low
* New Upstream Release
+ Better Kernel Module managment (Closes: #244241, #242062)
* Fixed description so that new users doesn't get scared (Closes: #243102)
- * Fixed /etc/default/firehol handling (Closes: #245307)
+ * Fixed /etc/default/firehol handling (Closes: #245307)
Thanks Michael Ablassmeier for the patch.
* Mentioned firehol-wizard in the new README.Debian
* Moved firehol and firehol-wizard manpages into the correct section
@@ -253,7 +253,7 @@ firehol (1.129+cvs+20030601-1) unstable; urgency=low
* Splitted firehol.sh in 2 scripts (firehol.sh, firehol-wizard.sh),
created a lib and a init-script.
- * Changed startup order to create an iptables firewall before
+ * Changed startup order to create an iptables firewall before
configuring the network devices (and stop it after deconfiguring
them)
@@ -278,7 +278,7 @@ firehol (1.128-3) unstable; urgency=low
firehol (1.128-2) unstable; urgency=low
* Fixed use of /var/lock/subsys/*
-
+
-- Marc Brockschmidt <[email protected]> Thu, 01 May 2003 21:45:00 +0200
firehol (1.128-1) unstable; urgency=low
diff --git a/debian/firehol.init b/debian/firehol.init
index 65d62bb..9d988c5 100644
--- a/debian/firehol.init
+++ b/debian/firehol.init
@@ -35,7 +35,7 @@ COMMAND="$1"
test -n "$1" && shift
case "$COMMAND" in
- start)
+ start)
if [ "$START_FIREHOL" = "NO" ]; then
log_warning_msg "$DESC disabled via /etc/default/firehol"
exit 0
diff --git a/debian/get-iana.1 b/debian/get-iana.1
index 7781059..06c5b94 100644
--- a/debian/get-iana.1
+++ b/debian/get-iana.1
@@ -1,9 +1,9 @@
.\" Title: get-iana
-.\" Author:
+.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
.\" Date: 08/30/2007
-.\" Manual:
-.\" Source:
+.\" Manual:
+.\" Source:
.\"
.TH "GET\-IANA" "1" "08/30/2007" "" ""
.\" disable hyphenation
diff --git a/debian/get-iana.1.txt b/debian/get-iana.1.txt
index 9c8c596..bf987e7 100644
--- a/debian/get-iana.1.txt
+++ b/debian/get-iana.1.txt
@@ -4,7 +4,7 @@ Costa Tsaousis <[email protected]>
NAME
----
-get-iana - updates the list of reserved ips from the IANA for usage from firehol
+get-iana - updates the list of reserved ips from the IANA for usage from firehol
SYNOPSIS
--------
@@ -14,10 +14,10 @@ DESCRIPTION
-----------
This manual page documents briefly the *get-iana* command.
-*get-iana* fetches the list of reserver networks from the iana website
-(http://www.iana.org/assignments/ipv4-address-space). And formats the for
-inclusion in the firehol(1) firewall script. If available it uses aggregate(1)
-for optimisation of the ip list.
+*get-iana* fetches the list of reserver networks from the iana website
+(http://www.iana.org/assignments/ipv4-address-space). And formats the for
+inclusion in the firehol(1) firewall script. If available it uses aggregate(1)
+for optimisation of the ip list.
SEE ALSO
--------
@@ -25,6 +25,6 @@ firehol(1), aggregate(1)
AUTHOR
------
-get-iana was written by Costa Tsaousis <[email protected]>.
+get-iana was written by Costa Tsaousis <[email protected]>.
This manual page was written by Alexander Wirt <[email protected]>.
--
1.7.10.4
