Hello community,
here is the log from the commit of package mailx for openSUSE:Factory
checked in at Mon Apr 11 09:01:31 CEST 2011.
--------
--- mailx/mailx.changes 2011-02-01 12:10:35.000000000 +0100
+++ /mounts/work_src_done/STABLE/mailx/mailx.changes 2011-04-09 23:31:39.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Apr 9 21:30:46 UTC 2011 - crrodriguez@opensuse.org
+
+- Allow mailx to compile properly when openSSL is built without
+ SSLv2 support.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mailx.spec ++++++
--- /var/tmp/diff_new_pack.8q2MyO/_old 2011-04-11 09:00:28.000000000 +0200
+++ /var/tmp/diff_new_pack.8q2MyO/_new 2011-04-11 09:00:28.000000000 +0200
@@ -27,7 +27,7 @@
Recommends: smtp_daemon
AutoReqProv: on
Version: 12.2
-Release: 153
+Release: 158
Summary: A MIME-Capable Implementation of the mailx Command
Source: mailx-%{version}.tar.bz2
Patch: mailx-%{version}.dif
@@ -54,7 +54,7 @@
%patch4 -p0 -b .toaddr
%patch5 -p0 -b .mime
%patch -p0
-%patch6 -p1
+%patch6
%build
CC=gcc
++++++ mailx-fix-openssl.patch ++++++
--- /var/tmp/diff_new_pack.8q2MyO/_old 2011-04-11 09:00:28.000000000 +0200
+++ /var/tmp/diff_new_pack.8q2MyO/_new 2011-04-11 09:00:28.000000000 +0200
@@ -1,8 +1,14 @@
-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
+--- openssl.c.orig
++++ openssl.c
+@@ -63,6 +63,7 @@ static sigjmp_buf ssljmp;
+ #include
+ #include
+ #include
++#include
+
+ #include "rcv.h"
+ #include
+@@ -105,7 +106,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);
@@ -11,7 +17,32 @@
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
+@@ -166,6 +167,10 @@ ssl_init(void)
+ verbose = value("verbose") != NULL;
+ if (initialized == 0) {
+ SSL_library_init();
++/* Load all bundled ENGINEs into memory and make them visible */
++ ENGINE_load_builtin_engines();
++ /* Register all of them for every algorithm they collectively implement */
++ ENGINE_register_all_complete();
+ initialized = 1;
+ }
+ if (rand_init == 0)
+@@ -211,9 +216,12 @@ ssl_select_method(const char *uhp)
+
+ cp = ssl_method_string(uhp);
+ if (cp != NULL) {
++#ifndef OPENSSL_NO_SSL2
+ if (equal(cp, "ssl2"))
+ method = SSLv2_client_method();
+- else if (equal(cp, "ssl3"))
++ else
++#endif
++ if (equal(cp, "ssl3"))
+ method = SSLv3_client_method();
+ else if (equal(cp, "tls1"))
+ method = TLSv1_client_method();
+@@ -308,7 +316,7 @@ ssl_check_host(const char *server, struc
X509 *cert;
X509_NAME *subj;
char data[256];
@@ -20,7 +51,7 @@
GENERAL_NAME *gen;
int i;
-@@ -494,7 +494,7 @@ smime_sign(FILE *ip, struct header *head
+@@ -494,7 +502,7 @@ smime_sign(FILE *ip, struct header *head
}
static int
@@ -29,7 +60,7 @@
{
struct message *x;
char *cp, *sender, *to, *cc, *cnttype;
-@@ -503,7 +503,8 @@ smime_verify(struct message *m, int n, S
+@@ -503,7 +511,8 @@ smime_verify(struct message *m, int n, S
off_t size;
BIO *fb, *pb;
PKCS7 *pkcs7;
@@ -39,7 +70,7 @@
X509 *cert;
X509_NAME *subj;
char data[LINESIZE];
-@@ -612,7 +613,7 @@ cverify(void *vp)
+@@ -612,7 +621,7 @@ cverify(void *vp)
{
int *msgvec = vp, *ip;
int ec = 0;
@@ -48,7 +79,7 @@
X509_STORE *store;
char *ca_dir, *ca_file;
-@@ -685,7 +686,7 @@ smime_encrypt(FILE *ip, const char *cert
+@@ -685,7 +694,7 @@ smime_encrypt(FILE *ip, const char *cert
X509 *cert;
PKCS7 *pkcs7;
BIO *bb, *yb;
@@ -57,7 +88,7 @@
EVP_CIPHER *cipher;
certfile = expand((char *)certfile);
-@@ -948,9 +949,9 @@ smime_certsave(struct message *m, int n,
+@@ -948,9 +957,9 @@ smime_certsave(struct message *m, int n,
off_t size;
BIO *fb, *pb;
PKCS7 *pkcs7;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org