--- firehol-1.273.orig/debian/conffiles
+++ firehol-1.273/debian/conffiles
@@ -0,0 +1,4 @@
+/etc/init.d/firehol
+/etc/firehol/firehol.conf
+/etc/default/firehol
+/etc/firehol/RESERVED_IPS
--- firehol-1.273.orig/debian/NEWS
+++ firehol-1.273/debian/NEWS
@@ -0,0 +1,9 @@
+firehol (1.256-1) unstable; urgency=low
+
+  This release reverts the split from firehol into firehol-wizard,firehol and
+  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. 
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 30 Aug 2007 17:18:22 +0200
--- firehol-1.273.orig/debian/bittorrent.conf
+++ firehol-1.273/debian/bittorrent.conf
@@ -0,0 +1,3 @@
+#FHVER: 1:213
+server_torrent_ports="tcp/6881:6999"
+client_torrent_ports="default"
--- firehol-1.273.orig/debian/README.source
+++ firehol-1.273/debian/README.source
@@ -0,0 +1,2 @@
+I use dpatch for patch handling inside the firehol package.  Please see
+/usr/share/doc/dpatch/README.source.gz (if you have installed dpatch) for documentation about dpatch.
--- firehol-1.273.orig/debian/README.Debian
+++ firehol-1.273/debian/README.Debian
@@ -0,0 +1,19 @@
+firehol for Debian GNU/Linux
+----------------------------
+
+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. 
+
+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). 
+
+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
+in the defaults file. Firehol then waits until the device is up
+or 60 secs are over.
+
+Thanks to Sam Couter for this contribution.
+
+-- Alexander Wirt <formorer@debian.org>  Fri, 21 Jul 2006 17:52:29 +0200
--- firehol-1.273.orig/debian/copyright
+++ firehol-1.273/debian/copyright
@@ -0,0 +1,27 @@
+This package was debianized by Marc Brockschmidt <marc@dch-faq.de> on
+Thu, 01 May 2003 13:10:00 +0200.
+
+It is available at: http://firehol.sf.net
+
+Upstream Authors: Costa Tsaousis <costa@tsaousis.gr>
+
+Copyright:
+
+Copyright (C) 2002-2003 Costa Tsaousis <costa@tsaousis.gr>
+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.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA 02110-1301, USA.
+
+
+See /usr/share/common-licenses/GPL-2
--- firehol-1.273.orig/debian/firehol.examples
+++ firehol-1.273/debian/firehol.examples
@@ -0,0 +1 @@
+adblock.sh
--- firehol-1.273.orig/debian/changelog
+++ firehol-1.273/debian/changelog
@@ -0,0 +1,251 @@
+firehol (1.273-1.4.201403231504) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Sun, 23 Mar 2014 15:04:02 +0100
+
+firehol (1.273-1) unstable; urgency=low
+
+  * New upstream release
+    - support /proc/config.gz (Closes: #465319)
+    - works without less (Closes: #494941)
+  * Update RESERVED_IPS 
+  * fix comment in /etc/default/firehol (Closes: #521873)
+  * Suggest ulogd (Closes: #555528)
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 14 Nov 2009 21:11:41 +0100
+
+firehol (1.256-4) unstable; urgency=low
+
+  * 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)
+  * Also support wizard parameter in the init script (Closes: #461082)
+  * Don't let initscript fail if there are no parameters (Closes: #489991)
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 18 Jul 2008 22:20:16 +0200
+
+firehol (1.256-3) unstable; urgency=low
+
+  * Adding a patch to 00list helps. Activate the OpenVPN Patch
+    (Closes: #440916)
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 18 Oct 2007 14:13:09 +0200
+
+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. 
+    (Closes: #440919)
+
+ -- Alexander Wirt <formorer@debian.org>  Wed, 05 Sep 2007 22:54:53 +0200
+
+firehol (1.256-1) unstable; urgency=low
+
+  * New upstream version (Closes: #425398)
+  * Removed split - makes updates much easier
+    - This fixes also some problems with the wizard (Closes: #424073)
+    - Restores old condrestart feature (Closes: #324851)
+  * Add support for vlan interfaces in the wizard (Closes: #411662).
+    Thanks to Vincent Danjean for the patch
+  * Add firehol configfile to initscript (Closes: #293873)
+  * Depend on lsb-base (Closes: #420990)
+  * Rename msn to msnp and add msn with port 1863 (Closes: #411846)
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 01 Sep 2007 08:44:26 +0200
+
+firehol (1.231-7) unstable; urgency=low
+
+  * Remove bashism from init script (Closes: #390726) 
+
+ -- Alexander Wirt <formorer@debian.org>  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 
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 29 Sep 2006 18:44:27 +0200
+
+firehol (1.231-5) unstable; urgency=low
+
+  * Added helpme option (starts wizard) to /etc/init.d/firehol
+    (Thanks to Eduard Bloch for the idea) (Closes: #335328)
+  * Updates list of reserved ips (Closes: #357250, Closes: #379127)
+  * Updated manpage (Closes: #335602)
+  * Removed bc from depedencies (Closes: #349409)
+  * Updated manpage for the protection command (Closes: #371832)
+  * 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 service ospf from cvs
+  * Backported a fix for the spf client from cvs
+  * Backported a fix for the sip service
+  * Backported recent feature 
+
+ -- Alexander Wirt <formorer@debian.org>  Fri, 21 Jul 2006 17:52:29 +0200
+
+firehol (1.231-4) unstable; urgency=low
+
+  * Cleaned up tempdir creation and removal in firehol-wizard 
+    (Closes: #324598). Thanks to Javier Fernández-Sanguino Peña for the patch
+
+ -- Alexander Wirt <formorer@debian.org>  Tue, 23 Aug 2005 07:23:29 +0200
+
+firehol (1.231-3) unstable; urgency=low
+
+  * Fixed lockfile deletion (Closes: #315399,#309651)
+
+ -- Alexander Wirt <formorer@debian.org>  Sun, 10 Jul 2005 08:52:50 +0200
+
+firehol (1.231-2) unstable; urgency=medium
+
+  * Create lockfile while starting firehol (Closes: #304853)
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 27 Jul 2006 15:20:26 +0200
+
+firehol (1.231-1) unstable; urgency=low
+
+  * New upstream release (Closes: #303560) 
+
+ -- Alexander Wirt <formorer@debian.org>  Fri,  8 Apr 2005 20:40:43 +0200
+
+firehol (1.214-2) unstable; urgency=high
+
+  * Makes wget and curl check fail silently because the normal user
+    will never need it. Added wget | curl to recommends.
+    (Closes: #291041)
+  * Allow additional argumentens for init script (Closes: #290728)
+    Thanks to Peter Marschall for the patch
+  * Fixed security bug in the tempdir creation (Closes: #291680)
+    Thanks to Sam Couter for pointing to it
+  * 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 
+    (Closes: #291667) Thanks again to Sam Couter for the patch.
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 22 Jan 2005 15:11:18 +0100
+
+firehol (1.214-1) unstable; urgency=low
+
+  * New upstream release (Closes: #279231)
+    + Updated RESERVED_IPS (Closes: #269248)
+  * Removed dependency on less (Closes: #260202)
+  * Added README.Services and bittorrent example
+  * Added openvpn as service (IANA Port from openvpn 2.0)
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 23 Dec 2004 15:33:52 +0100
+
+firehol (1.191-2) unstable; urgency=low
+
+  * Now uses pager instead of hardcoded less (Closes: #258654)
+    Thanks to Itamar Ravid for the patch
+
+ -- Alexander Wirt <formorer@debian.org>  Sun, 18 Jul 2004 15:35:34 +0200
+
+firehol (1.191-1) unstable; urgency=low
+
+  * New Maintainer: Alexander Wirt <formorer@debian.org>
+  * 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) 
+    Thanks Michael Ablassmeier for the patch.
+  * Mentioned firehol-wizard in the new README.Debian
+  * Moved firehol and firehol-wizard manpages into the correct section
+  * Removed gawk dependancy and set GAWK_CMD to awk in firehol-lib (Closes: #250401)
+
+ -- Alexander Wirt <formorer@debian.org>  Sat, 22 May 2004 18:39:45 +0200
+
+firehol (1.182+cvs+20040325-2) unstable; urgency=low
+
+  * Also search for the kernel config in /boot/config-`uname -r`. (Closes:
+    #241171)
+  * Don't die if we don't find lsmod and modprobe, only warn if they would be
+    needed. (Closes: #241172)
+  * debian/control: Recommend modutils | module-init-tools.
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Wed, 31 Mar 2004 15:29:16 +0200
+
+firehol (1.182+cvs+20040325-1) unstable; urgency=low
+
+  * New upstream source (no release, but stable):
+    + Fixed cups rule (Closes: #216632)
+  * debian/control:
+    + I'm a DD now!
+    + Bumped Standards-Version to 3.6.1 (no changes)
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Thu, 25 Mar 2004 21:05:42 +0100
+
+firehol (1.159-1) unstable; urgency=low
+
+  * New upstream release:
+     - New helper functions MARK and BLACKLIST
+     - Better support for kernel series 2.[56]
+     - Added lockd support in service NFS, suggested by Daniel Pittman
+     - New rules for TFTP, XDMCP and Veritas NetBackup.
+    (Closes: #214570)
+  * Fixed bashisms in debian/rules. Thanks Domenico Andreoli for the patch.
+    (Closes: #209366)
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Sat, 18 Oct 2003 15:53:05 +0200
+
+firehol (1.146+cvs+20030729-1) unstable; urgency=low
+
+  * New upstream release.
+  * Included patch from Daniel Pittman (Thanks!) fixing a typo in firehol
+    which resulted in trying to load the ip_tables module in all cases.
+    (Closes: #200571)
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Tue, 29 Jul 2003 02:02:05 +0200
+
+firehol (1.132+cvs+20030611-1) unstable; urgency=low
+
+  * New upstream version (shortened list of reserved IPs, 2 new
+    services: dcpp and msn)
+  * New upstream version (with manpage for firehol.conf(5)).
+  * Updated to Standards-Version 3.5.10.
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Tue, 10 Jun 2003 23:30:12 +0200
+
+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 
+    configuring the network devices (and stop it after deconfiguring
+    them)
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Sun, 01 Jun 2003 19:15:00 +0200
+
+firehol (1.128-4) unstable; urgency=low
+
+  * Fixed console messages from the init script (see Debian Policy,
+    chapter 10.4)
+  * Cleaned the startup code a bit...
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Sat, 10 May 2003 12:54:48 +0200
+
+firehol (1.128-3) unstable; urgency=low
+
+  * Cleaned debian/rules a bit.
+  * Now uses /etc/default/firehol to determine wether it is configured
+    or not.
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Sun, 05 May 2003 19:53:20 +0200
+
+firehol (1.128-2) unstable; urgency=low
+
+  * Fixed use of /var/lock/subsys/*
+ 
+ -- Marc Brockschmidt <marc@dch-faq.de>  Thu, 01 May 2003 21:45:00 +0200
+
+firehol (1.128-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Marc Brockschmidt <marc@dch-faq.de>  Thu, 01 May 2003 13:10:00 +0200
--- firehol-1.273.orig/debian/postrm
+++ firehol-1.273/debian/postrm
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+case "$1" in
+	remove)
+		;;
+
+	purge)
+		update-rc.d -f firehol remove >/dev/null
+		;;
+
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+		;;
+esac
--- firehol-1.273.orig/debian/postinst
+++ firehol-1.273/debian/postinst
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+if [ -f /etc/firehol.conf ]
+then
+	mv -f /etc/firehol.conf /etc/firehol/firehol.conf
+	echo
+	echo
+	echo "FireHOL has now its configuration in /etc/firehol/firehol.conf"
+	echo "Your existing configuration has been moved to its new place."
+	echo
+fi
+
+case "$1" in
+	configure)
+		if [ -x "/etc/init.d/firehol" ]; then
+			update-rc.d firehol defaults >/dev/null
+		fi
+		;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+		;;
+esac
--- firehol-1.273.orig/debian/control
+++ firehol-1.273/debian/control
@@ -0,0 +1,19 @@
+Source: firehol
+Section: net
+Priority: optional
+Maintainer: Alexander Wirt <formorer@debian.org>
+Uploaders: Marc 'HE' Brockschmidt <he@debian.org>
+Build-Depends: dpatch
+Standards-Version: 3.8.3
+
+Package: firehol
+Architecture: all
+Depends: iptables (>= 1.2.4), iproute, net-tools, bash (>= 2.04), lsb-base
+Recommends: modutils | module-init-tools, wget | curl, aggregate
+Suggests: ulogd
+Description: An easy to use but powerful iptables stateful firewall
+ Generates generic firewalls with an extremely simple but powerful
+ configuration language, enabling you to design any kind of local
+ or routing stateful packet filtering firewall with ease.
+ .
+ Firehol does not support ipv6.
--- firehol-1.273.orig/debian/RESERVED_IPS
+++ firehol-1.273/debian/RESERVED_IPS
@@ -0,0 +1,21 @@
+0.0.0.0/7
+5.0.0.0/8
+10.0.0.0/8
+14.0.0.0/8
+23.0.0.0/8
+27.0.0.0/8
+31.0.0.0/8
+36.0.0.0/7
+39.0.0.0/8
+42.0.0.0/8
+49.0.0.0/8
+50.0.0.0/8
+100.0.0.0/6
+104.0.0.0/6
+127.0.0.0/8
+176.0.0.0/7
+179.0.0.0/8
+181.0.0.0/8
+185.0.0.0/8
+223.0.0.0/8
+240.0.0.0/4
--- firehol-1.273.orig/debian/README.Services
+++ firehol-1.273/debian/README.Services
@@ -0,0 +1,33 @@
+Adding additional services to firehol
+=====================================
+
+Since version 1.214 it is possible to define new
+services with extra config files dropped into 
+/etc/firehol/services. Every file with the ending
+.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 
+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?
+Here a small example for bittorrent:
+
+-----------------------
+#FHVER: 1:213
+server_torrent_ports="tcp/6881:6999"
+client_torrent_ports="default"
+-----------------------
+
+Thats all :). If dropped into /etc/firehol/services
+you could use the torrent service as any builtin service in
+you config.
+
+You could find this file under the
+examples dir in /usr/share/doc/firehol.
+
+ -- Alexander Wirt <formorer@debian.org>  Thu, 23 Dec 2004 15:33:52 +0100
+
--- firehol-1.273.orig/debian/get-iana.1
+++ firehol-1.273/debian/get-iana.1
@@ -0,0 +1,30 @@
+.\"     Title: get-iana
+.\"    Author: 
+.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
+.\"      Date: 08/30/2007
+.\"    Manual: 
+.\"    Source: 
+.\"
+.TH "GET\-IANA" "1" "08/30/2007" "" ""
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+get-iana - updates the list of reserved ips from the IANA for usage from firehol
+.SH "SYNOPSIS"
+\fBget\-iana\fR
+.sp
+.SH "DESCRIPTION"
+This manual page documents briefly the \fBget\-iana\fR command\.
+.sp
+\fBget\-iana\fR 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\.
+.sp
+.SH "SEE ALSO"
+firehol(1), aggregate(1)
+.sp
+.SH "AUTHOR"
+get\-iana was written by Costa Tsaousis <costa@tsaousis\.gr>\.
+.sp
+This manual page was written by Alexander Wirt <formorer@debian\.org>\.
+.sp
--- firehol-1.273.orig/debian/get-iana.1.txt
+++ firehol-1.273/debian/get-iana.1.txt
@@ -0,0 +1,30 @@
+GET-IANA(1)
+===========
+Costa Tsaousis <costa@tsaousis.gr>
+
+NAME
+----
+get-iana - updates the list of reserved ips from the IANA for usage from firehol 
+
+SYNOPSIS
+--------
+*get-iana*
+
+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. 
+
+SEE ALSO
+--------
+firehol(1), aggregate(1)
+
+AUTHOR
+------
+get-iana was written by Costa Tsaousis <costa@tsaousis.gr>. 
+
+This manual page was written by Alexander Wirt <formorer@debian.org>.
--- firehol-1.273.orig/debian/rules
+++ firehol-1.273/debian/rules
@@ -0,0 +1,99 @@
+#!/usr/bin/make -f
+# First try in creating a debian/rules-file.
+
+build: build-stamp 
+build-stamp: patch
+	touch build-stamp
+
+clean: clean1 unpatch
+clean1:
+	-rm -f build
+	-rm -rf debian/*substvars debian/tmp debian/files
+
+binary:	binary-indep binary-arch
+
+binary-indep:	checkroot build
+	#Create the directories:
+	install -d debian/tmp/DEBIAN
+	install -d debian/tmp/sbin/
+	install -d debian/tmp/lib/firehol
+	install -d debian/tmp/usr/sbin
+	install -d debian/tmp/etc/firehol
+	install -d debian/tmp/etc/firehol/services
+	install -d debian/tmp/etc/default
+	install -d debian/tmp/etc/init.d
+	install -d debian/tmp/usr/share/man/man1/
+	install -d debian/tmp/usr/share/man/man5/	
+	install -d debian/tmp/usr/share/doc/firehol
+	install -d debian/tmp/usr/share/doc/firehol/html
+	install -d debian/tmp/usr/share/doc/firehol/examples
+
+	#Install the scripts and the config:
+	install -m 755 firehol.sh debian/tmp/sbin/firehol
+	install -m 755 debian/init.d/firehol debian/tmp/etc/init.d/firehol
+	install -m 644 examples/client-all.conf debian/tmp/etc/firehol/firehol.conf
+	install -m 644 debian/RESERVED_IPS debian/tmp/etc/firehol
+	install -m 755 get-iana.sh debian/tmp/usr/sbin/get-iana
+	sed -i -e 's/aggregate-flim/aggregate/g' debian/tmp/usr/sbin/get-iana
+
+	echo "#To enable firehol at startup set START_FIREHOL=YES" > debian/tmp/etc/default/firehol
+	echo "START_FIREHOL=NO" >> debian/tmp/etc/default/firehol
+	echo "#If you want to have firehol wait for an iface to be up add it here" >> debian/tmp/etc/default/firehol
+	echo 'WAIT_FOR_IFACE=""' >> debian/tmp/etc/default/firehol
+	
+	chmod 644 debian/tmp/etc/default/firehol
+
+	#Copy the documentation:
+	install -m 644 debian/README.Debian debian/README.Services debian/tmp/usr/share/doc/firehol/
+	install -m 644 doc/*.html doc/*.css debian/tmp/usr/share/doc/firehol/html/
+	install -m 644 man/firehol.1 debian/tmp/usr/share/man/man1/
+	install -m 644 debian/get-iana.1 debian/tmp/usr/share/man/man1/
+	install -m 644 man/firehol.conf.5 debian/tmp/usr/share/man/man5/
+	gzip -9 debian/tmp/usr/share/man/man1/firehol.1 debian/tmp/usr/share/man/man5/firehol.conf.5 debian/tmp/usr/share/man/man1/get-iana.1
+
+	#Copy the examples:
+	install -m 644 examples/*.conf debian/tmp/usr/share/doc/firehol/examples/
+	install -m 644 adblock.sh  debian/tmp/usr/share/doc/firehol/examples/
+	install -m 644 debian/bittorrent.conf debian/tmp/usr/share/doc/firehol/examples/
+	
+	#Copyright, Changelog, etc:
+	install -m 644 debian/copyright debian/tmp/usr/share/doc/firehol/
+	install -m 644 debian/changelog debian/tmp/usr/share/doc/firehol/changelog.Debian
+	gzip -9 debian/tmp/usr/share/doc/firehol/changelog.Debian
+	install -m 644 ChangeLog debian/tmp/usr/share/doc/firehol/changelog
+	gzip -9 debian/tmp/usr/share/doc/firehol/changelog
+
+	install -m 644 WhatIsNew README TODO debian/tmp/usr/share/doc/firehol/
+
+	#Create MD5-Sums:
+	(cd debian/tmp; find -type f | sed s#^./## | grep -v DEBIAN | xargs md5sum > DEBIAN/md5sums)
+	chmod 644 debian/tmp/DEBIAN/md5sums
+
+	# Standard package building stuff
+	install -m755 debian/postinst debian/tmp/DEBIAN
+	install -m755 debian/postrm debian/tmp/DEBIAN
+	install -m644 debian/conffiles debian/tmp/DEBIAN
+	dpkg-gencontrol -pfirehol -is -ip
+	chmod 644 debian/tmp/DEBIAN/control
+	chown -R root:root debian/tmp
+	dpkg --build debian/tmp ..
+
+binary-arch:	checkroot build
+	# No architecture dependent packages
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all
+	dpatch cat-all >patch-stamp
+	touch patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+
+checkroot:
+	test root = "`whoami`"
+
+.PHONY: binary clean binary-indep binary-arch build install patch unpatch \
+        clean1
--- firehol-1.273.orig/debian/patches/04_use_mawk.dpatch
+++ firehol-1.273/debian/patches/04_use_mawk.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_use_mawk.dpatch by  <formorer@crusty.snow-crash.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.273~/firehol.sh firehol-1.273/firehol.sh
+--- firehol-1.273~/firehol.sh	2009-11-14 21:18:00.000000000 +0100
++++ firehol-1.273/firehol.sh	2009-11-14 21:18:21.000000000 +0100
+@@ -145,7 +145,7 @@
+ which_cmd EXPR_CMD expr
+ which_cmd FIND_CMD find
+ which_cmd FOLD_CMD fold
+-which_cmd GAWK_CMD gawk
++which_cmd GAWK_CMD awk
+ which_cmd GREP_CMD grep
+ which_cmd HEAD_CMD head
+ which_cmd IPTABLES_CMD iptables
--- firehol-1.273.orig/debian/patches/03_debian_default.dpatch
+++ firehol-1.273/debian/patches/03_debian_default.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_debian_default.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/firehol.sh firehol-1.256/firehol.sh
+--- firehol-1.256~/firehol.sh	2007-05-23 01:34:10.000000000 +0200
++++ firehol-1.256/firehol.sh	2007-08-30 15:25:10.000000000 +0200
+@@ -5324,6 +5324,7 @@
+ 	exit 0
+ fi
+ 
++test -e /etc/default/firehol && . /etc/default/firehol 
+ 
+ # ------------------------------------------------------------------------------
+ # XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
--- firehol-1.273.orig/debian/patches/06_add_openvpn.dpatch
+++ firehol-1.273/debian/patches/06_add_openvpn.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_add_openvpn.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/firehol.sh firehol-1.256/firehol.sh
+--- firehol-1.256~/firehol.sh	2007-05-23 01:34:10.000000000 +0200
++++ firehol-1.256/firehol.sh	2007-09-05 22:54:33.000000000 +0200
+@@ -800,6 +800,10 @@
+ server_nxserver_ports="tcp/5000:5200"
+ client_nxserver_ports="default"
+ 
++# OpenVPN
++server_openvpn_ports="tcp/1194 udp/1194"
++client_openvpn_ports="default"
++
+ # Oracle database
+ server_oracle_ports="tcp/1521"
+ client_oracle_ports="default"
--- firehol-1.273.orig/debian/patches/01_wizard_support_vlan.dpatch
+++ firehol-1.273/debian/patches/01_wizard_support_vlan.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_wizard_support_vlan.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/firehol.sh firehol-1.256/firehol.sh
+--- firehol-1.256~/firehol.sh	2007-05-23 01:34:10.000000000 +0200
++++ firehol-1.256/firehol.sh	2007-08-30 09:45:25.000000000 +0200
+@@ -6204,7 +6204,7 @@
+ 		echo
+ 	}
+ 	
+-	interfaces=`${IP_CMD} link show | ${EGREP_CMD} "^[0-9A-Za-z]+:" | ${CUT_CMD} -d ':' -f 2 | ${SED_CMD} "s/^ //" | ${GREP_CMD} -v "^lo$" | ${SORT_CMD} | ${UNIQ_CMD} | ${TR_CMD} "\n" " "`
++	interfaces=`${IP_CMD} link show | ${EGREP_CMD} "^[0-9A-Za-z]+:" | ${CUT_CMD} -d ':' -f 2 | ${SED_CMD} "s/^ //" | ${SED_CMD} "s/@[a-z0-9]*//" | ${GREP_CMD} -v "^lo$" | ${SORT_CMD} | ${UNIQ_CMD} | ${TR_CMD} "\n" " "`
+ 	gw_if=`${IP_CMD} route show | ${GREP_CMD} "^default" | ${SED_CMD} "s/dev /dev:/g" | ${TR_CMD} " " "\n" | ${GREP_CMD} "^dev:" | ${CUT_CMD} -d ':' -f 2`
+ 	gw_ip=`${IP_CMD} route show | ${GREP_CMD} "^default" | ${SED_CMD} "s/via /via:/g" | ${TR_CMD} " " "\n" | ${GREP_CMD} "^via:" | ${CUT_CMD} -d ':' -f 2 | ips2net -`
+ 	
--- firehol-1.273.orig/debian/patches/05_fix_msnport.dpatch
+++ firehol-1.273/debian/patches/05_fix_msnport.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_msnport.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/firehol.sh firehol-1.256/firehol.sh
+--- firehol-1.256~/firehol.sh	2007-05-23 01:34:10.000000000 +0200
++++ firehol-1.256/firehol.sh	2007-09-01 08:43:32.000000000 +0200
+@@ -764,7 +764,10 @@
+ # because the mms module is not there:
+ # ALL_SHOULD_ALSO_RUN="${ALL_SHOULD_ALSO_RUN} mms"
+ 
+-server_msn_ports="tcp/6891"
++server_msnp_ports="tcp/6891"
++client_msnp_ports="default"
++
++server_msn_ports="tcp/1863 udp/1863"
+ client_msn_ports="default"
+ 
+ server_mysql_ports="tcp/3306"
--- firehol-1.273.orig/debian/patches/00list
+++ firehol-1.273/debian/patches/00list
@@ -0,0 +1,8 @@
+01_wizard_support_vlan
+02_add_wait_feature
+03_debian_default
+04_use_mawk
+05_fix_msnport
+06_add_openvpn
+#07_fix_get_iana.dpatch
+#08_fix_get_iana_path.dpatch
--- firehol-1.273.orig/debian/patches/02_add_wait_feature.dpatch
+++ firehol-1.273/debian/patches/02_add_wait_feature.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_add_wait_feature.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/firehol.sh firehol-1.256/firehol.sh
+--- firehol-1.256~/firehol.sh	2007-05-23 01:34:10.000000000 +0200
++++ firehol-1.256/firehol.sh	2007-08-30 11:12:33.000000000 +0200
+@@ -5274,6 +5274,38 @@
+ 	test ${FIREHOL_CONF_SHOW} -eq 1 && show_work_realcmd 3
+ }
+ 
++wait_for_interface() {
++	local iface=$1; shift
++	local timeout=60
++
++	if [ -n "$1" ]; then
++		timeout=$1
++	fi
++
++	local start=`date +%s`
++	local found=0
++
++	while [ "`date +%s`" -lt $(($start+$timeout)) -a $found -eq 0 ]
++	do
++		local addr=`ip addr show $iface 2> /dev/null | awk '$1 ~ /^inet$/ {print $2}'`
++		if [ -n "$addr" ]
++		then
++			found=1
++		fi
++		if [ $found -eq 0 ]
++		then
++			sleep 0.5
++		fi
++	done
++
++	if [ $found -eq 1 ]
++	then
++		# the interface is up
++		return 0
++	else
++		return 1
++	fi
++}
+ 
+ 
+ # ------------------------------------------------------------------------------
+@@ -6628,6 +6660,14 @@
+ # ------------------------------------------------------------------------------
+ # Run the configuration file.
+ 
++if [ -n "$WAIT_FOR_IFACE" ]
++then
++	for i in "$WAIT_FOR_IFACE"
++	do
++		wait_for_interface $i
++	done
++fi
++
+ enable -n trap			# Disable the trap buildin shell command.
+ enable -n exit			# Disable the exit buildin shell command.
+ source ${FIREHOL_TMP} "$@"	# Run the configuration as a normal script.
--- firehol-1.273.orig/debian/patches/08_fix_get_iana_path.dpatch
+++ firehol-1.273/debian/patches/08_fix_get_iana_path.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fix_get_iana_path.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/firehol.sh firehol-1.256/firehol.sh
+--- firehol-1.256~/firehol.sh	2008-07-18 22:44:56.000000000 +0200
++++ firehol-1.256/firehol.sh	2008-07-18 22:45:18.000000000 +0200
+@@ -401,9 +401,9 @@
+ # Suggested by Fco.Felix Belmonte <ffelix@gescosoft.com>
+ # Optimized (CIDR) by Marc 'HE' Brockschmidt <marc@marcbrockschmidt.de>
+ # Further optimized and reduced by http://www.vergenet.net/linux/aggregate/
+-# The supplied get-iana.sh uses 'aggregate-flim' if it finds it in the path.
++# The supplied get-iana uses 'aggregate' if it finds it in the path.
+ RESERVED_IPS="0.0.0.0/7 2.0.0.0/8 5.0.0.0/8 7.0.0.0/8 23.0.0.0/8 27.0.0.0/8 31.0.0.0/8 36.0.0.0/7 39.0.0.0/8 42.0.0.0/8 46.0.0.0/8 49.0.0.0/8 50.0.0.0/8 94.0.0.0/7 100.0.0.0/6 104.0.0.0/5 112.0.0.0/6 127.0.0.0/8 173.0.0.0/8 174.0.0.0/7 176.0.0.0/5 184.0.0.0/6 197.0.0.0/8 223.0.0.0/8 240.0.0.0/4 "
+-load_ips RESERVED_IPS "${RESERVED_IPS}" 90 "Run the supplied get-iana.sh script to generate this file." require-file
++load_ips RESERVED_IPS "${RESERVED_IPS}" 90 "Run the supplied get-iana script to generate this file." require-file
+ 
+ # Private IPv4 address space
+ # Suggested by Fco.Felix Belmonte <ffelix@gescosoft.com>
--- firehol-1.273.orig/debian/patches/07_fix_get_iana.dpatch
+++ firehol-1.273/debian/patches/07_fix_get_iana.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_fix_get_iana.dpatch by Alexander Wirt <formorer@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad firehol-1.256~/get-iana.sh firehol-1.256/get-iana.sh
+--- firehol-1.256~/get-iana.sh	2007-05-22 23:34:10.000000000 +0000
++++ firehol-1.256/get-iana.sh	2008-07-18 20:57:36.000000000 +0000
+@@ -51,7 +51,7 @@
+ #
+ 
+ IPV4_ADDRESS_SPACE_URL="http://www.iana.org/assignments/ipv4-address-space"
+-IANA_RESERVED="IANA - Reserved"
++IANA_RESERVED="\(IANA\|Future use\).*\(RESERVED\|UNALLOCATED\)"
+ 
+ tempfile="/tmp/iana.$$.$RANDOM"
+ 
+@@ -72,7 +72,7 @@
+ echo >&2
+ 
+ wget -O - --proxy=off "${IPV4_ADDRESS_SPACE_URL}"	|\
+-	grep "${IANA_RESERVED}"				|\
++	grep -e "${IANA_RESERVED}"			|\
+ 	cut -d ' ' -f 1					|\
+ (
+ 	
--- firehol-1.273.orig/debian/init.d/firehol
+++ firehol-1.273/debian/init.d/firehol
@@ -0,0 +1,68 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          firehol
+# Required-Start:    $network $syslog
+# Required-Stop:     $network 
+# Default-Start:     2 3 4 5 
+# Default-Stop:      0 1 6 
+# Description: Starts firehol firewall configuration 
+# short-description: firehol firewall configuration
+### END INIT INFO
+
+#includes lsb functions 
+. /lib/lsb/init-functions
+
+PATH=/sbin:/bin
+NAME=firehol
+DESC=Firewall
+
+test -x /sbin/firehol || exit 0
+
+set -e
+
+[ -r /etc/default/firehol ] && . /etc/default/firehol
+
+START_FIREHOL="$( echo $START_FIREHOL | /usr/bin/tr a-z A-Z)"
+
+COMMAND="$1" 
+test -n "$1" && shift
+
+case "$COMMAND" in
+  start)
+  	
+  	if [ "$START_FIREHOL" = "NO"  ]; then
+		log_warning_msg "$DESC disabled via /etc/default/firehol"
+		exit 0
+	else 
+		log_daemon_msg "Starting $DESC" "$NAME"
+		/sbin/firehol start "$@" >/dev/null || log_end_msg 1
+		log_end_msg 0
+	fi
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	/sbin/firehol stop "$@" >/dev/null || log_end_msg 1
+	log_end_msg 0
+	;;
+  helpme|wizard) 
+  	log_daemon_msg  "Starting $NAME wizard" 1>&2 
+	/sbin/firehol wizard
+	;;
+  restart|force-reload)
+  	if [ "$START_FIREHOL" = "NO"  ]; then
+		log_warning_msg "$DESC disabled via /etc/default/firehol"
+		exit 0
+	else 
+		log_daemon_msg "Restarting $DESC configuration"
+		/sbin/firehol restart "$@" >/dev/null || log_end_msg 1
+		log_action_end_msg 0 
+	fi
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	log_action_msg "Usage: $N {start|stop|restart|force-reload} [<args>]" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- firehol-1.273.orig/debian/source/format
+++ firehol-1.273/debian/source/format
@@ -0,0 +1 @@
+1.0
