diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/ipsec-tools/patches/patch-src_racoon_pfkey_c | |
parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/ipsec-tools/patches/patch-src_racoon_pfkey_c')
-rw-r--r-- | package/ipsec-tools/patches/patch-src_racoon_pfkey_c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c index cedbc5cdd..d0c416d83 100644 --- a/package/ipsec-tools/patches/patch-src_racoon_pfkey_c +++ b/package/ipsec-tools/patches/patch-src_racoon_pfkey_c @@ -1,7 +1,6 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- ipsec-tools-0.7.2.orig/src/racoon/pfkey.c 2008-12-08 07:06:24.000000000 +0100 -+++ ipsec-tools-0.7.2/src/racoon/pfkey.c 2009-05-29 15:48:49.201433105 +0200 -@@ -3008,12 +3008,12 @@ addnewsp(mhp) +--- ipsec-tools-0.8.0.orig/src/racoon/pfkey.c 2011-03-15 14:20:14.000000000 +0100 ++++ ipsec-tools-0.8.0/src/racoon/pfkey.c 2011-03-31 13:24:03.781819000 +0200 +@@ -3855,12 +3855,12 @@ addnewsp(mhp, local, remote) struct sockaddr *paddr; paddr = (struct sockaddr *)(xisr + 1); |