Version bump.

Correct ipsec.conf and ipsec.secrets paths in openswan-2.4 documentation (#284235).
Add ms-bad-proposal USE flag and patch (#284240).
(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 158 insertions, 0 deletions

diff --git a/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch b/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch
new file mode 100644
index 000000000000..8f50cbb8e17d
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.4-allow-ms-bad-proposal.patch
@@ -0,0 +1,11 @@
+diff -Nru openswan-2.4.15.orig/programs/pluto/Makefile openswan-2.4.15/programs/pluto/Makefile
+--- openswan-2.4.15.orig/programs/pluto/Makefile	2009-09-11 18:32:38.000000000 +0200
++++ openswan-2.4.15/programs/pluto/Makefile	2009-09-11 19:35:33.000000000 +0200
+@@ -244,6 +244,7 @@
+ 	-DGCC_LINT \
+ 	-DUSE_AES -DUSE_3DES \
+ 	-DIKE_ALG -DKERNEL_ALG -DDB_CONTEXT \
++	-DALLOW_MICROSOFT_BAD_PROPOSAL \
+ 	${AGGRESSIVE_DEFS} \
+ 	${XAUTH_DEFS} ${XAUTHPAM_DEFS} \
+ 	${NAT_DEFS} ${CURL_DEFS}\
diff --git a/net-misc/openswan/files/openswan-2.6-allow-ms-bad-proposal.patch b/net-misc/openswan/files/openswan-2.6-allow-ms-bad-proposal.patch
new file mode 100644
index 000000000000..1a1218985fcb
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6-allow-ms-bad-proposal.patch
@@ -0,0 +1,11 @@
+diff -Nru openswan-2.6.23.orig/programs/pluto/Makefile openswan-2.6.23/programs/pluto/Makefile
+--- openswan-2.6.23.orig/programs/pluto/Makefile	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/programs/pluto/Makefile	2009-09-11 19:27:47.000000000 +0200
+@@ -43,6 +43,7 @@
+ # End of configuration coping options.
+ 
+ CPPFLAGS = $(HDRDIRS) $(DEFINES) \
++	-DALLOW_MICROSOFT_BAD_PROPOSAL \
+ 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
+ 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
+ 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
diff --git a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch b/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
new file mode 100644
index 000000000000..24d3daad5e23
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
@@ -0,0 +1,136 @@
+diff -Nru openswan-2.6.23.orig/lib/libdns/Makefile openswan-2.6.23/lib/libdns/Makefile
+--- openswan-2.6.23.orig/lib/libdns/Makefile	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/lib/libdns/Makefile	2009-09-11 19:20:37.000000000 +0200
+@@ -30,8 +30,8 @@
+ 		-I${srcdir}../libisc/nothreads/include \
+ 		-I. -I./include -I${srcdir}include \
+ 		-I${srcdir}../libisc/include
+-CDEFINES = -g ${USERCOMPILE} ${PORTINCLUDE}
+-CWARNINGS = -Werror
++CDEFINES = ${USERCOMPILE} ${PORTINCLUDE}
++CWARNINGS = 
+ 
+ CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
+ 
+diff -Nru openswan-2.6.23.orig/lib/libisc/Makefile openswan-2.6.23/lib/libisc/Makefile
+--- openswan-2.6.23.orig/lib/libisc/Makefile	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/lib/libisc/Makefile	2009-09-11 19:20:37.000000000 +0200
+@@ -22,8 +22,8 @@
+ 		-I${srcdir}nothreads/include \
+ 		-I. -I./include -I${srcdir}include \
+ 		$(PORTINCLUDE) -I${OPENSWANSRCDIR}/include
+-CDEFINES = -g -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
+-# CWARNINGS = -Werror
++CDEFINES = -DHAVE_STRERROR ${USERCOMPILE} ${PORTINCLUDE}
++# CWARNINGS = 
+ 
+ CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
+ 
+diff -Nru openswan-2.6.23.orig/lib/liblwres/Makefile openswan-2.6.23/lib/liblwres/Makefile
+--- openswan-2.6.23.orig/lib/liblwres/Makefile	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/lib/liblwres/Makefile	2009-09-11 19:20:37.000000000 +0200
+@@ -22,8 +22,8 @@
+ 		-I${srcdir}../libisc/${ISCARCH}/include \
+ 		-I${srcdir}../libisc/include \
+ 		-I. -I./include -I${srcdir}include 
+-CDEFINES = -g
+-CWARNINGS = -Werror
++CDEFINES = 
++CWARNINGS = 
+ 
+ CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} 
+ 
+diff -Nru openswan-2.6.23.orig/Makefile.inc openswan-2.6.23/Makefile.inc
+--- openswan-2.6.23.orig/Makefile.inc	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/Makefile.inc	2009-09-11 19:20:37.000000000 +0200
+@@ -49,7 +49,7 @@
+ DESTDIR?=
+ 
+ # "local" part of tree, used in building other pathnames
+-INC_USRLOCAL=/usr/local
++INC_USRLOCAL?=/usr
+ 
+ # 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*
+@@ -94,7 +94,7 @@
+ 
+ # sample configuration files go into
+ INC_DOCDIR?=share/doc
+-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
++FINALEXAMPLECONFDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+ EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR}
+ 
+ FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan
+diff -Nru openswan-2.6.23.orig/programs/Makefile.program openswan-2.6.23/programs/Makefile.program
+--- openswan-2.6.23.orig/programs/Makefile.program	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/programs/Makefile.program	2009-09-11 19:20:37.000000000 +0200
+@@ -53,7 +53,6 @@
+ WERROR:= -Werror
+ endif
+ 
+-CFLAGS+= ${WERROR}
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+ LDFLAGS=-L$(LD_LIBRARY_PATH)
+diff -Nru openswan-2.6.23.orig/programs/setup/Makefile openswan-2.6.23/programs/setup/Makefile
+--- openswan-2.6.23.orig/programs/setup/Makefile	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/programs/setup/Makefile	2009-09-11 19:21:55.000000000 +0200
+@@ -18,7 +18,6 @@
+ 
+ # this dance is because setup has to get installed as /etc/rc.d/init.d/ipsec
+ # not as /etc/rc.d/init.d/setup.
+-PROGRAMDIR=$(RCDIR)
+ PROGRAM=
+ EXTRA8MAN=setup.8
+ 
+@@ -29,32 +28,6 @@
+ # into the $BINDIR.
+ #
+ # the priorities match those in setup's chkconfig line
+-doinstall:: setup
+-	@rm -f $(BINDIR)/setup
+-	@$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec
+-	@ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup
+-	-@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done
+-	-@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec
+-	-@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec
+-	-@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec
+-	-@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec
+-	-@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec
+-	-@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec
+-	-@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec
+-
+-install_file_list::
+-	@echo $(RCDIR)/ipsec
+-	@echo $(BINDIR)/setup
+-	@echo $(RCDIR)/../rc0.d/K76ipsec
+-	@echo $(RCDIR)/../rc1.d/K76ipsec
+-	@echo $(RCDIR)/../rc2.d/S47ipsec
+-	@echo $(RCDIR)/../rc3.d/S47ipsec
+-	@echo $(RCDIR)/../rc4.d/S47ipsec
+-	@echo $(RCDIR)/../rc5.d/S47ipsec
+-	@echo $(RCDIR)/../rc6.d/K76ipsec
+-
+-cleanall::
+-	@rm -f setup
+ 
+ #
+ # $Log: openswan-2.6.23-gentoo.patch,v $
+ # Revision 1.1  2009/09/11 18:46:35  mrness
+ # Version bump.
+ # Correct ipsec.conf and ipsec.secrets paths in openswan-2.4 documentation (#284235).
+ # Add ms-bad-proposal USE flag and patch (#284240).
+ # (Portage version: 2.1.6.13/cvs/Linux x86_64)
+ #
+diff -Nru openswan-2.6.23.orig/testing/utils/make-uml.sh openswan-2.6.23/testing/utils/make-uml.sh
+--- openswan-2.6.23.orig/testing/utils/make-uml.sh	2009-09-09 02:42:54.000000000 +0200
++++ openswan-2.6.23/testing/utils/make-uml.sh	2009-09-11 19:20:37.000000000 +0200
+@@ -262,7 +262,7 @@
+ 
+ cd $OPENSWANSRCDIR || exit 1
+ 
+-make WERROR=-Werror USE_OBJDIR=true programs
++make USE_OBJDIR=true programs
+ 
+ # now, execute the Makefile that we have created!
+ cd $POOLSPACE && make $OPENSWANHOSTS