public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-02-09 20:29 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-02-09 20:29 UTC (permalink / raw
  To: gentoo-commits

commit:     dbd85c5152093cbd22b9ce0efe2a57adea85993f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 20:28:59 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 20:28:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=dbd85c51

net-firewall/ipsec-tools: isolate patch from comment #1 bug #365077

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-firewall/ipsec-tools/ChangeLog                 |    6 ++++++
 net-firewall/ipsec-tools/Manifest                  |   11 ++++++-----
 ...ls-0.8.0.ebuild => ipsec-tools-0.8.0-r1.ebuild} |    0
 net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild  |    2 --
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index e01c2c3..e5cb845 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,5 +1,11 @@
 
 
+*ipsec-tools-0.8.0-r1 (09 Feb 2012)
+
+  09 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  ipsec-tools-0.8.0.ebuild, +ipsec-tools-0.8.0-r1.ebuild:
+  Isolated patch from comment #1 bug #365077
+
 *ipsec-tools-0.8.0 (08 Feb 2012)
 
   08 Feb 2012; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 01000bb..d36b8cf 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -5,13 +5,14 @@ AUX ipsec-tools-def-psk.patch 907 RMD160 4a72e22ecbc821cc96b338004b6ebb578701856
 AUX racoon.conf.d 621 RMD160 7f1d0b6e171e5dd60f1b033e4890bfd79d718389 SHA1 05c0759df99c544f1a68fb8916d1c953ceac0af8 SHA256 4e894adb1a76f673f960260929d083c1f6ddfcf094b371bcc2155fb6735d289f
 AUX racoon.init.d 1314 RMD160 f0c385fa389fad6cddef87aee9f10172c2ca6838 SHA1 b82a83850239f564b8d50c8039e188de6f18de7e SHA256 4d6506775650cc36b7197f90eef7d98573280ebb445b0260d0442aec6f4d0937
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
-EBUILD ipsec-tools-0.8.0.ebuild 5092 RMD160 67bb3161ee0d396090981681e139637d7eecf1ff SHA1 f60cf34ee9ae9bb416c9578d24157fb3f9d5495e SHA256 6189653978e5e50627736bbb2508bda32dbd682779aca810dccc5f950567f275
-MISC ChangeLog 250 RMD160 503df09837a8c66d69d5dec9c025ab3bd913b347 SHA1 206dba63f2098d006c7e9580f7f1d45251d8bdd4 SHA256 03e6098bbb57bca95e0568e60ae23d8c1ce60fffd66808ea64bb469970a1d71b
+EBUILD ipsec-tools-0.8.0-r1.ebuild 5092 RMD160 67bb3161ee0d396090981681e139637d7eecf1ff SHA1 f60cf34ee9ae9bb416c9578d24157fb3f9d5495e SHA256 6189653978e5e50627736bbb2508bda32dbd682779aca810dccc5f950567f275
+EBUILD ipsec-tools-0.8.0.ebuild 5043 RMD160 0b21b7d1742a66b24b692c42a8d95acd6343bdae SHA1 e4329bc72c7d49917d18b9e790540b51c2cd469d SHA256 2adb79ae0717555f5bde10b8c7b9dfe750553917999676a699b4345588da49aa
+MISC ChangeLog 446 RMD160 11ab3b22056008f69173531d9f96eb84ee0a47b5 SHA1 fdf55e7dfbdebc2679951f69d810f0b9495c6acd SHA256 408f8312ab501b361970238a439e703b3ca0b25e4788665d4486a9415ff75e1a
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8x3WgACgkQl5yvQNBFVTVwfgCfQErxJYtBH+nldzNQoLZGC8et
-gPMAnispXwXM6zgd5hYyQ8s9doQg0V3l
-=QB73
+iEYEAREIAAYFAk80LIsACgkQl5yvQNBFVTUg8wCfd9ihz5eqnCpiuur/b4ZpelmN
++z0An2ATcXUEJ/fTlahGNZle2i3YXbDJ
+=vlup
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild
similarity index 100%
copy from net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild
copy to net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild
index 1efbf7a..3daa777 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild
@@ -82,8 +82,6 @@ src_prepare() {
 	# fix for building with gcc-4.6
 	sed -i 's: -R: -Wl,-R:' "${S}"/configure.ac || die
 
-	epatch "${FILESDIR}/ipsec-tools-def-psk.patch"
-
 	AT_M4DIR="${S}" eautoreconf
 	epunt_cxx
 }



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-02-09 20:49 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-02-09 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     e9ee8b227c1d1339bb9519543e64d01ce66d36eb
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 20:49:38 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 20:49:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=e9ee8b22

net-firewall/ipsec-tools: moved 0.8.0 to the tree

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-firewall/ipsec-tools/ChangeLog                |    4 +
 net-firewall/ipsec-tools/Manifest                 |    9 +-
 net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild |  181 ---------------------
 3 files changed, 8 insertions(+), 186 deletions(-)

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index e5cb845..bec817d 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,5 +1,9 @@
 
 
+  09 Feb 2012; Anthony G. Basile <blueness@gentoo.org>
+  -ipsec-tools-0.8.0.ebuild:
+  moved ipsec-tools-0.8.0 to the tree
+
 *ipsec-tools-0.8.0-r1 (09 Feb 2012)
 
   09 Feb 2012; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index d36b8cf..0a73caf 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -6,13 +6,12 @@ AUX racoon.conf.d 621 RMD160 7f1d0b6e171e5dd60f1b033e4890bfd79d718389 SHA1 05c07
 AUX racoon.init.d 1314 RMD160 f0c385fa389fad6cddef87aee9f10172c2ca6838 SHA1 b82a83850239f564b8d50c8039e188de6f18de7e SHA256 4d6506775650cc36b7197f90eef7d98573280ebb445b0260d0442aec6f4d0937
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
 EBUILD ipsec-tools-0.8.0-r1.ebuild 5092 RMD160 67bb3161ee0d396090981681e139637d7eecf1ff SHA1 f60cf34ee9ae9bb416c9578d24157fb3f9d5495e SHA256 6189653978e5e50627736bbb2508bda32dbd682779aca810dccc5f950567f275
-EBUILD ipsec-tools-0.8.0.ebuild 5043 RMD160 0b21b7d1742a66b24b692c42a8d95acd6343bdae SHA1 e4329bc72c7d49917d18b9e790540b51c2cd469d SHA256 2adb79ae0717555f5bde10b8c7b9dfe750553917999676a699b4345588da49aa
-MISC ChangeLog 446 RMD160 11ab3b22056008f69173531d9f96eb84ee0a47b5 SHA1 fdf55e7dfbdebc2679951f69d810f0b9495c6acd SHA256 408f8312ab501b361970238a439e703b3ca0b25e4788665d4486a9415ff75e1a
+MISC ChangeLog 569 RMD160 88458dbe0ab99dbc74077252487226e828acab38 SHA1 c65312e9dedf12df9473c2746e008edd7adda8f5 SHA256 45b9e894be9222ca5883c510742d148982a5657e659ba7b2d71ad17831b7a0ad
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk80LIsACgkQl5yvQNBFVTUg8wCfd9ihz5eqnCpiuur/b4ZpelmN
-+z0An2ATcXUEJ/fTlahGNZle2i3YXbDJ
-=vlup
+iEYEAREIAAYFAk80MWIACgkQl5yvQNBFVTUoDwCdGBlM4TaBqwv6+L0pMsY2Ktzh
+PXYAnje/ffA/oDT6HiGSYscJOx3GcqGM
+=U53p
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild
deleted file mode 100644
index 3daa777..0000000
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0.ebuild
+++ /dev/null
@@ -1,181 +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.7.3-r1.ebuild,v 1.3 2011/04/06 01:01:46 flameeyes Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic autotools linux-info
-
-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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="rc5 idea kerberos stats ipv6 nat selinux readline pam hybrid ldap"
-
-RDEPEND="
-	kerberos? ( virtual/krb5 )
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-ipsec-tools
-	)
-	readline? ( sys-libs/readline )
-	pam? ( sys-libs/pam )
-	ldap? ( net-nds/openldap )
-	dev-libs/openssl
-	virtual/libiconv"
-#	iconv? ( virtual/libiconv )
-#	radius? ( net-dialup/gnuradius )
-
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.30"
-
-pkg_setup() {
-	get_version
-	if kernel_is -ge 2 6 19 ; then
-		einfo "Checking for suitable kernel configuration (Networking | Networking support | Networking options)"
-
-		if use nat; then
-			CONFIG_CHECK="${CONFIG_CHECK} ~NETFILTER_XT_MATCH_POLICY"
-			export WARNING_NETFILTER_XT_MATCH_POLICY="NAT support may fail weirdly unless you enable this option in your kernel"
-		fi
-
-		for i in XFRM_USER NET_KEY; do
-			CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-			eval "export WARNING_${i}='No tunnels will be available at all'"
-		done
-
-		for i in INET_IPCOMP INET_AH INET_ESP \
-			INET_XFRM_MODE_TRANSPORT \
-			INET_XFRM_MODE_TUNNEL \
-			INET_XFRM_MODE_BEET ; do
-			CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-			eval "export WARNING_${i}='IPv4 tunnels will not be available'"
-		done
-
-		for i in INET6_IPCOMP INET6_AH INET6_ESP \
-			INET6_XFRM_MODE_TRANSPORT \
-			INET6_XFRM_MODE_TUNNEL \
-			INET6_XFRM_MODE_BEET ; do
-			CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
-			eval "export WARNING_${i}='IPv6 tunnels will not be available'"
-		done
-
-		CONFIG_CHECK="${CONFIG_CHECK} ~CRYPTO_NULL"
-		export WARNING_CRYPTO_NULL="Unencrypted tunnels will not be available"
-		export CONFIG_CHECK
-
-		check_extra_config
-	else
-		eerror "You must have a kernel >=2.6.19 to run ipsec-tools."
-		eerror "Building now, assuming that you will run on a different kernel"
-	fi
-}
-
-src_prepare() {
-	# fix for bug #76741
-	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c || die
-	# 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
-
-	AT_M4DIR="${S}" eautoreconf
-	epunt_cxx
-}
-
-src_configure() {
-	# fix for bug #61025
-	filter-flags -march=c3
-
-	local myconf
-	myconf="--with-kernel-headers=/usr/include \
-			--enable-adminport \
-			--enable-frag \
-			--enable-dpd \
-			--enable-dependency-tracking \
-			$(use_enable rc5) \
-			$(use_enable idea) \
-			$(use_enable kerberos gssapi) \
-			$(use_enable stats) \
-			$(use_enable ipv6) \
-			$(use_enable nat natt) \
-			$(use_enable selinux security-context) \
-			$(use_with readline) \
-			$(use_with pam libpam) \
-			$(use_with ldap libldap)"
-
-	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
-
-	# dev-libs/libiconv is hard masked
-	#use iconv && myconf="${myconf} $(use_with iconv libiconv)"
-
-	# the default (/usr/include/openssl/) is OK for Gentoo, leave it
-	# myconf="${myconf} $(use_with ssl openssl )"
-
-	# No way to get it compiling with freeradius or gnuradius
-	# We would need libradius which only exists on FreeBSD
-
-	# See bug #77369
-	#myconf="${myconf} --enable-samode-unspec"
-
-	econf ${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/racoon
-	newconfd "${FILESDIR}"/racoon.conf.d racoon
-	newinitd "${FILESDIR}"/racoon.init.d racoon
-
-	dodoc ChangeLog README NEWS
-	dodoc -r src/racoon/samples
-	dodoc -r src/racoon/doc
-
-	docinto setkey
-	dodoc src/setkey/sample.cf
-
-	dodir /etc/racoon
-
-	# RFC are only available from CVS for the moment, see einfo below
-	#docinto "rfc"
-	#dodoc ${S}/src/racoon/rfc/*
-}
-
-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
-}



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-03-07 20:28 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-03-07 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d287250833dbe77a6e1e0a5a32f7e5a9655e417d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  7 20:28:15 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Mar  7 20:28:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=d2872508

net-firewall/ipsec-tools: fix colored ewarns/eerrors

---
 net-firewall/ipsec-tools/Manifest                  |    4 ++--
 .../ipsec-tools/ipsec-tools-0.8.0-r3.ebuild        |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 1fd674f..6dcbef0 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -4,9 +4,9 @@ AUX ipsec-tools-include-vendoridh.patch 434 RMD160 cf30a122392ba179a7c6b0cd65f4c
 AUX ipsec.conf 1209 RMD160 38ed5ce1b0ca6ce48d92ba0ad13b14122bd3371c SHA1 563926c8b14dc54cadebfcef108fe53abb189d4a SHA256 a9a6cbf1bd42aaefdb637814bc6198079bab84e37888e1b705f938f590978816
 AUX psk.txt 293 RMD160 b626935831085771ee71486b9c5e24e606518dc8 SHA1 49e68d8cb0208ed55ebc76a12dec7180f43af431 SHA256 d34b142b4566712f87382caf0a64bcc070bbde17f16e2ee49d5dde26cb1bbe08
 AUX racoon.conf 772 RMD160 4ad6f3f94dc587d9b4278e165e76b7eacb475b91 SHA1 e7a74b34181480764e36fc452a9e6a516c8c86b4 SHA256 e00cea25741fa16aa985d80ce49f2a59af0c98a44707a047193e936644b497a3
-AUX racoon.conf.d 621 RMD160 773a21f70bd4786eb6758f052bb54cc40273c259 SHA1 1291dbe1639cbb72a161e3af727c9c65c6ae0132 SHA256 bc7cf9c0fe8bd5f99c9353aa3c19e3314b3da21a7a2138fc6e901375be21b109
+AUX racoon.conf.d 605 RMD160 1c2db39154d8470ecd2e0fe95075ec47ffa47613 SHA1 19171c533f707778e1d5d84f4948a82d75b672b5 SHA256 1bf003daa972cbdc2e251c10f2d93684c1f637f70ac2445ad5482dbe7ee2b1d9
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 AUX racoon.pam.d 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
-EBUILD ipsec-tools-0.8.0-r3.ebuild 6434 RMD160 10903843463d3fa1f349c20d0715c0946635b6dd SHA1 1221812387be6f8b261c8d5c4dcecb977d0660e5 SHA256 cba83aba0cd293c5c2c35d31d39c9f40e446d9957af9dea28ab44b04dd23df42
+EBUILD ipsec-tools-0.8.0-r3.ebuild 6426 RMD160 82bf08c4c7456eb475f5a7b0979fcd454be427ba SHA1 568961d2306225c093e92e9ad1c148aef22d2c00 SHA256 6281bf1a192c35ecc03c092ea72b9dfb6bd311d3772e17305003a8648b3c958f
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
index 3298e02..1a40515 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
@@ -39,7 +39,7 @@ pkg_setup() {
 
 	if linux_config_exists && kernel_is -ge 2 6 19; then
 		ewarn
-		ewarn "\033[1;33m**************************************************\033[1;33m"
+		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}."
@@ -128,14 +128,14 @@ pkg_setup() {
 		ewarn "differ either now or in the future, then these checks"
 		ewarn "may lead to misleading results."
 		ewarn
-		ewarn "\033[1;33m**************************************************\033[1;33m"
+		ewarn "\033[1;33m**************************************************\033[00m"
 		ewarn
 	else
 		eerror
-		eerror "\033[1;31m**************************************************\033[1;31m"
+		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[1;31m"
+		eerror "\033[1;31m**************************************************\033[00m"
 		eerror
 	fi
 }



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-03-08  1:06 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-03-08  1:06 UTC (permalink / raw
  To: gentoo-commits

commit:     147a118867bb754e17a835d0359c4233e4a9aec9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 01:05:38 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 01:05:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=147a1188

net-firewall/ipsec-tools: samode-unspec is not supported in linux

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-firewall/ipsec-tools/Manifest                  |   12 +++++++++++-
 .../ipsec-tools/ipsec-tools-0.8.0-r3.ebuild        |    5 ++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 0e0d9d2..b236af5 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ipsec-tools-def-psk.patch 907 RMD160 4a72e22ecbc821cc96b338004b6ebb5787018569 SHA1 61be2483534c3a3084120a2d9fa08f660b7301f6 SHA256 15da775a7da892b7e99f0a6e531bdb9f37cc9d81c004f8a439152445f960f656
 AUX ipsec-tools-duplicate-header.patch 440 RMD160 0a9f53ad68232b382388447c3c4aa7c81f5b6de1 SHA1 1d48f49fae5e7c5278d52a512e6b06998f24eacf SHA256 47d31a605a48fc7168cd579f62217316a12b153177bc6b16618d46c38e6936d1
 AUX ipsec-tools-include-vendoridh.patch 434 RMD160 cf30a122392ba179a7c6b0cd65f4c21d68d16266 SHA1 a0de513e850618caa2b5917b5d5b838360eaa200 SHA256 be0fd6ec217405a6f1ab97231568297e705d995d0f5fa8a6ebae896e1b2e910c
@@ -8,5 +11,12 @@ AUX racoon.conf.d 605 RMD160 1c2db39154d8470ecd2e0fe95075ec47ffa47613 SHA1 19171
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 AUX racoon.pam.d 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
-EBUILD ipsec-tools-0.8.0-r3.ebuild 6351 RMD160 257da56672d4ef74f07d076498312ef54128b325 SHA1 072eab5b17c831e76f6a6d4befa83d9250cf77b3 SHA256 f7ce01ac9c494592785e9c9cfdacb040f14236b464b0887a207ec82b818a139d
+EBUILD ipsec-tools-0.8.0-r3.ebuild 6368 RMD160 5bd14d210dd3ee8b7c6c268599f4fabfb7c4d5bc SHA1 8b1b10680de5fd979e42665a6931367920298231 SHA256 bc75bafe09da1c8bd03f1342dca8f7fa50fb005bfea55b9418843e8fb60b170e
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk9YBeIACgkQl5yvQNBFVTWvbgCglDcQZS8JrMKI76ZqMtjCeKGz
+ZyAAn1qLZGJSOufdAE1lQsY4ATNA/FRW
+=bZpk
+-----END PGP SIGNATURE-----

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
index a8e37f8..03dcbc8 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
@@ -158,6 +158,7 @@ src_configure() {
 	filter-flags -march=c3
 
 	#--with-iconv leads to "Broken getaddrinfo()"
+	#--enable-samode-unspec is not supported in linux
 	local myconf
 	myconf="--with-kernel-headers=/usr/include \
 			--enable-adminport \
@@ -165,6 +166,7 @@ src_configure() {
 			--enable-dpd \
 			--enable-frag \
 			--without-libiconv \
+			--disable-samode-unspec \
 			$(use_enable idea) \
 			$(use_enable ipv6) \
 			$(use_enable kerberos gssapi) \
@@ -191,9 +193,6 @@ src_configure() {
 	# No way to get it compiling with freeradius or gnuradius
 	# We would need libradius which only exists on FreeBSD
 
-	# See bug #77369
-	#myconf="${myconf} --enable-samode-unspec"
-
 	econf ${myconf}
 }
 



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-03-08  2:29 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-03-08  2:29 UTC (permalink / raw
  To: gentoo-commits

commit:     a59cd84ec967e71037ad6c9215b12eadc955a853
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 02:29:44 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 02:29:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=a59cd84e

net-firewall/ipsec-tools: libradius is not supported in linux

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-firewall/ipsec-tools/Manifest                  |    8 ++++----
 .../ipsec-tools/ipsec-tools-0.8.0-r3.ebuild        |    9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index b236af5..6791236 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -11,12 +11,12 @@ AUX racoon.conf.d 605 RMD160 1c2db39154d8470ecd2e0fe95075ec47ffa47613 SHA1 19171
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 AUX racoon.pam.d 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
-EBUILD ipsec-tools-0.8.0-r3.ebuild 6368 RMD160 5bd14d210dd3ee8b7c6c268599f4fabfb7c4d5bc SHA1 8b1b10680de5fd979e42665a6931367920298231 SHA256 bc75bafe09da1c8bd03f1342dca8f7fa50fb005bfea55b9418843e8fb60b170e
+EBUILD ipsec-tools-0.8.0-r3.ebuild 6241 RMD160 440a6cc37743d75b086bb1e35b70bbdb453bee6e SHA1 1a59872aeec38e3b33a3d655fcd7d13aca9299a5 SHA256 b7cd0befd5a720d16ff489d07dd6999a8aa94f459a46ea247a7a77b689ba99b7
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9YBeIACgkQl5yvQNBFVTWvbgCglDcQZS8JrMKI76ZqMtjCeKGz
-ZyAAn1qLZGJSOufdAE1lQsY4ATNA/FRW
-=bZpk
+iEYEAREIAAYFAk9YGZgACgkQl5yvQNBFVTVxMgCeMnrg7ash2exv5SsBCZDAMi88
+ypQAnj3JilvxevaTFZSMa8o0OLBnSxyT
+=yiEh
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
index 03dcbc8..a7f7ff7 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
@@ -154,10 +154,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# fix for bug #61025
-	filter-flags -march=c3
-
-	#--with-iconv leads to "Broken getaddrinfo()"
+	#--with-{iconv,libradius} lead to "Broken getaddrinfo()"
 	#--enable-samode-unspec is not supported in linux
 	local myconf
 	myconf="--with-kernel-headers=/usr/include \
@@ -166,6 +163,7 @@ src_configure() {
 			--enable-dpd \
 			--enable-frag \
 			--without-libiconv \
+			--without-libradius \
 			--disable-samode-unspec \
 			$(use_enable idea) \
 			$(use_enable ipv6) \
@@ -190,9 +188,6 @@ src_configure() {
 	# the default (/usr/include/openssl/) is OK for Gentoo, leave it
 	# myconf="${myconf} $(use_with ssl openssl )"
 
-	# No way to get it compiling with freeradius or gnuradius
-	# We would need libradius which only exists on FreeBSD
-
 	econf ${myconf}
 }
 



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-03-08  2:56 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-03-08  2:56 UTC (permalink / raw
  To: gentoo-commits

commit:     3f5977b97361cb79714c41593a35b7c00aeabfec
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 02:56:35 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 02:56:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=3f5977b9

net-firewall/ipsec-tools: sysctl.h is no longer included in src/racoon/pfkey.c src/setkey/setkey.c

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-firewall/ipsec-tools/Manifest                  |    8 ++++----
 .../ipsec-tools/ipsec-tools-0.8.0-r3.ebuild        |    2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 6791236..ddc089d 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -11,12 +11,12 @@ AUX racoon.conf.d 605 RMD160 1c2db39154d8470ecd2e0fe95075ec47ffa47613 SHA1 19171
 AUX racoon.init.d 1314 RMD160 14fd9ea02fdb20d13a0e3284e1f1e468117247f2 SHA1 41cb71c0354d632ad35565dbf98a26364b592d56 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75
 AUX racoon.pam.d 156 RMD160 c4f6ba6e3a705eef63e571189e28de71e7d61178 SHA1 1223f7a43a5e124521d48852b2d23bb8ba0a788f SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c
 DIST ipsec-tools-0.8.0.tar.bz2 809297 RMD160 8715d97c52ef4de771e50df579e5e9241d5bf966 SHA1 d44a955a00cdfcd771fb1eca8267421bd47bc46e SHA256 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
-EBUILD ipsec-tools-0.8.0-r3.ebuild 6241 RMD160 440a6cc37743d75b086bb1e35b70bbdb453bee6e SHA1 1a59872aeec38e3b33a3d655fcd7d13aca9299a5 SHA256 b7cd0befd5a720d16ff489d07dd6999a8aa94f459a46ea247a7a77b689ba99b7
+EBUILD ipsec-tools-0.8.0-r3.ebuild 6135 RMD160 5c5113c51b9d1410a95a629635b5f5c890451bc0 SHA1 309cfe1bf239c8dffb96f8b7ff188008f9ef8b9a SHA256 bc4ae794a70a2c1961a48cbe099cad87be3edd5bc22a8f9ba65382e62e67df41
 MISC metadata.xml 537 RMD160 41f7f604e33d56879ee9dd0d5a18c7f8fcc0910e SHA1 0fdf06aa17efa68aa50f04db0277e0dc4f4be590 SHA256 12de55d6d62b8e91c8996422e33462b5637f9720a5096025752b93906bcbdc40
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk9YGZgACgkQl5yvQNBFVTVxMgCeMnrg7ash2exv5SsBCZDAMi88
-ypQAnj3JilvxevaTFZSMa8o0OLBnSxyT
-=yiEh
+iEYEAREIAAYFAk9YH+MACgkQl5yvQNBFVTUpUgCgmo+4jAsCbAJG6RJDD9WgRjxg
+VksAnj+GjzU2EUfhHs5Y/6mGqXzf/j1S
+=YExW
 -----END PGP SIGNATURE-----

diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
index a7f7ff7..5568c9d 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r3.ebuild
@@ -139,8 +139,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# fix for bug #76741
-	sed -i 's:#include <sys/sysctl.h>::' src/racoon/pfkey.c src/setkey/setkey.c || die
 	# fix for bug #124813
 	sed -i 's:-Werror::g' "${S}"/configure.ac || die
 	# fix for building with gcc-4.6



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-09-27 14:22 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-09-27 14:22 UTC (permalink / raw
  To: gentoo-commits

commit:     5807712b1fd2e736d58449181a7f65f5e06e0f26
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 14:22:24 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 14:22:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=5807712b

net-firewall/ipsec-tools: remove the old init.d file

---
 net-firewall/ipsec-tools/Manifest |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index c6d0c05..00ff670 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -5,7 +5,6 @@ AUX ipsec.conf 1209 SHA256 a9a6cbf1bd42aaefdb637814bc6198079bab84e37888e1b705f93
 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 606 SHA256 a5bac8d1d84d11651027f4264a9adac85d18ea8f126abb504397a866695d2ddd SHA512 c2f12c2829e8f1852a81104feb6b5f4afa58394fa46b65347ec30d469a822b748d3e317023ec0f060c20242988692ab76eba52fdc5f473e393c563243ff53c1d WHIRLPOOL 58a48357c475e927cb3d659582bb8c9b8ae10f1164c1831300375694a33052454dd65a29a0c869f17915f3d36aa2772b64811f44920f57d9de8cf2eb5f3df485
-AUX racoon.init.d 1314 SHA256 7c9447197032b30a2cb76a62179a3b0ef3768870c340adf4743976e7d65eba75 SHA512 ef882fde450ac1bd4ce4acfefa498699c1959d6a1fa9eb2ea210446007f8107c2203e5fb6c0ef5f21e7687479569bffe84a3815f32748fb103140fa2e8f3737a WHIRLPOOL d31da300e79211dff92568d9d6901b3cefaabbae57806b45f2e61031e11b4ba8afd53b3a2742e9174110291716a53910deb1a188da3ec279f5af2edcfa9281dc
 AUX racoon.init.d-r2 1232 SHA256 d31ca0615464fbc8a3a2a6c6b308ab937e795ca6a1ca7d1a54eadff20caf9825 SHA512 1fa08aff6fe116e8c440600a23bb78385716ad6ab0e6b28d28d63516b9d67c6c592bcd876b198bf6bffa11efe97772399db66c1d2b57e9eaa494983495313f5e WHIRLPOOL d0b691de48313962b04e7a86aeeee1933b03fbbfe322e5e7662229a84d5d5d794bcbb51d0ef45160c25856ec4e1f4e15b435134ddea3378633f5116547c375d7
 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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/
@ 2012-09-27 18:51 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2012-09-27 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6e435cfeb1acc52d8e8276a6a1373228637fbd2c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 18:50:16 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 18:50:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6e435cfe

net-firewall/ipsec-tools: intelligent migration of ipsec.conf -> ipsec-tools.conf

---
 net-firewall/ipsec-tools/Manifest                  |    2 +-
 .../ipsec-tools/ipsec-tools-0.8.0-r5.ebuild        |   38 ++++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletions(-)

diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 34b1061..7afd522 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -8,5 +8,5 @@ AUX racoon.conf.d-r1 906 SHA256 a94721a9d51b970f728c63c1f4348c53fb0629b05ef02a6e
 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 6105 SHA256 6e08dded31816117b3c097593ffc9058934af41b250215ba9a319b764435a9ae SHA512 1e7fdccb604a90afb72b62873b723581d2b856676631c18068a88a532657ed4c5a0076b5d89b73c92854445d3aa1e5ca8bf2cb0bbfa994dff0df78469c8fa749 WHIRLPOOL d5e5a650274a74193e28b83ba3f86db106988cc6bfe5a12893e752671d596f1aeb64bd1189e9d6f6302b458292e9054e293245b83385fa9cba8a23931bb88716
+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/ipsec-tools-0.8.0-r5.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r5.ebuild
index 7143c26..681045d 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
@@ -29,6 +29,44 @@ RDEPEND="
 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
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2012-09-27 18:51 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-08  2:29 [gentoo-commits] dev/blueness:master commit in: net-firewall/ipsec-tools/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2012-09-27 18:51 Anthony G. Basile
2012-09-27 14:22 Anthony G. Basile
2012-03-08  2:56 Anthony G. Basile
2012-03-08  1:06 Anthony G. Basile
2012-03-07 20:28 Anthony G. Basile
2012-02-09 20:49 Anthony G. Basile
2012-02-09 20:29 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox