Start Core Update 116

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

config/rootfiles/core/115/filelists/apache2

@@ -1 +0,0 @@
-../../../common/apache2

config/rootfiles/core/115/filelists/bootstrap

@@ -1 +0,0 @@
-../../../common/bootstrap

config/rootfiles/core/115/filelists/files

@@ -1,31 +0,0 @@
-etc/system-release
-etc/issue
-etc/httpd/conf/vhosts.d/captive.conf
-etc/httpd/conf/vhosts.d/ipfire-interface.conf
-etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
-etc/rc.d/init.d/apache
-etc/rc.d/init.d/firewall
-srv/web/ipfire/cgi-bin/captive/index.cgi
-srv/web/ipfire/cgi-bin/captive/logo.cgi
-srv/web/ipfire/cgi-bin/captive/redirect.cgi
-srv/web/ipfire/cgi-bin/captive.cgi
-srv/web/ipfire/cgi-bin/extrahd.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
-srv/web/ipfire/html/captive
-usr/bin/captive-cleanup
-usr/local/bin/backupiso
-usr/local/bin/captivectrl
-usr/local/bin/wirelessctrl
-var/ipfire/backup/include
-var/ipfire/captive
-var/ipfire/extrahd/bin/extrahd.pl
-var/ipfire/general-functions.pl
-var/ipfire/lang.pl
-var/ipfire/langs
-var/ipfire/menu.d/30-network.menu
-var/ipfire/modem-lib.pl
-var/ipfire/network-functions.pl
-var/ipfire/ovpn/openssl/ovpn.cnf
-var/log/httpd/captive

config/rootfiles/core/115/filelists/logrotate

@@ -1 +0,0 @@
-../../../common/logrotate

config/rootfiles/core/115/filelists/openvpn

@@ -1 +0,0 @@
-../../../common/openvpn

config/rootfiles/core/115/filelists/perl-Font-TTF

@@ -1 +0,0 @@
-../../../common/perl-Font-TTF

config/rootfiles/core/115/filelists/perl-IO-String

@@ -1 +0,0 @@
-../../../common/perl-IO-String

config/rootfiles/core/115/filelists/perl-PDF-API2

@@ -1 +0,0 @@
-../../../common/perl-PDF-API2

config/rootfiles/core/115/filelists/ubuntu-font-family

@@ -1 +0,0 @@
-../../../common/ubuntu-font-family

config/rootfiles/core/115/filelists/wpa_supplicant

@@ -1 +0,0 @@
-../../../common/wpa_supplicant

config/rootfiles/core/116/filelists/files

@@ -0,0 +1,2 @@
+etc/system-release
+etc/issue

config/rootfiles/core/116/filelists/xz

@@ -0,0 +1 @@
+../../../common/xz

config/rootfiles/core/116/update.sh

@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
-core=115
+core=116
 
 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
@@ -32,50 +32,17 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
-openvpnctrl -k
-openvpnctrl -kn2n
-/etc/rc.d/init.d/apache stop
 
 # Extract files
 extract_files
 
-# Remove files
-rm -vf \
-	/usr/local/bin/httpscert \
-	/srv/web/ipfire/html/dial.cgi
-
 # update linker config
 ldconfig
 
 # Update Language cache
-/usr/local/bin/update-lang-cache
+#/usr/local/bin/update-lang-cache
 
 # Start services
-/etc/rc.d/init.d/apache2 start
-openvpnctrl -s
-openvpnctrl -sn2n
-
-grep -q "captivectrl" /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
-# Cleanup captive clients
-%hourly * /usr/bin/captive-cleanup
-
-# Reload captive firewall rules
-%nightly * 23-1   /usr/local/bin/captivectrl >/dev/null
-EOF
-fcrontab -z
-
-# Load captive portal configuration
-/etc/rc.d/init.d/firewall restart
-
-# Regenerate IPsec configuration
-sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
-if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
-	/etc/init.d/ipsec restart
-fi
-
-# Let pakfire forget the perl-PDF-API2 package
-rm -fv /opt/pakfire/db/rootfiles/perl-PDF-API2
-rm -fv /opt/pakfire/db/*/meta-perl-PDF-API2
 
 # This update need a reboot...
 #touch /var/run/need_reboot