Found a solution (source:
http://www.mail-archive.com/pld-cvs-com...@lists.pld-linux.org/msg216476.html)
nail.patch
============================================
--- makeconfig.orig Fri Apr 16 13:11:40 2010
+++ makeconfig Fri Apr 16 13:14:29 2010
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Sccsid @(#)makeconfig 1.43 (gritter) 4/14/07
+# Sccsid @(#)makeconfig 1.44 (gritter) 5/26/09
#
tmp=___build$$
@@ -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>
@@ -346,18 +359,6 @@
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
@@ -393,7 +394,26 @@
!
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>
--- openssl.c.orig Fri Apr 16 13:15:25 2010
+++ openssl.c Fri Apr 16 13:24:24 2010
@@ -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;
============================================
Olivier Fournier wrote:
Hi All,
I have a problem compiling nail under Solaris 10 x86 (see log below).
Is it related to the new version of OpenSSL ?
How can I fix this issue?
Thanks a lot in advance.
Regards,
Olivier
============================================
/openpkg/bin/cc -O2 -pipe -I/openpkg/include
-DMAILRC='"/openpkg/etc/nail/nail.rc"' -DMAILSPOOL='"/var/mail"'
-DSENDMAIL='"/openpkg/sbin/sendmail"' -c openssl.c
openssl.c:108: error: expected declaration specifiers or '...' before
'STACK'
openssl.c: In function 'ssl_select_method':
openssl.c:215: warning: assignment discards qualifiers from pointer
target type
openssl.c:217: warning: assignment discards qualifiers from pointer
target type
openssl.c:219: warning: assignment discards qualifiers from pointer
target type
openssl.c:223: warning: assignment discards qualifiers from pointer
target type
openssl.c:226: warning: assignment discards qualifiers from pointer
target type
openssl.c: In function 'ssl_check_host':
openssl.c:311: error: 'STACK' undeclared (first use in this function)
openssl.c:311: error: (Each undeclared identifier is reported only once
openssl.c:311: error: for each function it appears in.)
openssl.c:311: error: 'gens' undeclared (first use in this function)
openssl.c: At top level:
openssl.c:499: error: expected declaration specifiers or '...' before
'STACK'
openssl.c: In function 'smime_verify':
openssl.c:508: error: 'STACK' undeclared (first use in this function)
openssl.c:508: error: 'certs' undeclared (first use in this function)
openssl.c:508: error: 'gens' undeclared (first use in this function)
openssl.c:555: error: 'chain' undeclared (first use in this function)
openssl.c: In function 'cverify':
openssl.c:617: error: 'STACK' undeclared (first use in this function)
openssl.c:617: error: 'chain' undeclared (first use in this function)
openssl.c:649: error: too many arguments to function 'smime_verify'
openssl.c: In function 'smime_encrypt':
openssl.c:690: error: 'STACK' undeclared (first use in this function)
openssl.c:690: error: 'certs' undeclared (first use in this function)
openssl.c: In function 'smime_certsave':
openssl.c:953: error: 'STACK' undeclared (first use in this function)
openssl.c:953: error: 'certs' undeclared (first use in this function)
openssl.c:955: error: 'chain' undeclared (first use in this function)
make: *** [openssl.o] Error 1
error: Bad exit status from /openpkg/RPM/TMP/rpm-tmp.7869 (%build)
RPM build errors:
Bad exit status from /openpkg/RPM/TMP/rpm-tmp.7869 (%build)
============================================
______________________________________________________________________
OpenPKG http://openpkg.org
User Communication List openpkg-users@openpkg.org
