core114: Ship updated apache2

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

diff --git a/config/rootfiles/core/114/filelists/apache2 b/config/rootfiles/core/114/filelists/apache2
new file mode 120000 (symlink)
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/114/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file

diff --git a/config/rootfiles/core/114/filelists/apr b/config/rootfiles/core/114/filelists/apr
new file mode 120000 (symlink)
index 0000000..87dd197
--- /dev/null
+++ b/config/rootfiles/core/114/filelists/apr
@@ -0,0 +1 @@
+../../../common/apr
\ No newline at end of file

diff --git a/config/rootfiles/core/114/filelists/aprutil b/config/rootfiles/core/114/filelists/aprutil
new file mode 120000 (symlink)
index 0000000..999f9f8
--- /dev/null
+++ b/config/rootfiles/core/114/filelists/aprutil
@@ -0,0 +1 @@
+../../../common/aprutil
\ No newline at end of file

diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/core/114/update.sh
index 54a2062304fd6d969d2b13620b9a4cae48a6db07..77cf1f8f476cc27f9894ba448f78485313bc0d0e 100644 (file)
--- a/config/rootfiles/core/114/update.sh
+++ b/config/rootfiles/core/114/update.sh
@@ -35,6 +35,7 @@ done
 ipsec stop
 /etc/init.d/squid stop
 /etc/init.d/unbound stop
+/etc/init.d/apache stop
 
 # Extract files
 extract_files
@@ -42,13 +43,15 @@ extract_files
 # update linker config
 ldconfig
 
-# Remove baudrate from inittab
+# Remove some files
+rm -f /usr/sbin/htpasswd
 
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
 # Start services
 /etc/init.d/unbound start
+/etc/init.d/apache start
 /etc/init.d/squid start
 
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then