Updating link to change in openSUSE:Factory/mailx revision 9.0
OBS-URL: https://build.opensuse.org/package/show/server:mail/mailx?expand=0&rev=00a23da634bdf307a94279f2750f9700
This commit is contained in:
parent
03f1c72479
commit
b2446e20d1
71
mailx-fix-openssl.patch
Normal file
71
mailx-fix-openssl.patch
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
Index: mailx-12.2/openssl.c
|
||||||
|
===================================================================
|
||||||
|
--- mailx-12.2.orig/openssl.c
|
||||||
|
+++ mailx-12.2/openssl.c
|
||||||
|
@@ -105,7 +105,7 @@ static SSL_METHOD *ssl_select_method(con
|
||||||
|
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 @@ ssl_check_host(const char *server, struc
|
||||||
|
X509 *cert;
|
||||||
|
X509_NAME *subj;
|
||||||
|
char data[256];
|
||||||
|
- /*GENERAL_NAMES*/STACK *gens;
|
||||||
|
+ STACK_OF(GENERAL_NAME) *gens;
|
||||||
|
GENERAL_NAME *gen;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
@@ -494,7 +494,7 @@ smime_sign(FILE *ip, struct header *head
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
@@ -503,7 +503,8 @@ smime_verify(struct message *m, int n, S
|
||||||
|
off_t size;
|
||||||
|
BIO *fb, *pb;
|
||||||
|
PKCS7 *pkcs7;
|
||||||
|
- STACK *certs, *gens;
|
||||||
|
+ STACK_OF(X509) *certs;
|
||||||
|
+ STACK_OF(GENERAL_NAME) *gens;
|
||||||
|
X509 *cert;
|
||||||
|
X509_NAME *subj;
|
||||||
|
char data[LINESIZE];
|
||||||
|
@@ -612,7 +613,7 @@ cverify(void *vp)
|
||||||
|
{
|
||||||
|
int *msgvec = vp, *ip;
|
||||||
|
int ec = 0;
|
||||||
|
- STACK *chain = NULL;
|
||||||
|
+ STACK_OF(X509) *chain = NULL;
|
||||||
|
X509_STORE *store;
|
||||||
|
char *ca_dir, *ca_file;
|
||||||
|
|
||||||
|
@@ -685,7 +686,7 @@ smime_encrypt(FILE *ip, const char *cert
|
||||||
|
X509 *cert;
|
||||||
|
PKCS7 *pkcs7;
|
||||||
|
BIO *bb, *yb;
|
||||||
|
- STACK *certs;
|
||||||
|
+ STACK_OF(X509) *certs;
|
||||||
|
EVP_CIPHER *cipher;
|
||||||
|
|
||||||
|
certfile = expand((char *)certfile);
|
||||||
|
@@ -948,9 +949,9 @@ smime_certsave(struct message *m, int n,
|
||||||
|
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;
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 19 16:55:31 CEST 2010 - meissner@suse.de
|
||||||
|
|
||||||
|
- fixed build issue with openssl 1.0
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 17 20:55:45 CET 2009 - jengelh@medozas.de
|
Thu Dec 17 20:55:45 CET 2009 - jengelh@medozas.de
|
||||||
|
|
||||||
|
@ -21,13 +21,13 @@
|
|||||||
Name: mailx
|
Name: mailx
|
||||||
BuildRequires: krb5-devel openssl-devel pcre postfix
|
BuildRequires: krb5-devel openssl-devel pcre postfix
|
||||||
Url: http://heirloom.sourceforge.net/mailx.html
|
Url: http://heirloom.sourceforge.net/mailx.html
|
||||||
License: BSD 3-clause (or similar)
|
License: BSD3c(or similar)
|
||||||
Group: Productivity/Networking/Email/Utilities
|
Group: Productivity/Networking/Email/Utilities
|
||||||
Provides: mail
|
Provides: mail
|
||||||
Requires: smtp_daemon
|
Requires: smtp_daemon
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 12.2
|
Version: 12.2
|
||||||
Release: 143
|
Release: 144
|
||||||
Summary: A MIME-Capable Implementation of the mailx Command
|
Summary: A MIME-Capable Implementation of the mailx Command
|
||||||
Source: mailx-%{version}.tar.bz2
|
Source: mailx-%{version}.tar.bz2
|
||||||
Patch: mailx-%{version}.dif
|
Patch: mailx-%{version}.dif
|
||||||
@ -36,6 +36,7 @@ Patch2: mailx-12.1-replyto.patch
|
|||||||
Patch3: nail-11.25-ttychar.dif
|
Patch3: nail-11.25-ttychar.dif
|
||||||
Patch4: nail-11.25-toaddr.dif
|
Patch4: nail-11.25-toaddr.dif
|
||||||
Patch5: mailx-%{version}-mime.dif
|
Patch5: mailx-%{version}-mime.dif
|
||||||
|
Patch6: mailx-fix-openssl.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -59,6 +60,7 @@ Authors:
|
|||||||
%patch4 -p0 -b .toaddr
|
%patch4 -p0 -b .toaddr
|
||||||
%patch5 -p0 -b .mime
|
%patch5 -p0 -b .mime
|
||||||
%patch -p0
|
%patch -p0
|
||||||
|
%patch6 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CC=gcc
|
CC=gcc
|
||||||
|
Loading…
Reference in New Issue
Block a user