Fix building with OpenSSL >= 1.0.0 wrt #330717 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 32 insertions, 12 deletions

diff --git a/mail-filter/mailfilter/ChangeLog b/mail-filter/mailfilter/ChangeLog
index bff31be73c07..128283289943 100644
--- a/mail-filter/mailfilter/ChangeLog
+++ b/mail-filter/mailfilter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/mailfilter
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/ChangeLog,v 1.29 2009/09/23 17:55:14 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/ChangeLog,v 1.30 2010/08/01 14:27:53 ssuominen Exp $
+
+  01 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  mailfilter-0.8.2.ebuild, +files/0.8.2-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #330717 by Diego E. Pettenò.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> mailfilter-0.7.1.ebuild:
   Remove virtual/libc
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 1304ff3328f1..f11a1060c463 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,5 +1,6 @@
 AUX 0.8.1-gcc43.patch 300 RMD160 29cd9944a85451d9e23f2a0856dd62e783661fd9 SHA1 41cb73a2163ecf0425fb90b48e5b1b97e5479b58 SHA256 8a326cbe5bba1ba179714e02eeade731267c3d911d66a9309829b53ade32d91d
 AUX 0.8.2-gcc44.patch 709 RMD160 79ff2cc4f40994bb994da754479e1fb657aaaf4e SHA1 9548acd89f29c8aeab8c939609b10b33a2737c0f SHA256 621b454da740a71b6d01bb49cfa9580b0f397852810fa8176e10dd0874a58ce2
+AUX 0.8.2-openssl-1.patch 297 RMD160 cde63c6ec293dc4e2a22e7d0982bae024abd6e07 SHA1 e6350994ef3fa28a2b7a009af3e1308f0bcead3b SHA256 a38cefa4ad7879c23c65a6d5e72dd98fc7bc6210344d6ce255fc4f466cafd4be
 AUX rcfile.example1 4010 RMD160 34da47fa659be032dd669b899f0d9beaa2b07b1f SHA1 6d51dec1555ad832465030910b647875fc42bc8c SHA256 3585f28d51455a9d3d3778ee1f3dc64257fe1d92a0c5e0e63494683698e8b6b8
 AUX rcfile.example2 4554 RMD160 180d6fdc01a984e7f379b7a5d3ad6ada5e043076 SHA1 bc4a4d2664a304f6886d9acdf35a6db47055451f SHA256 5179d51a310897cb1b39ac12e906afc38b09a622263b8efc18e5f49c60699141
 DIST mailfilter-0.7.1.tar.gz 506799 RMD160 2b2afe04e2146ba2786eaa582781dcfd8cfc83ba SHA1 e50ffbf39046b43870c408f2c188c7aeb07b5da9 SHA256 1b875d423bb3cb0f74252e5209a10ca7271053d52ba0d24bacb70fad6a9630bb
@@ -8,7 +9,7 @@ DIST mailfilter-0.8.2.tar.gz 382966 RMD160 c7e1375e4eedd76f38d22f0937f22b045ed58
 DIST mailfilter-0.8.tar.gz 347093 RMD160 a5cbf3cd2b96a3067d68527525033896947787ac SHA1 149f57c33f705ecc982a49e83693875c066edd41 SHA256 ebf02d2f782edcd445a78b299c1303f28a6aa1ee70fb30af7a274fcef42b6643
 EBUILD mailfilter-0.7.1.ebuild 764 RMD160 12eb1ed49756cda36db51118991fa293ec373447 SHA1 58f27fdc47c9461d6ba5dfdc4d50ee57642bd2ea SHA256 ac2d81b9d2ef996eb65ff18243a93cf0a438bfbf41fa3baa04749380a32dab2b
 EBUILD mailfilter-0.8.1.ebuild 877 RMD160 c70aafdb9d803105e785659f05aa82dafd71c606 SHA1 8e2242657e5e08c63b4c78e3532f6aacc1e2e68a SHA256 81accaa411388c5ffcd59b723a900ec49e676c3ed8f9fd071621fdba2e2bcd1f
-EBUILD mailfilter-0.8.2.ebuild 850 RMD160 d647f02261c4e5e3e8d64978bd09a4e8bc5003ed SHA1 d3fad40b42219c40167d7ffc8e4cb2aaa8d8501f SHA256 5cf56141ac63242d43544d6910d0deb975890071af84a46f9f88cf2fb19c7991
+EBUILD mailfilter-0.8.2.ebuild 834 RMD160 0ebe7f7b88f3c7d6b2e83b15af5d8e7b84dbe81f SHA1 3bb9ffd9286084e0eb9aa5c848ab1177a16a83bc SHA256 f9f4ddde70791afd7bd8238aa06461ac788eecfdb61389c28322c5e82b1826c6
 EBUILD mailfilter-0.8.ebuild 656 RMD160 f4a224eae53f8542241661adf780872c0fe3a336 SHA1 ccee7709a9d5b172d2165d0bacf4e59e97ff0a4d SHA256 ae6788cfb2c90e937ccefe0ca6ca42d3e20aa901ff16904a5f3e393fd541214a
-MISC ChangeLog 4334 RMD160 227706bc0628dc8be80b077c4dd6a023d1840623 SHA1 3deed93386d95bb12318922f159442eadeb9b232 SHA256 7879513d2c4639614658020e9d257cb309099fb17a91c27acfa59060ad63e7c7
+MISC ChangeLog 4519 RMD160 24c7b114f8e7bf551a770eb7dae4c94b4a5e3faf SHA1 75749efb6ce29bb9c06dcaed01bf2ff590f4fed9 SHA256 18e53411cbe4dc1312b8b6ecc13953ab045f6759e7e0305fc37a39f109e05cab
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-filter/mailfilter/files/0.8.2-openssl-1.patch b/mail-filter/mailfilter/files/0.8.2-openssl-1.patch
new file mode 100644
index 000000000000..ad58bbb561f8
--- /dev/null
+++ b/mail-filter/mailfilter/files/0.8.2-openssl-1.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/330717
+
+--- src/socket.cc
++++ src/socket.cc
+@@ -64,7 +64,11 @@
+ #ifdef USE_SSL
+   SSL*        ssl;
+   BIO*        sbio;
++  #if OPENSSL_VERSION_NUMBER >= 0x10000000L
++  const SSL_METHOD* ssl_meth;
++  #else
+   SSL_METHOD* ssl_meth;
++  #endif
+   SSL_CTX*    ssl_ctx;
+ #endif
+ 
diff --git a/mail-filter/mailfilter/mailfilter-0.8.2.ebuild b/mail-filter/mailfilter/mailfilter-0.8.2.ebuild
index befad988343b..cb336e21761b 100644
--- a/mail-filter/mailfilter/mailfilter-0.8.2.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.8.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.8.2.ebuild,v 1.4 2009/08/28 12:05:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.8.2.ebuild,v 1.5 2010/08/01 14:27:53 ssuominen Exp $
 
 EAPI=2
-
 inherit eutils
 
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
@@ -19,16 +18,16 @@ DEPEND="sys-devel/flex"
 RDEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/0.8.2-gcc44.patch
+	epatch "${FILESDIR}"/0.8.2-gcc44.patch \
+		"${FILESDIR}"/0.8.2-openssl-1.patch
 }
 
 src_compile() {
-	# bug #281069
-	emake -j1 || die "emake failed"
+	emake -j1 || die #281069
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc INSTALL doc/FAQ "${FILESDIR}"/rcfile.example{1,2} \
-		README THANKS ChangeLog AUTHORS NEWS || die "doc failed"
+		README THANKS ChangeLog AUTHORS NEWS || die
 }