pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/libXdmcp libXdmcp: fix builds with Solaris 11.3



details:   https://anonhg.NetBSD.org/pkgsrc/rev/779600b1957c
branches:  trunk
changeset: 374452:779600b1957c
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Wed Feb 23 03:10:26 2022 +0000

description:
libXdmcp: fix builds with Solaris 11.3

There are circumstances where getentropy() exists but arc4random_buf()
does not, as reported to be the case with Solaris 11.3 in PR pkg/54628,
report and analysis by Sad Clouds. sys/random.h only needs to be
included on SunOS, in that case (second patch iteration).

diffstat:

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

diffs (34 lines):

diff -r 967ed4ae5490 -r 779600b1957c x11/libXdmcp/distinfo
--- a/x11/libXdmcp/distinfo     Wed Feb 23 01:20:02 2022 +0000
+++ b/x11/libXdmcp/distinfo     Wed Feb 23 03:10:26 2022 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2022/01/14 16:13:53 gutteridge Exp $
+$NetBSD: distinfo,v 1.13 2022/02/23 03:10:26 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) = 1a065472f34d4d8453efce44263bd6d66a7c4d86
diff -r 967ed4ae5490 -r 779600b1957c x11/libXdmcp/patches/patch-Key.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libXdmcp/patches/patch-Key.c  Wed Feb 23 03:10:26 2022 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-Key.c,v 1.3 2022/02/23 03:10:26 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
+@@ -82,6 +82,11 @@ arc4random_buf (void *auth, int len)
+     int           ret;
+ 
+ #if HAVE_GETENTROPY
++
++#ifdef __sun
++#include <sys/random.h>
++#endif
++
+     /* weak emulation of arc4random through the getentropy libc call */
+     ret = getentropy (auth, len);
+     if (ret == 0)



Home | Main Index | Thread Index | Old Index