Fix building with OpenSSL >= 1.0.0 wrt #328363 by "thanasis".

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

4 files changed, 83 insertions, 5 deletions

diff --git a/mail-client/nail/ChangeLog b/mail-client/nail/ChangeLog
index b55c59001536..cf624a37e5dd 100644
--- a/mail-client/nail/ChangeLog
+++ b/mail-client/nail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/nail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.66 2010/07/12 17:16:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/ChangeLog,v 1.67 2010/07/15 09:00:01 ssuominen Exp $
+
+  15 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> nail-12.4.ebuild,
+  +files/nail-12.4-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #328363 by "thanasis".
 
   12 Jul 2010; Jeroen Roovers <jer@gentoo.org> nail-12.4.ebuild:
   Stable for HPPA (bug #324127).
diff --git a/mail-client/nail/Manifest b/mail-client/nail/Manifest
index ec44c478edb7..bfdb6cff7f2a 100644
--- a/mail-client/nail/Manifest
+++ b/mail-client/nail/Manifest
@@ -1,8 +1,9 @@
 AUX nail-12.4-debian.patch 1060 RMD160 0df7a5654c0cc8b38570cc73fb5e8efcceaab26e SHA1 59066d0220e6ca4d86fc24c87d5f74900e149645 SHA256 57d6259bb0de14e8583fc77dbff4329ac6a9ebcd002fcc38d435d7d94db4efb8
+AUX nail-12.4-openssl-1.patch 1860 RMD160 93e57687e7a65b2751c86e83da7749df68817313 SHA1 aee47cfa611d44ecf2abf2ea79ae2e214fa57480 SHA256 0c3fbb7f23f0000a40addf20d3d41d0a8e62ec8f93172118fa8798eb45dfa2e1
 AUX nail-nosocket.patch 473 RMD160 1598331c9a0ea4fcaa6682bae9e04cb5d7bb3117 SHA1 600c8bb47a17008c992297e28e29c73fb44108ef SHA256 840a0f3f592de84d03c225ccdc6c363b4d372eb605750a0ee7e1b02320547dc9
 DIST mailx-12.4.tar.bz2 271482 RMD160 8244d04d0a0058fdbe9867ca503c7cda8d580154 SHA1 b1e105adf9d36269daf317dedf68b6e4cca404a7 SHA256 92201e769fe346bc0364c87437a330ef3c97ab3e9d7b2235b93f509e85e5716a
 DIST nail-11.25.tar.bz2 267959 RMD160 d72a5a4760cc43bcc2e9223e2eca4f0a8de7605f SHA1 dd15a5bdedb74175763ababa8be70989334963e4 SHA256 ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5
 EBUILD nail-11.25-r3.ebuild 1985 RMD160 3f41c625e9647158370245bcee5616befea1fe55 SHA1 251a6b438ba909e733886680ebdb5ed4e1d588a0 SHA256 3b119bc9ac33b7e67017a740f86ea245037349ad1d9351ebeb014039be51a6c2
-EBUILD nail-12.4.ebuild 2266 RMD160 c1386af0fb38ae2f46fb60b2f4b3b28aea646bec SHA1 a326eb0195e5030de0050aa75a4bf7604a986b70 SHA256 333de1417a5e511a8e8a1160a8933b93d242a7cf1875d9ae283083409f4c363b
-MISC ChangeLog 8679 RMD160 d0daa9032301a789ae57e0cf9bd831b2a0e8276e SHA1 7a6e838089b8bb7b8df8deb62756ea4f384358d6 SHA256 004890f85a1ae3440dfc41d929ad49b6b6ea88fd8a2f196cf7f63b12286474bd
+EBUILD nail-12.4.ebuild 2311 RMD160 2f4645113f48b5edee954cee58ef2068a72f97eb SHA1 14ce5d41cbb1f0f6a5ce0adb2f44b68cd897115e SHA256 0997f27e1ddaac253401697d6ea21eac0b72a31b5e380769a834de9b758448d5
+MISC ChangeLog 8858 RMD160 207572adc9a8a54fe9ac4a2bfe7e26fba5accc4c SHA1 91b97de14204f69b1292df55bd9c60784c153bac SHA256 2e8b41a0113c7be73f144cb84f82a6dc37f02fe79de4c9671913e7c0c5701c2f
 MISC metadata.xml 259 RMD160 7bd304e664ab666fab49794d575652f4a5e1587c SHA1 1f0507ccb185c8f48f26b7ad1cfe4df64ce01ad1 SHA256 2b207df02a39323049a95d476319fcaafda0b918c0c4e1feaab97b61ca1a93c6
diff --git a/mail-client/nail/files/nail-12.4-openssl-1.patch b/mail-client/nail/files/nail-12.4-openssl-1.patch
new file mode 100644
index 000000000000..376c4d668e36
--- /dev/null
+++ b/mail-client/nail/files/nail-12.4-openssl-1.patch
@@ -0,0 +1,72 @@
+http://bugs.gentoo.org/328363
+http://repos.archlinux.org/wsvn/community/mailx-heirloom/trunk/mailx-heirloom-openssl-1.0.patch
+
+--- openssl.c
++++ openssl.c
+@@ -105,7 +105,7 @@
+ static void ssl_load_verifications(struct sock *sp);
+ static void ssl_certificate(struct sock *sp, const char *uhp);
+ static enum okay ssl_check_host(const char *server, struct sock *sp);
+-static int smime_verify(struct message *m, int n, STACK *chain,
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
+ 		X509_STORE *store);
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+@@ -308,7 +308,7 @@
+ 	X509 *cert;
+ 	X509_NAME *subj;
+ 	char data[256];
+-	/*GENERAL_NAMES*/STACK	*gens;
++	/*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES)	*gens;
+ 	GENERAL_NAME	*gen;
+ 	int	i;
+ 
+@@ -496,7 +496,7 @@
+ }
+ 
+ static int
+-smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
+ {
+ 	struct message	*x;
+ 	char	*cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +505,8 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
+-	STACK	*certs, *gens;
++	STACK_OF(X509)	*certs;
++	STACK_OF(GENERAL_NAMES) *gens;
+ 	X509	*cert;
+ 	X509_NAME	*subj;
+ 	char	data[LINESIZE];
+@@ -614,7 +615,7 @@
+ {
+ 	int	*msgvec = vp, *ip;
+ 	int	ec = 0;
+-	STACK	*chain = NULL;
++	STACK_OF(X509)	*chain = NULL;
+ 	X509_STORE	*store;
+ 	char	*ca_dir, *ca_file;
+ 
+@@ -687,7 +688,7 @@
+ 	X509	*cert;
+ 	PKCS7	*pkcs7;
+ 	BIO	*bb, *yb;
+-	STACK	*certs;
++	STACK_OF(X509)	*certs;
+ 	EVP_CIPHER	*cipher;
+ 
+ 	certfile = expand((char *)certfile);
+@@ -950,9 +951,9 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
+-	STACK	*certs;
++	STACK_OF(X509)	*certs;
+ 	X509	*cert;
+-	STACK	*chain = NULL;
++	STACK_OF(X509)	*chain = NULL;
+ 	enum okay	ok = OKAY;
+ 
+ 	message_number = n;
diff --git a/mail-client/nail/nail-12.4.ebuild b/mail-client/nail/nail-12.4.ebuild
index 6efe5d676989..6dbbd7dd752a 100644
--- a/mail-client/nail/nail-12.4.ebuild
+++ b/mail-client/nail/nail-12.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.10 2010/07/12 17:16:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nail/nail-12.4.ebuild,v 1.11 2010/07/15 09:00:01 ssuominen Exp $
 
 EAPI="3"
 
@@ -39,7 +39,8 @@ remove_sockets() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-debian.patch
+	epatch "${FILESDIR}"/${P}-debian.patch \
+		"${FILESDIR}"/${P}-openssl-1.patch
 	# Do not strip the binary
 	sed -i -e '/STRIP/d' Makefile
 }