diff options
| author | plunky <plunky@pkgsrc.org> | 2009-08-06 20:01:50 +0000 |
|---|---|---|
| committer | plunky <plunky@pkgsrc.org> | 2009-08-06 20:01:50 +0000 |
| commit | 196fef50bb47c33136866bba85acd906aaae90a2 (patch) | |
| tree | d0c100c4d6a46a4acdd89108d9d832b55bd25319 /mail/alpine | |
| parent | cc256a4b576989f1819373d6bf562a578c17eaa8 (diff) | |
| download | pkgsrc-196fef50bb47c33136866bba85acd906aaae90a2.tar.gz | |
OpenSSL has provided a "typedef char *STRING" in recent versions,
this conflicts with the "typedef struct { } STRING" used througout
Alpine.
Since Alpine does not actually use the OpenSSL STRING def, obscure
it with #define and pretend it does not exist.
Diffstat (limited to 'mail/alpine')
| -rw-r--r-- | mail/alpine/distinfo | 3 | ||||
| -rw-r--r-- | mail/alpine/patches/patch-ab | 23 |
2 files changed, 25 insertions, 1 deletions
diff --git a/mail/alpine/distinfo b/mail/alpine/distinfo index 3c2f1358ed6..5bba3824150 100644 --- a/mail/alpine/distinfo +++ b/mail/alpine/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2009/05/17 17:34:01 plunky Exp $ +$NetBSD: distinfo,v 1.16 2009/08/06 20:01:50 plunky Exp $ SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4 RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13 @@ -13,3 +13,4 @@ SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc187 RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581 Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852 +SHA1 (patch-ab) = f0983d8c0123b06a2970eb2736b04afad1502450 diff --git a/mail/alpine/patches/patch-ab b/mail/alpine/patches/patch-ab new file mode 100644 index 00000000000..2085d474802 --- /dev/null +++ b/mail/alpine/patches/patch-ab @@ -0,0 +1,23 @@ +$NetBSD: patch-ab,v 1.4 2009/08/06 20:01:50 plunky Exp $ + +OpenSSL provides a version of STRING that conflicts with the Alpine +internal version. Since we don't use it, just define it away for now.. + +--- imap/src/osdep/unix/ssl_unix.c.orig 2009-08-06 20:45:06.000000000 +0100 ++++ imap/src/osdep/unix/ssl_unix.c +@@ -27,6 +27,7 @@ + */ + + #define crypt ssl_private_crypt ++#define STRING ssl_private_STRING + #include <x509v3.h> + #include <ssl.h> + #include <err.h> +@@ -36,6 +37,7 @@ + #include <crypto.h> + #include <rand.h> + #undef crypt ++#undef STRING + + #define SSLBUFLEN 8192 + #define SSLCIPHERLIST "ALL:!LOW" |