slackware-current/source/l/glib2/glib2.slackware.localtime.diff
Patrick J Volkerding 44f92d940d Thu Nov 22 05:56:56 UTC 2018
a/kernel-generic-4.19.3-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.19.3-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.19.3-x86_64-1.txz:  Upgraded.
a/openssl-solibs-1.1.1a-x86_64-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-21.txz:  Rebuilt.
  rc.S: Don't run rc.fuse - udev takes care of the FUSE module and filesystem.
  rc.S: Support replacing the /etc/mtab file with a symlink to /proc/mounts.
  rc.6: Show more information when unmounting filesystems at shutdown.
ap/ghostscript-9.26-x86_64-1.txz:  Upgraded.
ap/mariadb-10.3.11-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues.
  For more information, see:
    https://mariadb.com/kb/en/library/mariadb-10311-release-notes/
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3282
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2016-9843
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3174
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3143
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3156
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3251
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3185
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3277
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3162
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3173
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3200
    https://cve.mitre.org/cgi-bin/cvename.cgi?name= CVE-2018-3284
  (* Security fix *)
d/cmake-3.13.0-x86_64-1.txz:  Upgraded.
d/git-2.19.2-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.14.63-x86-1.txz:  Upgraded.
d/kernel-headers-4.19.3-x86-1.txz:  Upgraded.
d/vala-0.42.3-x86_64-1.txz:  Added.
k/kernel-source-4.19.3-noarch-1.txz:  Upgraded.
l/adwaita-icon-theme-3.30.0-noarch-1.txz:  Upgraded.
l/at-spi2-atk-2.30.0-x86_64-1.txz:  Upgraded.
l/at-spi2-core-2.30.0-x86_64-1.txz:  Upgraded.
l/atk-2.30.0-x86_64-1.txz:  Upgraded.
l/atkmm-2.28.0-x86_64-1.txz:  Upgraded.
l/dconf-0.28.0-x86_64-1.txz:  Upgraded.
  dconf and dconf-editor require Vala; the alternative would be to try to
  stick with the old versions forever, and we don't want to do that.
l/dconf-editor-3.30.2-x86_64-1.txz:  Upgraded.
l/gcr-3.28.0-x86_64-3.txz:  Rebuilt.
  Recompiled to add Vala bindings.
l/gdk-pixbuf2-2.38.0-x86_64-1.txz:  Upgraded.
l/gexiv2-0.10.9-x86_64-1.txz:  Upgraded.
l/glib-networking-2.58.0-x86_64-1.txz:  Upgraded.
l/glib2-2.58.1-x86_64-1.txz:  Upgraded.
l/glibmm-2.58.0-x86_64-1.txz:  Upgraded.
l/gobject-introspection-1.58.0-x86_64-1.txz:  Upgraded.
l/gtk+3-3.24.1-x86_64-1.txz:  Upgraded.
l/gtkmm3-3.24.0-x86_64-1.txz:  Upgraded.
l/gvfs-1.38.1-x86_64-1.txz:  Upgraded.
l/libcap-2.26-x86_64-1.txz:  Upgraded.
l/libpsl-0.20.1-x86_64-1.txz:  Added.
  Required by libsoup.
l/libsoup-2.64.2-x86_64-1.txz:  Upgraded.
l/pangomm-2.42.0-x86_64-1.txz:  Upgraded.
l/pygobject3-3.30.2-x86_64-1.txz:  Upgraded.
l/vte-0.54.2-x86_64-1.txz:  Upgraded.
n/openssl-1.1.1a-x86_64-1.txz:  Upgraded.
  This update fixes timing side channel attacks on DSA and ECDSA signature
  generation that could allow an attacker to recover the private key.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0734
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0735
  (* Security fix *)
x/pixman-0.36.0-x86_64-1.txz:  Upgraded.
xfce/xfce4-terminal-0.8.7.4-x86_64-2.txz:  Rebuilt.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
2018-11-22 17:59:46 +01:00

37 lines
1.8 KiB
Diff

From 4ac2d88f3153d8cdaa003601363e71f46820a187 Mon Sep 17 00:00:00 2001
From: Patrick J. Volkerding <volkerdi@slackware.com>
Date: Tue, 20 Nov 2018 13:26:57 -0600
Subject: [PATCH] Also look at /etc/localtime-copied-from
In Slackware, /etc/localtime is a copy of the local timezone file, not a
symlink to it, but the latest glib expects a symlink (because that's been
demanded by systemd and guess-who). So, if we find that /etc/localtime is
not a symlink, consider /etc/localtime-copied-from next. On Slackware
systems this will be a symlink to the local timezone file under
/usr/share/zoneinfo. We still want to consider the possibility that
/etc/localtime *is* a symlink first though, since that's an acceptable
local system modification on Slackware.
--- ./glib/gtimezone.c.orig 2018-09-21 09:23:53.000000000 -0500
+++ ./glib/gtimezone.c 2018-11-20 13:11:31.601643410 -0600
@@ -440,6 +440,20 @@
/* Resolve the actual timezone pointed to by /etc/localtime. */
resolved_identifier = g_file_read_link (filename, &read_link_err);
+
+ /* If we didn't get the timezone here (probably because
+ * /etc/localtime is not a symlink), then we will try again using
+ * /etc/localtime-copied-from, which on Slackware is a symlink to
+ * the local timezone file. */
+ if (resolved_identifier == NULL)
+ {
+ filename = g_strdup ("/etc/localtime-copied-from");
+ g_clear_error (&read_link_err);
+ resolved_identifier = g_file_read_link (filename, &read_link_err);
+ }
+
+ /* Test that we got the resolved_identifier. If not, fall back on the
+ * last option (/var/db/zoneinfo file, as found on FreeBSD) */
if (resolved_identifier == NULL)
{
gboolean not_a_symlink = g_error_matches (read_link_err,