packages: openswan/openswan-prefix.patch - up to fit 2.6.23

[duddits]

Author: duddits                      Date: Thu Nov  5 20:42:47 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to fit 2.6.23

---- Files affected:
packages/openswan:
   openswan-prefix.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/openswan/openswan-prefix.patch
diff -u packages/openswan/openswan-prefix.patch:1.6 packages/openswan/openswan-prefix.patch:1.7
--- packages/openswan/openswan-prefix.patch:1.6	Mon Apr 20 10:49:08 2009
+++ packages/openswan/openswan-prefix.patch	Thu Nov  5 21:42:42 2009
@@ -1,7 +1,7 @@
-diff -Nuard openswan-2.1.2.orig/Makefile.inc openswan-2.1.2/Makefile.inc
---- openswan-2.1.2.orig/Makefile.inc	2004-05-07 05:12:52.000000000 +0200
-+++ openswan-2.1.2/Makefile.inc	2004-05-25 12:02:02.000000000 +0200
-@@ -62,7 +62,7 @@
+diff -burNp openswan-2.6.23/Makefile.inc openswan-2.6.23-dud/Makefile.inc
+--- openswan-2.6.23/Makefile.inc	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23-dud/Makefile.inc	2009-11-05 21:28:11.785688740 +0100
+@@ -49,7 +49,7 @@ SHELL=/bin/sh
  DESTDIR?=
  
  # "local" part of tree, used in building other pathnames
@@ -10,7 +10,7 @@
  
  # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
  # settings which are assumed to include it (or at least, to include *some*
-@@ -71,7 +71,7 @@
+@@ -58,7 +58,7 @@ PUBDIR=$(DESTDIR)$(INC_USRLOCAL)/sbin
  
  # BINDIR is where sub-commands get put, FINALBINDIR is where the "ipsec"
  # command will look for them when it is run. Also called LIBEXECDIR.
@@ -19,7 +19,7 @@
  LIBEXECDIR=$(DESTDIR)$(FINALBINDIR)
  
  FINALBINDIR=${FINALLIBEXECDIR}
-@@ -91,7 +91,7 @@
+@@ -78,7 +78,7 @@ LIBDIR=$(DESTDIR)$(FINALLIBDIR)
  # location within INC_USRLOCAL
  INC_MANDIR=man
  # the full pathname
@@ -28,23 +28,24 @@
  # all relevant subdirectories of MANTREE
  MANPLACES=man3 man5 man8
  
-@@ -294,7 +294,7 @@
- USE_OE?=no
- ifeq ($(USE_OE),no)
+@@ -358,7 +358,7 @@ USE_LIBCURL?=false
+ USE_OE?=true
+ ifeq ($(USE_OE),false)
  # warning: examples subdirectory is statically defined here
 -OE_FLAG=\#Disable Opportunistic Encryption\\ninclude ${FINALCONFDDIR}/examples/no_oe.conf
 +OE_FLAG=\#Disable Opportunistic Encryption\\ninclude ${FINALCONFDDIR}/no_oe.conf
  else
  endif
  
---- openswan-2.4.9/programs/examples/Makefile~	2007-10-01 15:45:22.000000000 +0300
-+++ openswan-2.4.9/programs/examples/Makefile	2007-10-01 15:59:30.299660808 +0300
-@@ -16,7 +16,7 @@
+diff -burNp openswan-2.6.23/programs/examples/Makefile openswan-2.6.23-dud/programs/examples/Makefile
+--- openswan-2.6.23/programs/examples/Makefile	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23-dud/programs/examples/Makefile	2009-11-05 21:29:01.589016940 +0100
+@@ -15,7 +15,7 @@
  OPENSWANSRCDIR?=$(shell cd ../..; pwd)
  include ${OPENSWANSRCDIR}/Makefile.inc
  
 -CONFDSUBDIR=examples
 +CONFDSUBDIR=.
- CONFDFILES=l2tp-cert.conf l2tp-psk.conf linux-linux.conf sysctl.conf xauth.conf ipv6.conf
+ CONFDFILES=l2tp-cert.conf l2tp-psk.conf linux-linux.conf sysctl.conf xauth.conf ipv6.conf hub-spoke.conf oe-exclude-dns.conf
  
  include ${srcdir}../Makefile.program
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openswan/openswan-prefix.patch?r1=1.6&r2=1.7&f=u