Pakfire und startklips Fixes.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@714 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index 4927a8d303b98d1c905062f893fd2bee8fb192a0..36f1d157c1518a8301bca72125f05a009bfa9521 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -675,8 +675,8 @@ 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.");
-               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid &>>$Conf::logdir/gnupg-database.log");
-               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid &>>$Conf::logdir/gnupg-database.log");
+               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $myid --status-fd 2 >> $Conf::logdir/gnupg-database.log 2>&1");
+               system("gpg --keyserver wwwkeys.de.pgp.net --always-trust --recv-key $trustid --status-fd 2 >> $Conf::logdir/gnupg-database.log 2>&1");
        } else {
                logger("CRYPTO INFO: Database is okay");
        }

diff --git a/src/patches/openswan-2.4.9-startklips-1.patch b/src/patches/openswan-2.4.9-startklips-1.patch
index 9638a7ebab0e96effd3dc6bb90d6b4eee7276e3d..4e3d74d604905f5744fe4f778a0fda027b3ad039 100644 (file)
--- a/src/patches/openswan-2.4.9-startklips-1.patch
+++ b/src/patches/openswan-2.4.9-startklips-1.patch
@@ -21,12 +21,12 @@
 -                      print "otheraddr=" other
 -                      print "mask=" $NF
 -              }'`
-+      eval `ip addr show red0 | awk '$1 == "inet"  { gsub(/\//, " "); 
++      eval `ip addr show $phys | awk '$1 == "inet"  { gsub(/\//, " "); 
 +                              print "addr=" $2;
 +                              print "mask=" $3;
 +                              print "otheraddr=" $5;
 +                      }'`
-+      eval `ip addr show red0 | awk '$3 ~ /BROADCAST|POINTTOPOINT/ { 
++      eval `ip addr show $phys | awk '$3 ~ /BROADCAST|POINTTOPOINT/ { 
 +                              if ($3 ~ /BROADCAST/) 
 +                                      print "type=broadcast"; 
 +                              else if ($3 ~ /POINTTOPOINT/)