Sat Nov 19 08:10:45 2022 UTC ()
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


(wiz)
diff -r1.14 -r1.15 pkgsrc/x11/libXdmcp/Makefile
diff -r1.14 -r1.15 pkgsrc/x11/libXdmcp/distinfo
diff -r1.7 -r1.8 pkgsrc/x11/libXdmcp/builtin.mk
diff -r1.4 -r0 pkgsrc/x11/libXdmcp/patches/patch-Key.c
diff -r1.1 -r0 pkgsrc/x11/libXdmcp/patches/patch-config.h.in
diff -r1.1 -r0 pkgsrc/x11/libXdmcp/patches/patch-configure
cvs diff -r1.14 -r1.15 pkgsrc/x11/libXdmcp/Makefile (switch to unified diff)

--- pkgsrc/x11/libXdmcp/Makefile 2022/11/09 13:14:21 1.14
+++ pkgsrc/x11/libXdmcp/Makefile 2022/11/19 08:10:45 1.15
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.14 2022/11/09 13:14:21 joerg Exp $ 1# $NetBSD: Makefile,v 1.15 2022/11/19 08:10:45 wiz Exp $
2 2
3DISTNAME= libXdmcp-1.1.3 3DISTNAME= libXdmcp-1.1.4
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://xorg.freedesktop.org/ 9HOMEPAGE= https://xorg.freedesktop.org/
10COMMENT= X Display Manager Control Protocol library from X.org 10COMMENT= X Display Manager Control Protocol library from X.org
11 11
12USE_LIBTOOL= yes 12USE_LIBTOOL= yes
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
14PKGCONFIG_OVERRIDE+= xdmcp.pc.in 14PKGCONFIG_OVERRIDE+= xdmcp.pc.in
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17X11_LIB_NAME?= libXdmcp 17X11_LIB_NAME?= libXdmcp
18.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk" 18.include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
19.include "../../meta-pkgs/modular-xorg/hacks.mk" 19.include "../../meta-pkgs/modular-xorg/hacks.mk"
20.include "../../x11/xorgproto/buildlink3.mk" 20.include "../../x11/xorgproto/buildlink3.mk"
21.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/x11/libXdmcp/distinfo (switch to unified diff)

--- pkgsrc/x11/libXdmcp/distinfo 2022/03/17 01:05:48 1.14
+++ pkgsrc/x11/libXdmcp/distinfo 2022/11/19 08:10:45 1.15
@@ -1,8 +1,5 @@ @@ -1,8 +1,5 @@
1$NetBSD: distinfo,v 1.14 2022/03/17 01:05:48 gutteridge Exp $ 1$NetBSD: distinfo,v 1.15 2022/11/19 08:10:45 wiz Exp $
2 2
3BLAKE2s (libXdmcp-1.1.3.tar.bz2) = a830d9b0484d17db15080be824ba9f9819ea08c56fe07670c2bd2e17fafc2386 3BLAKE2s (libXdmcp-1.1.4.tar.xz) = de650b9b48b5f3909ce6734a054493b1cdff7d667e4ced5383d216533101f528
4SHA512 (libXdmcp-1.1.3.tar.bz2) = cb1d4650f97d66e73acd2465ec7d757b9b797cce2f85e301860a44997a461837eea845ec9bd5b639ec5ca34c804f8bdd870697a5ce3f4e270b687c9ef74f25ec 4SHA512 (libXdmcp-1.1.4.tar.xz) = 83b384d43bfb034c395f83f97d1c6e73aa3d5faa8f8756b08e697c0b9c3c87189651b51e8213fbd1f5f9cbc2d8136cbf143627481744345d78cfe0ff2ad074a9
5Size (libXdmcp-1.1.3.tar.bz2) = 332795 bytes 5Size (libXdmcp-1.1.4.tar.xz) = 295184 bytes
6SHA1 (patch-Key.c) = 4080e63823818b464718fc7c09a7c53ba350aa48 
7SHA1 (patch-config.h.in) = 0470c2eaa4e431027e1507c5b01367ca2267b0ec 
8SHA1 (patch-configure) = 803ae824fcc3e281dde6fc1b3b5b65975ca0b051 
cvs diff -r1.7 -r1.8 pkgsrc/x11/libXdmcp/builtin.mk (switch to unified diff)

--- pkgsrc/x11/libXdmcp/builtin.mk 2019/11/03 09:14:11 1.7
+++ pkgsrc/x11/libXdmcp/builtin.mk 2022/11/19 08:10:45 1.8
@@ -1,89 +1,89 @@ @@ -1,89 +1,89 @@
1# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:11 rillig Exp $ 1# $NetBSD: builtin.mk,v 1.8 2022/11/19 08:10:45 wiz Exp $
2 2
3BUILTIN_PKG:= libXdmcp 3BUILTIN_PKG:= libXdmcp
4 4
5BUILTIN_FIND_FILES_VAR:= H_XDMCP 5BUILTIN_FIND_FILES_VAR:= H_XDMCP
6BUILTIN_FIND_FILES.H_XDMCP= ${X11BASE}/include/X11/Xdmcp.h 6BUILTIN_FIND_FILES.H_XDMCP= ${X11BASE}/include/X11/Xdmcp.h
7 7
8.include "../../mk/buildlink3/bsd.builtin.mk" 8.include "../../mk/buildlink3/bsd.builtin.mk"
9 9
10### 10###
11### Determine if there is a built-in implementation of the package and 11### Determine if there is a built-in implementation of the package and
12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). 12### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
13### 13###
14.if ${X11BASE} == ${LOCALBASE} 14.if ${X11BASE} == ${LOCALBASE}
15IS_BUILTIN.libXdmcp= no 15IS_BUILTIN.libXdmcp= no
16.elif !defined(IS_BUILTIN.libXdmcp) 16.elif !defined(IS_BUILTIN.libXdmcp)
17IS_BUILTIN.libXdmcp= no 17IS_BUILTIN.libXdmcp= no
18. if empty(H_XDMCP:M__nonexistent__) 18. if empty(H_XDMCP:M__nonexistent__)
19IS_BUILTIN.libXdmcp= yes 19IS_BUILTIN.libXdmcp= yes
20. endif 20. endif
21.endif 21.endif
22MAKEVARS+= IS_BUILTIN.libXdmcp 22MAKEVARS+= IS_BUILTIN.libXdmcp
23 23
24### 24###
25### Determine whether we should use the built-in implementation if it 25### Determine whether we should use the built-in implementation if it
26### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 26### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
27### 27###
28.if !defined(USE_BUILTIN.libXdmcp) 28.if !defined(USE_BUILTIN.libXdmcp)
29. if ${PREFER.libXdmcp} == "pkgsrc" 29. if ${PREFER.libXdmcp} == "pkgsrc"
30USE_BUILTIN.libXdmcp= no 30USE_BUILTIN.libXdmcp= no
31. else 31. else
32USE_BUILTIN.libXdmcp= ${IS_BUILTIN.libXdmcp} 32USE_BUILTIN.libXdmcp= ${IS_BUILTIN.libXdmcp}
33. if defined(BUILTIN_PKG.libXdmcp) && \ 33. if defined(BUILTIN_PKG.libXdmcp) && \
34 !empty(IS_BUILTIN.libXdmcp:M[yY][eE][sS]) 34 ${IS_BUILTIN.libXdmcp:M[yY][eE][sS]}
35USE_BUILTIN.libXdmcp= yes 35USE_BUILTIN.libXdmcp= yes
36. for _dep_ in ${BUILDLINK_API_DEPENDS.libXdmcp} 36. for _dep_ in ${BUILDLINK_API_DEPENDS.libXdmcp}
37. if !empty(USE_BUILTIN.libXdmcp:M[yY][eE][sS]) 37. if ${USE_BUILTIN.libXdmcp:M[yY][eE][sS]}
38USE_BUILTIN.libXdmcp!= \ 38USE_BUILTIN.libXdmcp!= \
39 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXdmcp:Q}; then \ 39 if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.libXdmcp:Q}; then \
40 ${ECHO} yes; \ 40 ${ECHO} yes; \
41 else \ 41 else \
42 ${ECHO} no; \ 42 ${ECHO} no; \
43 fi 43 fi
44. endif 44. endif
45. endfor 45. endfor
46. endif 46. endif
47. endif # PREFER.libXdmcp 47. endif # PREFER.libXdmcp
48.endif 48.endif
49MAKEVARS+= USE_BUILTIN.libXdmcp 49MAKEVARS+= USE_BUILTIN.libXdmcp
50 50
51.include "../../mk/x11.builtin.mk" 51.include "../../mk/x11.builtin.mk"
52 52
53CHECK_BUILTIN.libXdmcp?= no 53CHECK_BUILTIN.libXdmcp?= no
54.if !empty(CHECK_BUILTIN.libXdmcp:M[nN][oO]) 54.if ${CHECK_BUILTIN.libXdmcp:M[nN][oO]}
55 55
56# If we are using the builtin version, check whether it has a xdmcp.pc 56# If we are using the builtin version, check whether it has a xdmcp.pc
57# file or not. If the latter, generate a fake one. 57# file or not. If the latter, generate a fake one.
58. if !empty(USE_BUILTIN.libXdmcp:M[Yy][Ee][Ss]) 58. if ${USE_BUILTIN.libXdmcp:M[Yy][Ee][Ss]}
59BUILDLINK_TARGETS+= xdmcp-fake-pc 59BUILDLINK_TARGETS+= xdmcp-fake-pc
60 60
61xdmcp-fake-pc: 61xdmcp-fake-pc:
62 ${RUN} \ 62 ${RUN} \
63 for dir in lib lib${LIBABISUFFIX} share; do \ 63 for dir in lib lib${LIBABISUFFIX} share; do \
64 ${TEST} -f ${BUILDLINK_PREFIX.libXdmcp}/$${dir}/pkgconfig/xdmcp.pc && exit; \ 64 ${TEST} -f ${BUILDLINK_PREFIX.libXdmcp}/$${dir}/pkgconfig/xdmcp.pc && exit; \
65 done; \ 65 done; \
66 src=${BUILDLINK_PREFIX.libXdmcp}/lib/pkgconfig/xdmcp.pc; \ 66 src=${BUILDLINK_PREFIX.libXdmcp}/lib/pkgconfig/xdmcp.pc; \
67 dst=${BUILDLINK_DIR}/lib/pkgconfig/xdmcp.pc; \ 67 dst=${BUILDLINK_DIR}/lib/pkgconfig/xdmcp.pc; \
68 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \ 68 ${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig; \
69 if ${TEST} -f $${src}; then \ 69 if ${TEST} -f $${src}; then \
70 ${LN} -sf $${src} $${dst}; \ 70 ${LN} -sf $${src} $${dst}; \
71 else \ 71 else \
72 req=""; \ 72 req=""; \
73 if ${TEST} -f \ 73 if ${TEST} -f \
74 ${BUILDLINK_PREFIX.xorgproto}/lib/pkgconfig/xproto.pc; then \ 74 ${BUILDLINK_PREFIX.xorgproto}/lib/pkgconfig/xproto.pc; then \
75 req="xproto"; \ 75 req="xproto"; \
76 fi; \ 76 fi; \
77 { ${ECHO} "Name: Xdmcp"; \ 77 { ${ECHO} "Name: Xdmcp"; \
78 ${ECHO} "Description: X Display Manager Control Protocol library"; \ 78 ${ECHO} "Description: X Display Manager Control Protocol library"; \
79 ${ECHO} "Version: 0.99"; \ 79 ${ECHO} "Version: 0.99"; \
80 ${ECHO} "Requires: $${req}"; \ 80 ${ECHO} "Requires: $${req}"; \
81 ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.libXdmcp}/include"; \ 81 ${ECHO} "Cflags: -I${BUILDLINK_PREFIX.libXdmcp}/include"; \
82 ${ECHO} "Libs: -L${BUILDLINK_PREFIX.libXdmcp}/lib" \ 82 ${ECHO} "Libs: -L${BUILDLINK_PREFIX.libXdmcp}/lib" \
83 "${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXdmcp}/lib" \ 83 "${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libXdmcp}/lib" \
84 "-lXdmcp"; \ 84 "-lXdmcp"; \
85 } >$${dst}; \ 85 } >$${dst}; \
86 fi 86 fi
87. endif 87. endif
88 88
89.endif # CHECK_BUILTIN.libXdmcp 89.endif # CHECK_BUILTIN.libXdmcp
File Deleted: pkgsrc/x11/libXdmcp/patches/Attic/patch-Key.c
File Deleted: pkgsrc/x11/libXdmcp/patches/Attic/patch-config.h.in
File Deleted: pkgsrc/x11/libXdmcp/patches/Attic/patch-configure