On Wed, Aug 09, 2017 at 06:53:47PM -0400, Daniel Jakots wrote:
> On Wed, 9 Aug 2017 23:58:33 +0200, Klemens Nanni <k...@posteo.org> wrote:
>
> > Other than that a trivial version bump suffices
>
> Then can you please send a diff rather than a .tgz?
I sent a tarball since the new patch wouldn't be included in the diff.
Here's the inlined diff with the patch attached.
? patches/patch-src_socket_c
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 9 Aug 2017 23:11:42 -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/}
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 9 Aug 2017 23:11:42 -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
$OpenBSD$
Index: src/socket.c
--- src/socket.c.orig
+++ src/socket.c
@@ -40,10 +40,10 @@
# include <openssl/ssl.h>
# include <openssl/err.h>
# include <openssl/x509v3.h>
-# if OPENSSL_VERSION_NUMBER < 0x10100000L
+/*# if OPENSSL_VERSION_NUMBER < 0x10100000L*/
# define X509_OBJECT_get0_X509(o) ((o)->data.x509)
# define X509_STORE_get0_objects(o) ((o)->objs)
-# endif
+/*# endif*/
#endif
enum {
