summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-03-23 19:15:24 +0000
committerMike Gilbert <floppym@gentoo.org>2013-03-23 19:15:24 +0000
commit588fe4868390318e8a80147b14c30d81940fd5ca (patch)
tree988a98cc7bdd11fd07164b4c1fbc72de49e5d895 /net-firewall/ipsec-tools
parentUse -r1 for new python eclasses usage and -r2 for also include multilib suppo... (diff)
downloadhistorical-588fe4868390318e8a80147b14c30d81940fd5ca.tar.gz
historical-588fe4868390318e8a80147b14c30d81940fd5ca.tar.bz2
historical-588fe4868390318e8a80147b14c30d81940fd5ca.zip
Don't rename /etc/ipsec.conf if openswan is installed. Bug 462782 by Plüss Roland.
Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'net-firewall/ipsec-tools')
-rw-r--r--net-firewall/ipsec-tools/ChangeLog7
-rw-r--r--net-firewall/ipsec-tools/Manifest22
-rw-r--r--net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild4
-rw-r--r--net-firewall/ipsec-tools/ipsec-tools-0.8.1.ebuild4
4 files changed, 16 insertions, 21 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/Manifest b/net-firewall/ipsec-tools/Manifest
index 92cb5df8ee18..785a3c0cce5d 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -18,24 +18,14 @@ DIST ipsec-tools-0.8.0.tar.bz2 809297 SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f5
DIST ipsec-tools-0.8.1.tar.bz2 860717 SHA256 fa4a95bb36842f001b84c4e7a1bb727e3ee06147edbc830a881d63abe8153dd4 SHA512 c8308aba9764a8e0a0507dbc62e8e93dc4b51f7215f2c3bb50f2e7e1f46dde0c773cfe2992660ccd319523775a9bab668371ee53cd4af153d2fcf13a0ef4e1eb WHIRLPOOL b3e8743174f7a05ca028f47f5faa66286e397a50c68e7724568b89e5fd2eea76a903c3e77a144e772f913fd51a253466b93e10690125a87d643f186a9689476c
EBUILD ipsec-tools-0.8.0-r3.ebuild 6005 SHA256 2902daa99324e62e987b53ba7b3569d41d0a285da9d6c0fdf33a7962deb38452 SHA512 3b50e876a2067c514046e05b9414c5175f0b746e9bf2c0bacb2fa935e85246131d3a2ed289f0eff71f3f0aa1bf642c01929c348feb27b7e21458391440162d4d WHIRLPOOL 8b8ccd178359d6e7dd22618bf6b6b4d812213eacc3b4064abcf76eb83a91256f24bb7d55cd716062b17b790f29352392f3fd34279c8296d63a6c52a30787f8b3
EBUILD ipsec-tools-0.8.0-r4.ebuild 6058 SHA256 8d2a487e694546399215337927bb280203bbf55f669b8d5d2fed8a29556f9544 SHA512 60a6185526afab73d90d964063f27de71e0d047811cdfa25d5bb29c10588f3dec1a5ada5e4fbff35d20d73f8206bf7dd39a589f47a015db395013e3151ca2ce0 WHIRLPOOL 38c78828d2c8ca20e761bfb2bfa8378c0457bef2ab5a5ef400a8bf842a6ea56576f3c6a85a8c14953fcc610383651f7469bc09c869e5597e66025c3d8189382f
-EBUILD ipsec-tools-0.8.0-r5.ebuild 7668 SHA256 a8e186430b9c8c8a29519be27660570170befa437851f959ab614d76be6abd5e SHA512 7f73a78cf5c100057742277d908a5c21e95c8fe3c7bcb02b5a694c4887f50b25ff14d91620a1194de29a630859f2d0e6bfcaed80658dd4d62fdd4197eabe0f43 WHIRLPOOL 837cceecb4905d6482c2ea9bbbd353c37a5d3be21fcc669b95b399a43b86e3bd58f0c08db7e619a2c1c066e74a57e04fb50274f8ca840974de25f807f3487c2b
-EBUILD ipsec-tools-0.8.1.ebuild 7680 SHA256 073e3071dabfc4973dd3de2575b11c0f03edeed58e158aa813fee56715d93784 SHA512 24170cecb96ddebc755a6b62cca3adc6d4514c95374eb50c4b6cc86e19dd4b448621efa74aa6facad6dd6de133006e22db7c4c6dbe34f01198f52d4dfd1f65bf WHIRLPOOL 398818c80d26455d2c6d017ff44d69070e03004e9b92c78224135b853021e3195848460830fecc01c5eba1de035ef7dfb832bee7acea5bcd5dc5ba0b1c523513
-MISC ChangeLog 17757 SHA256 7c7c3ea672be12b7ba3ab034c5d0f35afc7787806159f5bb2d86a9d6724a64dc SHA512 be9bbf2c7f6078f509f156ebc76553fd3e2ab9f27a7ed90ab0b3b7808a2a70d276f09034b9a73848271777aacbc4379435b8b69d12925dd95bb09c92f44bc2ce WHIRLPOOL cb1258005bff442faf8d34ab568209ea5f64391815f1ff8cb4e287e32ac5ffb627805383918b460c4f5602f263600062a7685c694e4170c2ef6f8c76abbf680e
+EBUILD ipsec-tools-0.8.0-r5.ebuild 7703 SHA256 986063512e0f433cd7821f3546d78dcc59d883a1f31c941ea5694e57d4590167 SHA512 f6bd7f19ccd4f27c2d77786b6f9e23bbd1815af5e64ad02fb00d00c92a2b93e6cd23f0fd67b27c400a0047a4dc3cbec847b36cddb4c381869243d7c6489baf06 WHIRLPOOL 4a06de676713814e5e7fa65cce11ee3fce5bf8a85de83adb55f793649bfa9d6273005434622146ed1dff65c37e115de1e32b6db2c15b4965bda788e51954a5eb
+EBUILD ipsec-tools-0.8.1.ebuild 7715 SHA256 6e35764e3a149a3f173a14850ac9188f4c100c0fa88be4bbc257254128d342fe SHA512 1938eb51b5cfeb4268d58c9e8831cc16465051f8412e3a7cb956397d56b46cb18a962621aba6f3f0c03e4566a7be883c9ccedff2ddb28863686aa17054b8abf9 WHIRLPOOL 38522ac5e5af42da66a2681ab17ca9ab6dd83ae29d0a12bd4084f665824d330df6ab3098dcbb51edf7cde45c156dbf41692c0a5e1324ef9b24aef18698dd384f
+MISC ChangeLog 17951 SHA256 f84c5359d01ea26f68ff61ca54114d077e4eae281b858660643aed17ce9aefb8 SHA512 069c8faa9850d5fcf8d42f5e4d3007773f9ed3e049993b17daa034389759b4233483e8f801e3730101ae2d667de9c791a331999101e9dde828362fd6a834084d WHIRLPOOL fc659e58dcae415f0ccc2d37e8b97774600f646633566e2d0f0a19f8eb7b52c9355c4d1e4b4acada7e9b2b5d4b353673ebc4dcb2daa7b9fc1f2f11e772af5ab1
MISC metadata.xml 537 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 SHA512 9b26b2cd54e00527201339c3936ac717c57fe596e470d84e0dc0715f778b5797488b6cac61dea83bab61714a23a88e44dbd537bfeeb2b37d285653dcb838fab5 WHIRLPOOL a0dd0b61f957875ca3c50db5aa66470ed493be9c4f002bd165d75b41a8ca51cbcfd2567b4702bf1845b8e0a1ca54239e6ed163098d8b613d1f9f459192acc14e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRRwGmAAoJEJOE+m71LUu6eiQQAKZnwcPSqvPGgHgdte/iwgMH
-oqkzh2/k4gFGWTCgaZArgDdLZPkd2dM/a+GlXZzv50gN34NmbSAmZdmNXPqinogV
-OUlx5Rb5KctXhTFlpAczJDoPW2TdEoIE8kUSQC6IhNh2uXU9okkqaMuEYZp50Q7T
-XU8RwC6KpHzvLBBwVb0XIzKKn/UPY2PjTQAzUCEIaP56A8fzAZD88howZbDsiBRa
-Jo4KP5TmBDZo7/Ok2DUbSCDmLxqKqzA+DxTKanrD/kxvNTbZRaZ/e5TlPnjrtro4
-t0i14sPiQIwV7lAFQpKMoUllOXWbQXuDt101tMVVRb4ikU0u9qQ1jIIcC8OvbTRm
-u9Tf+Gntbe8VbixuWufp8zVq4gRJ0U4MXkP3JGXlRDV8OC2z0xYB05LgEjhrOvKD
-oNEzXGz0zUKYV92lmPoHz9V00Ol/dWxlgavdPv/lEBYLUn8i7g/zWaHSDw3KgdTQ
-gd5iznU60CpJD+wboX361fm1is8+clz6ddonNex5Wpzu2pVRpsEJVF0GGRYyOEwN
-WUs7xlrM97qm0KG62xL0xLzYiaSxrTo/sV6Nou512kQoisjcnDkL1g0MHu/HTbn3
-Ue38fJWPN//UA/IkzEYqLMz4k38INjeqSsWylQ4GgG0D7haAZF0gwHD6UkDjyZHt
-0dBoXVUftP415w044WDf
-=wJM/
+iF4EAREIAAYFAlFN/0sACgkQC77qH+pIQ6RzxAD/axjxmPRw7dfSTmKNwWOETkOk
+sNpq03jYjUMYmAZ7bigA/3kIsBwx7eCndPSnK5sCEDHXkALe2p8YVnC/ZJvNPjce
+=Ja13
-----END PGP SIGNATURE-----
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"