From 0413e130db2965981a620bfe54aacd708b2e574c Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 6 Dec 2012 19:57:16 +0100
Subject: [PATCH] updater: add core65 changes to updater.

---
 config/rootfiles/common/stage2           |  1 -
 config/rootfiles/core/66/filelists/GeoIP |  1 +
 config/rootfiles/core/66/filelists/files | 18 ++++++++++++------
 config/rootfiles/core/66/update.sh       | 12 ++++++++++++
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 config/rootfiles/core/66/filelists/GeoIP

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 7cd1934be..e10c649b1 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -86,7 +86,6 @@ usr/local/bin/settime
 usr/local/bin/timecheck
 #usr/local/bin/uname
 usr/local/bin/update-lang-cache
-usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
diff --git a/config/rootfiles/core/66/filelists/GeoIP b/config/rootfiles/core/66/filelists/GeoIP
new file mode 100644
index 000000000..0258236c0
--- /dev/null
+++ b/config/rootfiles/core/66/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files
index 8e7ba71a2..d923c5bec 100644
--- a/config/rootfiles/core/66/filelists/files
+++ b/config/rootfiles/core/66/filelists/files
@@ -1,8 +1,5 @@
-etc/system-release
+etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/issue
-etc/sysctl.conf
-etc/securetty
-opt/pakfire/etc/pakfire.conf
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/halt
@@ -17,17 +14,26 @@ etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/rc0.d/K47setclock
 etc/rc.d/rc6.d/K47setclock
+etc/securetty
+etc/sysctl.conf
+etc/system-release
 opt/pakfire/db/core/mine
+opt/pakfire/etc/pakfire.conf
 opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/bin/watch
+usr/local/bin/readhash
+usr/local/bin/scanhd
+usr/sbin/ovpn-ccd-convert
+var/ipfire/backup/include
+var/ipfire/general-functions.pl
 var/ipfire/langs
 var/ipfire/outgoing/bin/outgoingfw.pl
 var/ipfire/qos/bin/makeqosscripts.pl
-usr/local/bin/readhash
-usr/local/bin/scanhd
diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh
index e48c6731b..c4a05ea94 100644
--- a/config/rootfiles/core/66/update.sh
+++ b/config/rootfiles/core/66/update.sh
@@ -171,6 +171,8 @@ esac
 /etc/init.d/snort stop
 /etc/init.d/squid stop
 /etc/init.d/ipsec stop
+/etc/init.d/apache stop
+
 
 #Remove old snort, zoneinfo and ncurses-libs(wrong path).
 rm -rf /etc/snort
@@ -201,6 +203,7 @@ if [ $BOOTSPACE -lt 1000 ]; then
 		* )
 			/usr/bin/logger -p syslog.emerg -t ipfire \
 				"core-update-$core: FATAL-ERROR space run out on boot. System is not bootable..."
+			/etc/init.d/apache start
 			exit 4
 			;;
 	esac
@@ -213,9 +216,18 @@ telinit u
 # Regenerate ipsec configuration files.
 /srv/web/ipfire/cgi-bin/vpnmain.cgi
 
+# Convert OpenVPN RW connections.
+/usr/sbin/ovpn-ccd-convert
+
+# Update crontab.
+sed -i /var/spool/cron/root.orig \
+	-e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/local/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@'
+fcrontab -z &>/dev/null
+
 #
 # Start services
 #
+/etc/init.d/apache start
 /etc/init.d/squid start
 /etc/init.d/snort start
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
-- 
2.39.2