diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-23 19:15:21 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-23 19:15:21 +0000 |
| commit | efd48e79035b344b47f852e9f55f6b2eaa508af2 (patch) | |
| tree | 1482281dfc4c94af42fe49475d2e759e76c963a5 /net-firewall/ipsec-tools | |
| parent | Use -r1 for new python eclasses usage and -r2 for also include multilib suppo... (diff) | |
| download | gentoo-2-efd48e79035b344b47f852e9f55f6b2eaa508af2.tar.gz gentoo-2-efd48e79035b344b47f852e9f55f6b2eaa508af2.tar.bz2 gentoo-2-efd48e79035b344b47f852e9f55f6b2eaa508af2.zip | |
Don't rename /etc/ipsec.conf if openswan is installed. Bug 462782 by Plüss Roland.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-firewall/ipsec-tools')
| -rw-r--r-- | net-firewall/ipsec-tools/ChangeLog | 7 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild | 4 | ||||
| -rw-r--r-- | net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog index 48f960a5b9a8..072ae21315ec 100644 --- a/net-firewall/ipsec-tools/ChangeLog +++ b/net-firewall/ipsec-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-firewall/ipsec-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.111 2013/03/18 11:59:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.112 2013/03/23 19:15:21 floppym Exp $ + + 23 Mar 2013; Mike Gilbert <floppym@gentoo.org> ipsec-tools-0.8.0-r5.ebuild, + ipsec-tools-0.8.1.ebuild: + Don't rename /etc/ipsec.conf if openswan is installed. Bug 462782 by Plüss + Roland. 18 Mar 2013; Anthony G. Basile <blueness@gentoo.org> ipsec-tools-0.8.0-r5.ebuild: 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 index 896d0da7e238..98708e4ecd3a 100644 --- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild +++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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-r5.ebuild,v 1.6 2013/03/18 11:59:57 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild,v 1.7 2013/03/23 19:15:21 floppym Exp $ EAPI="4" @@ -34,7 +34,7 @@ pkg_preinst() { ewarn ewarn "\033[1;33m**************************************************\033[00m" ewarn - if ! has_version "net-misc/strongswan" ; then + if ! has_version "net-misc/strongswan" && ! has_version "net-misc/openswan"; 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" diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild index f8a3c2f74955..05ea136149dc 100644 --- a/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild +++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.1.ebuild,v 1.2 2013/03/16 08:48:44 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild,v 1.3 2013/03/23 19:15:21 floppym Exp $ EAPI="5" @@ -34,7 +34,7 @@ pkg_preinst() { ewarn ewarn "\033[1;33m**************************************************\033[00m" ewarn - if ! has_version "net-misc/strongswan" ; then + if ! has_version "net-misc/strongswan" && ! has_version "net-misc/openswan"; 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" |