diff --git a/security/libassuan/Makefile b/security/libassuan/Makefile index 42248905062..28777870403 100644 --- a/security/libassuan/Makefile +++ b/security/libassuan/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.22 2019/07/12 20:49:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2020/02/23 22:59:22 jca Exp $ COMMENT= IPC library used by GnuPG and gpgme -DISTNAME= libassuan-2.5.1 -REVISION= 0 +DISTNAME= libassuan-2.5.3 SHARED_LIBS += assuan 2.1 # 8.1 diff --git a/security/libassuan/distinfo b/security/libassuan/distinfo index 967a2a9ac95..8250159b897 100644 --- a/security/libassuan/distinfo +++ b/security/libassuan/distinfo @@ -1,2 +1,2 @@ -SHA256 (libassuan-2.5.1.tar.bz2) = R/lsN7TyqsKJ8LwbrPqL2LSyCaSI09FeIinLbMmyZEk= -SIZE (libassuan-2.5.1.tar.bz2) = 564857 +SHA256 (libassuan-2.5.3.tar.bz2) = kbywQDhmtOfEvBzFLtTDZKm1QUs5lPcYxwMD9/dl5wI= +SIZE (libassuan-2.5.3.tar.bz2) = 572348 diff --git a/security/libassuan/patches/patch-configure b/security/libassuan/patches/patch-configure deleted file mode 100644 index ca6ba3f8d3f..00000000000 --- a/security/libassuan/patches/patch-configure +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-configure,v 1.5 2017/12/02 18:48:42 ajacoutot Exp $ - -Index: configure ---- configure.orig -+++ configure -@@ -14657,11 +14657,12 @@ if ${assuan_cv_sys_so_peercred+:} false; then : - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+#include - #include - int - main () - { --struct ucred cr; -+struct sockpeercred cr; - int cl = sizeof cr; - getsockopt (1, SOL_SOCKET, SO_PEERCRED, &cr, &cl); - ; diff --git a/security/libassuan/patches/patch-src_assuan-socket-server_c b/security/libassuan/patches/patch-src_assuan-socket-server_c deleted file mode 100644 index 02de76a715e..00000000000 --- a/security/libassuan/patches/patch-src_assuan-socket-server_c +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_assuan-socket-server_c,v 1.3 2017/12/02 18:48:42 ajacoutot Exp $ -Index: src/assuan-socket-server.c ---- src/assuan-socket-server.c.orig -+++ src/assuan-socket-server.c -@@ -62,7 +62,11 @@ accept_connection_bottom (assuan_context_t ctx) - ctx->peercred_valid = 0; - #ifdef HAVE_SO_PEERCRED - { -+#ifdef __OpenBSD__ -+ struct sockpeercred cr; -+#else - struct ucred cr; -+#endif - socklen_t cl = sizeof cr; - - if ( !getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl))