From 15f49ae15762a805655a248949d2a7af614d7651 Mon Sep 17 00:00:00 2001 From: paulgear Date: Sun, 4 Sep 2005 10:56:09 +0000 Subject: [PATCH] Trying to get Debian build of current HEAD working. git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2630 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/debian/rules | 2 +- Shorewall/debian/shorewall.8 | 4 ---- Shorewall/debian/shorewall.install | 11 +++++++++-- Shorewall/debian/shorewall.postrm | 1 - 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Shorewall/debian/rules b/Shorewall/debian/rules index a1e413842..66c40e625 100755 --- a/Shorewall/debian/rules +++ b/Shorewall/debian/rules @@ -63,7 +63,7 @@ install: build binary-indep: build install dh_testdir dh_testroot - dh_installdocs releasenotes.txt + dh_installdocs releasenotes.txt COPYING INSTALL README.txt #debian/NEWS.Debian dh_installman debian/shorewall.8 dh_installchangelogs changelog.txt diff --git a/Shorewall/debian/shorewall.8 b/Shorewall/debian/shorewall.8 index 475d84d51..52f378460 100644 --- a/Shorewall/debian/shorewall.8 +++ b/Shorewall/debian/shorewall.8 @@ -266,10 +266,6 @@ Defines static blacklists. \fIrfc1918\fR Defines the treatment of packets under the \fInorfc1918\fR interface option (it is installed under \fI/ysr/share/shorewall\fR). -.TP -\fIbogons\fR -Defines the treatment of packets under the \fInobogons\fR interface option (it is installed under \fI/ysr/share/shorewall\fR). - .TP \fIroutestopped\fR Defines the hosts that are accessible from the firewall when the firewall is stopped. diff --git a/Shorewall/debian/shorewall.install b/Shorewall/debian/shorewall.install index fb6b1aeef..43119cd09 100644 --- a/Shorewall/debian/shorewall.install +++ b/Shorewall/debian/shorewall.install @@ -1,7 +1,14 @@ -functions firewall help actions.std shorewall action.* rfc1918 bogons configpath modules /usr/share/shorewall +action.* actions.std configpath continue firewall functions help macro.* modules rfc1918 shorewall /usr/share/shorewall -zones policy interfaces hosts rules nat params proxyarp routestopped maclist masq tcrules tos tunnels tunnel blacklist init initdone start stop stopped ecn accounting actions ipsec netmap ipsecvpn /usr/share/doc/shorewall/default-config +accounting actions blacklist ecn hosts init initdone interfaces ipsec ipsecvpn maclist masq nat netmap params policy providers proxyarp routestopped rules start started stop stopped tcclasses tcdevices tcrules tcstart tos tunnel tunnels zones /usr/share/doc/shorewall/default-config shorewall.conf /etc/shorewall shorewall /sbin + +#default.debian +#fallback.sh +#init.debian.sh +#init.sh +#install.sh +#uninstall.sh diff --git a/Shorewall/debian/shorewall.postrm b/Shorewall/debian/shorewall.postrm index c7fdbfbb3..1f1182702 100644 --- a/Shorewall/debian/shorewall.postrm +++ b/Shorewall/debian/shorewall.postrm @@ -21,7 +21,6 @@ case "$1" in #done rm -rf /var/lib/shorewall - rm -rf /etc/cron.daily/update-bogons ;; remove|upgrade|faild-upgrade|abort-*|disappear)