pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/libXdmcp libXdmcp: revert Solaris 11.3 build fix



details:   https://anonhg.NetBSD.org/pkgsrc/rev/768776b35122
branches:  trunk
changeset: 371811:768776b35122
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Fri Jan 14 16:13:53 2022 +0000

description:
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:

 x11/libXdmcp/distinfo            |   3 +--
 x11/libXdmcp/patches/patch-Key.c |  18 ------------------
 2 files changed, 1 insertions(+), 20 deletions(-)

diffs (33 lines):

diff -r 28923a64ecf8 -r 768776b35122 x11/libXdmcp/distinfo
--- a/x11/libXdmcp/distinfo     Fri Jan 14 16:13:35 2022 +0000
+++ b/x11/libXdmcp/distinfo     Fri Jan 14 16:13:53 2022 +0000
@@ -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 -r 28923a64ecf8 -r 768776b35122 x11/libXdmcp/patches/patch-Key.c
--- a/x11/libXdmcp/patches/patch-Key.c  Fri Jan 14 16:13:35 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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)
- {



Home | Main Index | Thread Index | Old Index