rpms/mailx/devel mailx-12.4-openssl.patch, NONE, 1.1 mailx.spec, 1.35, 1.36
Robert Scheck
robert at fedoraproject.org
Sat Dec 12 12:11:52 UTC 2009
Author: robert
Update of /cvs/pkgs/rpms/mailx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20641
Modified Files:
mailx.spec
Added Files:
mailx-12.4-openssl.patch
Log Message:
Make OpenSSL support working again if NSS flag is disabled
mailx-12.4-openssl.patch:
makeconfig | 21 ++++++++++++++++++++-
openssl.c | 44 ++++++++++++++++++++++++++++++++++++++------
2 files changed, 58 insertions(+), 7 deletions(-)
--- NEW FILE mailx-12.4-openssl.patch ---
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;
Index: mailx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mailx/devel/mailx.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- mailx.spec 25 Jul 2009 11:40:39 -0000 1.35
+++ mailx.spec 12 Dec 2009 12:11:52 -0000 1.36
@@ -4,7 +4,7 @@
Summary: Enhanced implementation of the mailx command
Name: mailx
Version: 12.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Applications/Internet
License: BSD with advertising
URL: http://heirloom.sourceforge.net/mailx.html
@@ -12,6 +12,7 @@ Source0: http://dl.sourceforge.net/heirl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: nail-11.25-config.patch
Patch1: mailx-12.3-pager.patch
+Patch2: mailx-12.4-openssl.patch
%if %{use_nss}
BuildRequires: nss-devel, pkgconfig, krb5-devel
@@ -46,6 +47,7 @@ as well as "nail" (the initial name of t
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
sed -i 's,/etc/nail.rc,%{mailrc},g' mailx.1 mailx.1.html
@@ -130,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Dec 12 2009 Robert Scheck <robert at fedoraproject.org> - 12.4-4
+- Make OpenSSL support working again if NSS flag is disabled
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list