On Wed, Aug 09, 2017 at 11:33:09PM -0400, Daniel Jakots wrote:
> On Thu, 10 Aug 2017 02:53:59 +0200, Klemens Nanni <k...@posteo.org>
> wrote:
>
> > > I'm not entirely sure yet whether the introduced patch to get
> > > X509_OBJECT_get0_X509() and X509_STORE_get0_objects() working is the
> > > way to go, maybe someone more knowledgable about OpenSSL internals
> > > can comment/fix this?
>
> > +-# if OPENSSL_VERSION_NUMBER < 0x10100000L
> > ++/*# if OPENSSL_VERSION_NUMBER < 0x10100000L*/
>
> That's not the best way to fix it. Here's an updated diff that also
> addresses the fact it doesn't build with gcc4.2:
>
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c: In function 'map_name':
> /usr/ports/pobj/isync-1.2.2/isync-1.2.2/src/util.c:526: error: #pragma GCC
> diagnostic not allowed inside functions
>
> Cheers,
> Daniel
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/isync/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 20 Dec 2015 09:59:22 -0000 1.30
> +++ Makefile 10 Aug 2017 03:26:41 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT= synchronize IMAP4 and maildir mailboxes
>
> -DISTNAME= isync-1.2.1
> +DISTNAME= isync-1.2.2
> CATEGORIES= mail
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=isync/}
>
> @@ -12,6 +12,8 @@ HOMEPAGE= http://isync.sourceforge.net/
> PERMIT_PACKAGE_CDROM= Yes
>
> WANTLIB= c crypto db sasl2 ssl z
> +
> +COMPILER= clang gcc
>
> LIB_DEPENDS= databases/db/v4 \
> security/cyrus-sasl2
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/isync/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo 20 Dec 2015 09:59:22 -0000 1.11
> +++ distinfo 10 Aug 2017 03:26:41 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (isync-1.2.1.tar.gz) = 5xbeKMmgjmJKA1yq45AvzztRFVO+XWFRehM+A6o1Mq4=
> -SIZE (isync-1.2.1.tar.gz) = 281990
> +SHA256 (isync-1.2.2.tar.gz) = 2Rl+J7/nfj2JcfT8sl7DeyUGgnxLyUObcjdsqgkc6Hc=
> +SIZE (isync-1.2.2.tar.gz) = 285745
> Index: patches/patch-src_socket_c
> ===================================================================
> RCS file: patches/patch-src_socket_c
> diff -N patches/patch-src_socket_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_socket_c 10 Aug 2017 03:26:45 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/socket.c
> +--- src/socket.c.orig
> ++++ src/socket.c
> +@@ -40,7 +40,7 @@
> + # include <openssl/ssl.h>
> + # include <openssl/err.h>
> + # include <openssl/x509v3.h>
> +-# if OPENSSL_VERSION_NUMBER < 0x10100000L
> ++# if OPENSSL_VERSION_NUMBER < 0x10100000L ||
> defined(LIBRESSL_VERSION_NUMBER)
> + # define X509_OBJECT_get0_X509(o) ((o)->data.x509)
> + # define X509_STORE_get0_objects(o) ((o)->objs)
> + # endif
>
Ah, I see. That's much better, thanks.
Does anyone want to commit this?
