Sat Sep 12 19:16:03 UTC 202020200912191603

a/kernel-generic-5.4.65-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.65-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.65-x86_64-1.txz:  Upgraded.
ap/cups-filters-1.28.2-x86_64-1.txz:  Upgraded.
ap/ghostscript-9.53.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.65-x86-1.txz:  Upgraded.
d/meson-0.55.3-x86_64-1.txz:  Upgraded.
d/vala-0.50.0-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.65-noarch-1.txz:  Upgraded.
l/glib2-2.66.0-x86_64-1.txz:  Upgraded.
l/librsvg-2.50.0-x86_64-1.txz:  Upgraded.
l/libssh-0.9.5-x86_64-1.txz:  Upgraded.
l/libxkbcommon-1.0.1-x86_64-1.txz:  Upgraded.
x/xf86-video-vesa-2.5.0-x86_64-1.txz:  Upgraded.
x/xorg-server-1.20.9-x86_64-3.txz:  Rebuilt.
  Applied upstream patch to fix a PCI related crash on some hardware.
  Thanks to Jaroslaw Siebert.
x/xorg-server-xephyr-1.20.9-x86_64-3.txz:  Rebuilt.
x/xorg-server-xnest-1.20.9-x86_64-3.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.9-x86_64-3.txz:  Rebuilt.
x/xorg-server-xwayland-1.20.9-x86_64-3.txz:  Rebuilt.
xap/mozilla-thunderbird-68.12.0-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/68.12.0/releasenotes/
    https://www.mozilla.org/en-US/security/advisories/mfsa2020-40/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15663
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15664
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-15669
  (* Security fix *)
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

4 files changed, 17 insertions, 2 deletions

diff --git a/source/x/x11/build/xf86-video-vesa b/source/x/x11/build/xf86-video-vesa
index 00750edc..d00491fd 100644
--- a/source/x/x11/build/xf86-video-vesa
+++ b/source/x/x11/build/xf86-video-vesa
@@ -1 +1 @@
-3
+1
diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index 0cfbf088..00750edc 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-2
+3
diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index 2f47985b..f670b417 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -22,3 +22,6 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
 # Reference: https://bugs.freedesktop.org/show_bug.cgi?id=94844
 # Added here 2018/7.
 zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix a PCI related segfault:
+zcat $CWD/patch/xorg-server/fix-pci-segfault.diff.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/fix-pci-segfault.diff b/source/x/x11/patch/xorg-server/fix-pci-segfault.diff
new file mode 100644
index 00000000..40037628
--- /dev/null
+++ b/source/x/x11/patch/xorg-server/fix-pci-segfault.diff
@@ -0,0 +1,12 @@
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index cef47da03d0e91e6a56a5e3cb14a51d931633eff..dadbac6c8f0ae6f3d636fdfe245e61bc0c98581d 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -289,7 +289,7 @@ xf86platformProbe(void)
+     for (i = 0; i < xf86_num_platform_devices; i++) {
+         char *busid = xf86_platform_odev_attributes(i)->busid;
+ 
+-        if (pci && (strncmp(busid, "pci:", 4) == 0)) {
++        if (pci && busid && (strncmp(busid, "pci:", 4) == 0)) {
+             platform_find_pci_info(&xf86_platform_devices[i], busid);
+         }