libXdmcp: update to 1.1.4.

Alan Coopersmith (11):
      Update configure.ac bug URL for gitlab migration
      gitlab CI: add a basic build test
      Fix build on Solaris 11.3.0 - 11.3.8
      Build xz tarballs instead of bzip2
      Fix spelling/wording issues
      gitlab CI: enable doc builds in basic build test
      Use memcpy() instead of memmove() when buffers are known not to overlap
      arc4random_buf: Only declare ret if HAVE_GETENTROPY is defined
      XdmcpDisposeARRAYofARRAY8: Reduce scope of i
      Only link with libbsd if needed for arc4random_buf()
      libXdmcp 1.1.4

Guillem Jover (1):
      Switch from libbsd to libbsd-overlay

6 files changed, 12 insertions, 73 deletions

diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile
index 1db8a6bcf1d..f694c8decf3 100644
--- a/x11/libXdmcp/Makefile
+++ b/x11/libXdmcp/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2022/11/09 13:14:21 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2022/11/19 08:10:45 wiz Exp $
 
-DISTNAME=		libXdmcp-1.1.3
+DISTNAME=		libXdmcp-1.1.4
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://xorg.freedesktop.org/
diff --git a/x11/libXdmcp/builtin.mk b/x11/libXdmcp/builtin.mk
index 86272efa7b3..994e84bbe1e 100644
--- a/x11/libXdmcp/builtin.mk
+++ b/x11/libXdmcp/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:11 rillig Exp $
+# $NetBSD: builtin.mk,v 1.8 2022/11/19 08:10:45 wiz Exp $
 
 BUILTIN_PKG:=	libXdmcp
 
@@ -31,10 +31,10 @@ USE_BUILTIN.libXdmcp=	no
 .  else
 USE_BUILTIN.libXdmcp=	${IS_BUILTIN.libXdmcp}
 .    if defined(BUILTIN_PKG.libXdmcp) && \
-        !empty(IS_BUILTIN.libXdmcp:M[yY][eE][sS])
+        ${IS_BUILTIN.libXdmcp:M[yY][eE][sS]}
 USE_BUILTIN.libXdmcp=	yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.libXdmcp}
-.        if !empty(USE_BUILTIN.libXdmcp:M[yY][eE][sS])
+.        if ${USE_BUILTIN.libXdmcp:M[yY][eE][sS]}
 USE_BUILTIN.libXdmcp!=							\
 	if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXdmcp:Q}; then \
 		${ECHO} yes;						\
@@ -51,11 +51,11 @@ MAKEVARS+=		USE_BUILTIN.libXdmcp
 .include "../../mk/x11.builtin.mk"
 
 CHECK_BUILTIN.libXdmcp?=	no
-.if !empty(CHECK_BUILTIN.libXdmcp:M[nN][oO])
+.if ${CHECK_BUILTIN.libXdmcp:M[nN][oO]}
 
 # If we are using the builtin version, check whether it has a xdmcp.pc
 # file or not.  If the latter, generate a fake one.
-.  if !empty(USE_BUILTIN.libXdmcp:M[Yy][Ee][Ss])
+.  if ${USE_BUILTIN.libXdmcp:M[Yy][Ee][Ss]}
 BUILDLINK_TARGETS+=	xdmcp-fake-pc
 
 xdmcp-fake-pc:
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index f7f4a64614d..2974c5763b2 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.14 2022/03/17 01:05:48 gutteridge Exp $
+$NetBSD: distinfo,v 1.15 2022/11/19 08:10:45 wiz Exp $
 
-BLAKE2s (libXdmcp-1.1.3.tar.bz2) = a830d9b0484d17db15080be824ba9f9819ea08c56fe07670c2bd2e17fafc2386
-SHA512 (libXdmcp-1.1.3.tar.bz2) = cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec
-Size (libXdmcp-1.1.3.tar.bz2) = 332795 bytes
-SHA1 (patch-Key.c) = 4080e63823818b464718fc7c09a7c53ba350aa48
-SHA1 (patch-config.h.in) = 0470c2eaa4e431027e1507c5b01367ca2267b0ec
-SHA1 (patch-configure) = 803ae824fcc3e281dde6fc1b3b5b65975ca0b051
+BLAKE2s (libXdmcp-1.1.4.tar.xz) = de650b9b48b5f3909ce6734a054493b1cdff7d667e4ced5383d216533101f528
+SHA512 (libXdmcp-1.1.4.tar.xz) = 83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9
+Size (libXdmcp-1.1.4.tar.xz) = 295184 bytes
diff --git a/x11/libXdmcp/patches/patch-Key.c b/x11/libXdmcp/patches/patch-Key.c
deleted file mode 100644
index bf8fa66f062..00000000000
--- a/x11/libXdmcp/patches/patch-Key.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-Key.c,v 1.4 2022/03/17 01:05:48 gutteridge Exp $
-
-Fix builds where getentropy() exists but arc4random_buf() does not, as
-the case with Solaris 11.3, reported in PR pkg/54628.
-https://gitlab.freedesktop.org/xorg/lib/libxdmcp/-/commit/4a71fdf6d34df67d3f1335590da6ae3050128fb2
-
---- Key.c.orig	2019-03-16 16:21:22.000000000 +0000
-+++ Key.c
-@@ -64,6 +64,11 @@ getbits (long data, unsigned char *dst)
- 
- #ifndef HAVE_ARC4RANDOM_BUF
- 
-+/* Solaris 11.3.0 - 11.4.15 only define getentropy() in <sys/random.h> */
-+#if HAVE_GETENTROPY && HAVE_SYS_RANDOM_H
-+# include <sys/random.h>
-+#endif
-+
- static void
- insecure_getrandom_buf (unsigned char *auth, int len)
- {
diff --git a/x11/libXdmcp/patches/patch-config.h.in b/x11/libXdmcp/patches/patch-config.h.in
deleted file mode 100644
index ecab823dc86..00000000000
--- a/x11/libXdmcp/patches/patch-config.h.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2022/03/17 01:05:48 gutteridge Exp $
-
-Fix builds where getentropy() exists but arc4random_buf() does not, as
-the case with Solaris 11.3, reported in PR pkg/54628.
-https://gitlab.freedesktop.org/xorg/lib/libxdmcp/-/commit/4a71fdf6d34df67d3f1335590da6ae3050128fb2
-
---- config.h.in.orig	2019-03-16 16:21:32.000000000 +0000
-+++ config.h.in
-@@ -42,6 +42,9 @@
- /* Define to 1 if you have the <string.h> header file. */
- #undef HAVE_STRING_H
- 
-+/* Define to 1 if you have the <sys/random.h> header file. */
-+#undef HAVE_SYS_RANDOM_H
-+
- /* Define to 1 if you have the <sys/stat.h> header file. */
- #undef HAVE_SYS_STAT_H
- 
diff --git a/x11/libXdmcp/patches/patch-configure b/x11/libXdmcp/patches/patch-configure
deleted file mode 100644
index ddd45a24e29..00000000000
--- a/x11/libXdmcp/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2022/03/17 01:05:48 gutteridge Exp $
-
-Fix builds where getentropy() exists but arc4random_buf() does not, as
-the case with Solaris 11.3, reported in PR pkg/54628.
-https://gitlab.freedesktop.org/xorg/lib/libxdmcp/-/commit/4a71fdf6d34df67d3f1335590da6ae3050128fb2
-
---- configure.orig	2019-03-16 16:21:31.000000000 +0000
-+++ configure
-@@ -19342,6 +19342,11 @@ else
- $as_echo "no, using $LN_S" >&6; }
- fi
- 
-+# Checks for header files.
-+ac_fn_c_check_header_compile "$LINENO" "sys/random.h" "ac_cv_header_sys_random_h" "$ac_includes_default"
-+if test "x$ac_cv_header_sys_random_h" = xyes; then :
-+  printf "%s\n" "#define HAVE_SYS_RANDOM_H 1" >>confdefs.h
-+fi
- 
- # Checks for libraries.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing recvfrom" >&5