OpenSwan gefixt.

Tippfehler im Pakfire-lib.

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

diff --git a/make.sh b/make.sh
index 1d36d55b78a1b8f3aad9018e68ab2d2560b603b0..e2873bd96062167c2b64a3026522d01fa0423d98 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -971,6 +971,7 @@ EOF
                                        fi
                                fi
                done
+               rm -f ipfire-$VERSION.$MACHINE-full.iso.md5
                if [ "$3" = "--with-sources-cd" ]; then
                        ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
                fi

diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index a91a2c2aedc42c84fa99476156a108b068d2a726..af7137bf16fb8aa2bb7fc8bced7b780da576d045 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -760,7 +760,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.");
-               my $command = "gpg --keyserver pgp.mit.edu --always-trust --status-fs 2";
+               my $command = "gpg --keyserver pgp.mit.edu --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 {

diff --git a/src/patches/openswan-2.4.9-startklips-1.patch b/src/patches/openswan-2.4.9-startklips-1.patch
index 4e3d74d604905f5744fe4f778a0fda027b3ad039..2719f69d8728cef4b00435e15ea0e2c3fd9a51c0 100644 (file)
--- a/src/patches/openswan-2.4.9-startklips-1.patch
+++ b/src/patches/openswan-2.4.9-startklips-1.patch
@@ -1,6 +1,6 @@
---- /usr/lib/ipsec/_startklips_old     2007-07-16 04:14:15.000000000 +0000
-+++ /usr/lib/ipsec/_startklips 2007-07-19 22:12:37.000000000 +0000
-@@ -104,23 +104,23 @@
+--- _startklips_old    2007-08-13 22:45:45.000000000 +0200
++++ _startklips        2007-08-13 21:27:00.000000000 +0200
+@@ -104,23 +104,35 @@
  
        # figure out ifconfig for interface
        addr=
@@ -21,27 +21,39 @@
 -                      print "otheraddr=" other
 -                      print "mask=" $NF
 -              }'`
-+      eval `ip addr show $phys | awk '$1 == "inet"  { gsub(/\//, " "); 
-+                              print "addr=" $2;
-+                              print "mask=" $3;
-+                              print "otheraddr=" $5;
-+                      }'`
-+      eval `ip addr show $phys | awk '$3 ~ /BROADCAST|POINTTOPOINT/ { 
++      eval `ip addr show $phys | awk '$3 ~ /BROADCAST|POINTOPOINT/ { 
 +                              if ($3 ~ /BROADCAST/) 
 +                                      print "type=broadcast"; 
-+                              else if ($3 ~ /POINTTOPOINT/) 
-+                                      print "type=pointtopoint";
++                              else if ($3 ~ /POINTOPOINT/) 
++                                      print "type=pointopoint";
 +                              else {
 +                                      print "type=";
-+                                      print "otheraddr=";
 +                              }
 +                      }'`
++                      
++      if [ "$type" == "broadcast" ]; then
++              eval `ip addr show $phys | awk '$1 == "inet"  { gsub(/\//, " "); 
++                                      print "addr=" $2;
++                                      print "mask=" $3;
++                                      print "otheraddr=" $5;
++                                      }'`
++      elif [ "$type" == "pointopoint" ]; then
++              eval `ip addr show $phys | awk '$1 == "inet"  { gsub(/\//, " "); 
++                                      print "addr=" $2;
++                                      print "mask=" $5;
++                                      print "otheraddr=" $4;
++                                      }'`
++      else
++              type="unknown"
++              otheraddr=
++      fi
++      
 +      eval `whatmask /$mask | awk -F': ' '$1 ~ /^Netmask =/ { print "mask=" $2 }'`
 +      
        if test " $addr" = " "
        then
                echo "unable to determine address of \`$phys'"
-@@ -129,7 +129,7 @@
+@@ -129,7 +141,7 @@
        if test " $type" = " unknown"
        then
                echo "\`$phys' is of an unknown type"
@@ -50,3 +62,18 @@
        fi
        if test " $omtu" != " "
        then
+@@ -223,10 +235,10 @@
+       fi
+       next=`netstat -nr |
+               awk '$1 == "0.0.0.0" && $3 == "0.0.0.0" { print $2 }'`
+-      if [ "$next" = "0.0.0.0" ] ; then
+-              next=`ip addr list $phys | grep -E '^ +inet6*.*scope global $phys' |
+-                      awk '{ print $2}' | awk -F / '{ print $1 }'`
+-      fi
++      #if [ "$next" = "0.0.0.0" ] ; then
++      #       next=`ip addr list $phys | grep -E '^ +inet6*.*scope global $phys' |
++      #               awk '{ print $4 }' | awk -F / '{ print $1 }'`
++      #fi
+       klipsinterface "ipsec0=$phys" $next
+ }
+