summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorgutteridge <gutteridge@pkgsrc.org>2022-01-14 16:13:53 +0000
committergutteridge <gutteridge@pkgsrc.org>2022-01-14 16:13:53 +0000
commit09cf5587fdb2e3a74cdffd44b07db8b5b1b0ccac (patch)
tree5478e7965ad9c8a7c98ee9f3bf5e6d3668dae567 /x11
parent3c5694b174c38c08d6e43dab1c89ebda3dc3ed1f (diff)
downloadpkgsrc-09cf5587fdb2e3a74cdffd44b07db8b5b1b0ccac.tar.gz
libXdmcp: revert Solaris 11.3 build fix
This requires further discussion in PR pkg/54628. This patch didn't cause an issue for me in a Linux build environment that doesn't have arc4random_buf() available, and doesn't need sys/random.h, but it could cause issues elsewhere.
Diffstat (limited to 'x11')
-rw-r--r--x11/libXdmcp/distinfo3
-rw-r--r--x11/libXdmcp/patches/patch-Key.c18
2 files changed, 1 insertions, 20 deletions
diff --git a/x11/libXdmcp/distinfo b/x11/libXdmcp/distinfo
index f7d09e3b076..852793ffc19 100644
--- a/x11/libXdmcp/distinfo
+++ b/x11/libXdmcp/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2022/01/14 01:59:59 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2022/01/14 16:13:53 gutteridge 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) = 6cc4fbc4f7407affa9a604887f15890f9d21ee89
diff --git a/x11/libXdmcp/patches/patch-Key.c b/x11/libXdmcp/patches/patch-Key.c
deleted file mode 100644
index 6cc30c11e02..00000000000
--- a/x11/libXdmcp/patches/patch-Key.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-Key.c,v 1.1 2022/01/14 02:00:00 gutteridge Exp $
-
-Fix builds where getentropy() exists but arc4random_buf() does not, as
-reported to be the case with Solaris 11.3 in PR pkg/54628.
-
---- Key.c.orig 2019-03-16 16:21:22.000000000 +0000
-+++ Key.c
-@@ -64,6 +64,10 @@ getbits (long data, unsigned char *dst)
-
- #ifndef HAVE_ARC4RANDOM_BUF
-
-+#ifdef HAVE_GETENTROPY
-+#include <sys/random.h>
-+#endif
-+
- static void
- insecure_getrandom_buf (unsigned char *auth, int len)
- {