summaryrefslogtreecommitdiff
path: root/package/openswan
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-21 20:03:53 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-21 20:03:53 +0100
commit88f8c823598fb3dda3d52e2624df7019096ba64a (patch)
tree3728a238a398bf5fbcea3f2148a9944d36b624b6 /package/openswan
parente417a01d00a49441432c03a0693b279f2f5db73c (diff)
parent19d0a5966d6841b6ff262e5928b593b0a1d77fff (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openswan')
-rw-r--r--package/openswan/patches/patch-lib_libopenswan_alg_info_c6
-rw-r--r--package/openswan/patches/patch-programs_eroute_eroute_c11
2 files changed, 14 insertions, 3 deletions
diff --git a/package/openswan/patches/patch-lib_libopenswan_alg_info_c b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
index 0c616e07c..0da5f9ad1 100644
--- a/package/openswan/patches/patch-lib_libopenswan_alg_info_c
+++ b/package/openswan/patches/patch-lib_libopenswan_alg_info_c
@@ -1,7 +1,7 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- openswan-2.6.18.orig/lib/libopenswan/alg_info.c 2008-10-06 18:52:49.000000000 +0200
-+++ openswan-2.6.18/lib/libopenswan/alg_info.c 2008-10-14 13:08:49.000000000 +0200
-@@ -749,7 +749,7 @@ alg_info_discover_pfsgroup_hack(struct a
+--- openswan-2.6.24.orig/lib/libopenswan/alg_info.c 2010-01-10 02:34:38.000000000 +0100
++++ openswan-2.6.24/lib/libopenswan/alg_info.c 2010-01-19 23:28:18.000000000 +0100
+@@ -765,7 +765,7 @@ alg_info_discover_pfsgroup_hack(struct a
static char err_buf[256];
int ret;
diff --git a/package/openswan/patches/patch-programs_eroute_eroute_c b/package/openswan/patches/patch-programs_eroute_eroute_c
new file mode 100644
index 000000000..f2d2c52b2
--- /dev/null
+++ b/package/openswan/patches/patch-programs_eroute_eroute_c
@@ -0,0 +1,11 @@
+--- openswan-2.6.24.orig/programs/eroute/eroute.c 2010-01-10 02:34:38.000000000 +0100
++++ openswan-2.6.24/programs/eroute/eroute.c 2010-01-20 08:43:00.000000000 +0100
+@@ -268,7 +268,7 @@ main(int argc, char **argv)
+ exit (1);
+ }
+ if(ntohl(said.spi) < 0x100) {
+- fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%x Must be larger than 0x100.\n",
++ fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%lx Must be larger than 0x100.\n",
+ progname, optarg, ntohl(said.spi));
+ exit(1);
+ }