diff options
author | Alin Năstac <mrness@gentoo.org> | 2008-01-29 12:44:36 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2008-01-29 12:44:36 +0000 |
commit | fd4d0e08ff86b3dfa4158a249a3bf30a568b2d71 (patch) | |
tree | 8fb3770c2d644b042a27a3d2ce861688cac60890 /net-misc | |
parent | Removed obsolete version (diff) | |
download | gentoo-2-fd4d0e08ff86b3dfa4158a249a3bf30a568b2d71.tar.gz gentoo-2-fd4d0e08ff86b3dfa4158a249a3bf30a568b2d71.tar.bz2 gentoo-2-fd4d0e08ff86b3dfa4158a249a3bf30a568b2d71.zip |
Version bump (#207936). Add curl and ldap USE flags.
(Portage version: 2.1.3.19)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/openswan/ChangeLog | 11 | ||||
-rw-r--r-- | net-misc/openswan/files/digest-openswan-2.4.11 | 3 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.4.11-gentoo.patch | 398 | ||||
-rw-r--r-- | net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch | 11 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.4.11.ebuild | 134 |
5 files changed, 555 insertions, 2 deletions
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index 055aa0620a3c..6b1680835691 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/openswan -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.43 2007/10/22 23:02:50 mrness Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.44 2008/01/29 12:44:35 mrness Exp $ + +*openswan-2.4.11 (29 Jan 2008) + + 29 Jan 2008; Alin Năstac <mrness@gentoo.org> + +files/openswan-2.4.11-gentoo.patch, + +files/openswan-2.4.11-implicit-decl.patch, +openswan-2.4.11.ebuild: + Version bump (#207936). Add curl and ldap USE flags. 22 Oct 2007; Alin Năstac <mrness@gentoo.org> -files/openswan-2.4.7-gentoo.patch, -files/openswan-2.4.8-gentoo.patch, diff --git a/net-misc/openswan/files/digest-openswan-2.4.11 b/net-misc/openswan/files/digest-openswan-2.4.11 new file mode 100644 index 000000000000..0b8c4a690309 --- /dev/null +++ b/net-misc/openswan/files/digest-openswan-2.4.11 @@ -0,0 +1,3 @@ +MD5 6cac660e0beb6db101bac5b86c743aab openswan-2.4.11.tar.gz 3759918 +RMD160 c77777aaeba65e92196aad9e7c32ffd7c2e4a49d openswan-2.4.11.tar.gz 3759918 +SHA256 4adea45d7cc413b558f15e4528de4486b62a07cfd2af2bf592b09cea3f16ecae openswan-2.4.11.tar.gz 3759918 diff --git a/net-misc/openswan/files/openswan-2.4.11-gentoo.patch b/net-misc/openswan/files/openswan-2.4.11-gentoo.patch new file mode 100644 index 000000000000..c145c7e95c29 --- /dev/null +++ b/net-misc/openswan/files/openswan-2.4.11-gentoo.patch @@ -0,0 +1,398 @@ +diff -Nru openswan-2.4.11.orig/doc/Makefile openswan-2.4.11/doc/Makefile +--- openswan-2.4.11.orig/doc/Makefile 2005-11-08 23:32:45.000000000 +0200 ++++ openswan-2.4.11/doc/Makefile 2008-01-29 14:03:15.000000000 +0200 +@@ -1,6 +1,6 @@ + # Makefile to generate various formats from HTML source + # +-# Assumes the htmldoc utility is available. ++# No longer cares if the htmldoc utility is available. + # This can be downloaded from www.easysw.com + # + # Also needs lynx(1) for HTML-to-text conversion +diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/crypt586.pl openswan-2.4.11/lib/libcrypto/libdes/asm/crypt586.pl +--- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 03:24:45.000000000 +0300 ++++ openswan-2.4.11/lib/libcrypto/libdes/asm/crypt586.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # The inner loop instruction sequence and the IP/FP modifications are from + # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> +diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/cbc.pl +--- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 11:07:06.000000000 +0300 ++++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) + # des_cblock (*input); +diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86asm.pl +--- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 11:07:06.000000000 +0300 ++++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # require 'x86asm.pl'; + # &asm_init("cpp","des-586.pl"); +diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86ms.pl +--- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 11:07:07.000000000 +0300 ++++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86ms; + +diff -Nru openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86unix.pl +--- openswan-2.4.11.orig/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 11:07:07.000000000 +0300 ++++ openswan-2.4.11/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + package x86unix; + +diff -Nru openswan-2.4.11.orig/lib/liblwres/Makefile openswan-2.4.11/lib/liblwres/Makefile +--- openswan-2.4.11.orig/lib/liblwres/Makefile 2007-10-22 17:33:11.000000000 +0300 ++++ openswan-2.4.11/lib/liblwres/Makefile 2008-01-29 14:04:47.000000000 +0200 +@@ -20,7 +20,7 @@ + CDEFINES = -g + CWARNINGS = -Werror + +-CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} ++CFLAGS+=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) + + VERSION="@(\#) openswan-hacking-9.3-for-osw2" + LIBINTERFACE=2 +diff -Nru openswan-2.4.11.orig/linux/net/ipsec/des/asm/des-586.pl openswan-2.4.11/linux/net/ipsec/des/asm/des-586.pl +--- openswan-2.4.11.orig/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 11:06:50.000000000 +0300 ++++ openswan-2.4.11/linux/net/ipsec/des/asm/des-586.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # The inner loop instruction sequence and the IP/FP modifications are from + # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk> +diff -Nru openswan-2.4.11.orig/linux/net/ipsec/des/asm/des686.pl openswan-2.4.11/linux/net/ipsec/des/asm/des686.pl +--- openswan-2.4.11.orig/linux/net/ipsec/des/asm/des686.pl 2004-07-10 11:06:50.000000000 +0300 ++++ openswan-2.4.11/linux/net/ipsec/des/asm/des686.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $prog="des686.pl"; + +diff -Nru openswan-2.4.11.orig/linux/net/ipsec/des/asm/desboth.pl openswan-2.4.11/linux/net/ipsec/des/asm/desboth.pl +--- openswan-2.4.11.orig/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 11:06:50.000000000 +0300 ++++ openswan-2.4.11/linux/net/ipsec/des/asm/desboth.pl 2008-01-29 14:03:15.000000000 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + $L="edi"; + $R="esi"; +diff -Nru openswan-2.4.11.orig/Makefile.inc openswan-2.4.11/Makefile.inc +--- openswan-2.4.11.orig/Makefile.inc 2007-12-04 19:56:45.000000000 +0200 ++++ openswan-2.4.11/Makefile.inc 2008-01-29 14:03:15.000000000 +0200 +@@ -46,7 +46,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* +@@ -80,7 +80,7 @@ + MANPLACES=man3 man5 man8 + + # where configuration files go +-FINALCONFFILE?=/etc/ipsec.conf ++FINALCONFFILE?=/etc/ipsec/ipsec.conf + CONFFILE=$(DESTDIR)$(FINALCONFFILE) + + FINALCONFDIR?=/etc +@@ -91,7 +91,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 +@@ -241,7 +241,7 @@ + # installed one in RH 7.2, won't work - you wind up depending upon + # openssl. + +-BIND9STATICLIBDIR?=/usr/local/lib ++BIND9STATICLIBDIR?=/usr/lib + + # if you install elsewere, you may need to point the include files to it. + #BIND9STATICLIBDIR?=/sandel/lib +diff -Nru openswan-2.4.11.orig/programs/barf/barf.in openswan-2.4.11/programs/barf/barf.in +--- openswan-2.4.11.orig/programs/barf/barf.in 2006-11-07 05:49:18.000000000 +0200 ++++ openswan-2.4.11/programs/barf/barf.in 2008-01-29 14:03:15.000000000 +0200 +@@ -16,7 +16,7 @@ + + LOGS=${LOGS-/var/log} + CONFS=${IPSEC_CONFS-/etc} +-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} ++CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} + me="ipsec barf" + # Max lines to use for things like 'route -n' + maxlines=100 +@@ -238,13 +238,13 @@ + done + fi + _________________________ ipsec/ls-libdir +-ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} ++ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} + _________________________ ipsec/ls-execdir +-ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} ++ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} + _________________________ ipsec/updowns +-for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` ++for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` + do +- cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f ++ cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f + done + _________________________ /proc/net/dev + cat /proc/net/dev +diff -Nru openswan-2.4.11.orig/programs/eroute/eroute.5 openswan-2.4.11/programs/eroute/eroute.5 +--- openswan-2.4.11.orig/programs/eroute/eroute.5 2006-10-26 23:40:43.000000000 +0300 ++++ openswan-2.4.11/programs/eroute/eroute.5 2008-01-29 14:03:15.000000000 +0200 +@@ -168,7 +168,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_eroute, /usr/local/bin/ipsec ++/proc/net/ipsec_eroute, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/eroute/eroute.8 openswan-2.4.11/programs/eroute/eroute.8 +--- openswan-2.4.11.orig/programs/eroute/eroute.8 2003-10-31 04:32:27.000000000 +0200 ++++ openswan-2.4.11/programs/eroute/eroute.8 2008-01-29 14:03:15.000000000 +0200 +@@ -308,7 +308,7 @@ + .br + .LP + .SH FILES +-/proc/net/ipsec_eroute, /usr/local/bin/ipsec ++/proc/net/ipsec_eroute, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), + ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) +diff -Nru openswan-2.4.11.orig/programs/_include/_include.in openswan-2.4.11/programs/_include/_include.in +--- openswan-2.4.11.orig/programs/_include/_include.in 2003-01-06 23:44:04.000000000 +0200 ++++ openswan-2.4.11/programs/_include/_include.in 2008-01-29 14:03:15.000000000 +0200 +@@ -47,10 +47,10 @@ + do + if test ! -r "$f" + then +- if test ! "$f" = "/etc/ipsec.conf" ++ if test ! "$f" = "/etc/ipsec/ipsec.conf" + then + echo "#:cannot open configuration file \'$f\'" +- if test "$f" = "/etc/ipsec.secrets" ++ if test "$f" = "/etc/ipsec/ipsec.secrets" + then + echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." + fi +diff -Nru openswan-2.4.11.orig/programs/ipsec/ipsec.8 openswan-2.4.11/programs/ipsec/ipsec.8 +--- openswan-2.4.11.orig/programs/ipsec/ipsec.8 2003-02-27 18:51:54.000000000 +0200 ++++ openswan-2.4.11/programs/ipsec/ipsec.8 2008-01-29 14:03:15.000000000 +0200 +@@ -81,7 +81,7 @@ + .I ipsec + thinks the IPsec configuration files are stored. + .SH FILES +-/usr/local/lib/ipsec usual utilities directory ++/usr/lib/ipsec usual utilities directory + .SH ENVIRONMENT + .PP + The following environment variables control where FreeS/WAN finds its +diff -Nru openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.5 openswan-2.4.11/programs/klipsdebug/klipsdebug.5 +--- openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.5 2006-10-27 01:21:25.000000000 +0300 ++++ openswan-2.4.11/programs/klipsdebug/klipsdebug.5 2008-01-29 14:03:15.000000000 +0200 +@@ -114,7 +114,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.8 openswan-2.4.11/programs/klipsdebug/klipsdebug.8 +--- openswan-2.4.11.orig/programs/klipsdebug/klipsdebug.8 2006-10-27 01:21:25.000000000 +0300 ++++ openswan-2.4.11/programs/klipsdebug/klipsdebug.8 2008-01-29 14:03:15.000000000 +0200 +@@ -111,7 +111,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/mailkey/mailkey.in openswan-2.4.11/programs/mailkey/mailkey.in +--- openswan-2.4.11.orig/programs/mailkey/mailkey.in 2006-10-29 02:49:23.000000000 +0300 ++++ openswan-2.4.11/programs/mailkey/mailkey.in 2008-01-29 14:03:15.000000000 +0200 +@@ -60,7 +60,7 @@ + + "$test1st" + +-Common concerns: This account must be able to read /etc/ipsec.secrets. ++Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. + If you haven't generated your key yet, please run 'ipsec newhostkey'." + exit 0 + } +diff -Nru openswan-2.4.11.orig/programs/pluto/Makefile openswan-2.4.11/programs/pluto/Makefile +--- openswan-2.4.11.orig/programs/pluto/Makefile 2007-11-06 20:56:26.000000000 +0200 ++++ openswan-2.4.11/programs/pluto/Makefile 2008-01-29 14:03:15.000000000 +0200 +@@ -210,7 +210,7 @@ + endif + + ifeq ($(USE_WEAKSTUFF),true) +-WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 #-DUSE_1DES ++WEAK_DEFS=-DUSE_VERYWEAK_DH1=1 -DUSE_1DES + endif + + ifeq ($(USE_EXTRACRYPTO),true) +@@ -256,7 +256,7 @@ + -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ + -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" + +-ALLFLAGS = $(CPPFLAGS) $(CFLAGS) ++ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) + + # libefence is a free memory allocation debugger + # Solaris 2 needs -lsocket -lnsl +diff -Nru openswan-2.4.11.orig/programs/setup/Makefile openswan-2.4.11/programs/setup/Makefile +--- openswan-2.4.11.orig/programs/setup/Makefile 2004-12-18 20:13:43.000000000 +0200 ++++ openswan-2.4.11/programs/setup/Makefile 2008-01-29 14:03:15.000000000 +0200 +@@ -33,25 +33,10 @@ + @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 + + clean:: + @rm -f setup +diff -Nru openswan-2.4.11.orig/programs/showhostkey/showhostkey.in openswan-2.4.11/programs/showhostkey/showhostkey.in +--- openswan-2.4.11.orig/programs/showhostkey/showhostkey.in 2007-06-19 18:27:27.000000000 +0300 ++++ openswan-2.4.11/programs/showhostkey/showhostkey.in 2008-01-29 14:03:15.000000000 +0200 +@@ -18,7 +18,7 @@ + usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] + [--dhclient] [--ipseckey]" + +-file=/etc/ipsec.secrets ++file=/etc/ipsec/ipsec.secrets + fmt="" + gw= + id= +diff -Nru openswan-2.4.11.orig/programs/showpolicy/showpolicy.8 openswan-2.4.11/programs/showpolicy/showpolicy.8 +--- openswan-2.4.11.orig/programs/showpolicy/showpolicy.8 2005-01-11 19:52:50.000000000 +0200 ++++ openswan-2.4.11/programs/showpolicy/showpolicy.8 2008-01-29 14:03:15.000000000 +0200 +@@ -19,7 +19,7 @@ + .PP + This is a test program. One might run it from inetd, via: + .TP +-discard stream tcp nowait nobody /usr/local/libexec/ipsec/showpolicy showpolicy ++discard stream tcp nowait nobody /usr/libexec/ipsec/showpolicy showpolicy + .SH FILES + /var/run/pluto/ipsecpolicy.ctl + .SH "SEE ALSO" +diff -Nru openswan-2.4.11.orig/programs/spi/spi.5 openswan-2.4.11/programs/spi/spi.5 +--- openswan-2.4.11.orig/programs/spi/spi.5 2006-10-26 23:53:59.000000000 +0300 ++++ openswan-2.4.11/programs/spi/spi.5 2008-01-29 14:03:15.000000000 +0200 +@@ -157,7 +157,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/spi/spi.8 openswan-2.4.11/programs/spi/spi.8 +--- openswan-2.4.11.orig/programs/spi/spi.8 2006-10-30 22:00:04.000000000 +0200 ++++ openswan-2.4.11/programs/spi/spi.8 2008-01-29 14:03:15.000000000 +0200 +@@ -215,7 +215,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/spigrp/spigrp.5 openswan-2.4.11/programs/spigrp/spigrp.5 +--- openswan-2.4.11.orig/programs/spigrp/spigrp.5 2006-10-26 23:50:29.000000000 +0300 ++++ openswan-2.4.11/programs/spigrp/spigrp.5 2008-01-29 14:03:15.000000000 +0200 +@@ -67,7 +67,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/spigrp/spigrp.8 openswan-2.4.11/programs/spigrp/spigrp.8 +--- openswan-2.4.11.orig/programs/spigrp/spigrp.8 2006-10-26 23:50:29.000000000 +0300 ++++ openswan-2.4.11/programs/spigrp/spigrp.8 2008-01-29 14:03:15.000000000 +0200 +@@ -87,7 +87,7 @@ + .SH "FILES" + + .PP +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + + .SH "SEE ALSO" + +diff -Nru openswan-2.4.11.orig/programs/tncfg/tncfg.5 openswan-2.4.11/programs/tncfg/tncfg.5 +--- openswan-2.4.11.orig/programs/tncfg/tncfg.5 2006-11-24 06:34:10.000000000 +0200 ++++ openswan-2.4.11/programs/tncfg/tncfg.5 2008-01-29 14:03:15.000000000 +0200 +@@ -82,7 +82,7 @@ + is not connected to any physical device. + .SH "FILES" + .PP +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + .SH "SEE ALSO" + .PP + ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), ipsec_pf_key(5) +diff -Nru openswan-2.4.11.orig/programs/tncfg/tncfg.8 openswan-2.4.11/programs/tncfg/tncfg.8 +--- openswan-2.4.11.orig/programs/tncfg/tncfg.8 2006-11-24 06:34:10.000000000 +0200 ++++ openswan-2.4.11/programs/tncfg/tncfg.8 2008-01-29 14:03:15.000000000 +0200 +@@ -61,7 +61,7 @@ + physical device. + .SH "FILES" + .PP +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + .SH "SEE ALSO" + .PP + ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5) diff --git a/net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch b/net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch new file mode 100644 index 000000000000..a270589bc05a --- /dev/null +++ b/net-misc/openswan/files/openswan-2.4.11-implicit-decl.patch @@ -0,0 +1,11 @@ +diff -Nru openswan-2.4.11.orig/programs/pluto/fetch.c openswan-2.4.11/programs/pluto/fetch.c +--- openswan-2.4.11.orig/programs/pluto/fetch.c 2004-06-14 05:01:32.000000000 +0300 ++++ openswan-2.4.11/programs/pluto/fetch.c 2008-01-29 14:39:16.000000000 +0200 +@@ -28,6 +28,7 @@ + #include <openswan.h> + + #ifdef LDAP_VER ++#define LDAP_DEPRECATED 1 + #include <ldap.h> + #endif + diff --git a/net-misc/openswan/openswan-2.4.11.ebuild b/net-misc/openswan/openswan-2.4.11.ebuild new file mode 100644 index 000000000000..88046dc0634c --- /dev/null +++ b/net-misc/openswan/openswan-2.4.11.ebuild @@ -0,0 +1,134 @@ +# 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.4.11.ebuild,v 1.1 2008/01/29 12:44:35 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" + +COMMON_DEPEND="!net-misc/strongswan + >=dev-libs/gmp-4.2.1 + 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_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-implicit-decl.patch +} + +get_make_options() { + echo KERNELSRC=\"${KERNEL_DIR}\" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + FINALEXAMPLECONFDIR=/usr/share/doc/${P} \ + 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 + fi + if use weak-algorithms ; then + echo USE_WEAKSTUFF=true + fi + echo USE_OE=false # by default, turn off Opportunistic Encryption + 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_preinst() { + # Try to fix previous openswan-2.4.9 blooper (#193824) + if [[ "${ROOT}" == / ]] && has_version "=net-misc/openswan-2.4.9" ; then + elog "Trying to remove empty {rundir,subsysdir} erroneously created by openswan-2.4.9" + local base dir + for base in / /root/ /etc/ ; do + for dir in rundir subsysdir ; do + if [[ -d "${base}${dir}" ]]; then + rmdir "${base}${dir}" \ + && elog "Empty directory ${base}${dir} has been removed" \ + || ewarn "Failed to remove ${base}${dir} (perhaps some other package owns it?)" + fi + done + done + 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 +} |