Mark version 2.4.15-r2 as stable on amd64 and x86. Version bump (#301813).

(Portage version: 2.1.8.3/cvs/Linux x86_64)

8 files changed, 330 insertions, 472 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 5e0a58c38879..0aa2e45c7fb9 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openswan
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.72 2009/12/15 14:49:44 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.73 2010/08/15 20:45:47 mrness Exp $
+
+*openswan-2.6.28 (15 Aug 2010)
+
+  15 Aug 2010; Alin Năstac <mrness@gentoo.org> -openswan-2.4.15-r1.ebuild,
+  openswan-2.4.15-r2.ebuild, -openswan-2.6.23-r1.ebuild,
+  -openswan-2.6.23-r2.ebuild, -files/openswan-2.6.23-gentoo.patch,
+  +openswan-2.6.28.ebuild, +files/openswan-2.6.28-gentoo.patch,
+  metadata.xml:
+  Mark version 2.4.15-r2 as stable on amd64 and x86. Version bump (#301813).
 
   15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
   metadata.xml: added required herd tag.
diff --git a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch b/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
deleted file mode 100644
index 425724cd9457..000000000000
--- a/net-misc/openswan/files/openswan-2.6.23-gentoo.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-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=
-+PROGRAM=setup
- 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.2  2009/09/17 16:07:11  mrness
- # Re-add setup script (#284955).
- # (Portage version: 2.1.6.13/cvs/Linux x86_64)
- #
- # 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 
diff --git a/net-misc/openswan/files/openswan-2.6.28-gentoo.patch b/net-misc/openswan/files/openswan-2.6.28-gentoo.patch
new file mode 100644
index 000000000000..98ad1053c438
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.28-gentoo.patch
@@ -0,0 +1,256 @@
+diff -Nru openswan-2.6.28.orig/lib/libcrypto/libmd5/Makefile openswan-2.6.28/lib/libcrypto/libmd5/Makefile
+--- openswan-2.6.28.orig/lib/libcrypto/libmd5/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libcrypto/libmd5/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ ifeq ($(USE_LIBNSS),true)
+ CFLAGS+=-DHAVE_LIBNSS
+-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+ 
+ include ${srcdir}../../Makefile.library
+diff -Nru openswan-2.6.28.orig/lib/libcrypto/libsha1/Makefile openswan-2.6.28/lib/libcrypto/libsha1/Makefile
+--- openswan-2.6.28.orig/lib/libcrypto/libsha1/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libcrypto/libsha1/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ ifeq ($(USE_LIBNSS),true)
+ CFLAGS+=-DHAVE_LIBNSS  
+-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+ 
+ 
+diff -Nru openswan-2.6.28.orig/lib/libcrypto/libsha2/Makefile openswan-2.6.28/lib/libcrypto/libsha2/Makefile
+--- openswan-2.6.28.orig/lib/libcrypto/libsha2/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libcrypto/libsha2/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -15,5 +15,5 @@
+ 
+ ifeq ($(USE_LIBNSS),true)
+ CFLAGS+=-DHAVE_LIBNSS
+-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
++INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+diff -Nru openswan-2.6.28.orig/lib/libdns/Makefile openswan-2.6.28/lib/libdns/Makefile
+--- openswan-2.6.28.orig/lib/libdns/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libdns/Makefile	2010-08-15 17:47:57.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.28.orig/lib/libipsecconf/Makefile openswan-2.6.28/lib/libipsecconf/Makefile
+--- openswan-2.6.28.orig/lib/libipsecconf/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libipsecconf/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -33,7 +33,7 @@
+ #CFLAGS+=-DFIPS_CHECK
+ ifeq ($(USE_LIBNSS),true)
+ CFLAGS+=-DHAVE_LIBNSS
+-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+ 
+ ifeq ($(USE_NM),true)
+diff -Nru openswan-2.6.28.orig/lib/libisc/Makefile openswan-2.6.28/lib/libisc/Makefile
+--- openswan-2.6.28.orig/lib/libisc/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libisc/Makefile	2010-08-15 17:47:57.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.28.orig/lib/liblwres/Makefile openswan-2.6.28/lib/liblwres/Makefile
+--- openswan-2.6.28.orig/lib/liblwres/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/liblwres/Makefile	2010-08-15 17:47:57.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.28.orig/lib/libopenswan/Makefile openswan-2.6.28/lib/libopenswan/Makefile
+--- openswan-2.6.28.orig/lib/libopenswan/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/lib/libopenswan/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -100,7 +100,7 @@
+ 
+ ifeq ($(USE_LIBNSS),true)
+ CFLAGS+=-DHAVE_LIBNSS
+-CFLAGS+=-I/usr/include/nspr4 -I/usr/include/nss3
++CFLAGS+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+ 
+ ifeq ($(USE_MODP_RFC5114),true)
+diff -Nru openswan-2.6.28.orig/Makefile.inc openswan-2.6.28/Makefile.inc
+--- openswan-2.6.28.orig/Makefile.inc	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/Makefile.inc	2010-08-15 17:47:57.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.28.orig/programs/Makefile.program openswan-2.6.28/programs/Makefile.program
+--- openswan-2.6.28.orig/programs/Makefile.program	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/Makefile.program	2010-08-15 17:47:57.000000000 +0200
+@@ -53,7 +53,6 @@
+ WERROR:= -Werror
+ endif
+ 
+-CFLAGS+= ${WERROR}
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+ LDFLAGS=-L$(LD_LIBRARY_PATH)
+@@ -104,8 +103,6 @@
+ ifneq ($(NOINSTALL),true)
+ 
+ doinstall:: $(PROGRAM) $(CONFFILES) $(EXTRA8MAN) $(EXTRA5MAN) $(EXTRA5PROC) $(LIBFILES) $(CONFDFILES)
+-	# remove any old vendor file installed previously
+-	@rm -f $(FINALLIBEXECDIR)/vendor
+ 	@mkdir -p $(PROGRAMDIR) $(MANDIR8) $(MANDIR5) $(LIBDIR) $(CONFDIR) $(CONFDDIR) $(CONFDDIR)/$(CONFDSUBDIR) $(EXAMPLECONFDIR)
+ 	@if [ -n "$(PROGRAM)" ]; then $(INSTALL) $(INSTBINFLAGS) $(PROGRAM) $(PROGRAMDIR); fi
+ 	@$(foreach f, $(addsuffix .8, $(PROGRAM)), \
+@@ -180,6 +177,7 @@
+ LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp
+ else
+ LDLIBS=${LIBS} ${USERLINK} ${LIBS} ${EXTRALIBS} -lgmp -lnspr4 -lnss3
++LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
+ endif
+ 
+ 
+diff -Nru openswan-2.6.28.orig/programs/pluto/Makefile.options openswan-2.6.28/programs/pluto/Makefile.options
+--- openswan-2.6.28.orig/programs/pluto/Makefile.options	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/pluto/Makefile.options	2010-08-15 17:48:34.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ # Use LIBNSS
+ ifeq ($(USE_LIBNSS),true)
+-HDRDIRS+= -I/usr/include/nspr4 -I/usr/include/nss3	
++HDRDIRS+= -I/usr/include/nspr -I/usr/include/nss	
+ endif
+ 
+ # BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN
+@@ -309,6 +309,7 @@
+ DEFINES+=-DHAVE_LIBNSS
+ LIBSPLUTO+= -lnspr4
+ LIBSPLUTO+= -lnss3
++LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
+ # For avoiding implicit DSO linking
+ LIBSPLUTO+= -lpthread
+ ifeq ($(USE_FIPSCHECK),true)
+diff -Nru openswan-2.6.28.orig/programs/rsasigkey/Makefile openswan-2.6.28/programs/rsasigkey/Makefile
+--- openswan-2.6.28.orig/programs/rsasigkey/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/rsasigkey/Makefile	2010-08-15 17:48:55.000000000 +0200
+@@ -21,13 +21,14 @@
+ FIPS_CHECK=1
+ CFLAGS+=-DFIPS_CHECK
+ endif
+-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
++INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+ 
+ PROGRAM=rsasigkey
+ LIBS=${OPENSWANLIB} -lgmp
+ ifeq ($(USE_LIBNSS),true)
+ LIBS+= -lnspr4 -lnss3 -lplc4
++LDFLAGS+=-L/usr/lib/nspr -L/usr/lib/nss
+ ifeq ($(USE_FIPSCHECK),true)
+ LIBS+=  -lfipscheck
+ endif
+diff -Nru openswan-2.6.28.orig/programs/setup/Makefile openswan-2.6.28/programs/setup/Makefile
+--- openswan-2.6.28.orig/programs/setup/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/setup/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -18,8 +18,7 @@
+ 
+ # 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=
++PROGRAM=setup
+ EXTRA8MAN=setup.8
+ 
+ include ${srcdir}../Makefile.program
+@@ -29,30 +28,4 @@
+ # 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
+ 
+diff -Nru openswan-2.6.28.orig/programs/showhostkey/Makefile openswan-2.6.28/programs/showhostkey/Makefile
+--- openswan-2.6.28.orig/programs/showhostkey/Makefile	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/programs/showhostkey/Makefile	2010-08-15 17:47:57.000000000 +0200
+@@ -16,7 +16,7 @@
+ include ${OPENSWANSRCDIR}/Makefile.inc
+ ifeq ($(USE_LIBNSS),true)
+ CFLAGS+=-DHAVE_LIBNSS
+-INCLUDES+=-I/usr/include/nspr4 -I/usr/include/nss3
++INCLUDES+=-I/usr/include/nspr -I/usr/include/nss
+ endif
+ 
+ PROGRAM=showhostkey
+diff -Nru openswan-2.6.28.orig/testing/utils/make-uml.sh openswan-2.6.28/testing/utils/make-uml.sh
+--- openswan-2.6.28.orig/testing/utils/make-uml.sh	2010-07-29 20:45:59.000000000 +0200
++++ openswan-2.6.28/testing/utils/make-uml.sh	2010-08-15 17:47:57.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 
diff --git a/net-misc/openswan/metadata.xml b/net-misc/openswan/metadata.xml
index 20e74f4f5162..b7cbea834212 100644
--- a/net-misc/openswan/metadata.xml
+++ b/net-misc/openswan/metadata.xml
@@ -21,5 +21,7 @@ growing frustrated with the politics surrounding the FreeS/WAN project.</longdes
     (1DES)</flag>
     <flag name="ms-bad-proposal">Allow bad IP address proposal offered by an
     Microsoft L2TP/IPSec servers</flag>
+    <flag name="nss">Include libnss support (adds smartcard support)</flag>
+    <flag name="ssl">Use OpenSSL libraries for BIGNUM support</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/openswan/openswan-2.4.15-r1.ebuild b/net-misc/openswan/openswan-2.4.15-r1.ebuild
deleted file mode 100644
index aa5b0343dd0a..000000000000
--- a/net-misc/openswan/openswan-2.4.15-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r1.ebuild,v 1.1 2009/09/11 18:46:36 mrness Exp $
-
-EAPI="2"
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms ms-bad-proposal"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources"
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			eerror "You need to have an IPsec enabled 2.4.x kernel."
-			eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
-	use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch
-
-	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
-	    -e 's:/usr/local:/usr:g' \
-	    -e 's:/etc/ipsec[\][&][.]conf:/etc/ipsec/ipsec\\\&.conf:g' \
-	    -e 's:/etc/ipsec[.]conf:/etc/ipsec/ipsec.conf:g' \
-	    -e 's:/etc/ipsec[\][&][.]secrets:/etc/ipsec/ipsec\\\&.secrets:g' \
-	    -e 's:/etc/ipsec[.]secrets:/etc/ipsec/ipsec.secrets:g' '{}' \; ||
-	    die "failed to replace text in docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALCONFDIR=/etc/ipsec \
-		FINALCONFFILE=/etc/ipsec/ipsec.conf \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF} \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-	fi
-	echo USE_OE=false # by default, turn off Opportunistic Encryption
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	dosym /etc/ipsec/ipsec.d /etc/ipsec.d
-
-	doinitd "${FILESDIR}"/ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild
index 57ee6154656e..5e6613557170 100644
--- a/net-misc/openswan/openswan-2.4.15-r2.ebuild
+++ b/net-misc/openswan/openswan-2.4.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.1 2009/12/05 08:01:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.4.15-r2.ebuild,v 1.2 2010/08/15 20:45:47 mrness Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="curl ldap smartcard extra-algorithms weak-algorithms ms-bad-proposal"
 
 COMMON_DEPEND="!net-misc/strongswan
diff --git a/net-misc/openswan/openswan-2.6.23-r1.ebuild b/net-misc/openswan/openswan-2.6.23-r1.ebuild
deleted file mode 100644
index cb45d304ee6d..000000000000
--- a/net-misc/openswan/openswan-2.6.23-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.23-r1.ebuild,v 1.1 2009/09/17 16:07:06 mrness Exp $
-
-EAPI="2"
-
-inherit eutils linux-info
-
-DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
-HOMEPAGE="http://www.openswan.org/"
-SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal"
-
-COMMON_DEPEND="!net-misc/strongswan
-	dev-libs/gmp
-	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
-	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
-	virtual/linux-sources
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.1.2" # see bug 237132
-RDEPEND="${COMMON_DEPEND}
-	virtual/logger
-	sys-apps/iproute2"
-
-pkg_setup() {
-	if use nocrypto-algorithms && ! use weak-algorithms; then
-		ewarn "Enabling nocrypto-algorithms USE flag has no effect when"
-		ewarn "weak-algorithms USE flag is disabled"
-	fi
-
-	linux-info_pkg_setup
-
-	if kernel_is 2 6; then
-		einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)."
-		einfo "KLIPS will not be compiled/installed."
-		MYMAKE="programs"
-
-	elif kernel_is 2 4; then
-		if ! [[ -d "${KERNEL_DIR}/net/ipsec" ]]; then
-			eerror "You need to have an IPsec enabled 2.4.x kernel."
-			eerror "Ensure you have one running and make a symlink to it in /usr/src/linux"
-			die
-		fi
-
-		einfo "Using patched-in IPsec code for kernel 2.4"
-		einfo "Your kernel only supports KLIPS for kernel level IPsec."
-		MYMAKE="confcheck programs"
-
-	else
-		die "Unsupported kernel version"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	use ms-bad-proposal && epatch "${FILESDIR}"/${PN}-${PV%.*}-allow-ms-bad-proposal.patch
-
-	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
-	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in docs"
-}
-
-get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF}/html \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	else
-		echo USE_EXTRACRYPTO=false
-	fi
-	if use weak-algorithms ; then
-		echo USE_WEAKSTUFF=true
-		if use nocrypto-algorithms; then
-			echo USE_NOCRYPTO=true
-		fi
-	fi
-	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
-	fi
-	echo HAVE_THREADS=${USETHREADS}
-}
-
-src_compile() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
-}
-
-src_install() {
-	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
-
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
-}
-
-pkg_preinst() {
-	if has_version "<net-misc/openswan-2.6.14" && pushd "${ROOT}etc/ipsec"; then
-		ewarn "Following files and directories were moved from '${ROOT}etc/ipsec' to '${ROOT}etc':"
-		local i err=0
-		if [ -h "../ipsec.d" ]; then
-			rm "../ipsec.d" || die "failed to remove ../ipsec.d symlink"
-		fi
-		for i in *; do
-			if [ -e "../$i" ]; then
-				eerror "  $i NOT MOVED, ../$i already exists!"
-				err=1
-			elif [ -d "$i" ]; then
-				mv "$i" .. || die "failed to move $i directory"
-				ewarn "  directory $i"
-			elif [ -f "$i" ]; then
-				sed -i -e 's:/etc/ipsec/:/etc/:g' "$i" && \
-					mv "$i" .. && ewarn "  file $i" || \
-					die "failed to move $i file"
-			else
-				eerror "  $i NOT MOVED, it is not a file nor a directory!"
-				err=1
-			fi
-		done
-		popd
-		if [ $err -eq 0 ]; then
-			rmdir "${ROOT}etc/ipsec" || eerror "Failed to remove ${ROOT}etc/ipsec"
-		else
-			ewarn "${ROOT}etc/ipsec is not empty, you will have to remove it yourself"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if kernel_is 2 6; then
-		CONFIG_CHECK="~NET_KEY ~INET_XFRM_MODE_TRANSPORT ~INET_XFRM_MODE_TUNNEL ~INET_AH ~INET_ESP ~INET_IPCOMP"
-		WARNING_INET_AH="CONFIG_INET_AH:\tmissing IPsec AH support (needed if you want only authentication)"
-		WARNING_INET_ESP="CONFIG_INET_ESP:\tmissing IPsec ESP support (needed if you want authentication and encryption)"
-		WARNING_INET_IPCOMP="CONFIG_INET_IPCOMP:\tmissing IPsec Payload Compression (required for compress=yes)"
-		check_extra_config
-	fi
-}
diff --git a/net-misc/openswan/openswan-2.6.23-r2.ebuild b/net-misc/openswan/openswan-2.6.28.ebuild
index 355bfc24e41f..fa65a5d23f75 100644
--- a/net-misc/openswan/openswan-2.6.23-r2.ebuild
+++ b/net-misc/openswan/openswan-2.6.28.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.23-r2.ebuild,v 1.1 2009/12/05 08:01:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.28.ebuild,v 1.1 2010/08/15 20:45:47 mrness Exp $
 
 EAPI="2"
 
-inherit eutils linux-info toolchain-funcs
+inherit eutils linux-info toolchain-funcs flag-o-matic
 
 DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
 HOMEPAGE="http://www.openswan.org/"
@@ -13,14 +13,16 @@ SRC_URI="http://www.openswan.org/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal"
+IUSE="caps curl ldap pam ssl extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal nss"
 
 COMMON_DEPEND="!net-misc/strongswan
 	dev-libs/gmp
 	dev-lang/perl
-	smartcard? ( dev-libs/opensc )
+	caps? ( sys-libs/libcap-ng )
 	curl? ( net-misc/curl )
-	ldap? ( net-nds/openldap )"
+	ldap? ( net-nds/openldap )
+	nss? ( dev-libs/nss )
+	ssl? ( dev-libs/openssl )"
 DEPEND="${COMMON_DEPEND}
 	virtual/linux-sources
 	app-text/xmlto
@@ -56,6 +58,9 @@ pkg_setup() {
 	else
 		die "Unsupported kernel version"
 	fi
+
+	# most code is OK, but programs/pluto code breaks strict aliasing
+	append-cflags -fno-strict-aliasing
 }
 
 src_prepare() {
@@ -68,52 +73,69 @@ src_prepare() {
 }
 
 get_make_options() {
-	echo KERNELSRC=\"${KERNEL_DIR}\" \
-		FINALEXAMPLECONFDIR=/usr/share/doc/${PF} \
-		INC_RCDEFAULT=/etc/init.d \
-		INC_USRLOCAL=/usr \
-		INC_MANDIR=share/man \
-		FINALDOCDIR=/usr/share/doc/${PF}/html \
-		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\" \
+	echo KERNELSRC=\"${KERNEL_DIR}\"\
+		FINALEXAMPLECONFDIR=/usr/share/doc/${PF}\
+		INC_RCDEFAULT=/etc/init.d\
+		INC_USRLOCAL=/usr\
+		INC_MANDIR=share/man\
+		FINALDOCDIR=/usr/share/doc/${PF}/html\
+		DESTDIR=\"${D}\"\
+		USERCOMPILE=\"${CFLAGS}\"\
 		CC=\"$(tc-getCC)\"
-	if use smartcard ; then
-		echo USE_SMARTCARD=true
-	fi
-	if use extra-algorithms ; then
-		echo USE_EXTRACRYPTO=true
-	else
-		echo USE_EXTRACRYPTO=false
-	fi
+
+	use caps\
+		&& echo USE_LIBCAP_NG=true\
+		|| echo USE_LIBCAP_NG=false
+
+	use curl\
+		&& echo USE_LIBCURL=true\
+		|| echo USE_LIBCURL=false
+
+	use ldap\
+		&& echo USE_LDAP=true\
+		|| echo USE_LDAP=false
+
+	echo USE_XAUTH=true
+	use pam\
+		&& echo USE_XAUTHPAM=true\
+		|| echo USE_XAUTHPAM=false
+
+	use nss\
+		&& echo USE_LIBNSS=true\
+		|| echo USE_LIBNSS=false
+
+	use ssl\
+		&& echo HAVE_OPENSSL=true\
+		|| echo HAVE_OPENSSL=false
+
+	use extra-algorithms\
+		&& echo USE_EXTRACRYPTO=true\
+		|| echo USE_EXTRACRYPTO=false
 	if use weak-algorithms ; then
 		echo USE_WEAKSTUFF=true
 		if use nocrypto-algorithms; then
 			echo USE_NOCRYPTO=true
 		fi
+	else
+		echo USE_WEAKSTUFF=false
 	fi
+
 	echo USE_LWRES=false # needs bind9 with lwres support
-	local USETHREADS=false
-	if use curl; then
-		echo USE_LIBCURL=true
-		USETHREADS=true
-	fi
-	if use ldap; then
-		echo USE_LDAP=true
-		USETHREADS=true
+	if use curl || use ldap || use pam; then
+		echo HAVE_THREADS=true
+	else
+		echo HAVE_THREADS=false
 	fi
-	echo HAVE_THREADS=${USETHREADS}
 }
 
 src_compile() {
 	eval set -- $(get_make_options)
-	emake "$@" \
-		${MYMAKE} || die "emake failed"
+	emake "$@" ${MYMAKE} || die "emake failed"
 }
 
 src_install() {
 	eval set -- $(get_make_options)
-	emake "$@" \
-		install || die "emake install failed"
+	emake "$@" install || die "emake install failed"
 
 	dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*}
 	dohtml doc/*.html
@@ -122,7 +144,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
 
-	dodir /var/run/pluto || die "failed to create /var/run/pluto"
+	keepdir /var/run/pluto
 }
 
 pkg_preinst() {