Update to libassuan-2.5.3

from Alex Naumov
This commit is contained in:
jca 2020-02-23 22:59:22 +00:00
parent 21ceed5c03
commit 8777c2964a
4 changed files with 4 additions and 40 deletions

View File

@ -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

View File

@ -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

View File

@ -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 <sys/types.h>
#include <sys/socket.h>
int
main ()
{
-struct ucred cr;
+struct sockpeercred cr;
int cl = sizeof cr;
getsockopt (1, SOL_SOCKET, SO_PEERCRED, &cr, &cl);
;

View File

@ -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))