Version bump to latest 2.6 version (#237132).

Package-Manager: portage-2.1.4.4

8 files changed, 350 insertions, 8 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 1345c204375d..c8648f3afde2 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.52 2008/09/17 20:57:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.53 2008/09/21 12:42:31 mrness Exp $
+
+*openswan-2.6.16 (21 Sep 2008)
+
+  21 Sep 2008; Alin Năstac <mrness@gentoo.org>
+  +files/openswan-2.6.16-gentoo.patch,
+  +files/openswan-2.6.16-qa-fixes.patch,
+  +files/openswan-2.6.16-refine-connection.patch, +files/ipsec-initd,
+  metadata.xml, +openswan-2.6.16.ebuild:
+  Version bump to latest 2.6 version (#237132).
 
   17 Sep 2008; Markus Meier <maekke@gentoo.org> openswan-2.4.13.ebuild:
   amd64/x86 stable, bug #237603
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index b4fbaa4bf8da..e3bda407ed95 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -2,24 +2,30 @@
 Hash: SHA1
 
 AUX ipsec 1551 RMD160 9f2480ebfb7549df1cbe3cf5c62575acd78a986a SHA1 53c1826bea6a613a025d34ea3b68e95c2b13e62c SHA256 926aedf5585626202b9817e0d37ef40c4a07ef1f75b77de228eb7f5f8b8e6f21
+AUX ipsec-initd 487 RMD160 23d9d7be6000fb95fdb142bc948964d6050b7864 SHA1 55a4c3ab2523f265e314c9048c0552699564fc4d SHA256 e86140b6e596a0b0d6e52ca521adb891eb3b9cc4ad8e6f28041fb773f9f60347
 AUX openswan-2.4.11-gentoo.patch 16263 RMD160 39f72ab5edcc29a46de25398414f434814465fad SHA1 ce0e922722921315eb97acf650a5101b010e0e63 SHA256 1fa4f4323c40ca2d7f61abead7dd4c08ce2df9ed644df277c7b700825f7d9ec5
 AUX openswan-2.4.11-implicit-decl.patch 372 RMD160 b9f1ac0ba583d18ca029f4d990d8c2c697ede6c6 SHA1 c1864d0f9cc7d865fcc0df9c270962f4904724c6 SHA256 398ce3760280ec1db3c14a3e073d4a428453c44aaf2bd8de9567ad9ecaf3dc92
 AUX openswan-2.4.12-deprecated-ldap.patch 372 RMD160 3e39f78960828f8552c0e0d9a561a10846bb9f74 SHA1 e2171af09ccdedac0a4839f51bd0ab8215c9158c SHA256 c895706d3dd7f7bf679457c9769d3ca95f62b47a7a42ea943204e3a3db5864cd
 AUX openswan-2.4.12-gentoo.patch 5966 RMD160 0a64f2bccbf4d89cb96f1a1b39b23810a83d71d6 SHA1 24328b8815c524e049edd163f700f7a6b4bc315e SHA256 ab212078ffc1d6060fd51554a74ef6e9cac6b7f5f8f3e09710f7780364b588f6
 AUX openswan-2.4.13-deprecated-ldap.patch 371 RMD160 4fb852b20240b9c2b22db5d2ca5b75ac7c4ca2f0 SHA1 8d70c48e525467e26cdf5f1f6fb36d49a03d8a20 SHA256 9d406ba127eca56ba5e64517fe107e1785c07cad9e7a770d8481d7998c4e1709
 AUX openswan-2.4.13-gentoo-fixed.patch 6155 RMD160 0cb034afaab18fb45a2cf7bb553dbb1a7c5c77df SHA1 50337cdf3b6d197414d29229287963a9326c1993 SHA256 1f4cf5fd660d75d2aede283b2170b19905a39fc36cc22a81cf651f4a5e662c80
+AUX openswan-2.6.16-gentoo.patch 2515 RMD160 b4a22ba60677ac9de7242b354d7400e5e208eee7 SHA1 c942a424355f7ee4e4128660769752ced5babf48 SHA256 8ba1d7b22c71fd7354423380d0576cf7bc12a6077d99de756ea8e95c607c1f5a
+AUX openswan-2.6.16-qa-fixes.patch 1557 RMD160 ba951202ff775e7be309dd2b45b2f541e35fa815 SHA1 0e942b91e62dd1eaf3fa1c84d1e304c4e4040629 SHA256 9b0ee1de39f7c62d2b81d1017561e0386b2bcc3860307fef0f2bbc461064f1f1
+AUX openswan-2.6.16-refine-connection.patch 1183 RMD160 930d7c2402b450bdbc08a9844f71197c2be54a61 SHA1 e32f0ccb56e54047c818d7f6e432120ba9871b51 SHA256 b2f28016457d1e4d7994d2bb2030eff0b987bd75d4368de8338d593efed90d94
 DIST openswan-2.4.11.tar.gz 3759918 RMD160 c77777aaeba65e92196aad9e7c32ffd7c2e4a49d SHA1 532bf898872ced97888be95adc5814b6155a9574 SHA256 4adea45d7cc413b558f15e4528de4486b62a07cfd2af2bf592b09cea3f16ecae
 DIST openswan-2.4.12.tar.gz 3764063 RMD160 09f4454399651d369961aa678205b90e13a124c0 SHA1 225ab28ca970a062160b026570597588883b71d8 SHA256 4024e9a6b6e7171fb195a4228043142dd5e92035325b6cd18deb338f77ca494b
 DIST openswan-2.4.13.tar.gz 3761840 RMD160 cc22c2d838d33fe2a08173aa1602ec39cfde3a80 SHA1 ad314d22f08c8de08624b1a7f69120eae23fad4b SHA256 1dcf1ebcc8b974def51b09e791de267ec9813b6af086337aa06909e27ccff5f6
+DIST openswan-2.6.16.tar.gz 6134304 RMD160 bb0b713dba75ecdfb7be6cef6521bde625fc91b6 SHA1 922d57ad4fc8f19f8fc31fb219076772099c86dd SHA256 bfa4b5a806669fc2eda76c86b659fdfc740b2e5e5e810f28829f63c5824dc2e3
 EBUILD openswan-2.4.11.ebuild 3755 RMD160 f132d77d7879c2e63a2b29aebb4a1ffe9ab7381e SHA1 70ab5a61c5b556dc1b97796d2a142e72d56d7c28 SHA256 c425cc7a7133b9286e7cd4a43de218ababc4f5a1433dda49e2b57e75388a6105
 EBUILD openswan-2.4.12.ebuild 3540 RMD160 b90a1cb2a06baf62f0ca364b88d1e0e9c7c6d80b SHA1 9d5b08a4e0ed61295daab21f6534d98f00d7830d SHA256 02d65ea25fbaedb9a0ce2d2a548bd00b541a2064ab281301028d303534f034d5
 EBUILD openswan-2.4.13.ebuild 3534 RMD160 34cdbfeebe98c478c4f87f39fc0e4a9bb8438e1b SHA1 4c9c9f11a13a782f01cc9d1fb8d22fe241b04bfc SHA256 3c091d439ed004e3f89c2e687878c499f93061a2d3eba038bf744bf432b0b5f0
-MISC ChangeLog 9078 RMD160 0a96ba9414a4b34171c058d0007352e54e73a4c9 SHA1 2e66631d054e6dcb0605a0b58274438417ead4f0 SHA256 2869d92d011e24694e31cbc95b5af3ffa5872e6e76f6062b5366cfbfccaf9051
-MISC metadata.xml 840 RMD160 6bbfd2826acdb167847150124c32e10a331aea55 SHA1 cf58a1f4529d694566218381a82f82ffe8f8a810 SHA256 1398590b9727e99d153f117f6f99551a5843f58ba087308c775bef8bfc4ec142
+EBUILD openswan-2.6.16.ebuild 4575 RMD160 697d42205aaa432b35c2c867436b62db101f57a3 SHA1 29f95f09ea37bdf49d93588b7a140f4a8702a9be SHA256 7bc7d128c90b03b9726a4f9ddb3abb8a7e4548b996719eac3139e05ed56e7139
+MISC ChangeLog 9398 RMD160 b39a83108876baa770e9ff09bfb8fd3a6634412b SHA1 080c4ed769d0b23f4141ead9e1e7e2020eb7ba9e SHA256 ecb38fe9e24ef6e220a89dff66b6564d32322ff495ff36a5a1f294427033aab4
+MISC metadata.xml 1084 RMD160 7cf6387beefc2f3837b1a89b1998455b2d4719c0 SHA1 a3fdcf876700e8497a5a326cf3c0d8bb94601e9d SHA256 a16ca55eac2181ef69fce35e53a92cded04dc188f52a60410b670d8c2d50284e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjRb38ACgkQkKaRLQcq0GLm7gCfVuLIL+ieW32e68XWKkkBseax
-l7UAn3EiU65xAKBq1iM7FKAnEZvOVM33
-=jjod
+iEYEARECAAYFAkjWQUYACgkQPrHvTlXvhtvskgCfdLn3UhVRCtm83//OJB40xgNG
+/gIAoKelpagC2i0RAaPWgKNT33p9PXso
+=nWx+
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openswan/files/ipsec-initd b/net-misc/openswan/files/ipsec-initd
new file mode 100644
index 000000000000..28d5eb977467
--- /dev/null
+++ b/net-misc/openswan/files/ipsec-initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/files/ipsec-initd,v 1.1 2008/09/21 12:42:32 mrness Exp $
+
+depend() {
+	need net logger
+	after dns
+}
+
+start() {
+	ebegin "Starting IPSec"
+	ipsec setup --start
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping IPSec"
+	ipsec setup --stop
+	eend $?
+}
+
+status() {
+	if [ "$RC_QUIET" != "yes" ]; then
+		ipsec setup --status
+	fi
+}
diff --git a/net-misc/openswan/files/openswan-2.6.16-gentoo.patch b/net-misc/openswan/files/openswan-2.6.16-gentoo.patch
new file mode 100644
index 000000000000..525326f591c2
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.16-gentoo.patch
@@ -0,0 +1,65 @@
+diff -ur openswan-2.6.16.orig/Makefile.inc openswan-2.6.16/Makefile.inc
+--- openswan-2.6.16.orig/Makefile.inc	2008-08-18 17:07:48.000000000 +0000
++++ openswan-2.6.16/Makefile.inc	2008-09-20 19:35:17.000000000 +0000
+@@ -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 -ur openswan-2.6.16.orig/programs/setup/Makefile openswan-2.6.16/programs/setup/Makefile
+--- openswan-2.6.16.orig/programs/setup/Makefile	2008-08-18 17:07:48.000000000 +0000
++++ openswan-2.6.16/programs/setup/Makefile	2008-09-20 19:35:17.000000000 +0000
+@@ -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=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: not supported by cvs2svn $
diff --git a/net-misc/openswan/files/openswan-2.6.16-qa-fixes.patch b/net-misc/openswan/files/openswan-2.6.16-qa-fixes.patch
new file mode 100644
index 000000000000..ca3b5b26f9ce
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.16-qa-fixes.patch
@@ -0,0 +1,45 @@
+diff -ur openswan-2.6.16.orig/include/osw_select.h openswan-2.6.16/include/osw_select.h
+--- openswan-2.6.16.orig/include/osw_select.h	2008-08-18 17:07:48.000000000 +0000
++++ openswan-2.6.16/include/osw_select.h	2008-09-20 20:01:54.000000000 +0000
+@@ -44,6 +44,6 @@
+ #define OSW_FD_ISSET(d, s)   ((OSW_FDS_BITS (s)[OSW_FDELT(d)] & OSW_FDMASK(d)) != 0)
+ 
+ #define osw_select(max, r, f, e, t) \
+-		select(max, (fd_set *)(r), (fd_set *)(f), (fd_set *)(e), t)
++		select(max, (fd_set *)(void *)(r), (fd_set *)(void *)(f), (fd_set *)(void *)(e), t)
+ 
+ #endif /* _OSW_SELECT_H_ */
+diff -ur openswan-2.6.16.orig/programs/pluto/connections.c openswan-2.6.16/programs/pluto/connections.c
+--- openswan-2.6.16.orig/programs/pluto/connections.c	2008-08-18 17:07:48.000000000 +0000
++++ openswan-2.6.16/programs/pluto/connections.c	2008-09-20 19:29:32.000000000 +0000
+@@ -247,6 +247,15 @@
+ #ifdef DEBUG
+     lset_t old_cur_debugging = cur_debugging;
+ #endif
++	union {
++		struct alg_info**     ppai;
++#ifdef KERNEL_ALG
++		struct alg_info_esp** ppai_esp;
++#endif
++#ifdef IKE_ALG
++		struct alg_info_ike** ppai_ike;
++#endif
++	} palg_info;
+ 
+     set_cur_connection(c);
+ 
+@@ -323,10 +332,12 @@
+ 
+     gw_delref(&c->gw_info);
+ #ifdef KERNEL_ALG
+-    alg_info_delref((struct alg_info **)&c->alg_info_esp);
++    palg_info.ppai_esp = &c->alg_info_esp;
++    alg_info_delref(palg_info.ppai);
+ #endif
+ #ifdef IKE_ALG
+-    alg_info_delref((struct alg_info **)&c->alg_info_ike);
++    palg_info.ppai_ike = &c->alg_info_ike;
++    alg_info_delref(palg_info.ppai);
+ #endif
+     pfree(c);
+ }
diff --git a/net-misc/openswan/files/openswan-2.6.16-refine-connection.patch b/net-misc/openswan/files/openswan-2.6.16-refine-connection.patch
new file mode 100644
index 000000000000..99bc27e2b200
--- /dev/null
+++ b/net-misc/openswan/files/openswan-2.6.16-refine-connection.patch
@@ -0,0 +1,22 @@
+diff -ur openswan-2.6.16.orig/programs/pluto/connections.c openswan-2.6.16/programs/pluto/connections.c
+--- openswan-2.6.16.orig/programs/pluto/connections.c	2008-09-21 11:19:47.000000000 +0200
++++ openswan-2.6.16/programs/pluto/connections.c	2008-09-21 12:24:55.000000000 +0200
+@@ -2395,14 +2395,13 @@
+ 	for (; d != NULL; d = d->hp_next)
+ 	{
+ 	    bool match1 = match_id(peer_id, &d->spd.that.id, &wildcards);
+-	    bool match2 = trusted_ca(peer_ca, d->spd.that.ca, &peer_pathlen);
+-	    bool match3 = match_requested_ca(c->requested_ca, d->spd.this.ca, &our_pathlen);
+-	    bool match = match1 && match2 && match3;
++	    bool match2 = match_requested_ca(c->requested_ca, d->spd.this.ca, &our_pathlen);
++	    bool match = match1 && match2;
+ 
+ 	    DBG(DBG_CONTROLMORE
+-		, DBG_log("refine_connection: checking %s against %s, best=%s with match=%d(id=%d/ca=%d/reqca=%d)"
++		, DBG_log("refine_connection: checking %s against %s, best=%s with match=%d(id=%d/reqca=%d)"
+ 			  , c->name, d->name, best_found ? best_found->name : "(none)"
+-			  , match, match1, match2, match3));
++			  , match, match1, match2));
+ 
+ 	    /* ignore group connections */
+ 	    if (d->policy & POLICY_GROUP)
diff --git a/net-misc/openswan/metadata.xml b/net-misc/openswan/metadata.xml
index 55d9e1e3e4dc..cfc10f55d824 100644
--- a/net-misc/openswan/metadata.xml
+++ b/net-misc/openswan/metadata.xml
@@ -12,7 +12,12 @@ implementation of IPsec for the Linux operating system. Is it a code fork
 of the FreeS/WAN project, started by a few of the developers who were 
 growing frustrated with the politics surrounding the FreeS/WAN project.</longdescription>
   <use>
-    <flag name="extra-algorithms">Include additional algorithms such as Blowfish, Twofish and Serpent</flag>
-    <flag name="weak-algorithms">Include weak algorithms such as DH1 and 1DES</flag>
+    <flag name="curl">Include curl support (used for fetching CRLs)</flag>
+    <flag name="ldap">Include LDAP support (used for fetching CRLs)</flag>
+    <flag name="extra-algorithms">Include additional strong algorithms
+    (Blowfish, Twofish, Serpent and SHA2)</flag>
+    <flag name="weak-algorithms">Include weak algorithms (DH1)</flag>
+    <flag name="nocrypto-algorithms">Include algorithms that don't even encrypt
+    (1DES)</flag>
   </use>
 </pkgmetadata>
diff --git a/net-misc/openswan/openswan-2.6.16.ebuild b/net-misc/openswan/openswan-2.6.16.ebuild
new file mode 100644
index 000000000000..6d14dfb29c98
--- /dev/null
+++ b/net-misc/openswan/openswan-2.6.16.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.16.ebuild,v 1.1 2008/09/21 12:42:31 mrness Exp $
+
+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"
+
+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"
+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_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-qa-fixes.patch
+	epatch "${FILESDIR}"/${P}-refine-connection.patch
+
+	find . -regex '.*[.][1-8]' -exec sed -i \
+	    -e s:/usr/local:/usr:g '{}' \; ||
+	    die "failed to replace text in xml docs"
+}
+
+get_make_options() {
+	echo KERNELSRC=\"${KERNEL_DIR}\" \
+		FINALEXAMPLECONFDIR=/usr/share/doc/${P} \
+		INC_RCDEFAULT=/etc/init.d \
+		INC_USRLOCAL=/usr \
+		INC_MANDIR=share/man \
+		FINALDOCDIR=/usr/share/doc/${P} \
+		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
+}