[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 072a19ec6419f1b18c1e4e9c98572b53a477089d

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 072a19ec6419f1b18c1e4e9c98572b53a477089d

[git]

[-- Attachment #1: Type: text/plain, Size: 2653 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, core120 has been updated
       via  072a19ec6419f1b18c1e4e9c98572b53a477089d (commit)
       via  d6d058a56b0ccb6cb96e06aedf66d19648ad58ec (commit)
       via  6ae5439e5c58d87f20130dfc4b90928ee5f72e89 (commit)
       via  9a507db2cba20474fa8a93bc25cfbcf02ca941c6 (commit)
      from  718119b897ed3a758745f0b59d078dded485a5e0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 072a19ec6419f1b18c1e4e9c98572b53a477089d
Merge: 718119b89 d6d058a56
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Apr 3 20:13:34 2018 +0200

    Merge branch 'master' into core119

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/120/update.sh | 6 ++++++
 src/initscripts/system/pakfire      | 2 ++
 src/pakfire/pakfire                 | 3 +++
 3 files changed, 11 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index 459262c86..0744f3a7f 100644
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -74,6 +74,12 @@ fi
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
+# Remove any pakfire keys stored in /
+rm -rfv /.gnupg
+
+# Move old pakfire keystore into new place
+mv -v /root/.gnupg /opt/pakfire/etc/.gnupg
+
 # Import new Pakfire key
 /etc/init.d/pakfire start
 
diff --git a/src/initscripts/system/pakfire b/src/initscripts/system/pakfire
index 43befc796..d59daabce 100644
--- a/src/initscripts/system/pakfire
+++ b/src/initscripts/system/pakfire
@@ -9,6 +9,8 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+export GNUPGHOME="/opt/pakfire/etc/.gnupg"
+
 case "${1}" in
 	start)
 		boot_mesg "Setting up Pakfire Package Manager..."
diff --git a/src/pakfire/pakfire b/src/pakfire/pakfire
index 202c1e5a1..dfba91556 100644
--- a/src/pakfire/pakfire
+++ b/src/pakfire/pakfire
@@ -24,6 +24,9 @@
 	delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
 	$< = $>;
 
+	# Store keys here
+	$ENV{"GNUPGHOME"} = "/opt/pakfire/etc/.gnupg";
+
 	require "/opt/pakfire/lib/functions.pl";
 	
 	my $interactive = 1;


hooks/post-receive
--
IPFire 2.x development tree