[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-27 Thread Anthony G. Basile
commit: 3655190898eff1e14dbf435f04aa8d14946eeaf8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Nov 27 22:31:31 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov 27 22:31:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36551908

net-firewall/ipsec-tools: add systemd unit files.

See: https://github.com/gentoo/gentoo/pull/350

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/ipsec.service   |  12 +
 net-firewall/ipsec-tools/files/racoon.service  |  11 +
 .../ipsec-tools/ipsec-tools-0.8.2-r1.ebuild| 279 +
 3 files changed, 302 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec.service
new file mode 100644
index 000..0341aa7
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/files/racoon.service 
b/net-firewall/ipsec-tools/files/racoon.service
new file mode 100644
index 000..dd72827
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/racoon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+Requires=ipsec.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
new file mode 100644
index 000..1f45d9e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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."
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-28 Thread Anthony G. Basile
commit: 028c3d23f6092f7ea35b16265cd94f19abf57370
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 28 10:35:26 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 28 10:35:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028c3d23

net-firewall/ipsec-tools: avoid file collision with libreswan, bug #567010

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/{ipsec.service => ipsec-tools.service}   | 0
 .../{ipsec-tools-0.8.2-r1.ebuild => ipsec-tools-0.8.2-r2.ebuild}| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec-tools.service
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec.service
rename to net-firewall/ipsec-tools/files/ipsec-tools.service

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
similarity index 99%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
rename to net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
index 1f45d9e..8b0d549 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
@@ -231,7 +231,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-   systemd_dounit "${FILESDIR}/ipsec.service"
+   systemd_dounit "${FILESDIR}/ipsec-tools.service"
systemd_dounit "${FILESDIR}/racoon.service"
use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-27 Thread Anthony G. Basile
commit: 3655190898eff1e14dbf435f04aa8d14946eeaf8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Nov 27 22:31:31 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov 27 22:31:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36551908

net-firewall/ipsec-tools: add systemd unit files.

See: https://github.com/gentoo/gentoo/pull/350

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/ipsec.service   |  12 +
 net-firewall/ipsec-tools/files/racoon.service  |  11 +
 .../ipsec-tools/ipsec-tools-0.8.2-r1.ebuild| 279 +
 3 files changed, 302 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec.service
new file mode 100644
index 000..0341aa7
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/files/racoon.service 
b/net-firewall/ipsec-tools/files/racoon.service
new file mode 100644
index 000..dd72827
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/racoon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+Requires=ipsec.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
new file mode 100644
index 000..1f45d9e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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."
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-28 Thread Anthony G. Basile
commit: 028c3d23f6092f7ea35b16265cd94f19abf57370
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 28 10:35:26 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 28 10:35:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028c3d23

net-firewall/ipsec-tools: avoid file collision with libreswan, bug #567010

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/{ipsec.service => ipsec-tools.service}   | 0
 .../{ipsec-tools-0.8.2-r1.ebuild => ipsec-tools-0.8.2-r2.ebuild}| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec-tools.service
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec.service
rename to net-firewall/ipsec-tools/files/ipsec-tools.service

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
similarity index 99%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
rename to net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
index 1f45d9e..8b0d549 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
@@ -231,7 +231,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-   systemd_dounit "${FILESDIR}/ipsec.service"
+   systemd_dounit "${FILESDIR}/ipsec-tools.service"
systemd_dounit "${FILESDIR}/racoon.service"
use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-27 Thread Anthony G. Basile
commit: 3655190898eff1e14dbf435f04aa8d14946eeaf8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Nov 27 22:31:31 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov 27 22:31:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36551908

net-firewall/ipsec-tools: add systemd unit files.

See: https://github.com/gentoo/gentoo/pull/350

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/ipsec.service   |  12 +
 net-firewall/ipsec-tools/files/racoon.service  |  11 +
 .../ipsec-tools/ipsec-tools-0.8.2-r1.ebuild| 279 +
 3 files changed, 302 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec.service
new file mode 100644
index 000..0341aa7
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/files/racoon.service 
b/net-firewall/ipsec-tools/files/racoon.service
new file mode 100644
index 000..dd72827
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/racoon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+Requires=ipsec.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
new file mode 100644
index 000..1f45d9e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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."
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-28 Thread Anthony G. Basile
commit: 028c3d23f6092f7ea35b16265cd94f19abf57370
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 28 10:35:26 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 28 10:35:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028c3d23

net-firewall/ipsec-tools: avoid file collision with libreswan, bug #567010

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/{ipsec.service => ipsec-tools.service}   | 0
 .../{ipsec-tools-0.8.2-r1.ebuild => ipsec-tools-0.8.2-r2.ebuild}| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec-tools.service
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec.service
rename to net-firewall/ipsec-tools/files/ipsec-tools.service

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
similarity index 99%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
rename to net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
index 1f45d9e..8b0d549 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
@@ -231,7 +231,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-   systemd_dounit "${FILESDIR}/ipsec.service"
+   systemd_dounit "${FILESDIR}/ipsec-tools.service"
systemd_dounit "${FILESDIR}/racoon.service"
use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-27 Thread Anthony G. Basile
commit: 3655190898eff1e14dbf435f04aa8d14946eeaf8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Nov 27 22:31:31 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov 27 22:31:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36551908

net-firewall/ipsec-tools: add systemd unit files.

See: https://github.com/gentoo/gentoo/pull/350

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/ipsec.service   |  12 +
 net-firewall/ipsec-tools/files/racoon.service  |  11 +
 .../ipsec-tools/ipsec-tools-0.8.2-r1.ebuild| 279 +
 3 files changed, 302 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec.service
new file mode 100644
index 000..0341aa7
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/files/racoon.service 
b/net-firewall/ipsec-tools/files/racoon.service
new file mode 100644
index 000..dd72827
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/racoon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+Requires=ipsec.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
new file mode 100644
index 000..1f45d9e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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."
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-28 Thread Anthony G. Basile
commit: 028c3d23f6092f7ea35b16265cd94f19abf57370
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 28 10:35:26 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 28 10:35:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028c3d23

net-firewall/ipsec-tools: avoid file collision with libreswan, bug #567010

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/{ipsec.service => ipsec-tools.service}   | 0
 .../{ipsec-tools-0.8.2-r1.ebuild => ipsec-tools-0.8.2-r2.ebuild}| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec-tools.service
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec.service
rename to net-firewall/ipsec-tools/files/ipsec-tools.service

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
similarity index 99%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
rename to net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
index 1f45d9e..8b0d549 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
@@ -231,7 +231,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-   systemd_dounit "${FILESDIR}/ipsec.service"
+   systemd_dounit "${FILESDIR}/ipsec-tools.service"
systemd_dounit "${FILESDIR}/racoon.service"
use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-27 Thread Anthony G. Basile
commit: 3655190898eff1e14dbf435f04aa8d14946eeaf8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Nov 27 22:31:31 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov 27 22:31:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36551908

net-firewall/ipsec-tools: add systemd unit files.

See: https://github.com/gentoo/gentoo/pull/350

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/ipsec.service   |  12 +
 net-firewall/ipsec-tools/files/racoon.service  |  11 +
 .../ipsec-tools/ipsec-tools-0.8.2-r1.ebuild| 279 +
 3 files changed, 302 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec.service
new file mode 100644
index 000..0341aa7
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/files/racoon.service 
b/net-firewall/ipsec-tools/files/racoon.service
new file mode 100644
index 000..dd72827
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/racoon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+Requires=ipsec.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
new file mode 100644
index 000..1f45d9e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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."
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-28 Thread Anthony G. Basile
commit: 028c3d23f6092f7ea35b16265cd94f19abf57370
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 28 10:35:26 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 28 10:35:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028c3d23

net-firewall/ipsec-tools: avoid file collision with libreswan, bug #567010

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/{ipsec.service => ipsec-tools.service}   | 0
 .../{ipsec-tools-0.8.2-r1.ebuild => ipsec-tools-0.8.2-r2.ebuild}| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec-tools.service
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec.service
rename to net-firewall/ipsec-tools/files/ipsec-tools.service

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
similarity index 99%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
rename to net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
index 1f45d9e..8b0d549 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
@@ -231,7 +231,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-   systemd_dounit "${FILESDIR}/ipsec.service"
+   systemd_dounit "${FILESDIR}/ipsec-tools.service"
systemd_dounit "${FILESDIR}/racoon.service"
use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-27 Thread Anthony G. Basile
commit: 3655190898eff1e14dbf435f04aa8d14946eeaf8
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Fri Nov 27 22:31:31 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Fri Nov 27 22:31:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36551908

net-firewall/ipsec-tools: add systemd unit files.

See: https://github.com/gentoo/gentoo/pull/350

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/ipsec.service   |  12 +
 net-firewall/ipsec-tools/files/racoon.service  |  11 +
 .../ipsec-tools/ipsec-tools-0.8.2-r1.ebuild| 279 +
 3 files changed, 302 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec.service
new file mode 100644
index 000..0341aa7
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Load IPSec Security Policy Database
+After=syslog.target network.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStart=/usr/sbin/setkey -k -f /etc/ipsec-tools.conf
+ExecStop=/usr/sbin/setkey -F -P ; /usr/sbin/setkey -F
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/files/racoon.service 
b/net-firewall/ipsec-tools/files/racoon.service
new file mode 100644
index 000..dd72827
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/racoon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Racoon IKEv1 key management daemon for IPSEC
+After=syslog.target network.target
+Requires=ipsec.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/racoon -f /etc/racoon/racoon.conf
+
+[Install]
+WantedBy=multi-user.target

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
new file mode 100644
index 000..1f45d9e
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap nat pam rc5 readline selinux stats"
+
+CDEPEND="
+   dev-libs/openssl:0=
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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."
+

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2015-11-28 Thread Anthony G. Basile
commit: 028c3d23f6092f7ea35b16265cd94f19abf57370
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 28 10:35:26 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 28 10:35:26 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028c3d23

net-firewall/ipsec-tools: avoid file collision with libreswan, bug #567010

Package-Manager: portage-2.2.20.1

 net-firewall/ipsec-tools/files/{ipsec.service => ipsec-tools.service}   | 0
 .../{ipsec-tools-0.8.2-r1.ebuild => ipsec-tools-0.8.2-r2.ebuild}| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-firewall/ipsec-tools/files/ipsec.service 
b/net-firewall/ipsec-tools/files/ipsec-tools.service
similarity index 100%
rename from net-firewall/ipsec-tools/files/ipsec.service
rename to net-firewall/ipsec-tools/files/ipsec-tools.service

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
similarity index 99%
rename from net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
rename to net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
index 1f45d9e..8b0d549 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r2.ebuild
@@ -231,7 +231,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d-r2 racoon
newinitd "${FILESDIR}"/racoon.init.d-r3 racoon
-   systemd_dounit "${FILESDIR}/ipsec.service"
+   systemd_dounit "${FILESDIR}/ipsec-tools.service"
systemd_dounit "${FILESDIR}/racoon.service"
use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
 



[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***

[gentoo-commits] repo/gentoo:master commit in: net-firewall/ipsec-tools/files/, net-firewall/ipsec-tools/

2016-11-19 Thread Anthony G. Basile
commit: a86c6a00d09d263a993dfac13f2a10b76e4b4403
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sat Nov 19 15:36:42 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Nov 19 15:36:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c6a00

net-firewall/ipsec-tools: fix bug #550118, CVE-2015-4047

Package-Manager: portage-2.3.0

 .../files/ipsec-tools-CVE-2015-4047.patch  |  16 ++
 .../ipsec-tools/ipsec-tools-0.8.2-r5.ebuild| 283 +
 2 files changed, 299 insertions(+)

diff --git a/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch 
b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
new file mode 100644
index ..58f72e1
--- /dev/null
+++ b/net-firewall/ipsec-tools/files/ipsec-tools-CVE-2015-4047.patch
@@ -0,0 +1,16 @@
+See: https://bugs.gentoo.org/show_bug.cgi?id=550118
+
+--- ./src/racoon/gssapi.c9 Sep 2006 16:22:09 -   1.4
 ./src/racoon/gssapi.c19 May 2015 15:16:00 -  1.6
+@@ -192,6 +192,11 @@
+   gss_name_t princ, canon_princ;
+   OM_uint32 maj_stat, min_stat;
+ 
++  if (iph1->rmconf == NULL) {
++  plog(LLV_ERROR, LOCATION, NULL, "no remote config\n");
++  return -1;
++  }
++
+   gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state));
+   if (gps == NULL) {
+   plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n");

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild 
b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
new file mode 100644
index ..b79dd83
--- /dev/null
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.2-r5.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit flag-o-matic autotools linux-info pam systemd
+
+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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="hybrid idea ipv6 kerberos ldap libressl nat pam rc5 readline selinux 
stats"
+
+CDEPEND="
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   kerberos? ( virtual/krb5 )
+   ldap? ( net-nds/openldap )
+   pam? ( sys-libs/pam )
+   readline? ( sys-libs/readline:0= )
+   selinux? ( sys-libs/libselinux )"
+
+DEPEND="${CDEPEND}
+   >=sys-kernel/linux-headers-2.6.30"
+
+RDEPEND="${CDEPEND}
+   selinux? ( sec-policy/selinux-ipsec )
+"
+
+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" &&
+   ! has_version "net-misc/openswan" &&
+   ! has_version "net-misc/libreswan"; 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***