Thu Aug 6 20:01:51 2009 UTC ()
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.


(plunky)
diff -r1.15 -r1.16 pkgsrc/mail/alpine/distinfo
diff -r0 -r1.4 pkgsrc/mail/alpine/patches/patch-ab
cvs diff -r1.15 -r1.16 pkgsrc/mail/alpine/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/alpine/distinfo 2009/05/17 17:34:01 1.15
+++ pkgsrc/mail/alpine/distinfo 2009/08/06 20:01:50 1.16
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.15 2009/05/17 17:34:01 plunky Exp $ 1$NetBSD: distinfo,v 1.16 2009/08/06 20:01:50 plunky Exp $
2 2
3SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4 3SHA1 (alpine-2.00/alpine-2.00.tar.bz2) = dcbd3c5419954f484ccf706feaba31ce48cdebc4
4RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13 4RMD160 (alpine-2.00/alpine-2.00.tar.bz2) = 9e67704b23b3973d8b878e65ad9e6f5026c10d13
5Size (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 bytes 5Size (alpine-2.00/alpine-2.00.tar.bz2) = 5222673 bytes
6SHA1 (alpine-2.00/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348 6SHA1 (alpine-2.00/fancy.patch.gz) = 2622d3e86a76908bf4d1ca63501c6dac75563348
7RMD160 (alpine-2.00/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e 7RMD160 (alpine-2.00/fancy.patch.gz) = b877b97fd88fa73a8428d288f929579560faec4e
8Size (alpine-2.00/fancy.patch.gz) = 24556 bytes 8Size (alpine-2.00/fancy.patch.gz) = 24556 bytes
9SHA1 (alpine-2.00/maildir.patch.gz) = b1b790ca644c891f52f28663867b2deb032bb98c 9SHA1 (alpine-2.00/maildir.patch.gz) = b1b790ca644c891f52f28663867b2deb032bb98c
10RMD160 (alpine-2.00/maildir.patch.gz) = ffa3a6a588c76e33bc92fe26ddfb9f6e6dbefe20 10RMD160 (alpine-2.00/maildir.patch.gz) = ffa3a6a588c76e33bc92fe26ddfb9f6e6dbefe20
11Size (alpine-2.00/maildir.patch.gz) = 32100 bytes 11Size (alpine-2.00/maildir.patch.gz) = 32100 bytes
12SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4 12SHA1 (alpine-2.00/searchheader.patch.gz) = 1c8dfaefa9a9ed502da454b5d1334c94bc1873c4
13RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581 13RMD160 (alpine-2.00/searchheader.patch.gz) = cc1b2c3cf4cbceaf62e1c0378f5edf6bee619581
14Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes 14Size (alpine-2.00/searchheader.patch.gz) = 1708 bytes
15SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852 15SHA1 (patch-aa) = c306613a297d61591d577b6968a31fc85b03f852
 16SHA1 (patch-ab) = f0983d8c0123b06a2970eb2736b04afad1502450
File Added: pkgsrc/mail/alpine/patches/Attic/patch-ab
$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"