[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 396ff12342dcf96352b24be7909e84b5cbfd8323

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 396ff12342dcf96352b24be7909e84b5cbfd8323

[git]

[-- Attachment #1: Type: text/plain, Size: 3357 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, next has been updated
       via  396ff12342dcf96352b24be7909e84b5cbfd8323 (commit)
       via  73b2988ae4a4202dd48a078b359eb8f618e2b611 (commit)
      from  979f8700b26fc442f021f8a6fe891e05b76aabe0 (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 396ff12342dcf96352b24be7909e84b5cbfd8323
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 12 19:40:01 2017 +0000

    pakfire: Properly check if we have our key with our fingerprint
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 73b2988ae4a4202dd48a078b359eb8f618e2b611
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Dec 12 19:28:16 2017 +0000

    pakfire: Drop importing CACert's PGP key
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 src/pakfire/lib/functions.pl | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Difference in files:
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 5fe4cc4e6..0bf702e5b 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -35,7 +35,6 @@ package Pakfire;
 
 # GPG Keys
 my $myid = "179740DC4D8C47DC63C099C74BDE364C64D96617";		# Our own gpg-key paks(a)ipfire.org
-my $trustid = "A31D4F81EF4EBD07B456FA04D2BB0D0165D0FD58";	# gpg-key of CaCert
 
 # A small color-hash :D
 my %color;
@@ -902,17 +901,15 @@ sub senduuid {
 
 sub checkcryptodb {
 	logger("CRYPTO INFO: Checking GnuPG Database");
-	my $ret = system("gpg --list-keys | grep -q $myid");
-	unless ( "$ret" eq "0" ) {
-		message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this.");
-		message("CRYPTO WARN: It's normal to see this on first execution.");
-		message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
-		my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
-		system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
-		system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1");
-	} else {
-		logger("CRYPTO INFO: Database is okay");
-	}
+	system("gpg --fingerprint $myid >/dev/null");
+	return if ($? == 0);
+
+	message("CRYPTO WARN: The GnuPG isn't configured correctly. Trying now to fix this.");
+	message("CRYPTO WARN: It's normal to see this on first execution.");
+	message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP.");
+
+	my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2";
+	system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1");
 }
 
 sub callback {


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