Core Update 166: Introduce new 2022 Pakfire key

Cc: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index bd5559597ac643f70176fdc7442e08d851d6be8b..b2a10cf3704d531d201c7d913a3079949b4dc1b9 100644 (file)
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -7,6 +7,7 @@ opt/pakfire/db/rootfiles
 #opt/pakfire/pakfire.conf
 opt/pakfire/etc/pakfire.conf
 opt/pakfire/pakfire-2018.key
+opt/pakfire/pakfire-2022.key
 #opt/pakfire/lib
 opt/pakfire/lib/functions.pl
 opt/pakfire/lib/functions.sh

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

diff --git a/config/rootfiles/core/166/update.sh b/config/rootfiles/core/166/update.sh
index a6cfa9fc31eef7fec0dda6b06c17a982cc406de9..cd7f320e2f57afe23b10b713543ee96fd2eb9faf 100644 (file)
--- a/config/rootfiles/core/166/update.sh
+++ b/config/rootfiles/core/166/update.sh
@@ -297,9 +297,10 @@ rm -rvf \
        /var/lib/GeoIP
 
 # Delete old 2007 Pakfire key from GPG keyring
-export GNUPGHOME="/opt/pakfire/etc/.gnupg"
-gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
-unset GNUPGHOME
+GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617
+
+# Add new 2022 Pakfire key to GPG keyring
+GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --import /opt/pakfire/pakfire-2022.key &>/dev/null
 
 # Stop services
 /etc/init.d/ipsec stop

diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire
index 1305bda4840336951f275250fbfb09eda789ceea..9b3c043e9578a598a04c91226271c9ac1f4dfd31 100644 (file)
--- a/src/initscripts/system/pakfire
+++ b/src/initscripts/system/pakfire
@@ -27,7 +27,7 @@ export GNUPGHOME="/opt/pakfire/etc/.gnupg"
 case "${1}" in
        start)
                boot_mesg "Setting up Pakfire Package Manager..."
-               gpg --import /opt/pakfire/pakfire-2018.key &>/dev/null
+               gpg --import /opt/pakfire/pakfire-2018.key /opt/pakfire/pakfire-2022.key &>/dev/null
                evaluate_retval
                ;;
 

diff --git a/src/pakfire/pakfire-2022.key b/src/pakfire/pakfire-2022.key
new file mode 100644 (file)
index 0000000..bd85dab
--- /dev/null
+++ b/src/pakfire/pakfire-2022.key
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+LYmcvOchLc+rTl8/4TMFYAzxKA==
+=kuwW
+-----END PGP PUBLIC KEY BLOCK-----