| 1 |
commit: 6e435cfeb1acc52d8e8276a6a1373228637fbd2c |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 27 18:50:16 2012 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 18:50:16 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6e435cfe |
| 7 |
|
| 8 |
net-firewall/ipsec-tools: intelligent migration of ipsec.conf -> ipsec-tools.conf |
| 9 |
|
| 10 |
--- |
| 11 |
net-firewall/ipsec-tools/Manifest | 2 +- |
| 12 |
.../ipsec-tools/ipsec-tools-0.8.0-r5.ebuild | 38 ++++++++++++++++++++ |
| 13 |
2 files changed, 39 insertions(+), 1 deletions(-) |
| 14 |
|
| 15 |
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest |
| 16 |
index 34b1061..7afd522 100644 |
| 17 |
--- a/net-firewall/ipsec-tools/Manifest |
| 18 |
+++ b/net-firewall/ipsec-tools/Manifest |
| 19 |
@@ -8,5 +8,5 @@ AUX racoon.conf.d-r1 906 SHA256 a94721a9d51b970f728c63c1f4348c53fb0629b05ef02a6e |
| 20 |
AUX racoon.init.d-r2 1279 SHA256 d9038da4f5c969a7da450d6d7a566fd77c4471ff0a1ceb2f176f0c9015d1eda8 SHA512 1a5337c74285b54c21b4d3d216f0a3756a3e2d6ea31028b56782c7a635ffac8142d61074fa0927df6dd1034e15234d3a4eda192c94e8cd5f510520e36bcf81a6 WHIRLPOOL f7219e0306b2d9e6311cd12ea06d560e1bf937ce409e44d7bf5a6e77325e4e6357b138fd709ca7972696a4669f1c6e6d72273250c84462ebf6b9e8c979aea330 |
| 21 |
AUX racoon.pam.d 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b |
| 22 |
DIST ipsec-tools-0.8.0.tar.bz2 809297 SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717 SHA512 3bec6bab4fe555612f1d48966e797202830f5254a8d2146a14d268ff0c68445af790285214db41ab08ee4888625e8e680c3b848c30789d836169d1612a25fe2c WHIRLPOOL 862d2bbf78aca8c9e01e00c995aeb3b662e1ea4a769081b9880a3fee7821ef5968e10fe75d9671268979188c7ca3b91d507a1fc9a097729d0648bc4c965e675d |
| 23 |
-EBUILD ipsec-tools-0.8.0-r5.ebuild 6105 SHA256 6e08dded31816117b3c097593ffc9058934af41b250215ba9a319b764435a9ae SHA512 1e7fdccb604a90afb72b62873b723581d2b856676631c18068a88a532657ed4c5a0076b5d89b73c92854445d3aa1e5ca8bf2cb0bbfa994dff0df78469c8fa749 WHIRLPOOL d5e5a650274a74193e28b83ba3f86db106988cc6bfe5a12893e752671d596f1aeb64bd1189e9d6f6302b458292e9054e293245b83385fa9cba8a23931bb88716 |
| 24 |
+EBUILD ipsec-tools-0.8.0-r5.ebuild 7683 SHA256 e0186e522daa8adaca18cf037da7373b6f9a76e0f8488a94a9f2f52b79bcd265 SHA512 5ba14cb21e44c43fb1a8c1165ac3480b01753b0d042f04932ae7ea06b98603efa873dfe4db286d8ab0188d86061450a46a6a632d0a751c3a6ce7291d7fc0478c WHIRLPOOL c298b1fad30ebe2ab59f01898b0e2d40db45f1cee977d9a639b36b7c22b7ad6c917cd75b39d88e3af7014f94a1a1327cc34c770fa176a060e7571e1ae28c2a55 |
| 25 |
MISC metadata.xml 537 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40 SHA512 9b26b2cd54e00527201339c3936ac717c57fe596e470d84e0dc0715f778b5797488b6cac61dea83bab61714a23a88e44dbd537bfeeb2b37d285653dcb838fab5 WHIRLPOOL a0dd0b61f957875ca3c50db5aa66470ed493be9c4f002bd165d75b41a8ca51cbcfd2567b4702bf1845b8e0a1ca54239e6ed163098d8b613d1f9f459192acc14e |
| 26 |
|
| 27 |
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 |
| 28 |
index 7143c26..681045d 100644 |
| 29 |
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild |
| 30 |
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild |
| 31 |
@@ -29,6 +29,44 @@ RDEPEND=" |
| 32 |
DEPEND="${RDEPEND} |
| 33 |
>=sys-kernel/linux-headers-2.6.30" |
| 34 |
|
| 35 |
+pkg_preinst() { |
| 36 |
+ if has_version "<${CATEGORY}/${PN}-0.8.0-r5" ; then |
| 37 |
+ ewarn |
| 38 |
+ ewarn "\033[1;33m**************************************************\033[00m" |
| 39 |
+ ewarn |
| 40 |
+ if ! has_version "net-misc/strongswan" ; then |
| 41 |
+ ewarn "We found an earlier version of ${PN} installed." |
| 42 |
+ ewarn "As of ${PN}-0.8.0-r5, the old configuration file," |
| 43 |
+ ewarn "ipsec.conf, has been changed to ipsec-tools.conf to avoid" |
| 44 |
+ ewarn "a conflict with net-misc/strongswan; bug #436144. We will" |
| 45 |
+ ewarn "rename this file for you with this upgrade. However, if" |
| 46 |
+ ewarn "you later downgrade, you'll have to rename the file to" |
| 47 |
+ ewarn "its orignal manually or change /etc/conf.d/racoon to point" |
| 48 |
+ ewarn "to the new file." |
| 49 |
+ |
| 50 |
+ if [[ -f /etc/ipsec.conf && ! -f /etc/ipsec-tools.conf ]] ; then |
| 51 |
+ mv /etc/ipsec.conf /etc/ipsec-tools.conf |
| 52 |
+ else |
| 53 |
+ ewarn |
| 54 |
+ ewarn "Oops! I can't move ipsec.conf to ipsec-tools.conf!" |
| 55 |
+ ewarn "Either the former doesn't exist or the later does and" |
| 56 |
+ ewarn "I won't clobber it. Please fix this situation manually." |
| 57 |
+ fi |
| 58 |
+ else |
| 59 |
+ ewarn "You had both an earlier version of ${PN} and" |
| 60 |
+ ewarn "net-misc/strongswan installed. I can't tell whether" |
| 61 |
+ ewarn "the configuration file, ipsec.conf, belongs to one" |
| 62 |
+ ewarn "package or the other due to a file conflict; bug #436144." |
| 63 |
+ ewarn "The current version of ${PN} uses ipsec-tools.conf " |
| 64 |
+ ewarn "as its configuration file, as will future versions." |
| 65 |
+ ewarn "Please fix this situation manually." |
| 66 |
+ fi |
| 67 |
+ ewarn |
| 68 |
+ ewarn "\033[1;33m**************************************************\033[00m" |
| 69 |
+ ewarn |
| 70 |
+ fi |
| 71 |
+} |
| 72 |
+ |
| 73 |
pkg_setup() { |
| 74 |
linux-info_pkg_setup |
Archives