packages: mailx/mailx.spec, mailx/mailx-ipv6.patch (NEW), mailx/mailx-opens...

baggins baggins at pld-linux.org
Wed Apr 14 13:15:53 CEST 2010 

Author: baggins                      Date: Wed Apr 14 11:15:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with openssl 1.0.0
- prefer openssl over NSS
- enable ipv6 support

---- Files affected:
packages/mailx:
   mailx.spec (1.52 -> 1.53) , mailx-ipv6.patch (NONE -> 1.1)  (NEW), mailx-openssl-nss.patch (NONE -> 1.1)  (NEW), mailx-openssl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mailx/mailx.spec
diff -u packages/mailx/mailx.spec:1.52 packages/mailx/mailx.spec:1.53
--- packages/mailx/mailx.spec:1.52	Wed Apr 14 13:00:47 2010
+++ packages/mailx/mailx.spec	Wed Apr 14 13:15:48 2010
@@ -10,6 +10,9 @@
 # Source0-md5:	0c93759e34200eb56a0e7c464680a54a
 Patch0:		%{name}-bsdcompat.patch
 Patch1:		%{name}-use-krb5-gss.patch
+Patch2:		%{name}-openssl-nss.patch
+Patch3:		%{name}-openssl.patch
+Patch4:		%{name}-ipv6.patch
 URL:		http://heirloom.sourceforge.net/mailx.html
 BuildRequires:	heimdal-devel
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -36,6 +39,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__make} \
@@ -92,6 +98,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2010/04/14 11:15:48  baggins
+- fix building with openssl 1.0.0
+- prefer openssl over NSS
+- enable ipv6 support
+
 Revision 1.52  2010/04/14 11:00:47  glen
 - version is 12.4, not 24.4
 

================================================================
Index: packages/mailx/mailx-ipv6.patch
diff -u /dev/null packages/mailx/mailx-ipv6.patch:1.1
--- /dev/null	Wed Apr 14 13:15:53 2010
+++ packages/mailx/mailx-ipv6.patch	Wed Apr 14 13:15:48 2010
@@ -0,0 +1,11 @@
+--- mailx-12.4/Makefile~	2008-07-29 00:33:38.000000000 +0200
++++ mailx-12.4/Makefile	2010-04-14 13:14:15.339187324 +0200
+@@ -50,7 +50,7 @@
+ 
+ # If you know that the IPv6 functions work on your machine, you can enable
+ # them here.
+-#IPv6		= -DHAVE_IPv6_FUNCS
++IPv6		= -DHAVE_IPv6_FUNCS
+ 
+ #
+ # Binaries are stripped with this command after installation.

================================================================
Index: packages/mailx/mailx-openssl-nss.patch
diff -u /dev/null packages/mailx/mailx-openssl-nss.patch:1.1
--- /dev/null	Wed Apr 14 13:15:53 2010
+++ packages/mailx/mailx-openssl-nss.patch	Wed Apr 14 13:15:48 2010
@@ -0,0 +1,52 @@
+--- mailx-12.4/makeconfig~	2010-04-14 13:04:22.441129101 +0200
++++ mailx-12.4/makeconfig	2010-04-14 13:11:52.843187470 +0200
+@@ -322,11 +322,24 @@
+ #}
+ #!
+ 
+-link_check nss 'for Network Security Services (NSS)' '#define USE_SSL
+-#define USE_NSS' '-lsmime3 -lnss3 -lssl3 -lnspr4 -lplc4' <<\! || \
+-		link_check openssl 'for sufficiently recent OpenSSL' \
+-			'#define USE_SSL
+-#define USE_OPENSSL' '-lssl -lcrypto' <<\%
++link_check openssl 'for sufficiently recent OpenSSL' '#define USE_SSL
++#define USE_OPENSSL' '-lssl -lcrypto' <<\! || \
++		link_check nss 'for Network Security Services (NSS)' \
++		'#define USE_SSL
++#define USE_NSS' '-lsmime3 -lnss3 -lssl3 -lnspr4 -lplc4' <<\%
++#include <openssl/ssl.h>
++#include <openssl/err.h>
++#include <openssl/x509v3.h>
++#include <openssl/x509.h>
++#include <openssl/rand.h>
++
++int main(void)
++{
++	SSLv23_client_method();
++	PEM_read_PrivateKey(0, 0, 0, 0);
++	return 0;
++}
++!
+ #include <nss.h>
+ #include <ssl.h>
+ #include <prinit.h>
+@@ -345,19 +358,6 @@
+ 	NSS_CMSSignerInfo_AddSMIMECaps(0);
+ 	return 0;
+ }
+-!
+-#include <openssl/ssl.h>
+-#include <openssl/err.h>
+-#include <openssl/x509v3.h>
+-#include <openssl/x509.h>
+-#include <openssl/rand.h>
+-
+-int main(void)
+-{
+-	SSLv23_client_method();
+-	PEM_read_PrivateKey(0, 0, 0, 0);
+-	return 0;
+-}
+ %
+ if test x$have_nss = xyes
+ then

================================================================
Index: packages/mailx/mailx-openssl.patch
diff -u /dev/null packages/mailx/mailx-openssl.patch:1.1
--- /dev/null	Wed Apr 14 13:15:54 2010
+++ packages/mailx/mailx-openssl.patch	Wed Apr 14 13:15:48 2010
@@ -0,0 +1,170 @@
+http://nail.cvs.sourceforge.net/viewvc/nail/nail/makeconfig?r1=1.14&r2=1.15
+http://nail.cvs.sourceforge.net/viewvc/nail/nail/openssl.c?r1=1.12&r2=1.13
+
+--- nail/makeconfig	2007/04/14 15:26:00	1.14
++++ nail/makeconfig	2009/05/26 21:04:15	1.15
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ #
+-# Sccsid @(#)makeconfig	1.43 (gritter) 4/14/07
++# Sccsid @(#)makeconfig	1.44 (gritter) 5/26/09
+ #
+ 
+ tmp=___build$$
+@@ -393,6 +393,25 @@
+ !
+ fi
+ 
++if test x$have_openssl = xyes
++then
++	compile_check stack_of 'for STACK_OF()' '#define HAVE_STACK_OF' <<\!
++#include <openssl/ssl.h>
++#include <openssl/err.h>
++#include <openssl/x509v3.h>
++#include <openssl/x509.h>
++#include <openssl/rand.h>
++
++int main(void)
++{
++	STACK_OF(GENERAL_NAME)	*gens = NULL;
++	printf("%p", gens);	/* to make it used */
++	SSLv23_client_method();
++	PEM_read_PrivateKey(0, 0, 0, 0);
++	return 0;
++}
++!
++fi
+ 
+ cat >$tmp2.c <<\!
+ #include <gssapi/gssapi.h>
+--- nail/openssl.c	2007/08/04 11:41:36	1.12
++++ nail/openssl.c	2009/05/26 21:04:15	1.13
+@@ -38,7 +38,7 @@
+ 
+ #ifndef lint
+ #ifdef	DOSCCS
+-static char sccsid[] = "@(#)openssl.c	1.25 (gritter) 8/4/07";
++static char sccsid[] = "@(#)openssl.c	1.26 (gritter) 5/26/09";
+ #endif
+ #endif /* not lint */
+ 
+@@ -101,12 +101,17 @@
+ static int ssl_rand_init(void);
+ static void ssl_init(void);
+ static int ssl_verify_cb(int success, X509_STORE_CTX *store);
+-static SSL_METHOD *ssl_select_method(const char *uhp);
++static const SSL_METHOD *ssl_select_method(const char *uhp);
+ 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);
++#ifdef HAVE_STACK_OF
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
++		X509_STORE *store);
++#else
+ static int smime_verify(struct message *m, int n, STACK *chain,
+ 		X509_STORE *store);
++#endif
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+ static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn);
+@@ -203,10 +208,10 @@
+ 	return 1;
+ }
+ 
+-static SSL_METHOD *
++static const SSL_METHOD *
+ ssl_select_method(const char *uhp)
+ {
+-	SSL_METHOD *method;
++	const SSL_METHOD *method;
+ 	char	*cp;
+ 
+ 	cp = ssl_method_string(uhp);
+@@ -308,7 +313,11 @@
+ 	X509 *cert;
+ 	X509_NAME *subj;
+ 	char data[256];
++#ifdef HAVE_STACK_OF
++	STACK_OF(GENERAL_NAME)	*gens;
++#else
+ 	/*GENERAL_NAMES*/STACK	*gens;
++#endif
+ 	GENERAL_NAME	*gen;
+ 	int	i;
+ 
+@@ -357,7 +366,8 @@
+ 
+ 	ssl_init();
+ 	ssl_set_vrfy_level(uhp);
+-	if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) {
++	if ((sp->s_ctx =
++	     SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) {
+ 		ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed"));
+ 		return STOP;
+ 	}
+@@ -496,7 +506,11 @@
+ }
+ 
+ static int
++#ifdef HAVE_STACK_OF
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
++#else
+ smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++#endif
+ {
+ 	struct message	*x;
+ 	char	*cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +519,12 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
++#ifdef HAVE_STACK_OF
++	STACK_OF(X509)	*certs;
++	STACK_OF(GENERAL_NAME)	*gens;
++#else
+ 	STACK	*certs, *gens;
++#endif
+ 	X509	*cert;
+ 	X509_NAME	*subj;
+ 	char	data[LINESIZE];
+@@ -614,7 +633,11 @@
+ {
+ 	int	*msgvec = vp, *ip;
+ 	int	ec = 0;
++#ifdef HAVE_STACK_OF
++	STACK_OF(X509)	*chain = NULL;
++#else
+ 	STACK	*chain = NULL;
++#endif
+ 	X509_STORE	*store;
+ 	char	*ca_dir, *ca_file;
+ 
+@@ -687,7 +710,11 @@
+ 	X509	*cert;
+ 	PKCS7	*pkcs7;
+ 	BIO	*bb, *yb;
++#ifdef HAVE_STACK_OF
++	STACK_OF(X509)	*certs;
++#else
+ 	STACK	*certs;
++#endif
+ 	EVP_CIPHER	*cipher;
+ 
+ 	certfile = expand((char *)certfile);
+@@ -950,9 +977,14 @@
+ 	off_t	size;
+ 	BIO	*fb, *pb;
+ 	PKCS7	*pkcs7;
++#ifdef HAVE_STACK_OF
++	STACK_OF(X509)	*certs;
++	STACK_OF(X509)	*chain = NULL;
++#else
+ 	STACK	*certs;
+-	X509	*cert;
+ 	STACK	*chain = NULL;
++#endif
++	X509	*cert;
+ 	enum okay	ok = OKAY;
+ 
+ 	message_number = n;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mailx/mailx.spec?r1=1.52&r2=1.53&f=u

More information about the pld-cvs-commit mailing list