packages: openswan/openswan-prefix.patch, openswan/openswan.spec - Up to 2....

[caleb]

Author: caleb                        Date: Sat Oct 23 11:01:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 2.6.31

---- Files affected:
packages/openswan:
   openswan-prefix.patch (1.7 -> 1.8) , openswan.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/openswan/openswan-prefix.patch
diff -u packages/openswan/openswan-prefix.patch:1.7 packages/openswan/openswan-prefix.patch:1.8
--- packages/openswan/openswan-prefix.patch:1.7	Thu Nov  5 21:42:42 2009
+++ packages/openswan/openswan-prefix.patch	Sat Oct 23 13:01:00 2010
@@ -28,24 +28,14 @@
  # all relevant subdirectories of MANTREE
  MANPLACES=man3 man5 man8
  
-@@ -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
- 
-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
+--- openswan-2.6.31/programs/examples/Makefile.orig	2010-10-18 19:13:36.000000000 +0300
++++ openswan-2.6.31/programs/examples/Makefile	2010-10-23 13:57:30.737483665 +0300
 @@ -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 hub-spoke.conf oe-exclude-dns.conf
+ CONFDFILES=l2tp-cert.conf l2tp-psk.conf linux-linux.conf sysctl.conf xauth.conf ipv6.conf hub-spoke.conf oe-exclude-dns.conf mast-l2tp-psk.conf
  
  include ${srcdir}../Makefile.program

================================================================
Index: packages/openswan/openswan.spec
diff -u packages/openswan/openswan.spec:1.50 packages/openswan/openswan.spec:1.51
--- packages/openswan/openswan.spec:1.50	Wed Aug 18 17:17:34 2010
+++ packages/openswan/openswan.spec	Sat Oct 23 13:01:00 2010
@@ -13,12 +13,12 @@
 Summary:	Open Source implementation of IPsec for the Linux operating system
 Summary(pl.UTF-8):	Otwarta implementacja IPseca dla systemu operacyjnego Linux
 Name:		openswan
-Version:	2.6.28
+Version:	2.6.31
 Release:	0.1
 License:	GPL/BSD
 Group:		Networking/Daemons
 Source0:	http://www.openswan.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	37f2ad2664dd89e6ad96ae82f6378166
+# Source0-md5:	1f508adf9d0be4f34c003b833d8fce4a
 Source1:	%{name}.init
 Patch0:		%{name}-prefix.patch
 Patch1:		%{name}-bash.patch
@@ -128,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/10/23 11:01:00  caleb
+- Up to 2.6.31
+
 Revision 1.50  2010/08/18 15:17:34  caleb
 - Up to 2.6.28, spec update from Marcin Rybak <marcin.rybak#gmail.com>
 
================================================================

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