From cf4d6bb76cd51b978ef84a570c3766e7d43a3d16 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Aug 2013 14:07:06 +0200
Subject: [PATCH] Add new firewall to fifteen.

---
 config/rootfiles/core/fifteen/filelists/files |  9 +++++
 .../rootfiles/core/fifteen/filelists/firewall | 33 ++++++++++++++++---
 .../core/fifteen/filelists/misc-progs         |  1 +
 .../core/fifteen/filelists/strongswan         |  1 +
 config/rootfiles/core/fifteen/update.sh       |  8 +++++
 5 files changed, 48 insertions(+), 4 deletions(-)
 create mode 120000 config/rootfiles/core/fifteen/filelists/misc-progs
 create mode 120000 config/rootfiles/core/fifteen/filelists/strongswan

diff --git a/config/rootfiles/core/fifteen/filelists/files b/config/rootfiles/core/fifteen/filelists/files
index 8dcb0777a..2d4ff42bf 100644
--- a/config/rootfiles/core/fifteen/filelists/files
+++ b/config/rootfiles/core/fifteen/filelists/files
@@ -1,4 +1,13 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/network
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/upnp.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+var/ipfire/backup/bin/backup.pl
+var/ipfire/backup/exclude
+var/ipfire/backup/include
+var/ipfire/general-functions.pl
 var/ipfire/header.pl
 var/ipfire/langs
diff --git a/config/rootfiles/core/fifteen/filelists/firewall b/config/rootfiles/core/fifteen/filelists/firewall
index 3eb6cba94..fc505981c 100644
--- a/config/rootfiles/core/fifteen/filelists/firewall
+++ b/config/rootfiles/core/fifteen/filelists/firewall
@@ -1,4 +1,29 @@
-usr/bin/convert-dmz
-usr/bin/convert-outgoingfw
-usr/bin/convert-portfw
-usr/bin/convert-xtaccess
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
+srv/web/ipfire/cgi-bin/forwardfw.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
+srv/web/ipfire/cgi-bin/p2p-block.cgi
+usr/sbin/convert-dmz
+usr/sbin/convert-outgoingfw
+usr/sbin/convert-portfw
+usr/sbin/convert-xtaccess
+usr/sbin/firewall-policy
+var/ipfire/forward
+var/ipfire/forward/bin/firewall-lib.pl
+var/ipfire/forward/bin/rules.pl
+var/ipfire/forward/config
+var/ipfire/forward/dmz
+var/ipfire/forward/input
+var/ipfire/forward/nat
+var/ipfire/forward/outgoing
+var/ipfire/forward/p2protocols
+var/ipfire/forward/settings
+var/ipfire/fwhosts
+var/ipfire/fwhosts/customhosts
+var/ipfire/fwhosts/customnetworks
+var/ipfire/fwhosts/customgroups
+var/ipfire/fwhosts/customservices
+var/ipfire/fwhosts/customservicegrp
+var/ipfire/fwhosts/icmp-types
+var/ipfire/menu.d/50-firewall.menu
diff --git a/config/rootfiles/core/fifteen/filelists/misc-progs b/config/rootfiles/core/fifteen/filelists/misc-progs
new file mode 120000
index 000000000..7223caddd
--- /dev/null
+++ b/config/rootfiles/core/fifteen/filelists/misc-progs
@@ -0,0 +1 @@
+../../../common/misc-progs
\ No newline at end of file
diff --git a/config/rootfiles/core/fifteen/filelists/strongswan b/config/rootfiles/core/fifteen/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/fifteen/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index 1e5521229..3ea5ec596 100644
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -44,6 +44,14 @@ extract_files
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove old initscripts
+rm -f /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+rm -f /etc/rc.d/init.d/networking/red.up/25-portfw
+rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
+
+# Remove old CGI files
+rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
+
 # Convert firewall configuration
 /usr/bin/convert-xtaccess
 /usr/bin/convert-outgoingfw
-- 
2.39.2