Require <openssl-1.0.1 for bug #414501, 4.78 will come with 1.0.1 support

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

5 files changed, 27 insertions, 13 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 209a17a0e10f..2ebcaad9187b 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.220 2012/03/06 22:03:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.221 2012/05/04 06:47:24 grobian Exp $
+
+  04 May 2012; Fabian Groffen <grobian@gentoo.org> exim-4.76-r1.ebuild,
+  exim-4.76.ebuild, exim-4.77.ebuild:
+  Require <openssl-1.0.1 for bug #414501, 4.78 will come with 1.0.1 support
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> exim-4.77.ebuild:
   Marking exim-4.77 ppc64 for bug 391237
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 1c0a92f03f83..5ec15191d55c 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX auth_conf.sub 790 RMD160 5d6a71cf9fb593fc34ddce8dc421fcd843356c82 SHA1 5744531af5ee282ae29bdbb4e89fbee16c0034a7 SHA256 d0631d487f115c07a178d48bc7168cd16d7b22c8879b1e926923152cde95ba78
 AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA1 d52b5d10656ead546beda128068ed2f9dbc67200 SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da
 AUX exim-4.20-maildir.patch 478 RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce SHA1 c8287f7e44d93b0ca8761b8f7111974cfe1280a5 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c
@@ -19,8 +22,15 @@ DIST exim-4.77.tar.bz2 1576148 RMD160 b70ced4c6323ccc167db68f3a7d30163287b2240 S
 DIST exim-html-4.77.tar.bz2 416407 RMD160 f758f2953fc077c78229b28c7750ba04e673f085 SHA1 bccf154854ed855aa031018a84f34c260fe00723 SHA256 05823ebe0c0554215d928bee1a856bb2011e993f170edadbad57f0fb21dd9c76
 DIST exim_469_dsn_1_3.patch 40222 RMD160 c744d6b5b388716e423529eda5b807aa8b9da2eb SHA1 3d1d7115dd80a974d40febbdef844d87860b8729 SHA256 605c520ea79507fd387772796c62303c5a49d1dc47b744b4267301096eedd49a
 DIST system_filter.exim.gz 3075 RMD160 47bcc6de402d896b73fd01d7f0d3c3ecbad9cf0b SHA1 384d138d8612f3a80b2b68f272b43cd69bc4411a SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437
-EBUILD exim-4.76-r1.ebuild 10419 RMD160 08693ae53cf2ecf1c4da7801a4af6001da5c5bc4 SHA1 45b7fc34c2c1598e18f67285aa7d1fabfed2fbbe SHA256 0892ec6c900826a34df31a675a80b42f3e2316dac1c09b154982fa541ee622cb
-EBUILD exim-4.76.ebuild 10316 RMD160 930cdf30324c6ad0d95d7dfa5017a2ef516b3a60 SHA1 67fe0632a088ba539c40baf0c0d6d0a143c1fb69 SHA256 733501c20911916e0bf6ec584921d7a6c23de8b29a5b149400636a9ef233b773
-EBUILD exim-4.77.ebuild 10993 RMD160 571b1c0ca042d647f9f206a63da2f5abc7bf3ee2 SHA1 716dee990fbef2c30824088b3df3b22ed6e059a8 SHA256 5f61e1db32b1a46b1a1ca933dfd058d9f296e78614b89b0e5b62acfede0953b6
-MISC ChangeLog 43997 RMD160 0424090a94861b9c314e97dea3f263a34dfb8fdd SHA1 eefcb95d63b99fbe066c00fd9a0f10df5e1e769c SHA256 6d7a795fa2e429dfa4e17b5871dc20c53a6b6e24e6d5d28120566f4442214376
+EBUILD exim-4.76-r1.ebuild 10443 RMD160 865f6423041b7210e21f8543dccd535ec8c69443 SHA1 70cccc3b9fe805476383e80c499aec47343d6967 SHA256 146343370a30a6a2c5d5a6a2a6821e047dafcce7ee849dc296f8f129344488ca
+EBUILD exim-4.76.ebuild 10340 RMD160 c23a4553630f7a0e9667375d77718f7b0c310bce SHA1 ecfcfefe9b614b97cb3b68feef1f1363e2b91197 SHA256 4ff6b14244c970063480b8c8d4588f523650e70ee3613582286ee1e03f192afe
+EBUILD exim-4.77.ebuild 11018 RMD160 ca5f5b61f2d6395ab4f840a461f2ed97b86aacc3 SHA1 25d97681d821f6fe4c30c09df044167eee5489c4 SHA256 99e4c90e1aa82a2d48e78b2508571973a7f24150edb48d5191d796c298bf60b1
+MISC ChangeLog 44185 RMD160 31759d46e998ec54c3b26e501cef5ff5882d0905 SHA1 ef8ee421c16ded5268f1305b3f96af96ef367d59 SHA256 10c0c1853fa7e6ccefe3b57285fe6624db6316e3750e419a39d8e08a29f0930a
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (Darwin)
+
+iEYEARECAAYFAk+je4EACgkQX3X2B8XHTol55gCfe8N3b3poWyJUfL8W5IWIaz9v
+ZrMAnRQseGYiQjSyIXVj6yBj7n3qqIKg
+=csfx
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.76-r1.ebuild b/mail-mta/exim/exim-4.76-r1.ebuild
index 8853a02391c8..a8ee0d786ec5 100644
--- a/mail-mta/exim/exim-4.76-r1.ebuild
+++ b/mail-mta/exim/exim-4.76-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76-r1.ebuild,v 1.1 2011/08/03 19:19:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76-r1.ebuild,v 1.2 2012/05/04 06:47:24 grobian Exp $
 
 EAPI="3"
 
@@ -27,7 +27,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	perl? ( sys-devel/libperl )
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 )
 	gnutls? ( net-libs/gnutls
 			  dev-libs/libtasn1 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
diff --git a/mail-mta/exim/exim-4.76.ebuild b/mail-mta/exim/exim-4.76.ebuild
index d7edd79413ed..a8c5931e878c 100644
--- a/mail-mta/exim/exim-4.76.ebuild
+++ b/mail-mta/exim/exim-4.76.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.10 2011/07/04 10:28:12 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.11 2012/05/04 06:47:24 grobian Exp $
 
 EAPI="3"
 
@@ -27,7 +27,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	perl? ( sys-devel/libperl )
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 )
 	gnutls? ( net-libs/gnutls
 			  dev-libs/libtasn1 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
diff --git a/mail-mta/exim/exim-4.77.ebuild b/mail-mta/exim/exim-4.77.ebuild
index ad11fa9bc8dd..1ab0483b0e9a 100644
--- a/mail-mta/exim/exim-4.77.ebuild
+++ b/mail-mta/exim/exim-4.77.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.77.ebuild,v 1.11 2012/03/06 22:03:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.77.ebuild,v 1.12 2012/05/04 06:47:24 grobian Exp $
 
 EAPI="3"
 
@@ -28,7 +28,7 @@ DEPEND=">=sys-apps/sed-4.0.5
 	perl? ( sys-devel/libperl )
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6 <dev-libs/openssl-1.0.1 )
 	gnutls? ( net-libs/gnutls
 			  dev-libs/libtasn1 )
 	ldap? ( >=net-nds/openldap-2.0.7 )