Sat Oct 15 20:28:34 UTC 202220221015202834

a/kernel-firmware-20221013_49fccf6-noarch-1.txz:  Upgraded.
a/kernel-generic-5.19.16-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.19.16-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.19.16-x86_64-1.txz:  Upgraded.
ap/man-db-2.11.0-x86_64-1.txz:  Upgraded.
ap/man-pages-6.00-noarch-1.txz:  Upgraded.
d/kernel-headers-5.19.16-x86-1.txz:  Upgraded.
k/kernel-source-5.19.16-noarch-1.txz:  Upgraded.
l/libedit-20221009_3.1-x86_64-1.txz:  Upgraded.
l/mozilla-nss-3.84-x86_64-1.txz:  Upgraded.
l/nodejs-18.11.0-x86_64-1.txz:  Upgraded.
l/zlib-1.2.13-x86_64-1.txz:  Upgraded.
  Fixed a bug when getting a gzip header extra field with inflateGetHeader().
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-37434
  (* Security fix *)
n/fetchmail-6.4.34-x86_64-1.txz:  Upgraded.
n/gnupg2-2.2.40-x86_64-1.txz:  Upgraded.
x/bdftopcf-1.1.1-x86_64-1.txz:  Upgraded.
x/libwacom-2.5.0-x86_64-1.txz:  Upgraded.
x/smproxy-1.0.7-x86_64-1.txz:  Upgraded.
x/viewres-1.0.7-x86_64-1.txz:  Upgraded.
x/xditview-1.0.6-x86_64-1.txz:  Upgraded.
x/xf86-input-vmmouse-13.2.0-x86_64-1.txz:  Added.
x/xgc-1.0.6-x86_64-1.txz:  Upgraded.
x/xkbprint-1.0.6-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

11 files changed, 76 insertions, 28 deletions

diff --git a/source/x/x11/build/bdftopcf b/source/x/x11/build/bdftopcf
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/bdftopcf
+++ b/source/x/x11/build/bdftopcf
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/smproxy b/source/x/x11/build/smproxy
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/smproxy
+++ b/source/x/x11/build/smproxy
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/viewres b/source/x/x11/build/viewres
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/viewres
+++ b/source/x/x11/build/viewres
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xditview b/source/x/x11/build/xditview
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xditview
+++ b/source/x/x11/build/xditview
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xf86-input-vmmouse b/source/x/x11/build/xf86-input-vmmouse
index f599e28b8..d00491fd7 100644
--- a/source/x/x11/build/xf86-input-vmmouse
+++ b/source/x/x11/build/xf86-input-vmmouse
@@ -1 +1 @@
-10
+1
diff --git a/source/x/x11/build/xgc b/source/x/x11/build/xgc
index b8626c4cf..d00491fd7 100644
--- a/source/x/x11/build/xgc
+++ b/source/x/x11/build/xgc
@@ -1 +1 @@
-4
+1
diff --git a/source/x/x11/build/xkbprint b/source/x/x11/build/xkbprint
index 00750edc0..d00491fd7 100644
--- a/source/x/x11/build/xkbprint
+++ b/source/x/x11/build/xkbprint
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/package-blacklist b/source/x/x11/package-blacklist
index 68cc00705..85fbc7979 100644
--- a/source/x/x11/package-blacklist
+++ b/source/x/x11/package-blacklist
@@ -13,7 +13,6 @@ xf86-input-joystick
 xf86-input-keyboard
 xf86-input-mouse
 xf86-input-penmount
-xf86-input-vmmouse
 xf86-input-void
 xf86-video-apm
 xf86-video-ark
diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch
index 936bf1ca4..e9b5ec3cd 100644
--- a/source/x/x11/patch/xdm.patch
+++ b/source/x/x11/patch/xdm.patch
@@ -1,6 +1,6 @@
 zcat $CWD/patch/xdm/xdm.glibc.crypt.diff.gz | patch -p1 --verbose || \
   { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xdm/xdm-1.1.11-arc4random-include.patch.gz | patch -p1 --verbose || \
-  { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/xdm/xdm-1.1.11-setproctitle-include.patch.gz | patch -p1 --verbose || \
   { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/xdm/xdm.arc4random.diff.gz | patch -p1 --verbose || \
+  { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch b/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch
deleted file mode 100644
index db948094b..000000000
--- a/source/x/x11/patch/xdm/xdm-1.1.11-arc4random-include.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/xdm/genauth.c b/xdm/genauth.c
---- a/xdm/genauth.c	2011-09-25 09:35:47.000000000 +0200
-+++ b/xdm/genauth.c	2014-01-06 16:28:09.664060603 +0100
-@@ -40,6 +40,14 @@
- 
- #include <errno.h>
- 
-+#ifdef HAVE_ARC4RANDOM
-+# ifdef __linux__
-+#  include <bsd/stdlib.h>
-+# else
-+#  include <stdlib.h>
-+# endif
-+#endif
-+
- #include <time.h>
- #define Time_t time_t
- 
diff --git a/source/x/x11/patch/xdm/xdm.arc4random.diff b/source/x/x11/patch/xdm/xdm.arc4random.diff
new file mode 100644
index 000000000..06948e63e
--- /dev/null
+++ b/source/x/x11/patch/xdm/xdm.arc4random.diff
@@ -0,0 +1,67 @@
+diff -aurN xdm-1.1.11/xdm/genauth.c xdm-20220911_468b760/xdm/genauth.c
+--- xdm-1.1.11/xdm/genauth.c	2011-09-25 09:35:47.000000000 +0200
++++ xdm-20220911_468b760/xdm/genauth.c	2022-10-08 06:24:57.000000000 +0200
+@@ -40,6 +40,22 @@
+ 
+ #include <errno.h>
+ 
++#ifdef HAVE_ARC4RANDOM
++# ifdef __linux__
++#  if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
++#   if __GLIBC_PREREQ(2, 36)
++#    include <stdlib.h>
++#   else
++#    include <bsd/stdlib.h>
++#   endif
++#  else
++#   include <bsd/stdlib.h>
++#  endif
++# else
++#  include <stdlib.h>
++# endif
++#endif
++
+ #include <time.h>
+ #define Time_t time_t
+ 
+@@ -372,7 +388,7 @@
+ 	  randomDevice, errno);
+     }
+ #  endif
+-    /*  Try some pseudo-random number genrator daemon next */
++    /*  Try some pseudo-random number generator daemon next */
+     if (prngdSocket != NULL || prngdPort != 0) {
+ 	    if (get_prngd_bytes((char *)tmpkey, sizeof(tmpkey), prngdPort,
+ 		    prngdSocket) == 0) {
+@@ -408,15 +424,20 @@
+     static int	    xdmcpAuthInited;
+     long	    ldata[2];
+ 
+-# ifdef ITIMER_REAL
++# ifndef HAVE_ARC4RANDOM
++#  ifdef ITIMER_REAL
+     struct timeval  now;
+ 
+     X_GETTIMEOFDAY (&now);
+     ldata[0] = now.tv_usec;
+     ldata[1] = now.tv_sec;
+-# else
++#  else
+     ldata[0] = time ((long *) 0);
+     ldata[1] = getpid ();
++#  endif
++# else
++    ldata[0] = arc4random();
++    ldata[1] = arc4random();
+ # endif
+ 
+     longtochars (ldata[0], data+0);
+@@ -462,7 +483,7 @@
+ 	LogError("Cannot open randomDevice \"%s\", errno = %d\n",
+ 		 randomDevice, errno);
+ #  endif /* DEV_RANDOM */
+-    /*  Try some pseudo-random number genrator daemon next */
++    /*  Try some pseudo-random number generator daemon next */
+     if (prngdSocket != NULL || prngdPort != 0) {
+ 	    if (get_prngd_bytes(auth, len, prngdPort, prngdSocket) == 0) {
+ 		    return 1;