cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't define SSL, fix build with OpenSSL 0.9.8i.

Browse Source
This commit is contained in:
naddy 2008-12-16 18:47:51 +00:00
parent 09775d40ec
commit b10b3f3463
5 changed files with 80 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/cue/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2007/09/16 00:17:04 merdely Exp $
# $OpenBSD: Makefile,v 1.14 2008/12/16 18:47:51 naddy Exp $
COMMENT= mh-e like mail user agent
@ -16,7 +16,8 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto z
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.13
CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ARGS= --enable-ipv6 \
--without-canna \
--with-openssl=/usr \

12
mail/cue/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2004/11/26 16:40:10 naddy Exp $
--- configure.orig Tue Nov 23 21:07:42 2004
+++ configure Tue Nov 23 21:07:51 2004
@@ -673,7 +673,7 @@ netbsd*)
;;
esac
-OPTS="-O"
+#OPTS="-O"

32
mail/cue/patches/patch-configure_in Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-configure_in,v 1.1 2008/12/16 18:47:51 naddy Exp $
--- configure.in.orig Wed Apr 27 13:54:13 2005
+++ configure.in Tue Dec 16 19:22:35 2008
@@ -37,7 +37,7 @@ netbsd*)
;;
esac
-OPTS="-O"
+OPTS=""
dnl AC_PREFIX_PKG(VARIABLE, HEADER, LIBRARY, PATH [, IF-TRUE [, IF FALSE ] ])
AC_DEFUN(AC_PREFIX_PKG, [
@@ -383,14 +383,14 @@ if test "$enable_pgpmime" = yes -o "$enable_smime" = y
AC_MSG_RESULT($with_openssl),
[ AC_MSG_RESULT(yes)
withval="/usr /usr/local /usr/local/ssl /usr/pkg" ])
- AC_PREFIX_PKG(ssl, ssl.h, libcrypto.a, $withval)
- if test "$ssl" = no; then
- AC_PREFIX_PKG(ssl, openssl/ssl.h, libcrypto.a, $withval)
- if test "$ssl" != no; then
+ AC_PREFIX_PKG(use_ssl, ssl.h, libcrypto.a, $withval)
+ if test "$use_ssl" = no; then
+ AC_PREFIX_PKG(use_ssl, openssl/ssl.h, libcrypto.a, $withval)
+ if test "$use_ssl" != no; then
AC_DEFINE(OPENSSL)
fi
fi
- if test "$ssl" != no; then
+ if test "$use_ssl" != no; then
if test "$enable_pgpmime" = yes -a "$zlib" != no; then
AC_DEFINE(PGPMIME)
EXOBJS="pgp.o pgpmime.o $EXOBJS"

12
mail/cue/patches/patch-popxmit_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-popxmit_c,v 1.1 2008/12/16 18:47:51 naddy Exp $
--- popxmit.c.orig Tue Dec 16 19:23:22 2008
+++ popxmit.c Tue Dec 16 19:23:42 2008
@@ -40,7 +40,7 @@
#include <string.h>
#include <unistd.h>
-#ifdef SSL /*XXX*/
+#ifdef USE_SSL /*XXX*/
#define APOP
#endif

33
mail/cue/patches/patch-smime_c Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-smime_c,v 1.1 2008/12/16 18:47:51 naddy Exp $
--- smime.c.orig Thu Feb 12 23:19:04 2004
+++ smime.c Tue Dec 16 19:42:21 2008
@@ -126,7 +126,13 @@ smime_decrypt(struct state *state)
p = CP(&fdb->buf_body);
ep = CE(&fdb->buf_body);
decode_text(&p, ep, &cbuf, fdb->flags | FDB_NOCONV);
- p7 = d2i_PKCS7(NULL, (u_char **)&cbuf.ptr, cbuf.len);
+ p7bio = BIO_new_mem_buf(cbuf.ptr, cbuf.len);
+ if (p7bio == NULL) {
+ strlcpy(state->status, "no more memory", sizeof(state->status));
+ return -1;
+ }
+ p7 = d2i_PKCS7_bio(p7bio, NULL);
+ BIO_free(p7bio);
if (p7 == NULL) {
strlcpy(state->status, "Invalid pkcs7 data",
sizeof(state->status));
@@ -451,7 +457,13 @@ smime_verify(struct state *state)
#ifdef SMIME_DEBUG
{ FILE *fp; fp = fopen("/tmp/smime.p7s", "w"); fwrite(cbuf.ptr, cbuf.len, 1, fp); fclose(fp); }
#endif
- p7 = d2i_PKCS7(NULL, (u_char **)&cbuf.ptr, cbuf.len);
+ p7bio = BIO_new_mem_buf(cbuf.ptr, cbuf.len);
+ if (p7bio == NULL) {
+ strlcpy(state->status, "no more memory", sizeof(state->status));
+ return -1;
+ }
+ p7 = d2i_PKCS7_bio(p7bio, NULL);
+ BIO_free(p7bio);
if (p7 == NULL) {
strlcpy(state->status, "Invalid sign", sizeof(state->status));
return -1;