CVS commit: pkgsrc/devel/libuuid

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat Jul 10 23:11:22 UTC 2021

Modified Files:
        pkgsrc/devel/libuuid: distinfo
Added Files:
        pkgsrc/devel/libuuid/patches: patch-lib_pager.c

Log Message:
devel/libuuid: fix illegal code affecting x11/mcookie.

Might affect PR 55086.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/libuuid/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuuid/patches/patch-lib_pager.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libuuid/distinfo
diff -u pkgsrc/devel/libuuid/distinfo:1.21 pkgsrc/devel/libuuid/distinfo:1.22
--- pkgsrc/devel/libuuid/distinfo:1.21  Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/distinfo       Sat Jul 10 23:11:22 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2020/03/12 10:11:34 ryoon Exp $
+$NetBSD: distinfo,v 1.22 2021/07/10 23:11:22 dholland Exp $
 
 SHA1 (util-linux-2.32.1.tar.xz) = de9271fb93fb651d21c027e2efb0cf0ac80f2e9a
 RMD160 (util-linux-2.32.1.tar.xz) = bf61cb460eabcfdb90909dbcfd8e64bb9097ce65
@@ -10,6 +10,7 @@ SHA1 (patch-configure) = 400904ae2e58b71
 SHA1 (patch-include_c.h) = 4596369e4b742329be513952c66d1fa3705de017
 SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
 SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
+SHA1 (patch-lib_pager.c) = 3d4b65f9ccb6437bcc0777634660b5ae3150d14e
 SHA1 (patch-lib_randutils.c) = 422e94d9bdaf6a77894b79d67285fd8a0cb1d05a
 SHA1 (patch-libblkid_docs_Makefile.in) = 97a1559dad77e32d78bd504d8d3523b9cc403c36
 SHA1 (patch-libfdisk_docs_Makefile.in) = def97b85e8760cd18af736ab331e2f476f0c9c67

Added files:

Index: pkgsrc/devel/libuuid/patches/patch-lib_pager.c
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-lib_pager.c:1.1
--- /dev/null   Sat Jul 10 23:11:22 2021
+++ pkgsrc/devel/libuuid/patches/patch-lib_pager.c      Sat Jul 10 23:11:22 2021
@@ -0,0 +1,23 @@
+$NetBSD: patch-lib_pager.c,v 1.1 2021/07/10 23:11:22 dholland Exp $
+
+select's fd_set arguments are declared "restrict" so don't pass aliased
+pointers. note that nothing following actually _uses_ the data...
+
+--- lib/pager.c~       2018-06-04 07:57:02.793445882 +0000
++++ lib/pager.c
+@@ -141,11 +141,13 @@ static void pager_preexec(void)
+        * Work around bug in "less" by not starting it until we
+        * have real input
+        */
+-      fd_set in;
++      fd_set in, ex;
+ 
+       FD_ZERO(&in);
+       FD_SET(STDIN_FILENO, &in);
+-      select(1, &in, NULL, &in, NULL);
++      FD_ZERO(&ex);
++      FD_SET(STDIN_FILENO, &ex);
++      select(1, &in, NULL, &ex, NULL);
+ 
+       if (setenv("LESS", "FRSX", 0) != 0)
+               warn(_("failed to set the %s environment variable"), "LESS");