Use selected CC (#293277). Install more doc files (#294533).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 156 insertions, 141 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index a7b141e6986e..ea7aa9399d00 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,6 +1,14 @@
 # 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.70 2009/09/17 16:07:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.71 2009/12/05 08:01:44 mrness Exp $
+
+*openswan-2.6.23-r2 (05 Dec 2009)
+*openswan-2.4.15-r2 (05 Dec 2009)
+
+  05 Dec 2009; Alin Năstac <mrness@gentoo.org> +openswan-2.4.15-r2.ebuild,
+  -openswan-2.6.22.ebuild, -files/openswan-2.6.22-gentoo.patch,
+  +openswan-2.6.23-r2.ebuild:
+  Use selected CC (#293277). Install more doc files (#294533).
 
 *openswan-2.6.23-r1 (17 Sep 2009)
 
diff --git a/net-misc/openswan/files/openswan-2.6.22-gentoo.patch b/net-misc/openswan/files/openswan-2.6.22-gentoo.patch
deleted file mode 100644
index 185b5c9fbdd2..000000000000
--- a/net-misc/openswan/files/openswan-2.6.22-gentoo.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -Nru openswan-2.6.22.orig/lib/libdns/Makefile openswan-2.6.22/lib/libdns/Makefile
---- openswan-2.6.22.orig/lib/libdns/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/lib/libdns/Makefile	2009-06-24 18:54:55.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.22.orig/lib/libisc/Makefile openswan-2.6.22/lib/libisc/Makefile
---- openswan-2.6.22.orig/lib/libisc/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/lib/libisc/Makefile	2009-06-24 18:54:55.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.22.orig/lib/liblwres/Makefile openswan-2.6.22/lib/liblwres/Makefile
---- openswan-2.6.22.orig/lib/liblwres/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/lib/liblwres/Makefile	2009-06-24 18:54:55.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.22.orig/Makefile.inc openswan-2.6.22/Makefile.inc
---- openswan-2.6.22.orig/Makefile.inc	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/Makefile.inc	2009-06-24 18:54:55.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.22.orig/programs/Makefile.program openswan-2.6.22/programs/Makefile.program
---- openswan-2.6.22.orig/programs/Makefile.program	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/Makefile.program	2009-06-24 18:54:55.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.22.orig/programs/setup/Makefile openswan-2.6.22/programs/setup/Makefile
---- openswan-2.6.22.orig/programs/setup/Makefile	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/programs/setup/Makefile	2009-06-24 18:54: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=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.22-gentoo.patch,v $
- # Revision 1.1  2009/06/24 17:18:36  mrness
- # Version bump wrt security bug #275233.
- # (Portage version: 2.1.6.13/cvs/Linux x86_64)
- #
-diff -Nru openswan-2.6.22.orig/testing/utils/make-uml.sh openswan-2.6.22/testing/utils/make-uml.sh
---- openswan-2.6.22.orig/testing/utils/make-uml.sh	2009-06-23 04:53:08.000000000 +0200
-+++ openswan-2.6.22/testing/utils/make-uml.sh	2009-06-24 18:54:55.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/openswan-2.4.15-r2.ebuild b/net-misc/openswan/openswan-2.4.15-r2.ebuild
new file mode 100644
index 000000000000..57ee6154656e
--- /dev/null
+++ b/net-misc/openswan/openswan-2.4.15-r2.ebuild
@@ -0,0 +1,134 @@
+# 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-r2.ebuild,v 1.1 2009/12/05 08:01:44 mrness Exp $
+
+EAPI="2"
+
+inherit eutils linux-info toolchain-funcs
+
+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}\" \
+		CC=\"$(tc-getCC)\"
+	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"
+
+	dodoc docs/{KNOWN_BUGS,RELEASE-NOTES*,debugging*}
+	dodoc doc/*.html
+	docinto quickstarts
+	dodoc doc/quickstarts/*
+
+	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.6.22.ebuild b/net-misc/openswan/openswan-2.6.23-r2.ebuild
index 333b30aad621..355bfc24e41f 100644
--- a/net-misc/openswan/openswan-2.6.22.ebuild
+++ b/net-misc/openswan/openswan-2.6.23-r2.ebuild
@@ -1,10 +1,10 @@
 # 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.22.ebuild,v 1.2 2009/06/28 09:45:59 mrness Exp $
+# $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 $
 
 EAPI="2"
 
-inherit eutils linux-info
+inherit eutils linux-info toolchain-funcs
 
 DESCRIPTION="Open Source implementation of IPsec for the Linux operating system (was SuperFreeS/WAN)."
 HOMEPAGE="http://www.openswan.org/"
@@ -13,7 +13,7 @@ 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"
+IUSE="curl ldap smartcard extra-algorithms weak-algorithms nocrypto-algorithms ms-bad-proposal"
 
 COMMON_DEPEND="!net-misc/strongswan
 	dev-libs/gmp
@@ -60,10 +60,11 @@ pkg_setup() {
 
 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]' -exec sed -i \
+	find . -type f -regex '.*[.]\([1-8]\|html\|xml\)' -exec sed -i \
 	    -e s:/usr/local:/usr:g '{}' \; ||
-	    die "failed to replace text in xml docs"
+	    die "failed to replace text in docs"
 }
 
 get_make_options() {
@@ -74,7 +75,8 @@ get_make_options() {
 		INC_MANDIR=share/man \
 		FINALDOCDIR=/usr/share/doc/${PF}/html \
 		DESTDIR=\"${D}\" \
-		USERCOMPILE=\"${CFLAGS}\"
+		USERCOMPILE=\"${CFLAGS}\" \
+		CC=\"$(tc-getCC)\"
 	if use smartcard ; then
 		echo USE_SMARTCARD=true
 	fi
@@ -113,6 +115,11 @@ src_install() {
 	emake "$@" \
 		install || die "emake install failed"
 
+	dodoc docs/{KNOWN_BUGS*,RELEASE-NOTES*,PATENTS*,debugging*}
+	dohtml doc/*.html
+	docinto quickstarts
+	dodoc doc/quickstarts/*
+
 	newinitd "${FILESDIR}"/ipsec-initd ipsec || die "failed to install init script"
 
 	dodir /var/run/pluto || die "failed to create /var/run/pluto"