Start Core Update 134

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2026-04-28 03:33:25 +02:00 · 2019-06-12 17:18:23 +01:00
parent e263c29c92
commit ce46df9b83
31 changed files with 94 additions and 1 deletions
--- a/config/rootfiles/core/133/filelists/aarch64/binutils
+++ b/config/rootfiles/core/133/filelists/aarch64/binutils
@@ -1 +0,0 @@
-../../../../common/aarch64/binutils
--- a/config/rootfiles/core/133/filelists/aarch64/gcc
+++ b/config/rootfiles/core/133/filelists/aarch64/gcc
@@ -1 +0,0 @@
-../../../../common/aarch64/gcc
--- a/config/rootfiles/core/133/filelists/aarch64/glibc
+++ b/config/rootfiles/core/133/filelists/aarch64/glibc
@@ -1 +0,0 @@
-../../../../common/aarch64/glibc
--- a/config/rootfiles/core/133/filelists/armv5tel/binutils
+++ b/config/rootfiles/core/133/filelists/armv5tel/binutils
@@ -1 +0,0 @@
-../../../../common/armv5tel/binutils
--- a/config/rootfiles/core/133/filelists/armv5tel/gcc
+++ b/config/rootfiles/core/133/filelists/armv5tel/gcc
@@ -1 +0,0 @@
-../../../../common/armv5tel/gcc
--- a/config/rootfiles/core/133/filelists/armv5tel/glibc
+++ b/config/rootfiles/core/133/filelists/armv5tel/glibc
@@ -1 +0,0 @@
-../../../../common/armv5tel/glibc
--- a/config/rootfiles/core/133/filelists/bind
+++ b/config/rootfiles/core/133/filelists/bind
@@ -1 +0,0 @@
-../../../common/bind
--- a/config/rootfiles/core/133/filelists/files
+++ b/config/rootfiles/core/133/filelists/files
@@ -1,14 +0,0 @@
-etc/system-release
-etc/issue
-etc/rc.d/init.d/smt
-srv/web/ipfire/cgi-bin/credits.cgi
-srv/web/ipfire/cgi-bin/dhcp.cgi
-srv/web/ipfire/cgi-bin/ids.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/vpnmain.cgi
-srv/web/ipfire/cgi-bin/vulnerabilities.cgi
-usr/local/bin/update-ids-ruleset
-usr/sbin/convert-ids-modifysids-file
-usr/sbin/convert-snort
-var/ipfire/ids-functions.pl
-var/ipfire/langs
--- a/config/rootfiles/core/133/filelists/i586/binutils
+++ b/config/rootfiles/core/133/filelists/i586/binutils
@@ -1 +0,0 @@
-../../../../common/i586/binutils
--- a/config/rootfiles/core/133/filelists/i586/gcc
+++ b/config/rootfiles/core/133/filelists/i586/gcc
@@ -1 +0,0 @@
-../../../../common/i586/gcc
--- a/config/rootfiles/core/133/filelists/i586/glibc
+++ b/config/rootfiles/core/133/filelists/i586/glibc
@@ -1 +0,0 @@
-../../../../common/i586/glibc
--- a/config/rootfiles/core/133/filelists/i586/hyperscan
+++ b/config/rootfiles/core/133/filelists/i586/hyperscan
@@ -1 +0,0 @@
-../../../../common/i586/hyperscan
--- a/config/rootfiles/core/133/filelists/ids-ruleset-sources
+++ b/config/rootfiles/core/133/filelists/ids-ruleset-sources
@@ -1 +0,0 @@
-../../../common/ids-ruleset-sources
--- a/config/rootfiles/core/133/filelists/knot
+++ b/config/rootfiles/core/133/filelists/knot
@@ -1 +0,0 @@
-../../../common/knot
--- a/config/rootfiles/core/133/filelists/openssl
+++ b/config/rootfiles/core/133/filelists/openssl
@@ -1 +0,0 @@
-../../../common/openssl
--- a/config/rootfiles/core/133/filelists/pam
+++ b/config/rootfiles/core/133/filelists/pam
@@ -1 +0,0 @@
-../../../common/pam
--- a/config/rootfiles/core/133/filelists/rrdtool
+++ b/config/rootfiles/core/133/filelists/rrdtool
@@ -1 +0,0 @@
-../../../common/rrdtool
--- a/config/rootfiles/core/133/filelists/squid
+++ b/config/rootfiles/core/133/filelists/squid
@@ -1 +0,0 @@
-../../../common/squid
--- a/config/rootfiles/core/133/filelists/strongswan
+++ b/config/rootfiles/core/133/filelists/strongswan
@@ -1 +0,0 @@
-../../../common/strongswan
--- a/config/rootfiles/core/133/filelists/suricata
+++ b/config/rootfiles/core/133/filelists/suricata
@@ -1 +0,0 @@
-../../../common/suricata
--- a/config/rootfiles/core/133/filelists/wpa_supplicant
+++ b/config/rootfiles/core/133/filelists/wpa_supplicant
@@ -1 +0,0 @@
-../../../common/wpa_supplicant
--- a/config/rootfiles/core/133/filelists/x86_64/binutils
+++ b/config/rootfiles/core/133/filelists/x86_64/binutils
@@ -1 +0,0 @@
-../../../../common/x86_64/binutils
--- a/config/rootfiles/core/133/filelists/x86_64/gcc
+++ b/config/rootfiles/core/133/filelists/x86_64/gcc
@@ -1 +0,0 @@
-../../../../common/x86_64/gcc
--- a/config/rootfiles/core/133/filelists/x86_64/glibc
+++ b/config/rootfiles/core/133/filelists/x86_64/glibc
@@ -1 +0,0 @@
-../../../../common/x86_64/glibc
--- a/config/rootfiles/core/133/filelists/x86_64/hyperscan
+++ b/config/rootfiles/core/133/filelists/x86_64/hyperscan
@@ -1 +0,0 @@
-../../../../common/x86_64/hyperscan
--- a/config/rootfiles/core/134/exclude
+++ b/config/rootfiles/core/134/exclude
--- a/config/rootfiles/core/134/filelists/files
+++ b/config/rootfiles/core/134/filelists/files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/unbound
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
--- a/config/rootfiles/core/134/update.sh
+++ b/config/rootfiles/core/134/update.sh
@@ -24,52 +24,26 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1

-core=133
+core=134

 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done

-# remove dropped packages
-for package in jansson; do
-	rm -f "/opt/pakfire/db/installed/meta-${package}"
-	rm -f "/opt/pakfire/db/meta/meta-${package}"
-	rm -f "/opt/pakfire/db/rootfiles/${package}"
-done
-
 # Stop services
-/etc/init.d/squid stop
-/usr/local/bin/ipsecctrl D

 # Extract files
 extract_files

-# create main/security file
-touch /var/ipfire/main/security
-chmod 644 /var/ipfire/main/security
-chown nobody:nobody /var/ipfire/main/security
-
 # update linker config
 ldconfig

-# restart init after glibc update
-telinit u
-
 # Update Language cache
 /usr/local/bin/update-lang-cache

-# Regenerate /etc/ipsec.conf
-sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
-
-# Modify suricata modify-sids file
-/usr/sbin/convert-ids-modifysids-file
-
 # Start services
-/usr/local/bin/ipsecctrl S
-/etc/init.d/suricata restart
-/etc/init.d/squid start
-/etc/init.d/collectd restart
+/etc/init.d/unbound restart

 # Finish
 /etc/init.d/fireinfo start