From a0b54a259dcfd3bef31ae53f0ede14c303faefbf Mon Sep 17 00:00:00 2001 From: Jay Pfeifer Date: Thu, 16 Feb 2006 08:49:51 +0000 Subject: Version bump. Remove older 2.5.0 version. (Portage version: 2.1_pre4-r1) --- net-misc/strongswan/ChangeLog | 11 +- net-misc/strongswan/Manifest | 26 ++- net-misc/strongswan/files/digest-strongswan-2.5.0 | 1 - net-misc/strongswan/files/digest-strongswan-2.6.2 | 3 + .../strongswan/files/strongswan-2.5.0-gentoo.patch | 257 --------------------- .../strongswan/files/strongswan-2.6.2-gentoo.patch | 257 +++++++++++++++++++++ net-misc/strongswan/strongswan-2.5.0.ebuild | 149 ------------ net-misc/strongswan/strongswan-2.6.2.ebuild | 149 ++++++++++++ 8 files changed, 441 insertions(+), 412 deletions(-) delete mode 100644 net-misc/strongswan/files/digest-strongswan-2.5.0 create mode 100644 net-misc/strongswan/files/digest-strongswan-2.6.2 delete mode 100644 net-misc/strongswan/files/strongswan-2.5.0-gentoo.patch create mode 100644 net-misc/strongswan/files/strongswan-2.6.2-gentoo.patch delete mode 100644 net-misc/strongswan/strongswan-2.5.0.ebuild create mode 100644 net-misc/strongswan/strongswan-2.6.2.ebuild (limited to 'net-misc/strongswan') diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog index 10fb95b9b068..b42f5a46ade8 100644 --- a/net-misc/strongswan/ChangeLog +++ b/net-misc/strongswan/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/strongswan # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.39 2006/01/15 19:28:37 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.40 2006/02/16 08:49:51 pfeifer Exp $ + +*strongswan-2.6.2 (16 Feb 2006) + + 16 Feb 2006; Jay Pfeifer + -files/strongswan-2.5.0-gentoo.patch, + +files/strongswan-2.6.2-gentoo.patch, -strongswan-2.5.0.ebuild, + +strongswan-2.6.2.ebuild: + Version bump. + Remove older 2.5.0 version. 15 Jan 2006; Jason Wever strongswan-2.5.7.ebuild: Added ~sparc keyword wrt bug #60816. diff --git a/net-misc/strongswan/Manifest b/net-misc/strongswan/Manifest index e76b8be956ea..67e4608e408c 100644 --- a/net-misc/strongswan/Manifest +++ b/net-misc/strongswan/Manifest @@ -1,9 +1,27 @@ -MD5 48047678851f939135dfa462e019f725 ChangeLog 6658 -MD5 e6a1667ed80d993a4631509fce802b2b files/digest-strongswan-2.5.0 70 +MD5 34221d617b8b4ceb77d1464dbea48880 ChangeLog 6920 +RMD160 2082ac0417d383dc1a4146602ce5c10330ca6e3f ChangeLog 6920 +SHA256 614c7d40c309b8c9b133b7a21878959f36f1704ce7165d58338405fbd9325b39 ChangeLog 6920 MD5 52b3df694f5bcf547de79d913e96114c files/digest-strongswan-2.5.7 70 +RMD160 55c3d840037fb964dee09b8cfda9c52c5429aded files/digest-strongswan-2.5.7 70 +SHA256 8027be41aa40e45bda98b5f3fcf621a67f61c8173be904f06b4bb54692931e6c files/digest-strongswan-2.5.7 70 +MD5 d63440e5cfb21a5d4e14913ce2c0e924 files/digest-strongswan-2.6.2 256 +RMD160 1e6833fc4b4143fd046e9474216173f9635c1974 files/digest-strongswan-2.6.2 256 +SHA256 4b58d838783aa458b7b08d5121e73b62a0d8e6b8ea58b72c6b1e6ccb5d8543c9 files/digest-strongswan-2.6.2 256 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538 -MD5 8871962155e5503d97764fa621063dc9 files/strongswan-2.5.0-gentoo.patch 11561 +RMD160 eaecc2b05c66aa3d6140fe3b6b01147c34c9ead3 files/ipsec 1538 +SHA256 a405d35526f0017b6cf95ed67f5cab1e325a1850ae85f763cdb7d7b2a913b51a files/ipsec 1538 MD5 3c4497cd3d13f2c5e42de1e36579b2f8 files/strongswan-2.5.7-gentoo.patch 11561 +RMD160 7073faf7422117dde68857db5a1c9fccc1c7cd01 files/strongswan-2.5.7-gentoo.patch 11561 +SHA256 5ba19c6cdd47dc35f0e711b9838c2ba807bf34ffbbddf7c238561a41d920d612 files/strongswan-2.5.7-gentoo.patch 11561 +MD5 b4bf5e5d10c4f0fc9ba8ecaf61066bd8 files/strongswan-2.6.2-gentoo.patch 11564 +RMD160 62dec97fccb460c49bc585b302094321ed0aa819 files/strongswan-2.6.2-gentoo.patch 11564 +SHA256 926e9d664c195c003d4038a2f289d6ec54f19c2c4147d13bd902d3b0fa8ce9e1 files/strongswan-2.6.2-gentoo.patch 11564 MD5 48d78406890387afe4b0d4bba793f8d1 metadata.xml 634 -MD5 c51c49fe2382efe8b609625aad583409 strongswan-2.5.0.ebuild 3708 +RMD160 24c570ea95443f70aa0e077267719bd31746a2f6 metadata.xml 634 +SHA256 9b0a5ff28d7243716eb1d42dd87633df10b94606bf7f095dba8bbff6fa01bb32 metadata.xml 634 MD5 5368fbd1934286be75c6f2d1b2d1f5a8 strongswan-2.5.7.ebuild 3714 +RMD160 930a619c2e72000a4ebec93f79028e5d23a1481a strongswan-2.5.7.ebuild 3714 +SHA256 c233cbc04b7e17da26fcfacfde5babb82066636441a774d7c8ae4f5c751aa500 strongswan-2.5.7.ebuild 3714 +MD5 315629d3d392ba88069a28a4f94219d9 strongswan-2.6.2.ebuild 3651 +RMD160 575d6f9e9c7e043da7aadd6d1adb06f19d847b4f strongswan-2.6.2.ebuild 3651 +SHA256 9c7fca26fd4f9e44176f2fd3215d0280754a864593cd291c7a6d3bc2d81af427 strongswan-2.6.2.ebuild 3651 diff --git a/net-misc/strongswan/files/digest-strongswan-2.5.0 b/net-misc/strongswan/files/digest-strongswan-2.5.0 deleted file mode 100644 index 88cb4d9f04a1..000000000000 --- a/net-misc/strongswan/files/digest-strongswan-2.5.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 7fb324466f0ff57c0ce62012171e146a strongswan-2.5.0.tar.bz2 2667226 diff --git a/net-misc/strongswan/files/digest-strongswan-2.6.2 b/net-misc/strongswan/files/digest-strongswan-2.6.2 new file mode 100644 index 000000000000..c3abc83847b6 --- /dev/null +++ b/net-misc/strongswan/files/digest-strongswan-2.6.2 @@ -0,0 +1,3 @@ +MD5 67590df6197dafee11e52b5a2516b7f7 strongswan-2.6.2.tar.bz2 2634571 +RMD160 600aa3c523f9db432441f7c9c4c4898a6b89edb4 strongswan-2.6.2.tar.bz2 2634571 +SHA256 713fbd4bebecf9e4293251aa8b1b2f0bd308f698633b0fc727b7570135434385 strongswan-2.6.2.tar.bz2 2634571 diff --git a/net-misc/strongswan/files/strongswan-2.5.0-gentoo.patch b/net-misc/strongswan/files/strongswan-2.5.0-gentoo.patch deleted file mode 100644 index 5d1959f34fc5..000000000000 --- a/net-misc/strongswan/files/strongswan-2.5.0-gentoo.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff -Naupr strongswan-2.5.0/Makefile.inc strongswan-2.5.0-gentoo/Makefile.inc ---- strongswan-2.5.0/Makefile.inc 2004-09-17 12:15:20.000000000 -0500 -+++ strongswan-2.5.0-gentoo/Makefile.inc 2005-07-23 13:20:20.000000000 -0500 -@@ -62,7 +62,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec - 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* -@@ -96,7 +96,7 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_ - MANPLACES=man3 man5 man8 - - # where configuration files go --FINALCONFFILE?=/etc/ipsec.conf -+FINALCONFFILE?=/etc/ipsec/ipsec.conf - CONFFILE=$(DESTDIR)$(FINALCONFFILE) - - FINALCONFDIR?=/etc -@@ -107,10 +107,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR) - - # sample configuration files go into - INC_DOCDIR?=share/doc --FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan -+FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.5.0 - EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} - --FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan -+FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.5.0 - DOCDIR=${DESTDIR}${FINALDOCDIR} - - # where per-conn pluto logs go -@@ -239,7 +239,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4 - # installed one in RH 7.2, won't work - you wind up depending upon - # openssl. - --BIND9STATICLIBDIR?=/usr/local/lib -+BIND9STATICLIBDIR?=/usr/lib - - # FreeSWAN 3.x will require bind9. - USE_LWRES?=false -diff -Naupr strongswan-2.5.0/programs/_include/_include.in strongswan-2.5.0-gentoo/programs/_include/_include.in ---- strongswan-2.5.0/programs/_include/_include.in 2004-03-15 15:03:06.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/_include/_include.in 2005-07-23 13:20:20.000000000 -0500 -@@ -49,10 +49,10 @@ for f - 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 $IPSEC_NAME for the first time." - fi -diff -Naupr strongswan-2.5.0/programs/barf/barf.in strongswan-2.5.0-gentoo/programs/barf/barf.in ---- strongswan-2.5.0/programs/barf/barf.in 2004-09-23 16:08:23.000000000 -0500 -+++ strongswan-2.5.0-gentoo/programs/barf/barf.in 2005-07-23 13:20:20.000000000 -0500 -@@ -19,7 +19,7 @@ IPSEC_NAME="strongSwan" - KERNSRC=${KERNSRC-/usr/src/linux} - LOGS=${LOGS-/var/log} - CONFS=${IPSEC_CONFS-/etc} --CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} -+CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} - me="ipsec barf" - - # kludge to produce no barf output mentioning policygroups if none are present. -@@ -207,13 +207,13 @@ then - 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 -Naupr strongswan-2.5.0/programs/eroute/eroute.5 strongswan-2.5.0-gentoo/programs/eroute/eroute.5 ---- strongswan-2.5.0/programs/eroute/eroute.5 2004-03-15 14:35:27.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/eroute/eroute.5 2005-07-23 13:20:20.000000000 -0500 -@@ -223,7 +223,7 @@ Parameters Index of - in hexadecimal using Authentication Header protocol (51, - IPPROTO_AH) with no identies defined for either end. - .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(5), ipsec_spi(5), - ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5), -diff -Naupr strongswan-2.5.0/programs/eroute/eroute.8 strongswan-2.5.0-gentoo/programs/eroute/eroute.8 ---- strongswan-2.5.0/programs/eroute/eroute.8 2004-03-15 14:35:27.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/eroute/eroute.8 2005-07-23 13:20:20.000000000 -0500 -@@ -308,7 +308,7 @@ will be in clear text. - .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 -Naupr strongswan-2.5.0/programs/ipsec/ipsec.8 strongswan-2.5.0-gentoo/programs/ipsec/ipsec.8 ---- strongswan-2.5.0/programs/ipsec/ipsec.8 2004-03-15 14:35:27.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/ipsec/ipsec.8 2005-07-23 13:20:20.000000000 -0500 -@@ -81,7 +81,7 @@ reports where - .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 -Naupr strongswan-2.5.0/programs/klipsdebug/klipsdebug.5 strongswan-2.5.0-gentoo/programs/klipsdebug/klipsdebug.5 ---- strongswan-2.5.0/programs/klipsdebug/klipsdebug.5 2004-03-15 14:35:28.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/klipsdebug/klipsdebug.5 2005-07-23 13:20:20.000000000 -0500 -@@ -103,7 +103,7 @@ full - sockets debugging has been set and everything else is not set. - .LP - .SH FILES --/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec -+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5), -diff -Naupr strongswan-2.5.0/programs/klipsdebug/klipsdebug.8 strongswan-2.5.0-gentoo/programs/klipsdebug/klipsdebug.8 ---- strongswan-2.5.0/programs/klipsdebug/klipsdebug.8 2004-03-15 14:35:28.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/klipsdebug/klipsdebug.8 2005-07-23 13:20:20.000000000 -0500 -@@ -117,7 +117,7 @@ turns off only the - debugging messages. - .LP - .SH FILES --/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec -+/proc/net/ipsec_klipsdebug, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5) -diff -Naupr strongswan-2.5.0/programs/lwdnsq/lwdnsq.xml.in strongswan-2.5.0-gentoo/programs/lwdnsq/lwdnsq.xml.in ---- strongswan-2.5.0/programs/lwdnsq/lwdnsq.xml.in 2004-03-15 14:35:28.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/lwdnsq/lwdnsq.xml.in 2005-07-23 13:20:20.000000000 -0500 -@@ -430,7 +430,7 @@ information. - Special IPSECKEY processing - - --/etc/ipsec.d/lwdnsq.conf -+/etc/ipsec/ipsec.d/lwdnsq.conf - - - -diff -Naupr strongswan-2.5.0/programs/mailkey/mailkey.in strongswan-2.5.0-gentoo/programs/mailkey/mailkey.in ---- strongswan-2.5.0/programs/mailkey/mailkey.in 2004-03-15 14:35:28.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/mailkey/mailkey.in 2005-07-23 13:20:20.000000000 -0500 -@@ -60,7 +60,7 @@ with the following error: - - "$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 -Naupr strongswan-2.5.0/programs/showhostkey/showhostkey.in strongswan-2.5.0-gentoo/programs/showhostkey/showhostkey.in ---- strongswan-2.5.0/programs/showhostkey/showhostkey.in 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/showhostkey/showhostkey.in 2005-07-23 13:20:20.000000000 -0500 -@@ -18,7 +18,7 @@ me="ipsec showhostkey" - usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] - [--dhclient]" - --file=/etc/ipsec.secrets -+file=/etc/ipsec/ipsec.secrets - fmt="" - gw= - id= -diff -Naupr strongswan-2.5.0/programs/spi/spi.5 strongswan-2.5.0-gentoo/programs/spi/spi.5 ---- strongswan-2.5.0/programs/spi/spi.5 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/spi/spi.5 2005-07-23 13:20:20.000000000 -0500 -@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has - 3858 seconds ago and has been idle for 23 seconds. - .LP - .SH FILES --/proc/net/ipsec_spi, /usr/local/bin/ipsec -+/proc/net/ipsec_spi, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), - ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5), -diff -Naupr strongswan-2.5.0/programs/spi/spi.8 strongswan-2.5.0-gentoo/programs/spi/spi.8 ---- strongswan-2.5.0/programs/spi/spi.8 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/spi/spi.8 2005-07-23 13:20:20.000000000 -0500 -@@ -461,7 +461,7 @@ and protocol - (4). - .LP - .SH FILES --/proc/net/ipsec_spi, /usr/local/bin/ipsec -+/proc/net/ipsec_spi, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5) -diff -Naupr strongswan-2.5.0/programs/spigrp/spigrp.5 strongswan-2.5.0-gentoo/programs/spigrp/spigrp.5 ---- strongswan-2.5.0/programs/spigrp/spigrp.5 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/spigrp/spigrp.5 2005-07-23 13:20:20.000000000 -0500 -@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend - machine. - .LP - .SH FILES --/proc/net/ipsec_spigrp, /usr/local/bin/ipsec -+/proc/net/ipsec_spigrp, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), - ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5), -diff -Naupr strongswan-2.5.0/programs/spigrp/spigrp.8 strongswan-2.5.0-gentoo/programs/spigrp/spigrp.8 ---- strongswan-2.5.0/programs/spigrp/spigrp.8 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/spigrp/spigrp.8 2005-07-23 13:20:20.000000000 -0500 -@@ -128,7 +128,7 @@ and finally an AH header to authenticate - .BR 0x236 . - .LP - .SH FILES --/proc/net/ipsec_spigrp, /usr/local/bin/ipsec -+/proc/net/ipsec_spigrp, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), - ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5) -diff -Naupr strongswan-2.5.0/programs/tncfg/tncfg.5 strongswan-2.5.0-gentoo/programs/tncfg/tncfg.5 ---- strongswan-2.5.0/programs/tncfg/tncfg.5 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/tncfg/tncfg.5 2005-07-23 13:20:20.000000000 -0500 -@@ -75,7 +75,7 @@ shows that virtual device - is not connected to any physical device. - .LP - .SH "FILES" --/proc/net/ipsec_tncfg, /usr/local/bin/ipsec -+/proc/net/ipsec_tncfg, /usr/bin/ipsec - .SH "SEE ALSO" - ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), - ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), -diff -Naupr strongswan-2.5.0/programs/tncfg/tncfg.8 strongswan-2.5.0-gentoo/programs/tncfg/tncfg.8 ---- strongswan-2.5.0/programs/tncfg/tncfg.8 2004-03-15 14:35:31.000000000 -0600 -+++ strongswan-2.5.0-gentoo/programs/tncfg/tncfg.8 2005-07-23 13:20:20.000000000 -0500 -@@ -76,7 +76,7 @@ virtual device to the - physical device. - .LP - .SH "FILES" --/proc/net/ipsec_tncfg, /usr/local/bin/ipsec -+/proc/net/ipsec_tncfg, /usr/bin/ipsec - .SH "SEE ALSO" - 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/strongswan/files/strongswan-2.6.2-gentoo.patch b/net-misc/strongswan/files/strongswan-2.6.2-gentoo.patch new file mode 100644 index 000000000000..f147a00f75da --- /dev/null +++ b/net-misc/strongswan/files/strongswan-2.6.2-gentoo.patch @@ -0,0 +1,257 @@ +diff -Naupr strongswan-2.6.2/Makefile.inc strongswan-2.6.2-gentoo/Makefile.inc +--- strongswan-2.6.2/Makefile.inc 2006-01-25 11:23:15.000000000 -0600 ++++ strongswan-2.6.2-gentoo/Makefile.inc 2006-02-16 01:30:48.000000000 -0600 +@@ -60,7 +60,7 @@ POLICYLIB=${FREESWANSRCDIR}/lib/libipsec + 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 @@ MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_ + MANPLACES=man3 man5 man8 + + # where configuration files go +-FINALCONFFILE?=/etc/ipsec.conf ++FINALCONFFILE?=/etc/ipsec/ipsec.conf + CONFFILE=$(DESTDIR)$(FINALCONFFILE) + + FINALCONFDIR?=/etc +@@ -105,10 +105,10 @@ CONFDDIR=$(DESTDIR)$(FINALCONFDDIR) + + # sample configuration files go into + INC_DOCDIR?=share/doc +-FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan ++FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.6.2 + EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} + +-FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan ++FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/strongswan-2.6.2 + DOCDIR=${DESTDIR}${FINALDOCDIR} + + # where per-conn pluto logs go +@@ -229,7 +229,7 @@ RH_KERNELSRC?=/usr/src/linux-2.4 + # installed one in RH 7.2, won't work - you wind up depending upon + # openssl. + +-BIND9STATICLIBDIR?=/usr/local/lib ++BIND9STATICLIBDIR?=/usr/lib + + # FreeSWAN 3.x will require bind9. + USE_LWRES?=false +diff -Naupr strongswan-2.6.2/programs/_include/_include.in strongswan-2.6.2-gentoo/programs/_include/_include.in +--- strongswan-2.6.2/programs/_include/_include.in 2004-03-15 15:03:06.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/_include/_include.in 2006-02-16 01:30:48.000000000 -0600 +@@ -49,10 +49,10 @@ for f + 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 $IPSEC_NAME for the first time." + fi +diff -Naupr strongswan-2.6.2/programs/barf/barf.in strongswan-2.6.2-gentoo/programs/barf/barf.in +--- strongswan-2.6.2/programs/barf/barf.in 2004-09-23 16:08:23.000000000 -0500 ++++ strongswan-2.6.2-gentoo/programs/barf/barf.in 2006-02-16 01:30:48.000000000 -0600 +@@ -19,7 +19,7 @@ IPSEC_NAME="strongSwan" + KERNSRC=${KERNSRC-/usr/src/linux} + LOGS=${LOGS-/var/log} + CONFS=${IPSEC_CONFS-/etc} +-CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} ++CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} + me="ipsec barf" + + # kludge to produce no barf output mentioning policygroups if none are present. +@@ -207,13 +207,13 @@ then + 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 -Naupr strongswan-2.6.2/programs/eroute/eroute.5 strongswan-2.6.2-gentoo/programs/eroute/eroute.5 +--- strongswan-2.6.2/programs/eroute/eroute.5 2004-03-15 14:35:27.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/eroute/eroute.5 2006-02-16 01:30:48.000000000 -0600 +@@ -223,7 +223,7 @@ Parameters Index of + in hexadecimal using Authentication Header protocol (51, + IPPROTO_AH) with no identies defined for either end. + .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(5), ipsec_spi(5), + ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5), +diff -Naupr strongswan-2.6.2/programs/eroute/eroute.8 strongswan-2.6.2-gentoo/programs/eroute/eroute.8 +--- strongswan-2.6.2/programs/eroute/eroute.8 2004-03-15 14:35:27.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/eroute/eroute.8 2006-02-16 01:30:48.000000000 -0600 +@@ -308,7 +308,7 @@ will be in clear text. + .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 -Naupr strongswan-2.6.2/programs/ipsec/ipsec.8 strongswan-2.6.2-gentoo/programs/ipsec/ipsec.8 +--- strongswan-2.6.2/programs/ipsec/ipsec.8 2006-02-09 13:47:38.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/ipsec/ipsec.8 2006-02-16 01:30:48.000000000 -0600 +@@ -303,7 +303,7 @@ reports where + .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 strongSwan finds its +diff -Naupr strongswan-2.6.2/programs/klipsdebug/klipsdebug.5 strongswan-2.6.2-gentoo/programs/klipsdebug/klipsdebug.5 +--- strongswan-2.6.2/programs/klipsdebug/klipsdebug.5 2004-03-15 14:35:28.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/klipsdebug/klipsdebug.5 2006-02-16 01:30:48.000000000 -0600 +@@ -103,7 +103,7 @@ full + sockets debugging has been set and everything else is not set. + .LP + .SH FILES +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5), +diff -Naupr strongswan-2.6.2/programs/klipsdebug/klipsdebug.8 strongswan-2.6.2-gentoo/programs/klipsdebug/klipsdebug.8 +--- strongswan-2.6.2/programs/klipsdebug/klipsdebug.8 2004-03-15 14:35:28.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/klipsdebug/klipsdebug.8 2006-02-16 01:30:48.000000000 -0600 +@@ -117,7 +117,7 @@ turns off only the + debugging messages. + .LP + .SH FILES +-/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec ++/proc/net/ipsec_klipsdebug, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5) +diff -Naupr strongswan-2.6.2/programs/lwdnsq/lwdnsq.xml.in strongswan-2.6.2-gentoo/programs/lwdnsq/lwdnsq.xml.in +--- strongswan-2.6.2/programs/lwdnsq/lwdnsq.xml.in 2004-03-15 14:35:28.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/lwdnsq/lwdnsq.xml.in 2006-02-16 01:30:48.000000000 -0600 +@@ -430,7 +430,7 @@ information. + Special IPSECKEY processing + + +-/etc/ipsec.d/lwdnsq.conf ++/etc/ipsec/ipsec.d/lwdnsq.conf + + + +diff -Naupr strongswan-2.6.2/programs/mailkey/mailkey.in strongswan-2.6.2-gentoo/programs/mailkey/mailkey.in +--- strongswan-2.6.2/programs/mailkey/mailkey.in 2004-03-15 14:35:28.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/mailkey/mailkey.in 2006-02-16 01:30:48.000000000 -0600 +@@ -60,7 +60,7 @@ with the following error: + + "$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 -Naupr strongswan-2.6.2/programs/showhostkey/showhostkey.in strongswan-2.6.2-gentoo/programs/showhostkey/showhostkey.in +--- strongswan-2.6.2/programs/showhostkey/showhostkey.in 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/showhostkey/showhostkey.in 2006-02-16 01:30:48.000000000 -0600 +@@ -18,7 +18,7 @@ me="ipsec showhostkey" + usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] + [--dhclient]" + +-file=/etc/ipsec.secrets ++file=/etc/ipsec/ipsec.secrets + fmt="" + gw= + id= +diff -Naupr strongswan-2.6.2/programs/spi/spi.5 strongswan-2.6.2-gentoo/programs/spi/spi.5 +--- strongswan-2.6.2/programs/spi/spi.5 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/spi/spi.5 2006-02-16 01:30:48.000000000 -0600 +@@ -162,7 +162,7 @@ since 1 of 8 bits is a parity bit), has + 3858 seconds ago and has been idle for 23 seconds. + .LP + .SH FILES +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), + ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5), +diff -Naupr strongswan-2.6.2/programs/spi/spi.8 strongswan-2.6.2-gentoo/programs/spi/spi.8 +--- strongswan-2.6.2/programs/spi/spi.8 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/spi/spi.8 2006-02-16 01:30:48.000000000 -0600 +@@ -461,7 +461,7 @@ and protocol + (4). + .LP + .SH FILES +-/proc/net/ipsec_spi, /usr/local/bin/ipsec ++/proc/net/ipsec_spi, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5) +diff -Naupr strongswan-2.6.2/programs/spigrp/spigrp.5 strongswan-2.6.2-gentoo/programs/spigrp/spigrp.5 +--- strongswan-2.6.2/programs/spigrp/spigrp.5 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/spigrp/spigrp.5 2006-02-16 01:30:48.000000000 -0600 +@@ -77,7 +77,7 @@ be an incoming or outgoing group, depend + machine. + .LP + .SH FILES +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), + ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5), +diff -Naupr strongswan-2.6.2/programs/spigrp/spigrp.8 strongswan-2.6.2-gentoo/programs/spigrp/spigrp.8 +--- strongswan-2.6.2/programs/spigrp/spigrp.8 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/spigrp/spigrp.8 2006-02-16 01:30:48.000000000 -0600 +@@ -128,7 +128,7 @@ and finally an AH header to authenticate + .BR 0x236 . + .LP + .SH FILES +-/proc/net/ipsec_spigrp, /usr/local/bin/ipsec ++/proc/net/ipsec_spigrp, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), + ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5) +diff -Naupr strongswan-2.6.2/programs/tncfg/tncfg.5 strongswan-2.6.2-gentoo/programs/tncfg/tncfg.5 +--- strongswan-2.6.2/programs/tncfg/tncfg.5 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/tncfg/tncfg.5 2006-02-16 01:30:48.000000000 -0600 +@@ -75,7 +75,7 @@ shows that virtual device + is not connected to any physical device. + .LP + .SH "FILES" +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + .SH "SEE ALSO" + ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), + ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), +diff -Naupr strongswan-2.6.2/programs/tncfg/tncfg.8 strongswan-2.6.2-gentoo/programs/tncfg/tncfg.8 +--- strongswan-2.6.2/programs/tncfg/tncfg.8 2004-03-15 14:35:31.000000000 -0600 ++++ strongswan-2.6.2-gentoo/programs/tncfg/tncfg.8 2006-02-16 01:30:48.000000000 -0600 +@@ -76,7 +76,7 @@ virtual device to the + physical device. + .LP + .SH "FILES" +-/proc/net/ipsec_tncfg, /usr/local/bin/ipsec ++/proc/net/ipsec_tncfg, /usr/bin/ipsec + .SH "SEE ALSO" + 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/strongswan/strongswan-2.5.0.ebuild b/net-misc/strongswan/strongswan-2.5.0.ebuild deleted file mode 100644 index 6c86eeac809f..000000000000 --- a/net-misc/strongswan/strongswan-2.5.0.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.5.0.ebuild,v 1.3 2005/09/03 15:25:33 hansmi Exp $ - -inherit eutils - -DESCRIPTION="Open Source implementation of IPsec for the Linux operating system." -HOMEPAGE="http://www.strongswan.org/" -SRC_URI="http://download.strongswan.org/${P}.tar.bz2 - mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ppc x86" -IUSE="curl ldap smartcard" - -DEPEND="!net-misc/openswan - virtual/libc - virtual/linux-sources - curl? ( net-misc/curl ) - ldap? ( =net-nds/openldap-2* ) - smartcard? ( dev-libs/opensc ) - >=dev-libs/gmp-3.1.1 - net-dns/host - sys-apps/iproute2" -RDEPEND="" - -check_version_h() { - if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ] - then - eerror "Please verify that your /usr/src/linux symlink is pointing" - eerror "to your current kernel sources, and that you have a running kernel" - die "/usr/src/linux symlink not setup!" - fi -} - -get_KV_info() { - check_version_h - - # Get the kernel version of sources in /usr/src/linux ... - export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \ - "${ROOT}/usr/src/linux/include/linux/version.h")" - export KV_major="$(echo "${KV_full}" | cut -d. -f1)" - export KV_minor="$(echo "${KV_full}" | cut -d. -f2)" - export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" -} - -is_kernel() { - [ -z "$1" -o -z "$2" ] && return 1 - - get_KV_info - - if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] - then - return 0 - else - return 1 - fi -} - -pkg_setup() { - get_KV_info - - einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}" - - if is_kernel 2 5 - then - eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild." - die "Please install a 2.6.x version of the Linux kernel." - fi - - if is_kernel 2 6 - then - einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." - einfo "KLIPS will not be compiled/installed." - export MYMAKE="programs" - - elif is_kernel 2 4 - then - [ -d /usr/src/linux/net/ipsec ] || { - 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" - } - einfo "Using patched-in IPsec code for kernel 2.4" - einfo "Your kernel only supports KLIPS for kernel level IPsec." - export MYMAKE="confcheck programs" - - else - eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}." - die "Install an IPsec enabled 2.4 or 2.6 kernel." - fi -} - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.patch - - cd programs/pluto - - if use curl ; then - ebegin "Curl support requested. Enabling curl support" - sed -i -e 's:#LIBCURL=1:LIBCURL=1:g' Makefile || die - eend $? - fi - - if use ldap ; then - ebegin "LDAP support requested. Enabling LDAPv3 support" - sed -i -e 's:#LDAP_VERSION=3:LDAP_VERSION=3:g' Makefile || die - eend $? - fi - - if use smartcard ; then - ebegin "Smartcard support requested. Enabling opensc support" - sed -i -e 's:#SMARTCARD=1:SMARTCARD=1:g' Makefile || die - eend $? - fi -} - -src_compile() { - make \ - DESTDIR=${D} \ - USERCOMPILE="${CFLAGS}" \ - FINALCONFDIR=/etc/ipsec \ - INC_RCDEFAULT=/etc/init.d \ - INC_USRLOCAL=/usr \ - INC_MANDIR=share/man \ - ${MYMAKE} || die -} - -src_install() { - make \ - DESTDIR=${D} \ - USERCOMPILE="${CFLAGS}" \ - FINALCONFDIR=/etc/ipsec \ - INC_RCDEFAULT=/etc/init.d \ - INC_USRLOCAL=/usr \ - INC_MANDIR=share/man \ - install || die - - dohtml doc/*.html - rm -f ${S}/doc/*.html - dodoc CHANGES* CREDITS INSTALL LICENSE README* doc/* - dosym /etc/ipsec/ipsec.d /etc/ipsec.d - - exeinto /etc/init.d/ - doexe ${FILESDIR}/ipsec -} diff --git a/net-misc/strongswan/strongswan-2.6.2.ebuild b/net-misc/strongswan/strongswan-2.6.2.ebuild new file mode 100644 index 000000000000..ec45ce1d1c06 --- /dev/null +++ b/net-misc/strongswan/strongswan-2.6.2.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.6.2.ebuild,v 1.1 2006/02/16 08:49:51 pfeifer Exp $ + +inherit eutils + +DESCRIPTION="Open Source implementation of IPsec for the Linux operating system." +HOMEPAGE="http://www.strongswan.org/" +SRC_URI="http://download.strongswan.org/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~ppc ~sparc ~x86" +IUSE="curl ldap smartcard" + +DEPEND="!net-misc/openswan + virtual/libc + virtual/linux-sources + curl? ( net-misc/curl ) + ldap? ( =net-nds/openldap-2* ) + smartcard? ( dev-libs/opensc ) + >=dev-libs/gmp-3.1.1 + net-dns/host + sys-apps/iproute2" +RDEPEND="" + +check_version_h() { + if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ] + then + eerror "Please verify that your /usr/src/linux symlink is pointing" + eerror "to your current kernel sources, and that you have a running kernel" + die "/usr/src/linux symlink not setup or kernel tree has not been configured!" + fi +} + +get_KV_info() { + check_version_h + + # Get the kernel version of sources in /usr/src/linux ... + export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \ + "${ROOT}/usr/src/linux/include/linux/version.h")" + export KV_major="$(echo "${KV_full}" | cut -d. -f1)" + export KV_minor="$(echo "${KV_full}" | cut -d. -f2)" + export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" +} + +is_kernel() { + [ -z "$1" -o -z "$2" ] && return 1 + + get_KV_info + + if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] + then + return 0 + else + return 1 + fi +} + +pkg_setup() { + get_KV_info + + einfo "Linux kernel is version ${KV_major}.${KV_minor}.${KV_micro}" + + if is_kernel 2 5 + then + eerror "Kernel version ${KV_major}.${KV_minor}.${KV_micro} will not work with this ebuild." + die "Please install a 2.6.x version of the Linux kernel." + fi + + if is_kernel 2 6 + then + einfo "This ebuild will set ${P} to use 2.6 native IPsec (KAME)." + einfo "KLIPS will not be compiled/installed." + export MYMAKE="programs" + + elif is_kernel 2 4 + then + [ -d /usr/src/linux/net/ipsec ] || { + 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" + } + einfo "Using patched-in IPsec code for kernel 2.4" + einfo "Your kernel only supports KLIPS for kernel level IPsec." + export MYMAKE="confcheck programs" + + else + eerror "Sorry, no support for your kernel version ${KV_major}.${KV_minor}.${KV_micro}." + die "Install an IPsec enabled 2.4 or 2.6 kernel." + fi +} + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.patch + + cd programs/pluto + + if use curl ; then + ebegin "Curl support requested. Enabling curl support" + sed -i -e 's:#LIBCURL=1:LIBCURL=1:g' Makefile || die + eend $? + fi + + if use ldap ; then + ebegin "LDAP support requested. Enabling LDAPv3 support" + sed -i -e 's:#LDAP_VERSION=3:LDAP_VERSION=3:g' Makefile || die + eend $? + fi + + if use smartcard ; then + ebegin "Smartcard support requested. Enabling opensc support" + sed -i -e 's:#SMARTCARD=1:SMARTCARD=1:g' Makefile || die + eend $? + fi +} + +src_compile() { + make \ + DESTDIR=${D} \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + ${MYMAKE} || die +} + +src_install() { + make \ + DESTDIR=${D} \ + USERCOMPILE="${CFLAGS}" \ + FINALCONFDIR=/etc/ipsec \ + INC_RCDEFAULT=/etc/init.d \ + INC_USRLOCAL=/usr \ + INC_MANDIR=share/man \ + install || die + + dohtml doc/*.html + rm -f ${S}/doc/*.html + dodoc CHANGES* CREDITS INSTALL LICENSE README* doc/* + dosym /etc/ipsec/ipsec.d /etc/ipsec.d + + exeinto /etc/init.d/ + doexe ${FILESDIR}/ipsec +} -- cgit v1.2.3-65-gdbad