[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 557d986cbb406369e0c253879e25f7c21f442830

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 557d986cbb406369e0c253879e25f7c21f442830

[git]

[-- Attachment #1: Type: text/plain, Size: 3482 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  557d986cbb406369e0c253879e25f7c21f442830 (commit)
       via  b29a624081f02a3d4161b1c181dcf064429b51c8 (commit)
       via  6c7290acb29d6a9c7d455406a7bf0dafd4897b58 (commit)
       via  3560f497c090dafefc1d2d5b89ad7069a58c01f3 (commit)
      from  3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1 (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 557d986cbb406369e0c253879e25f7c21f442830
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jun 2 23:48:50 2015 +0200

    core91: pakfire: Add changed functions.pl to update

commit b29a624081f02a3d4161b1c181dcf064429b51c8
Author: Lars Schuhmacher <larsen007(a)web.de>
Date:   Mon Jun 1 22:50:07 2015 +0200

    pakfire: Add information about probable causes when pakfire cannot connect
    
    Add information about probable causes when pakfire cannot connect. This
    includes port 11371 TCP and incorrect date/time settings.
    
    Signed-off-by: Lars Schuhmacher <larsen007(a)web.de>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 6c7290acb29d6a9c7d455406a7bf0dafd4897b58
Merge: 3560f49 3d82ea0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jun 2 21:56:58 2015 +0200

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

commit 3560f497c090dafefc1d2d5b89ad7069a58c01f3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Jun 2 19:38:34 2015 +0200

    core91: Ship connections.cgi because of past changes in e60cd3a4042e95cf2748aac2de9d991c724ef24d

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

Summary of changes:
 config/rootfiles/core/91/filelists/files | 2 ++
 src/pakfire/lib/functions.pl             | 1 +
 2 files changed, 3 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files
index f1a51e6..76eee39 100644
--- a/config/rootfiles/core/91/filelists/files
+++ b/config/rootfiles/core/91/filelists/files
@@ -1,3 +1,5 @@
 etc/system-release
 etc/issue
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 6bf85af..d2f77fa 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -890,6 +890,7 @@ sub checkcryptodb {
 	unless ( "$ret" eq "0" ) {
 		message("CRYPTO WARN: The GnuPG isn't configured corectly. 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");


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