From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EE9AB138010 for ; Fri, 28 Sep 2012 00:47:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEA6D21C025; Fri, 28 Sep 2012 00:46:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5FA2C21C025 for ; Fri, 28 Sep 2012 00:46:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E82C33CF72 for ; Fri, 28 Sep 2012 00:46:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5C86AE544A for ; Fri, 28 Sep 2012 00:46:55 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1348793153.cfcac0b12af83c90e5f771bacc02d3f50c49cbfb.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/, net-firewall/ipsec-tools/files/ X-VCS-Repository: dev/blueness X-VCS-Files: net-firewall/ipsec-tools/Manifest net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch net-firewall/ipsec-tools/files/ipsec-tools.conf net-firewall/ipsec-tools/files/psk.txt net-firewall/ipsec-tools/files/racoon.conf net-firewall/ipsec-tools/files/racoon.conf.d-r1 net-firewall/ipsec-tools/files/racoon.init.d-r2 net-firewall/ipsec-tools/files/racoon.pam.d net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild net-firewall/ipsec-tools/metadata.xml X-VCS-Directories: net-firewall/ipsec-tools/ net-firewall/ipsec-tools/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: cfcac0b12af83c90e5f771bacc02d3f50c49cbfb X-VCS-Branch: master Date: Fri, 28 Sep 2012 00:46:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 968be71d-ba6d-4fe1-924d-b632cba7d7d0 X-Archives-Hash: c2d64e5ae545333afd5d907d833e94ae commit: cfcac0b12af83c90e5f771bacc02d3f50c49cbfb Author: Anthony G. Basile gentoo org> AuthorDate: Fri Sep 28 00:45:53 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Sep 28 00:45:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=cfcac0b1 net-firewall/ipsec-tools: moved to tree --- net-firewall/ipsec-tools/Manifest | 12 - .../files/ipsec-tools-0.8.0-sysctl.patch | 22 -- .../ipsec-tools/files/ipsec-tools-def-psk.patch | 25 -- .../files/ipsec-tools-include-vendoridh.patch | 11 - net-firewall/ipsec-tools/files/ipsec-tools.conf | 26 -- net-firewall/ipsec-tools/files/psk.txt | 10 - net-firewall/ipsec-tools/files/racoon.conf | 33 --- net-firewall/ipsec-tools/files/racoon.conf.d-r1 | 27 -- net-firewall/ipsec-tools/files/racoon.init.d-r2 | 57 ---- net-firewall/ipsec-tools/files/racoon.pam.d | 4 - .../ipsec-tools/ipsec-tools-0.8.0-r5.ebuild | 276 -------------------- net-firewall/ipsec-tools/metadata.xml | 14 - 12 files changed, 0 insertions(+), 517 deletions(-) diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest deleted file mode 100644 index 7afd522..0000000 --- a/net-firewall/ipsec-tools/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX ipsec-tools-0.8.0-sysctl.patch 485 SHA256 eb94a1f77ac9c194e51c2f64b65d9c8f70ff109fdfe77f72801449277b7312f4 SHA512 a2a96cea5c2b451665d54572e471a6c2b4fb72382dcd90bda536aaabf78cdd36d630d5c1fa56372b95066dc7dffd56480d3402fdbe2d56825a017b2cc075ac66 WHIRLPOOL 54c8f99ef2881e0fdf1e1aaf7c7908e9fac31326da9a15df160f81f4b9a8bb7a4db738ebd8c888c9a0bfae7e558c48231cb6413e1e953309a658ad12bfb9e106 -AUX ipsec-tools-def-psk.patch 907 SHA256 15da775a7da892b7e99f0a6e531bdb9f37cc9d81c004f8a439152445f960f656 SHA512 683f168fac390df602ece1608db7f65370749c291e837497fa68fe4f39ddab907d10d67d4c80d583d7f12a1ea0bf02ba98d228e7c6e9267b49a1a8a7e57e99c4 WHIRLPOOL cfe93bc7e71aa627b973b416acfcdf9f9346ef5237726a079a0da3a383f949bb780624482f1f17b93cc43fc786711c4d8d3abc173f600f05d8790639cbed911a -AUX ipsec-tools-include-vendoridh.patch 434 SHA256 be0fd6ec217405a6f1ab97231568297e705d995d0f5fa8a6ebae896e1b2e910c SHA512 fc39e09dd7b1a2d3b6cdfbfad9f4978ab5d070ae2435cf77fe2283b566bea1d58cd26dbf6cafb563587200724c9602a32ce737fd163b757872e8a6d2c8007d5c WHIRLPOOL 1507b428ab919b0e45125ec4901af6b3a764a33c98cae6e2df0c061432414cb61e980606d24f55054d4433203f5eca3a123d4dd6dfd74645d7bc222f66cab1bd -AUX ipsec-tools.conf 1209 SHA256 a9a6cbf1bd42aaefdb637814bc6198079bab84e37888e1b705f938f590978816 SHA512 727297a06b75b883a7bd730d84f7a7cec04f81b51df71a6d2419602d835abe3c958d27aac176e29e2463421792843517bda802b3437b306ab43e94d178593bfa WHIRLPOOL 9c8f70c3c117e5cc4a1793637a101920ffd9126e02373db4e68b9eba4588a385cbc08fc81a0b5bf3ae0bff3d9de20a5a14b020e6d62effb97bce790ce4e74437 -AUX psk.txt 293 SHA256 d34b142b4566712f87382caf0a64bcc070bbde17f16e2ee49d5dde26cb1bbe08 SHA512 ed09588bcbf9b16e4e18315c7b9a7667788b4ab26cd962376430c316cfb0ee5a30ff26910190731b287c1a1b5927951a79f71a096071e73d67dc867a455b14cf WHIRLPOOL fe1aadd94612e742029d6e0be7401f2994c9fed4fec899f3fc09c90cb134aca710c41a083164d6cece46b331652ddb3b76720c60bc40b837243b329db7eb60db -AUX racoon.conf 772 SHA256 e00cea25741fa16aa985d80ce49f2a59af0c98a44707a047193e936644b497a3 SHA512 8876920331b4003fd096f1997e1266a12783120e390cea55ca283a8fd6485552b54e87f60e75f33409a4cdb99171d2358953287edd47ddeac8bda6da0cc8becc WHIRLPOOL 12c55b1f5e67592483c2602040454f7c0e511c4867b0ed1e7acb593d3ffd0b2b2bfe7a5defb900eb8759006b4382d8c3d891ace2472d772e223e68eb99bd72cc -AUX racoon.conf.d-r1 906 SHA256 a94721a9d51b970f728c63c1f4348c53fb0629b05ef02a6ee2c3f9e5b74e1163 SHA512 3efd2bd0ad9ef5c4340eb1a60aa561c1c37a71740d2d672d2493b0bb9488c3f12ad654270ba4a81c82f2152684f6f1423242a1b029c120c12e0d2300eae509e1 WHIRLPOOL 0ca879cefc0c784cdeddc2562ca9b6cc28ec5d8541f762818733eba7915ba6e9a87615af8fbf674363398333865f69032474fd49030d12e8a256919977da3404 -AUX racoon.init.d-r2 1279 SHA256 d9038da4f5c969a7da450d6d7a566fd77c4471ff0a1ceb2f176f0c9015d1eda8 SHA512 1a5337c74285b54c21b4d3d216f0a3756a3e2d6ea31028b56782c7a635ffac8142d61074fa0927df6dd1034e15234d3a4eda192c94e8cd5f510520e36bcf81a6 WHIRLPOOL f7219e0306b2d9e6311cd12ea06d560e1bf937ce409e44d7bf5a6e77325e4e6357b138fd709ca7972696a4669f1c6e6d72273250c84462ebf6b9e8c979aea330 -AUX racoon.pam.d 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b -DIST ipsec-tools-0.8.0.tar.bz2 809297 SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717 SHA512 3bec6bab4fe555612f1d48966e797202830f5254a8d2146a14d268ff0c68445af790285214db41ab08ee4888625e8e680c3b848c30789d836169d1612a25fe2c WHIRLPOOL 862d2bbf78aca8c9e01e00c995aeb3b662e1ea4a769081b9880a3fee7821ef5968e10fe75d9671268979188c7ca3b91d507a1fc9a097729d0648bc4c965e675d -EBUILD ipsec-tools-0.8.0-r5.ebuild 7683 SHA256 e0186e522daa8adaca18cf037da7373b6f9a76e0f8488a94a9f2f52b79bcd265 SHA512 5ba14cb21e44c43fb1a8c1165ac3480b01753b0d042f04932ae7ea06b98603efa873dfe4db286d8ab0188d86061450a46a6a632d0a751c3a6ce7291d7fc0478c WHIRLPOOL c298b1fad30ebe2ab59f01898b0e2d40db45f1cee977d9a639b36b7c22b7ad6c917cd75b39d88e3af7014f94a1a1327cc34c770fa176a060e7571e1ae28c2a55 -MISC metadata.xml 537 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 SHA512 9b26b2cd54e00527201339c3936ac717c57fe596e470d84e0dc0715f778b5797488b6cac61dea83bab61714a23a88e44dbd537bfeeb2b37d285653dcb838fab5 WHIRLPOOL a0dd0b61f957875ca3c50db5aa66470ed493be9c4f002bd165d75b41a8ca51cbcfd2567b4702bf1845b8e0a1ca54239e6ed163098d8b613d1f9f459192acc14e diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch b/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch deleted file mode 100644 index 5c69bbb..0000000 --- a/net-firewall/ipsec-tools/files/ipsec-tools-0.8.0-sysctl.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/425770 - ---- a/src/racoon/pfkey.c -+++ b/src/racoon/pfkey.c -@@ -59,7 +59,6 @@ - #include - #include - #include --#include - - #include - #include ---- a/src/setkey/setkey.c -+++ b/src/setkey/setkey.c -@@ -40,7 +40,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch b/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch deleted file mode 100644 index f351860..0000000 --- a/net-firewall/ipsec-tools/files/ipsec-tools-def-psk.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -brau ipsec-tools-0.7.3.o/src/racoon/oakley.c ipsec-tools-0.7.3/src/racoon/oakley.c ---- ipsec-tools-0.7.3.o/src/racoon/oakley.c 2009-08-13 11:18:45.000000000 +0200 -+++ ipsec-tools-0.7.3/src/racoon/oakley.c 2011-06-06 09:36:11.000000000 +0200 -@@ -2498,8 +2498,21 @@ - plog(LLV_ERROR, LOCATION, iph1->remote, - "couldn't find the pskey for %s.\n", - saddrwop2str(iph1->remote)); -+ } -+ } -+ if (iph1->authstr == NULL) { -+ /* -+ * If we could not locate a psk above try and locate -+ * the default psk, ie, "*". -+ */ -+ iph1->authstr = privsep_getpsk("*", 1); -+ if (iph1->authstr == NULL) { -+ plog(LLV_ERROR, LOCATION, iph1->remote, -+ "couldn't find the the default pskey either.\n"); - goto end; - } -+ plog(LLV_NOTIFY, LOCATION, iph1->remote, -+ "Using default PSK.\n"); - } - plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n"); - /* should be secret PSK */ diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch b/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch deleted file mode 100644 index 2e22c82..0000000 --- a/net-firewall/ipsec-tools/files/ipsec-tools-include-vendoridh.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c ipsec-tools-0.8.0/src/racoon/ipsec_doi.c ---- ipsec-tools-0.8.0.orig//src/racoon/ipsec_doi.c 2012-02-28 13:42:24.000000000 -0500 -+++ ipsec-tools-0.8.0/src/racoon/ipsec_doi.c 2012-02-28 13:41:22.000000000 -0500 -@@ -87,6 +87,7 @@ - #ifdef HAVE_GSSAPI - #include - #include "gssapi.h" -+#include "vendorid.h" - #ifdef HAVE_ICONV_2ND_CONST - #define __iconv_const const - #else diff --git a/net-firewall/ipsec-tools/files/ipsec-tools.conf b/net-firewall/ipsec-tools/files/ipsec-tools.conf deleted file mode 100644 index bfff04a..0000000 --- a/net-firewall/ipsec-tools/files/ipsec-tools.conf +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/sbin/setkey -f -# -# THIS IS A SAMPLE FILE! -# -# This is a sample file to test Gentoo's ipsec-tools out of the box. -# Do not use it in production. See: http://www.ipsec-howto.org/ -# -flush; -spdflush; - -# -# Uncomment the following if you want to do manual keying, ie, you want to run IPsec without racoon. -# Do not switch 192.168.3.21 <-> 192.168.3.25 on the peer -# -#add 192.168.3.25 192.168.3.21 ah 0x200 -A hmac-md5 0xc0291ff014dccdd03874d9e8e4cdf3e6; -#add 192.168.3.21 192.168.3.25 ah 0x300 -A hmac-md5 0x96358c90783bbfa3d7b196ceabe0536b; -#add 192.168.3.25 192.168.3.21 esp 0x201 -E 3des-cbc 0x7aeaca3f87d060a12f4a4487d5a5c3355920fae69a96c831; -#add 192.168.3.21 192.168.3.25 esp 0x301 -E 3des-cbc 0xf6ddb555acfd9d77b03ea3843f2653255afe8eb5573965df; - -# -# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer -# -#spdadd 192.168.3.21 192.168.3.25 any -P out ipsec esp/transport//require ah/transport//require; -#spdadd 192.168.3.25 192.168.3.21 any -P in ipsec esp/transport//require ah/transport//require; -spdadd 192.168.3.25 192.168.3.21 any -P out ipsec esp/transport//require ah/transport//require; -spdadd 192.168.3.21 192.168.3.25 any -P in ipsec esp/transport//require ah/transport//require; diff --git a/net-firewall/ipsec-tools/files/psk.txt b/net-firewall/ipsec-tools/files/psk.txt deleted file mode 100644 index 97f5180..0000000 --- a/net-firewall/ipsec-tools/files/psk.txt +++ /dev/null @@ -1,10 +0,0 @@ -# THIS IS A SAMPLE FILE! -# -# This is a sample file to test Gentoo's ipsec-tools out of the box. -# Do not use it in production. See: http://www.ipsec-howto.org/ -# -# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer -# -# Peer IP/FQDN Secret -# 192.168.3.25 sample -192.168.3.21 sample diff --git a/net-firewall/ipsec-tools/files/racoon.conf b/net-firewall/ipsec-tools/files/racoon.conf deleted file mode 100644 index 2e9206d..0000000 --- a/net-firewall/ipsec-tools/files/racoon.conf +++ /dev/null @@ -1,33 +0,0 @@ -# THIS IS A SAMPLE FILE! -# -# This is a sample file to test Gentoo's ipsec-tools out of the box. -# Do not use it in production. See: http://www.ipsec-howto.org/ -# -path pre_shared_key "/etc/racoon/psk.txt"; - -# -# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer -# -#remote 192.168.3.25 -remote 192.168.3.21 -{ - exchange_mode main; - proposal { - encryption_algorithm 3des; - hash_algorithm md5; - authentication_method pre_shared_key; - dh_group modp1024; - } -} - -# -# Make sure to switch 192.168.3.21 <-> 192.168.3.25 on the peer -# -#sainfo address 192.168.3.21 any address 192.168.3.25 any -sainfo address 192.168.3.25 any address 192.168.3.21 any -{ - pfs_group modp768; - encryption_algorithm 3des; - authentication_algorithm hmac_md5; - compression_algorithm deflate; -} diff --git a/net-firewall/ipsec-tools/files/racoon.conf.d-r1 b/net-firewall/ipsec-tools/files/racoon.conf.d-r1 deleted file mode 100644 index ac2b718..0000000 --- a/net-firewall/ipsec-tools/files/racoon.conf.d-r1 +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/files/racoon.conf.d,v 1.4 2012/03/09 02:55:47 blueness Exp $ - -# Config file for /etc/init.d/racoon - -# See the man page or run `racoon --help` for valid command-line options -# RACOON_OPTS="-d" - -RACOON_CONF="/etc/racoon/racoon.conf" -RACOON_PSK_FILE="/etc/racoon/psk.txt" - -# The amount of time in ms for start-stop-daemon to wait before a timeout -# Racoon can sometimes be slow. We'll wait 1 sec. Bug #435398. - -RACOON_WAIT="1000" - -# The setkey config file. Don't name it ipsec.conf as this clashes -# with strongswan. We'll follow debian's naming. Bug #436144. - -SETKEY_CONF="/etc/ipsec-tools.conf" - -# Comment or remove the following if you don't want the policy tables -# to be flushed when racoon is stopped. - -RACOON_RESET_TABLES="true" - diff --git a/net-firewall/ipsec-tools/files/racoon.init.d-r2 b/net-firewall/ipsec-tools/files/racoon.init.d-r2 deleted file mode 100644 index aeed27d..0000000 --- a/net-firewall/ipsec-tools/files/racoon.init.d-r2 +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before netmount - use net -} - -checkconfig() { - if [ ! -e ${SETKEY_CONF} ] ; then - eerror "You need to configure setkey before starting racoon." - return 1 - fi - if [ ! -e ${RACOON_CONF} ] ; then - eerror "You need a configuration file to start racoon." - return 1 - fi - if [ ! -z ${RACOON_PSK_FILE} ] ; then - if [ ! -f ${RACOON_PSK_FILE} ] ; then - eerror "PSK file not found as specified." - eerror "Set RACOON_PSK_FILE in /etc/conf.d/racoon." - return 1 - fi - case "`ls -Lldn ${RACOON_PSK_FILE}`" in - -r--------*) - ;; - *) - eerror "Your defined PSK file should be mode 400 for security!" - return 1 - ;; - esac - fi -} - -command=/usr/sbin/racoon -command_args="-f ${RACOON_CONF} ${RACOON_OPTS}" -pidfile=/var/run/racoon.pid -start_stop_daemon_args="--wait ${RACOON_WAIT}" - -start_pre() { - checkconfig || return 1 - einfo "Loading ipsec policies from ${SETKEY_CONF}." - /usr/sbin/setkey -f ${SETKEY_CONF} - if [ $? -eq 1 ] ; then - eerror "Error while loading ipsec policies" - fi -} - -stop_post() { - if [ -n "${RACOON_RESET_TABLES}" ]; then - ebegin "Flushing policy entries" - /usr/sbin/setkey -F - /usr/sbin/setkey -FP - eend $? - fi -} diff --git a/net-firewall/ipsec-tools/files/racoon.pam.d b/net-firewall/ipsec-tools/files/racoon.pam.d deleted file mode 100644 index b801aaa..0000000 --- a/net-firewall/ipsec-tools/files/racoon.pam.d +++ /dev/null @@ -1,4 +0,0 @@ -auth include system-remote-login -account include system-remote-login -password include system-remote-login -session include system-remote-login diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild deleted file mode 100644 index 681045d..0000000 --- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r4.ebuild,v 1.2 2012/09/25 01:12:33 vapier Exp $ - -EAPI="4" - -inherit eutils flag-o-matic autotools linux-info pam - -DESCRIPTION="A port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation" -HOMEPAGE="http://ipsec-tools.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats" - -RDEPEND=" - dev-libs/openssl - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - pam? ( sys-libs/pam ) - readline? ( sys-libs/readline ) - selinux? ( - sys-libs/libselinux - sec-policy/selinux-ipsec - )" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.30" - -pkg_preinst() { - if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - if ! has_version "net-misc/strongswan" ; then - ewarn "We found an earlier version of ${PN} installed." - ewarn "As of ${PN}-0.8.0-r5, the old configuration file," - ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid" - ewarn "a conflict with net-misc/strongswan; bug #436144. We will" - ewarn "rename this file for you with this upgrade. However, if" - ewarn "you later downgrade, you'll have to rename the file to" - ewarn "its orignal manually or change /etc/conf.d/racoon to point" - ewarn "to the new file." - - if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then - mv /etc/ipsec.conf /etc/ipsec-tools.conf - else - ewarn - ewarn "Oops! I can't move ipsec.conf to ipsec-tools.conf!" - ewarn "Either the former doesn't exist or the later does and" - ewarn "I won't clobber it. Please fix this situation manually." - fi - else - ewarn "You had both an earlier version of ${PN} and" - ewarn "net-misc/strongswan installed. I can't tell whether" - ewarn "the configuration file, ipsec.conf, belongs to one" - ewarn "package or the other due to a file conflict; bug #436144." - ewarn "The current version of ${PN} uses ipsec-tools.conf " - ewarn "as its configuration file, as will future versions." - ewarn "Please fix this situation manually." - fi - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - fi -} - -pkg_setup() { - linux-info_pkg_setup - - get_version - - if linux_config_exists && kernel_is -ge 2 6 19; then - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - ewarn "Checking kernel configuration in /usr/src/linux or" - ewarn "or /proc/config.gz for compatibility with ${PN}." - ewarn "Here are the potential problems:" - ewarn - - local nothing="1" - - # Check options for all flavors of IPSec - local msg="" - for i in XFRM_USER NET_KEY; do - if ! linux_chkconfig_present ${i}; then - msg="${msg} ${i}" - fi - done - if [[ ! -z "$msg" ]]; then - nothing="0" - ewarn - ewarn "ALL IPSec may fail. CHECK:" - ewarn "${msg}" - fi - - # Check unencrypted IPSec - if ! linux_chkconfig_present CRYPTO_NULL; then - nothing="0" - ewarn - ewarn "Unencrypted IPSec may fail. CHECK:" - ewarn " CRYPTO_NULL" - fi - - # Check IPv4 IPSec - msg="" - for i in \ - INET_IPCOMP INET_AH INET_ESP \ - INET_XFRM_MODE_TRANSPORT \ - INET_XFRM_MODE_TUNNEL \ - INET_XFRM_MODE_BEET - do - if ! linux_chkconfig_present ${i}; then - msg="${msg} ${i}" - fi - done - if [[ ! -z "$msg" ]]; then - nothing="0" - ewarn - ewarn "IPv4 IPSec may fail. CHECK:" - ewarn "${msg}" - fi - - # Check IPv6 IPSec - if use ipv6; then - msg="" - for i in INET6_IPCOMP INET6_AH INET6_ESP \ - INET6_XFRM_MODE_TRANSPORT \ - INET6_XFRM_MODE_TUNNEL \ - INET6_XFRM_MODE_BEET - do - if ! linux_chkconfig_present ${i}; then - msg="${msg} ${i}" - fi - done - if [[ ! -z "$msg" ]]; then - nothing="0" - ewarn - ewarn "IPv6 IPSec may fail. CHECK:" - ewarn "${msg}" - fi - fi - - # Check IPSec behind NAT - if use nat; then - if ! linux_chkconfig_present NETFILTER_XT_MATCH_POLICY; then - nothing="0" - ewarn - ewarn "IPSec behind NAT may fail. CHECK:" - ewarn " NETFILTER_XT_MATCH_POLICY" - fi - fi - - if [[ $nothing == "1" ]]; then - ewarn "NO PROBLEMS FOUND" - fi - - ewarn - ewarn "WARNING: If your *configured* and *running* kernel" - ewarn "differ either now or in the future, then these checks" - ewarn "may lead to misleading results." - ewarn - ewarn "\033[1;33m**************************************************\033[00m" - ewarn - else - eerror - eerror "\033[1;31m**************************************************\033[00m" - eerror "Make sure that your *running* kernel is/will be >=2.6.19." - eerror "Building ${PN} now, assuming that you know what you're doing." - eerror "\033[1;31m**************************************************\033[00m" - eerror - fi -} - -src_prepare() { - # fix for bug #124813 - sed -i 's:-Werror::g' "${S}"/configure.ac || die - # fix for building with gcc-4.6 - sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die - - epatch "${FILESDIR}/${PN}-def-psk.patch" - epatch "${FILESDIR}/${PN}-include-vendoridh.patch" - epatch "${FILESDIR}"/${P}-sysctl.patch #425770 - - AT_M4DIR="${S}" eautoreconf - epunt_cxx -} - -src_configure() { - #--with-{iconv,libradius} lead to "Broken getaddrinfo()" - #--enable-samode-unspec is not supported in linux - local myconf - myconf="--with-kernel-headers=/usr/include \ - --enable-adminport \ - --enable-dependency-tracking \ - --enable-dpd \ - --enable-frag \ - --without-libiconv \ - --without-libradius \ - --disable-samode-unspec \ - $(use_enable idea) \ - $(use_enable ipv6) \ - $(use_enable kerberos gssapi) \ - $(use_with ldap libldap) \ - $(use_enable nat natt) \ - $(use_with pam libpam) \ - $(use_enable rc5) \ - $(use_with readline) \ - $(use_enable selinux security-context) \ - $(use_enable stats)" - - use nat && myconf="${myconf} --enable-natt-versions=yes" - - # enable mode-cfg and xauth support - if use pam; then - myconf="${myconf} --enable-hybrid" - else - myconf="${myconf} $(use_enable hybrid)" - fi - - econf ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install - keepdir /var/lib/racoon - newconfd "${FILESDIR}"/racoon.conf.d-r1 racoon - newinitd "${FILESDIR}"/racoon.init.d-r2 racoon - use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon - - insinto /etc - doins "${FILESDIR}"/ipsec-tools.conf - insinto /etc/racoon - doins "${FILESDIR}"/racoon.conf - doins "${FILESDIR}"/psk.txt - chmod 400 "${D}"/etc/racoon/psk.txt - - dodoc ChangeLog README NEWS - dodoc -r src/racoon/samples - dodoc -r src/racoon/doc - docinto samples - mv ipsec.conf ipsec-tools.conf - newdoc src/setkey/sample.cf ipsec-tools.conf -} - -pkg_postinst() { - if use nat; then - elog - elog "You have enabled the nat traversal functionnality." - elog "Nat versions wich are enabled by default are 00,02,rfc" - elog "you can find those drafts in the CVS repository:" - elog "cvs -d anoncvs@anoncvs.netbsd.org:/cvsroot co ipsec-tools" - elog - elog "If you feel brave enough and you know what you are" - elog "doing, you can consider emerging this ebuild with" - elog "EXTRA_ECONF=\"--enable-natt-versions=08,07,06\"" - elog - fi - - if use ldap; then - elog - elog "You have enabled ldap support with {$PN}." - elog "The man page does NOT contain any information on it yet." - elog "Consider using a more recent version or CVS." - elog - fi - - elog - elog "Please have a look in /usr/share/doc/${P} and visit" - elog "http://www.netbsd.org/Documentation/network/ipsec/" - elog "to find more information on how to configure this tool." - elog -} diff --git a/net-firewall/ipsec-tools/metadata.xml b/net-firewall/ipsec-tools/metadata.xml deleted file mode 100644 index 6e6434c..0000000 --- a/net-firewall/ipsec-tools/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - blueness@gentoo.org - - - Makes available both mode-cfg and xauth support - Enable support for the IDEA algorithm - Enable NAT-Traversal - Enable support for the patented RC5 algorithm - Enable statistics reporting - -