From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 21 Jun 2022 07:41:04 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.27-core170~4^2~149^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e683e650678fe314cddb3b601abe4e9278bd7bc;hp=95530b3edb1e42eb1a68988272916c033fc2cd57;p=ipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

diff --git a/config/rootfiles/oldcore/168/update.sh b/config/rootfiles/oldcore/168/update.sh
index 6bb081ff28..418c493995 100644
--- a/config/rootfiles/oldcore/168/update.sh
+++ b/config/rootfiles/oldcore/168/update.sh
@@ -143,6 +143,22 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/init.d/ipsec start
 fi
 
+# krb5 is now part of the core system, remove Pakfire metadata for it
+if [ -e "/opt/pakfire/db/installed/meta-krb5" ] && [ -e "/opt/pakfire/db/meta/meta-krb5" ]; then
+	rm -vf \
+		/opt/pakfire/db/installed/meta-krb5 \
+		/opt/pakfire/db/meta/meta-krb5 \
+		/opt/pakfire/db/rootfiles/krb5
+fi
+
+# libtiff is now part of the core system, remove Pakfire metadata for it
+if [ -e "/opt/pakfire/db/installed/meta-libtiff" ] && [ -e "/opt/pakfire/db/meta/meta-libtiff" ]; then
+	rm -vf \
+		/opt/pakfire/db/installed/meta-libtiff \
+		/opt/pakfire/db/meta/meta-libtiff \
+		/opt/pakfire/db/rootfiles/libtiff
+fi
+
 # This update needs a reboot...
 touch /var/run/need_reboot