webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 09:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

OpenSwan gefixt.

Browse Source 
Tippfehler im Pakfire-lib.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@761 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-08-13 20:58:51 +00:00
parent 74693811db
commit a4c9c66090
3 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
make.sh
View File

@@ -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

2
src/pakfire/lib/functions.pl
View File

@@ -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 {

53
src/patches/openswan-2.4.9-startklips-1.patch
View File

@@ -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
}