From ca24bdf2171b8756a322c99932f890bd69bcd86c Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 1 Dec 2020 20:18:01 +0000 Subject: Tue Dec 1 20:18:01 UTC 2020 a/hwdata-0.342-noarch-1.txz: Upgraded. a/pam-1.5.1-x86_64-1.txz: Upgraded. ap/sqlite-3.34.0-x86_64-1.txz: Upgraded. l/libarchive-3.5.0-x86_64-1.txz: Upgraded. x/fontconfig-2.13.92-x86_64-1.txz: Upgraded. I'm pretty sure there was a good reason to switch to 2.13.92 on the devel release path, but I'm not sure the same can be said about 2.13.93. We'll stick with this one for now until there's a stable release or another good reason to bump it. x/xorg-server-1.20.10-x86_64-1.txz: Upgraded. x/xorg-server-xephyr-1.20.10-x86_64-1.txz: Upgraded. x/xorg-server-xnest-1.20.10-x86_64-1.txz: Upgraded. x/xorg-server-xvfb-1.20.10-x86_64-1.txz: Upgraded. x/xorg-server-xwayland-1.20.10-x86_64-1.txz: Upgraded. xap/gnuplot-5.4.1-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 29 +- ChangeLog.txt | 17 + FILELIST.TXT | 213 +-- recompress.sh | 14 +- .../fedora-patches/pam-1.5.0-redhat-modules.patch | 74 + source/a/pam/pam-redhat.url | 1 + source/a/pam/pam.SlackBuild | 7 +- source/ap/sqlite/sqlite.SlackBuild | 2 +- source/l/libarchive/libarchive.SlackBuild | 2 +- .../fontconfig-0-timestamp-dir-on-sb.patch | 55 + .../fontconfig-drop-lang-from-pkgkit-format.patch | 12 + .../fedora-patches/fontconfig-fix-1744377.patch | 122 ++ .../fedora-patches/fontconfig-fix-assertion.patch | 144 ++ .../fedora-patches/fontconfig-fix-dtd-id.patch | 490 +++++++ .../fedora-patches/fontconfig-fix-dtd.patch | 26 + .../fedora-patches/fontconfig-fix-test.patch | 41 + .../fontconfig/fedora-patches/fontconfig-mt.patch | 1439 ++++++++++++++++++++ .../fontconfig-read-latest-cache.patch | 228 ++++ .../fontconfig-required-freetype-version.patch | 14 + .../fontconfig-score-hint-on-match.patch | 36 + .../fedora-patches/fontconfig-sysroot.patch | 285 ++++ source/x/fontconfig/fontconfig.SlackBuild | 28 +- source/x/fontconfig/fontconfig.dejavu.diff | 19 +- source/x/fontconfig/fontconfig.font.dir.list.diff | 32 +- source/x/fontconfig/fontconfig.liberation.diff | 16 +- source/x/fontconfig/fontconfig.noto.diff | 35 - source/x/x11/build/xorg-server | 2 +- 27 files changed, 3197 insertions(+), 186 deletions(-) create mode 100644 source/a/pam/fedora-patches/pam-1.5.0-redhat-modules.patch create mode 100644 source/a/pam/pam-redhat.url create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-mt.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-read-latest-cache.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-required-freetype-version.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-score-hint-on-match.patch create mode 100644 source/x/fontconfig/fedora-patches/fontconfig-sysroot.patch delete mode 100644 source/x/fontconfig/fontconfig.noto.diff diff --git a/ChangeLog.rss b/ChangeLog.rss index 08e84e784..d26f9dab0 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,34 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Mon, 30 Nov 2020 20:03:36 GMT - Tue, 1 Dec 2020 07:59:44 GMT + Tue, 1 Dec 2020 20:18:01 GMT + Wed, 2 Dec 2020 07:59:48 GMT maintain_current_git.sh v 1.12 + + Tue, 1 Dec 2020 20:18:01 GMT + Tue, 1 Dec 2020 20:18:01 GMT + https://git.slackware.nl/current/tag/?h=20201201201801 + 20201201201801 + + +a/hwdata-0.342-noarch-1.txz: Upgraded. +a/pam-1.5.1-x86_64-1.txz: Upgraded. +ap/sqlite-3.34.0-x86_64-1.txz: Upgraded. +l/libarchive-3.5.0-x86_64-1.txz: Upgraded. +x/fontconfig-2.13.92-x86_64-1.txz: Upgraded. + I'm pretty sure there was a good reason to switch to 2.13.92 on the devel + release path, but I'm not sure the same can be said about 2.13.93. We'll + stick with this one for now until there's a stable release or another good + reason to bump it. +x/xorg-server-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xephyr-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xnest-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xvfb-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xwayland-1.20.10-x86_64-1.txz: Upgraded. +xap/gnuplot-5.4.1-x86_64-1.txz: Upgraded. + ]]> + + Mon, 30 Nov 2020 20:03:36 GMT Mon, 30 Nov 2020 20:03:36 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 21225c6ad..174595948 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,20 @@ +Tue Dec 1 20:18:01 UTC 2020 +a/hwdata-0.342-noarch-1.txz: Upgraded. +a/pam-1.5.1-x86_64-1.txz: Upgraded. +ap/sqlite-3.34.0-x86_64-1.txz: Upgraded. +l/libarchive-3.5.0-x86_64-1.txz: Upgraded. +x/fontconfig-2.13.92-x86_64-1.txz: Upgraded. + I'm pretty sure there was a good reason to switch to 2.13.92 on the devel + release path, but I'm not sure the same can be said about 2.13.93. We'll + stick with this one for now until there's a stable release or another good + reason to bump it. +x/xorg-server-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xephyr-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xnest-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xvfb-1.20.10-x86_64-1.txz: Upgraded. +x/xorg-server-xwayland-1.20.10-x86_64-1.txz: Upgraded. +xap/gnuplot-5.4.1-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Nov 30 20:03:36 UTC 2020 a/kernel-firmware-20201130_7455a36-noarch-1.txz: Upgraded. ap/sudo-1.9.4-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 1c0cfd49e..76d402729 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Nov 30 20:06:37 UTC 2020 +Tue Dec 1 20:20:44 UTC 2020 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2020-11-30 20:03 . +drwxr-xr-x 12 root root 4096 2020-12-01 20:18 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14975 2020-02-08 21:06 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1396100 2020-11-29 20:55 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2020-11-29 20:55 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1396084 2020-11-30 20:06 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2020-11-30 20:06 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 1092770 2020-11-30 20:03 ./ChangeLog.txt +-rw-r--r-- 1 root root 1093591 2020-12-01 20:18 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2020-11-25 02:03 ./EFI/BOOT -rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2020-11-25 02:03 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1792356 2020-11-29 20:55 ./FILELIST.TXT +-rw-r--r-- 1 root root 1792339 2020-11-30 20:06 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 773107 2020-11-30 20:06 ./PACKAGES.TXT +-rw-r--r-- 1 root root 773112 2020-12-01 20:20 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3629 2020-11-25 01:01 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -791,13 +791,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2020-11-30 20:06 ./slackware64 --rw-r--r-- 1 root root 304302 2020-11-30 20:06 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2020-11-30 20:06 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 378618 2020-11-30 20:05 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3896712 2020-11-30 20:05 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2020-12-01 20:20 ./slackware64 +-rw-r--r-- 1 root root 304317 2020-12-01 20:20 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2020-12-01 20:20 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 378633 2020-12-01 20:19 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3900582 2020-12-01 20:19 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 24576 2020-11-30 20:05 ./slackware64/a +drwxr-xr-x 2 root root 24576 2020-12-01 20:19 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt -rw-r--r-- 1 root root 10820 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz -rw-r--r-- 1 root root 163 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz.asc @@ -933,9 +933,9 @@ drwxr-xr-x 2 root root 24576 2020-11-30 20:05 ./slackware64/a -rw-r--r-- 1 root root 441 2019-11-07 22:20 ./slackware64/a/hostname-3.23-x86_64-1.txt -rw-r--r-- 1 root root 9036 2019-11-07 22:20 ./slackware64/a/hostname-3.23-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-07 22:20 ./slackware64/a/hostname-3.23-x86_64-1.txz.asc --rw-r--r-- 1 root root 316 2020-11-05 19:43 ./slackware64/a/hwdata-0.341-noarch-1.txt --rw-r--r-- 1 root root 1423460 2020-11-05 19:43 ./slackware64/a/hwdata-0.341-noarch-1.txz --rw-r--r-- 1 root root 163 2020-11-05 19:43 ./slackware64/a/hwdata-0.341-noarch-1.txz.asc +-rw-r--r-- 1 root root 316 2020-12-01 19:23 ./slackware64/a/hwdata-0.342-noarch-1.txt +-rw-r--r-- 1 root root 1427612 2020-12-01 19:23 ./slackware64/a/hwdata-0.342-noarch-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:23 ./slackware64/a/hwdata-0.342-noarch-1.txz.asc -rw-r--r-- 1 root root 465 2019-03-01 19:41 ./slackware64/a/infozip-6.0-x86_64-5.txt -rw-r--r-- 1 root root 410772 2019-03-01 19:41 ./slackware64/a/infozip-6.0-x86_64-5.txz -rw-r--r-- 1 root root 163 2019-03-01 19:41 ./slackware64/a/infozip-6.0-x86_64-5.txz.asc @@ -1051,9 +1051,9 @@ drwxr-xr-x 2 root root 24576 2020-11-30 20:05 ./slackware64/a -rw-r--r-- 1 root root 417 2019-08-06 04:40 ./slackware64/a/os-prober-1.77-x86_64-3.txt -rw-r--r-- 1 root root 16832 2019-08-06 04:40 ./slackware64/a/os-prober-1.77-x86_64-3.txz -rw-r--r-- 1 root root 163 2019-08-06 04:40 ./slackware64/a/os-prober-1.77-x86_64-3.txz.asc --rw-r--r-- 1 root root 422 2020-10-20 18:37 ./slackware64/a/pam-1.4.0-x86_64-2.txt --rw-r--r-- 1 root root 482624 2020-10-20 18:37 ./slackware64/a/pam-1.4.0-x86_64-2.txz --rw-r--r-- 1 root root 163 2020-10-20 18:37 ./slackware64/a/pam-1.4.0-x86_64-2.txz.asc +-rw-r--r-- 1 root root 422 2020-12-01 19:59 ./slackware64/a/pam-1.5.1-x86_64-1.txt +-rw-r--r-- 1 root root 478368 2020-12-01 19:59 ./slackware64/a/pam-1.5.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:59 ./slackware64/a/pam-1.5.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 563 2018-04-13 13:11 ./slackware64/a/patch-2.7.6-x86_64-3.txt -rw-r--r-- 1 root root 117972 2018-04-13 13:11 ./slackware64/a/patch-2.7.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:11 ./slackware64/a/patch-2.7.6-x86_64-3.txz.asc @@ -1172,7 +1172,7 @@ drwxr-xr-x 2 root root 24576 2020-11-30 20:05 ./slackware64/a -rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt -rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc -drwxr-xr-x 2 root root 20480 2020-11-30 20:05 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2020-12-01 20:19 ./slackware64/ap -rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt -rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc @@ -1387,9 +1387,9 @@ drwxr-xr-x 2 root root 20480 2020-11-30 20:05 ./slackware64/ap -rw-r--r-- 1 root root 293 2018-06-27 00:12 ./slackware64/ap/sox-14.4.2-x86_64-6.txt -rw-r--r-- 1 root root 386332 2018-06-27 00:12 ./slackware64/ap/sox-14.4.2-x86_64-6.txz -rw-r--r-- 1 root root 163 2018-06-27 00:12 ./slackware64/ap/sox-14.4.2-x86_64-6.txz.asc --rw-r--r-- 1 root root 483 2020-10-30 08:43 ./slackware64/ap/sqlite-3.33.0-x86_64-2.txt --rw-r--r-- 1 root root 934104 2020-10-30 08:43 ./slackware64/ap/sqlite-3.33.0-x86_64-2.txz --rw-r--r-- 1 root root 163 2020-10-30 08:43 ./slackware64/ap/sqlite-3.33.0-x86_64-2.txz.asc +-rw-r--r-- 1 root root 483 2020-12-01 19:33 ./slackware64/ap/sqlite-3.34.0-x86_64-1.txt +-rw-r--r-- 1 root root 939812 2020-12-01 19:33 ./slackware64/ap/sqlite-3.34.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:33 ./slackware64/ap/sqlite-3.34.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 584 2020-06-23 21:03 ./slackware64/ap/squashfs-tools-4.4-x86_64-2.txt -rw-r--r-- 1 root root 136696 2020-06-23 21:03 ./slackware64/ap/squashfs-tools-4.4-x86_64-2.txz -rw-r--r-- 1 root root 163 2020-06-23 21:03 ./slackware64/ap/squashfs-tools-4.4-x86_64-2.txz.asc @@ -2519,7 +2519,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez -rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile -drwxr-xr-x 2 root root 73728 2020-11-30 20:05 ./slackware64/l +drwxr-xr-x 2 root root 73728 2020-12-01 20:19 ./slackware64/l -rw-r--r-- 1 root root 338 2020-05-16 19:55 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-4.txt -rw-r--r-- 1 root root 193724 2020-05-16 19:55 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-4.txz -rw-r--r-- 1 root root 163 2020-05-16 19:55 ./slackware64/l/ConsoleKit2-1.2.1-x86_64-4.txz.asc @@ -2930,9 +2930,9 @@ drwxr-xr-x 2 root root 73728 2020-11-30 20:05 ./slackware64/l -rw-r--r-- 1 root root 426 2018-04-13 14:54 ./slackware64/l/libao-1.2.2-x86_64-2.txt -rw-r--r-- 1 root root 57720 2018-04-13 14:54 ./slackware64/l/libao-1.2.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 14:54 ./slackware64/l/libao-1.2.2-x86_64-2.txz.asc --rw-r--r-- 1 root root 402 2020-06-23 21:11 ./slackware64/l/libarchive-3.4.3-x86_64-2.txt --rw-r--r-- 1 root root 500392 2020-06-23 21:11 ./slackware64/l/libarchive-3.4.3-x86_64-2.txz --rw-r--r-- 1 root root 163 2020-06-23 21:11 ./slackware64/l/libarchive-3.4.3-x86_64-2.txz.asc +-rw-r--r-- 1 root root 402 2020-12-01 19:24 ./slackware64/l/libarchive-3.5.0-x86_64-1.txt +-rw-r--r-- 1 root root 502740 2020-12-01 19:24 ./slackware64/l/libarchive-3.5.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:24 ./slackware64/l/libarchive-3.5.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 369 2020-10-20 18:38 ./slackware64/l/libasyncns-0.8-x86_64-3.txt -rw-r--r-- 1 root root 22304 2020-10-20 18:38 ./slackware64/l/libasyncns-0.8-x86_64-3.txz -rw-r--r-- 1 root root 163 2020-10-20 18:38 ./slackware64/l/libasyncns-0.8-x86_64-3.txz.asc @@ -4073,7 +4073,7 @@ drwxr-xr-x 2 root root 4096 2020-04-05 21:10 ./slackware64/tcl -rw-r--r-- 1 root root 227 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txt -rw-r--r-- 1 root root 1780348 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txz.asc -drwxr-xr-x 2 root root 61440 2020-11-29 20:54 ./slackware64/x +drwxr-xr-x 2 root root 61440 2020-12-01 20:19 ./slackware64/x -rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt -rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc @@ -4212,9 +4212,9 @@ drwxr-xr-x 2 root root 61440 2020-11-29 20:54 ./slackware64/x -rw-r--r-- 1 root root 451 2018-06-06 02:14 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-3.txt -rw-r--r-- 1 root root 36508 2018-06-06 02:14 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-3.txz -rw-r--r-- 1 root root 163 2018-06-06 02:14 ./slackware64/x/font-xfree86-type1-1.0.4-noarch-3.txz.asc --rw-r--r-- 1 root root 385 2020-11-29 20:46 ./slackware64/x/fontconfig-2.13.93-x86_64-1.txt --rw-r--r-- 1 root root 320824 2020-11-29 20:46 ./slackware64/x/fontconfig-2.13.93-x86_64-1.txz --rw-r--r-- 1 root root 163 2020-11-29 20:46 ./slackware64/x/fontconfig-2.13.93-x86_64-1.txz.asc +-rw-r--r-- 1 root root 385 2020-05-19 18:39 ./slackware64/x/fontconfig-2.13.92-x86_64-1.txt +-rw-r--r-- 1 root root 315392 2020-05-19 18:39 ./slackware64/x/fontconfig-2.13.92-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-05-19 18:39 ./slackware64/x/fontconfig-2.13.92-x86_64-1.txz.asc -rw-r--r-- 1 root root 372 2020-10-21 21:39 ./slackware64/x/fonttosfnt-1.2.0-x86_64-1.txt -rw-r--r-- 1 root root 33480 2020-10-21 21:39 ./slackware64/x/fonttosfnt-1.2.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2020-10-21 21:39 ./slackware64/x/fonttosfnt-1.2.0-x86_64-1.txz.asc @@ -4880,21 +4880,21 @@ drwxr-xr-x 2 root root 61440 2020-11-29 20:54 ./slackware64/x -rw-r--r-- 1 root root 345 2018-04-13 06:10 ./slackware64/x/xorg-docs-1.7.1-noarch-2.txt -rw-r--r-- 1 root root 274568 2018-04-13 06:10 ./slackware64/x/xorg-docs-1.7.1-noarch-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xorg-docs-1.7.1-noarch-2.txz.asc --rw-r--r-- 1 root root 671 2020-09-11 18:49 ./slackware64/x/xorg-server-1.20.9-x86_64-3.txt --rw-r--r-- 1 root root 1755644 2020-09-11 18:49 ./slackware64/x/xorg-server-1.20.9-x86_64-3.txz --rw-r--r-- 1 root root 163 2020-09-11 18:49 ./slackware64/x/xorg-server-1.20.9-x86_64-3.txz.asc --rw-r--r-- 1 root root 370 2020-09-11 18:49 ./slackware64/x/xorg-server-xephyr-1.20.9-x86_64-3.txt --rw-r--r-- 1 root root 859772 2020-09-11 18:49 ./slackware64/x/xorg-server-xephyr-1.20.9-x86_64-3.txz --rw-r--r-- 1 root root 163 2020-09-11 18:49 ./slackware64/x/xorg-server-xephyr-1.20.9-x86_64-3.txz.asc --rw-r--r-- 1 root root 592 2020-09-11 18:49 ./slackware64/x/xorg-server-xnest-1.20.9-x86_64-3.txt --rw-r--r-- 1 root root 597708 2020-09-11 18:49 ./slackware64/x/xorg-server-xnest-1.20.9-x86_64-3.txz --rw-r--r-- 1 root root 163 2020-09-11 18:49 ./slackware64/x/xorg-server-xnest-1.20.9-x86_64-3.txz.asc --rw-r--r-- 1 root root 689 2020-09-11 18:49 ./slackware64/x/xorg-server-xvfb-1.20.9-x86_64-3.txt --rw-r--r-- 1 root root 721980 2020-09-11 18:49 ./slackware64/x/xorg-server-xvfb-1.20.9-x86_64-3.txz --rw-r--r-- 1 root root 163 2020-09-11 18:49 ./slackware64/x/xorg-server-xvfb-1.20.9-x86_64-3.txz.asc --rw-r--r-- 1 root root 816 2020-09-11 18:49 ./slackware64/x/xorg-server-xwayland-1.20.9-x86_64-3.txt --rw-r--r-- 1 root root 813708 2020-09-11 18:49 ./slackware64/x/xorg-server-xwayland-1.20.9-x86_64-3.txz --rw-r--r-- 1 root root 163 2020-09-11 18:49 ./slackware64/x/xorg-server-xwayland-1.20.9-x86_64-3.txz.asc +-rw-r--r-- 1 root root 671 2020-12-01 19:35 ./slackware64/x/xorg-server-1.20.10-x86_64-1.txt +-rw-r--r-- 1 root root 1756180 2020-12-01 19:35 ./slackware64/x/xorg-server-1.20.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:35 ./slackware64/x/xorg-server-1.20.10-x86_64-1.txz.asc +-rw-r--r-- 1 root root 370 2020-12-01 19:35 ./slackware64/x/xorg-server-xephyr-1.20.10-x86_64-1.txt +-rw-r--r-- 1 root root 859312 2020-12-01 19:35 ./slackware64/x/xorg-server-xephyr-1.20.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:35 ./slackware64/x/xorg-server-xephyr-1.20.10-x86_64-1.txz.asc +-rw-r--r-- 1 root root 592 2020-12-01 19:35 ./slackware64/x/xorg-server-xnest-1.20.10-x86_64-1.txt +-rw-r--r-- 1 root root 597376 2020-12-01 19:35 ./slackware64/x/xorg-server-xnest-1.20.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:35 ./slackware64/x/xorg-server-xnest-1.20.10-x86_64-1.txz.asc +-rw-r--r-- 1 root root 689 2020-12-01 19:35 ./slackware64/x/xorg-server-xvfb-1.20.10-x86_64-1.txt +-rw-r--r-- 1 root root 722240 2020-12-01 19:35 ./slackware64/x/xorg-server-xvfb-1.20.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:35 ./slackware64/x/xorg-server-xvfb-1.20.10-x86_64-1.txz.asc +-rw-r--r-- 1 root root 816 2020-12-01 19:35 ./slackware64/x/xorg-server-xwayland-1.20.10-x86_64-1.txt +-rw-r--r-- 1 root root 813984 2020-12-01 19:35 ./slackware64/x/xorg-server-xwayland-1.20.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:35 ./slackware64/x/xorg-server-xwayland-1.20.10-x86_64-1.txz.asc -rw-r--r-- 1 root root 669 2018-04-13 06:10 ./slackware64/x/xorg-sgml-doctools-1.11-x86_64-3.txt -rw-r--r-- 1 root root 24032 2018-04-13 06:10 ./slackware64/x/xorg-sgml-doctools-1.11-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xorg-sgml-doctools-1.11-x86_64-3.txz.asc @@ -4955,7 +4955,7 @@ drwxr-xr-x 2 root root 61440 2020-11-29 20:54 ./slackware64/x -rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt -rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc -drwxr-xr-x 2 root root 12288 2020-11-29 20:18 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2020-12-01 20:19 ./slackware64/xap -rw-r--r-- 1 root root 625 2020-04-05 20:17 ./slackware64/xap/MPlayer-20200103-x86_64-2.txt -rw-r--r-- 1 root root 2733304 2020-04-05 20:17 ./slackware64/xap/MPlayer-20200103-x86_64-2.txz -rw-r--r-- 1 root root 163 2020-04-05 20:17 ./slackware64/xap/MPlayer-20200103-x86_64-2.txz.asc @@ -5007,9 +5007,9 @@ drwxr-xr-x 2 root root 12288 2020-11-29 20:18 ./slackware64/xap -rw-r--r-- 1 root root 336 2020-05-31 18:24 ./slackware64/xap/gnuchess-6.2.7-x86_64-1.txt -rw-r--r-- 1 root root 1691024 2020-05-31 18:24 ./slackware64/xap/gnuchess-6.2.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2020-05-31 18:24 ./slackware64/xap/gnuchess-6.2.7-x86_64-1.txz.asc --rw-r--r-- 1 root root 644 2020-07-17 18:24 ./slackware64/xap/gnuplot-5.4.0-x86_64-1.txt --rw-r--r-- 1 root root 1539932 2020-07-17 18:24 ./slackware64/xap/gnuplot-5.4.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2020-07-17 18:24 ./slackware64/xap/gnuplot-5.4.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 644 2020-12-01 19:22 ./slackware64/xap/gnuplot-5.4.1-x86_64-1.txt +-rw-r--r-- 1 root root 1541700 2020-12-01 19:22 ./slackware64/xap/gnuplot-5.4.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2020-12-01 19:22 ./slackware64/xap/gnuplot-5.4.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 377 2020-01-21 17:43 ./slackware64/xap/gparted-1.1.0-x86_64-1.txt -rw-r--r-- 1 root root 862784 2020-01-21 17:43 ./slackware64/xap/gparted-1.1.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2020-01-21 17:43 ./slackware64/xap/gparted-1.1.0-x86_64-1.txz.asc @@ -5201,13 +5201,13 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2020-11-30 20:06 ./source --rw-r--r-- 1 root root 502351 2020-11-30 20:06 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2020-11-30 20:06 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 708380 2020-11-30 20:06 ./source/FILE_LIST --rw-r--r-- 1 root root 22249855 2020-11-30 20:06 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2020-12-01 20:20 ./source +-rw-r--r-- 1 root root 503615 2020-12-01 20:20 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2020-12-01 20:20 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 709806 2020-12-01 20:20 ./source/FILE_LIST +-rw-r--r-- 1 root root 22238404 2020-12-01 20:20 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT -drwxr-xr-x 119 root root 4096 2020-11-27 19:24 ./source/a +drwxr-xr-x 119 root root 4096 2020-12-01 19:58 ./source/a -rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2018-06-24 18:43 ./source/a/aaa_base -rw-r--r-- 1 root root 11115 2018-06-24 18:43 ./source/a/aaa_base/_aaa_base.tar.gz @@ -5596,8 +5596,8 @@ drwxr-xr-x 2 root root 4096 2019-11-07 22:20 ./source/a/hostname -rw-r--r-- 1 root root 50 2019-08-26 18:12 ./source/a/hostname/hostname.url -rw-r--r-- 1 root root 13672 2019-11-07 11:46 ./source/a/hostname/hostname_3.23.tar.gz -rw-r--r-- 1 root root 897 2018-02-27 06:13 ./source/a/hostname/slack-desc -drwxr-xr-x 2 root root 4096 2020-11-05 18:46 ./source/a/hwdata --rw-r--r-- 1 root root 1404172 2020-11-03 09:13 ./source/a/hwdata/hwdata-0.341.tar.lz +drwxr-xr-x 2 root root 4096 2020-12-01 19:23 ./source/a/hwdata +-rw-r--r-- 1 root root 1408205 2020-12-01 08:27 ./source/a/hwdata/hwdata-0.342.tar.lz -rwxr-xr-x 1 root root 4007 2019-09-29 23:48 ./source/a/hwdata/hwdata.SlackBuild -rw-r--r-- 1 root root 802 2018-02-27 06:13 ./source/a/hwdata/slack-desc drwxr-xr-x 4 root root 4096 2019-03-01 19:25 ./source/a/infozip @@ -5891,11 +5891,11 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/os-prober -rw-r--r-- 1 root root 338 2013-08-30 20:22 ./source/a/os-prober/os-prober.reiserfs.diff.gz -rw-r--r-- 1 root root 26660 2018-12-23 19:13 ./source/a/os-prober/os-prober_1.77.tar.xz -rw-r--r-- 1 root root 874 2018-02-27 06:13 ./source/a/os-prober/slack-desc -drwxr-xr-x 4 root root 4096 2020-10-20 18:31 ./source/a/pam --rw-r--r-- 1 root root 988908 2020-06-08 10:49 ./source/a/pam/Linux-PAM-1.4.0.tar.xz --rw-r--r-- 1 root root 801 2020-06-08 10:49 ./source/a/pam/Linux-PAM-1.4.0.tar.xz.asc +drwxr-xr-x 4 root root 4096 2020-12-01 19:30 ./source/a/pam +-rw-r--r-- 1 root root 972964 2020-11-25 18:28 ./source/a/pam/Linux-PAM-1.5.1.tar.xz +-rw-r--r-- 1 root root 801 2020-11-25 18:28 ./source/a/pam/Linux-PAM-1.5.1.tar.xz.asc -rw-r--r-- 1 root root 252 2014-07-26 06:55 ./source/a/pam/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2020-06-13 19:12 ./source/a/pam/fedora-patches +drwxr-xr-x 2 root root 4096 2020-11-11 19:58 ./source/a/pam/fedora-patches -rw-r--r-- 1 root root 487 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.1.3-nouserenv.patch.gz -rw-r--r-- 1 root root 534 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.1.6-limits-user.patch.gz -rw-r--r-- 1 root root 541 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.1.8-audit-user-mgmt.patch.gz @@ -5915,10 +5915,12 @@ drwxr-xr-x 2 root root 4096 2020-06-13 19:12 ./source/a/pam/fedora-patche -rw-r--r-- 1 root root 698 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch.gz -rw-r--r-- 1 root root 4944 2019-02-02 06:05 ./source/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch.gz -rw-r--r-- 1 root root 390 2020-06-13 19:12 ./source/a/pam/fedora-patches/pam-1.4.0-redhat-modules.patch.gz --rw-rw-r-- 1 root root 44588 2018-12-04 08:15 ./source/a/pam/pam-redhat-1.0.0.tar.lz --rwxr-xr-x 1 root root 8511 2020-10-20 18:31 ./source/a/pam/pam.SlackBuild +-rw-r--r-- 1 root root 857 2020-11-11 19:58 ./source/a/pam/fedora-patches/pam-1.5.0-redhat-modules.patch.gz +-rw-r--r-- 1 root root 36626 2020-12-01 19:27 ./source/a/pam/pam-redhat-1.1.4.tar.lz +-rw-r--r-- 1 root root 29 2020-12-01 19:30 ./source/a/pam/pam-redhat.url +-rwxr-xr-x 1 root root 8604 2020-12-01 19:29 ./source/a/pam/pam.SlackBuild -rw-r--r-- 1 root root 106 2019-07-16 18:05 ./source/a/pam/pam.url -drwxr-xr-x 2 root root 4096 2020-06-13 19:16 ./source/a/pam/patches +drwxr-xr-x 2 root root 4096 2020-12-01 19:29 ./source/a/pam/patches -rw-r--r-- 1 root root 386 2020-01-02 20:41 ./source/a/pam/patches/pam.etc.environment.better.comments.diff.gz -rw-r--r-- 1 root root 873 2019-07-16 20:25 ./source/a/pam/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/patch @@ -6771,11 +6773,11 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/sox -rw-r--r-- 1 root root 744 2018-06-26 22:00 ./source/ap/sox/slack-desc -rw-r--r-- 1 root root 763840 2015-02-22 21:04 ./source/ap/sox/sox-14.4.2.tar.xz -rwxr-xr-x 1 root root 4156 2019-09-29 23:48 ./source/ap/sox/sox.SlackBuild -drwxr-xr-x 2 root root 4096 2020-10-30 08:35 ./source/ap/sqlite +drwxr-xr-x 2 root root 4096 2020-12-01 19:33 ./source/ap/sqlite -rw-r--r-- 1 root root 1684 2008-08-01 05:31 ./source/ap/sqlite/COPYRIGHT.gz -rw-r--r-- 1 root root 937 2018-11-29 19:15 ./source/ap/sqlite/slack-desc --rw-r--r-- 1 root root 6964581 2020-08-15 00:19 ./source/ap/sqlite/sqlite-src-3330000.tar.lz --rwxr-xr-x 1 root root 6251 2020-10-30 08:35 ./source/ap/sqlite/sqlite.SlackBuild +-rw-r--r-- 1 root root 6981043 2020-12-01 19:19 ./source/ap/sqlite/sqlite-src-3340000.tar.lz +-rwxr-xr-x 1 root root 6251 2020-12-01 19:32 ./source/ap/sqlite/sqlite.SlackBuild drwxr-xr-x 2 root root 4096 2020-07-09 18:37 ./source/ap/squashfs-tools -rwxr-xr-x 1 root root 1939 2020-07-09 18:37 ./source/ap/squashfs-tools/get-squashfs-tools.sh -rw-r--r-- 1 root root 1078 2018-09-13 21:00 ./source/ap/squashfs-tools/slack-desc @@ -9286,10 +9288,10 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/libao -rw-r--r-- 1 root root 79396 2017-07-01 22:55 ./source/l/libao/libao-1.2.2.tar.xz -rwxr-xr-x 1 root root 3311 2019-09-29 23:48 ./source/l/libao/libao.SlackBuild -rw-r--r-- 1 root root 879 2018-02-27 06:12 ./source/l/libao/slack-desc -drwxr-xr-x 2 root root 4096 2020-05-22 17:35 ./source/l/libarchive --rw-r--r-- 1 root root 4811508 2020-05-20 01:36 ./source/l/libarchive/libarchive-3.4.3.tar.xz --rw-r--r-- 1 root root 833 2020-05-20 01:36 ./source/l/libarchive/libarchive-3.4.3.tar.xz.asc --rwxr-xr-x 1 root root 3666 2020-06-23 21:11 ./source/l/libarchive/libarchive.SlackBuild +drwxr-xr-x 2 root root 4096 2020-12-01 19:23 ./source/l/libarchive +-rw-r--r-- 1 root root 4852596 2020-12-01 10:09 ./source/l/libarchive/libarchive-3.5.0.tar.xz +-rw-r--r-- 1 root root 833 2020-12-01 10:09 ./source/l/libarchive/libarchive-3.5.0.tar.xz.asc +-rwxr-xr-x 1 root root 3666 2020-12-01 19:23 ./source/l/libarchive/libarchive.SlackBuild -rw-r--r-- 1 root root 41 2019-06-17 02:47 ./source/l/libarchive/libarchive.url -rw-r--r-- 1 root root 856 2018-02-27 06:12 ./source/l/libarchive/slack-desc drwxr-xr-x 2 root root 4096 2020-10-20 18:31 ./source/l/libasyncns @@ -11653,16 +11655,27 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/dejavu-fonts-ttf -rwxr-xr-x 1 root root 2983 2019-09-29 23:48 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild -rw-r--r-- 1 root root 169 2018-06-05 22:36 ./source/x/dejavu-fonts-ttf/doinst.sh.gz -rw-r--r-- 1 root root 904 2018-02-27 06:13 ./source/x/dejavu-fonts-ttf/slack-desc -drwxr-xr-x 3 root root 4096 2020-11-29 20:45 ./source/x/fontconfig +drwxr-xr-x 3 root root 4096 2020-05-19 18:10 ./source/x/fontconfig -rw-r--r-- 1 root root 139 2013-02-28 21:07 ./source/x/fontconfig/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2020-11-29 19:51 ./source/x/fontconfig/fedora-patches +drwxr-xr-x 2 root root 4096 2020-05-19 17:42 ./source/x/fontconfig/fedora-patches +-rw-r--r-- 1 root root 675 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch.gz +-rw-r--r-- 1 root root 438 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch.gz +-rw-r--r-- 1 root root 1969 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch.gz +-rw-r--r-- 1 root root 1629 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch.gz +-rw-r--r-- 1 root root 2275 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch.gz +-rw-r--r-- 1 root root 452 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch.gz +-rw-r--r-- 1 root root 814 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch.gz +-rw-r--r-- 1 root root 9115 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-mt.patch.gz +-rw-r--r-- 1 root root 2578 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-read-latest-cache.patch.gz +-rw-r--r-- 1 root root 419 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-required-freetype-version.patch.gz +-rw-r--r-- 1 root root 622 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-score-hint-on-match.patch.gz -rw-r--r-- 1 root root 326 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-sleep-less.patch.gz --rw-r--r-- 1 root root 1418288 2020-11-28 04:04 ./source/x/fontconfig/fontconfig-2.13.93.tar.xz --rwxr-xr-x 1 root root 6882 2020-11-29 20:52 ./source/x/fontconfig/fontconfig.SlackBuild --rw-r--r-- 1 root root 338 2020-11-29 20:41 ./source/x/fontconfig/fontconfig.dejavu.diff.gz --rw-r--r-- 1 root root 560 2020-11-29 19:44 ./source/x/fontconfig/fontconfig.font.dir.list.diff.gz --rw-r--r-- 1 root root 342 2020-11-29 20:42 ./source/x/fontconfig/fontconfig.liberation.diff.gz --rw-r--r-- 1 root root 341 2020-11-29 20:43 ./source/x/fontconfig/fontconfig.noto.diff.gz +-rw-r--r-- 1 root root 2714 2020-04-23 09:20 ./source/x/fontconfig/fedora-patches/fontconfig-sysroot.patch.gz +-rw-r--r-- 1 root root 1413128 2019-08-09 11:17 ./source/x/fontconfig/fontconfig-2.13.92.tar.xz +-rwxr-xr-x 1 root root 7824 2020-05-19 18:38 ./source/x/fontconfig/fontconfig.SlackBuild +-rw-r--r-- 1 root root 340 2017-04-30 19:35 ./source/x/fontconfig/fontconfig.dejavu.diff.gz +-rw-r--r-- 1 root root 574 2013-03-01 04:32 ./source/x/fontconfig/fontconfig.font.dir.list.diff.gz +-rw-r--r-- 1 root root 346 2017-04-30 19:19 ./source/x/fontconfig/fontconfig.liberation.diff.gz -rw-r--r-- 1 root root 30 2020-05-19 02:12 ./source/x/fontconfig/fontconfig.url -rw-r--r-- 1 root root 657 2007-01-25 05:00 ./source/x/fontconfig/setup.05.fontconfig -rw-r--r-- 1 root root 843 2020-05-19 02:09 ./source/x/fontconfig/slack-desc @@ -12238,7 +12251,7 @@ drwxr-xr-x 2 root root 12288 2020-05-18 17:49 ./source/x/x11/build -rw-r--r-- 1 root root 2 2019-03-04 22:09 ./source/x/x11/build/xmore -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xorg-cf-files -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xorg-docs --rw-r--r-- 1 root root 2 2020-09-11 18:39 ./source/x/x11/build/xorg-server +-rw-r--r-- 1 root root 2 2020-12-01 19:34 ./source/x/x11/build/xorg-server -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xorg-sgml-doctools -rw-r--r-- 1 root root 2 2019-06-20 17:41 ./source/x/x11/build/xorgproto -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xpr @@ -12417,21 +12430,21 @@ drwxr-xr-x 10 root root 4096 2019-10-28 19:02 ./source/x/x11/post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-lucidatypewriter-75dpi.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-ttf.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bh-type1.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-100dpi.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-75dpi.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-speedo.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-type1.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cronyx-cyrillic.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cursor-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-daewoo-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-dec-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-ibm-type1.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-isas-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-jis-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-micro-misc.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-cyrillic.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-ethiopic.post-install --rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-meltho.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-100dpi.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-75dpi.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-speedo.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-bitstream-type1.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cronyx-cyrillic.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-cursor-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-daewoo-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-dec-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-ibm-type1.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-isas-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-jis-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-micro-misc.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-cyrillic.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-ethiopic.post-install +-rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-misc-meltho.post-install -rw-r--r-- 1 root root 664 2008-02-01 03:22 ./source/x/x11/post-install/font-misc-misc.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-mutt-misc.post-install -rw-r--r-- 1 root root 275 2007-02-13 21:50 ./source/x/x11/post-install/font-schumacher-misc.post-install @@ -13024,8 +13037,8 @@ drwxr-xr-x 2 root root 4096 2020-02-23 17:53 ./source/x/x11/src/xcb -rw-r--r-- 1 root root 266716 2014-02-19 11:40 ./source/x/x11/src/xcb/xcb-util-wm-0.4.1.tar.xz -rw-r--r-- 1 root root 232228 2012-03-23 22:46 ./source/x/x11/src/xcb/xpyb-1.3.1.tar.xz -rw-r--r-- 1 root root 47 2018-03-23 18:19 ./source/x/x11/src/xf86-input-wacom.url -drwxr-xr-x 2 root root 4096 2020-08-25 17:30 ./source/x/x11/src/xserver --rw-r--r-- 1 root root 4970924 2020-08-25 15:45 ./source/x/x11/src/xserver/xorg-server-1.20.9.tar.xz +drwxr-xr-x 2 root root 4096 2020-12-01 19:33 ./source/x/x11/src/xserver +-rw-r--r-- 1 root root 4983864 2020-12-01 16:40 ./source/x/x11/src/xserver/xorg-server-1.20.10.tar.xz -rwxr-xr-x 1 root root 15219 2020-02-19 20:37 ./source/x/x11/x11.SlackBuild drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/xcm -rw-r--r-- 1 root root 744 2018-11-11 20:29 ./source/x/xcm/slack-desc @@ -13173,8 +13186,8 @@ drwxr-xr-x 2 root root 4096 2020-05-31 18:23 ./source/xap/gnuchess -rw-r--r-- 1 root root 792 2018-02-27 06:13 ./source/xap/gnuchess/slack-desc -rw-r--r-- 1 root root 2731760 2016-08-01 03:55 ./source/xap/gnuchess/xboard-4.9.1.tar.xz -rw-r--r-- 1 root root 269 2015-03-20 18:35 ./source/xap/gnuchess/xboard.conf.diff.gz -drwxr-xr-x 2 root root 4096 2020-07-17 18:21 ./source/xap/gnuplot --rw-r--r-- 1 root root 4536670 2020-07-16 17:15 ./source/xap/gnuplot/gnuplot-5.4.0.tar.lz +drwxr-xr-x 2 root root 4096 2020-12-01 19:21 ./source/xap/gnuplot +-rw-r--r-- 1 root root 4538380 2020-12-01 00:27 ./source/xap/gnuplot/gnuplot-5.4.1.tar.lz -rwxr-xr-x 1 root root 5047 2020-07-17 18:23 ./source/xap/gnuplot/gnuplot.SlackBuild -rw-r--r-- 1 root root 24 2018-06-05 04:25 ./source/xap/gnuplot/gnuplot.url -rw-r--r-- 1 root root 1099 2018-02-27 06:13 ./source/xap/gnuplot/slack-desc diff --git a/recompress.sh b/recompress.sh index bd23670f2..b37dceed6 100755 --- a/recompress.sh +++ b/recompress.sh @@ -191,6 +191,7 @@ gzip ./source/a/pam/fedora-patches/pam-1.3.1-unix-crypt_checksalt.patch gzip ./source/a/pam/fedora-patches/pam-1.3.1-unix-fix_checksalt_syslog.patch gzip ./source/a/pam/fedora-patches/pam-1.4.0-redhat-modules.patch gzip ./source/a/pam/fedora-patches/pam-1.3.1-noflex.patch +gzip ./source/a/pam/fedora-patches/pam-1.5.0-redhat-modules.patch gzip ./source/a/pam/fedora-patches/pam-1.3.1-unix-bcrypt_b.patch gzip ./source/a/pam/fedora-patches/pam-1.3.1-unix-yescrypt.patch gzip ./source/a/pam/fedora-patches/pam-1.3.1-coverity.patch @@ -1208,8 +1209,19 @@ gzip ./source/x/libvdpau/doinst.sh gzip ./source/x/ttf-tlwg/doinst.sh gzip ./source/x/xterm/doinst.sh gzip ./source/x/fontconfig/fontconfig.font.dir.list.diff -gzip ./source/x/fontconfig/fontconfig.noto.diff +gzip ./source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch gzip ./source/x/fontconfig/fedora-patches/fontconfig-sleep-less.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-score-hint-on-match.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-required-freetype-version.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-read-latest-cache.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-sysroot.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch +gzip ./source/x/fontconfig/fedora-patches/fontconfig-mt.patch gzip ./source/x/fontconfig/doinst.sh gzip ./source/x/fontconfig/fontconfig.liberation.diff gzip ./source/x/fontconfig/fontconfig.dejavu.diff diff --git a/source/a/pam/fedora-patches/pam-1.5.0-redhat-modules.patch b/source/a/pam/fedora-patches/pam-1.5.0-redhat-modules.patch new file mode 100644 index 000000000..82010bbad --- /dev/null +++ b/source/a/pam/fedora-patches/pam-1.5.0-redhat-modules.patch @@ -0,0 +1,74 @@ +--- ./doc/sag/pam_faillock.xml.orig 2020-11-10 09:46:13.000000000 -0600 ++++ ./doc/sag/pam_faillock.xml 2020-11-11 13:54:28.033031520 -0600 +@@ -36,3 +36,41 @@ + href="../../modules/pam_faillock/pam_faillock.8.xml" xpointer='xpointer(//refsect1[@id = "pam_faillock-author"]/*)'/> + + ++ ++ ++
++ pam_faillock - temporarily locking access based on failed authentication attempts during an interval ++ ++ ++ ++ ++ ++ ++
++ ++
++
++ ++
++
++ ++
++
++ ++
++
++ ++
++
++ ++
++
+--- ./configure.ac.orig 2020-11-11 13:54:28.033031520 -0600 ++++ ./configure.ac 2020-11-11 13:56:58.260034880 -0600 +@@ -639,6 +639,8 @@ + po/Makefile.in \ + Make.xml.rules \ + modules/Makefile \ ++ modules/pam_chroot/Makefile modules/pam_console/Makefile \ ++ modules/pam_postgresok/Makefile \ + modules/pam_access/Makefile \ + modules/pam_debug/Makefile modules/pam_deny/Makefile \ + modules/pam_echo/Makefile modules/pam_env/Makefile \ +--- ./modules/Makefile.am.orig 2020-11-11 13:54:28.033031520 -0600 ++++ ./modules/Makefile.am 2020-11-11 13:58:24.059036799 -0600 +@@ -44,6 +44,8 @@ + + SUBDIRS := \ + pam_access \ ++ pam_chroot \ ++ pam_console \ + pam_debug \ + pam_deny \ + pam_echo \ +@@ -67,6 +69,7 @@ + $(MAYBE_PAM_NAMESPACE) \ + pam_nologin \ + pam_permit \ ++ pam_postgresok \ + pam_pwhistory \ + $(MAYBE_PAM_RHOSTS) \ + pam_rootok \ diff --git a/source/a/pam/pam-redhat.url b/source/a/pam/pam-redhat.url new file mode 100644 index 000000000..f83042c0a --- /dev/null +++ b/source/a/pam/pam-redhat.url @@ -0,0 +1 @@ +https://pagure.io/pam-redhat diff --git a/source/a/pam/pam.SlackBuild b/source/a/pam/pam.SlackBuild index 9577c304a..a3499c1c0 100755 --- a/source/a/pam/pam.SlackBuild +++ b/source/a/pam/pam.SlackBuild @@ -27,7 +27,7 @@ SRCNAM=Linux-PAM PKGNAM=pam PAMRHVER=${PAMRHVER:-$(echo pam-redhat-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -98,13 +98,14 @@ for file in pam-redhat-$PAMRHVER/* ; do done # NOTE: Linux-PAM-1.4.0 already ships with most of these applied: #zcat $CWD/fedora-patches/pam-1.3.1-redhat-modules.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/fedora-patches/pam-1.4.0-redhat-modules.patch.gz | patch -p1 --verbose || exit 1 +#zcat $CWD/fedora-patches/pam-1.4.0-redhat-modules.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/fedora-patches/pam-1.5.0-redhat-modules.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/fedora-patches/pam-1.3.1-noflex.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/fedora-patches/pam-1.1.3-nouserenv.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/fedora-patches/pam-1.1.6-limits-user.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/fedora-patches/pam-1.1.8-full-relro.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/fedora-patches/pam-1.3.0-pwhistory-helper.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/fedora-patches/pam-1.1.8-audit-user-mgmt.patch.gz | patch -p1 --verbose || exit 1 +#zcat $CWD/fedora-patches/pam-1.1.8-audit-user-mgmt.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/fedora-patches/pam-1.3.0-unix-nomsg.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/fedora-patches/pam-1.3.1-coverity.patch.gz | patch -p1 --verbose || exit 1 #zcat $CWD/fedora-patches/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild index 781f7d40a..6e4df6f07 100755 --- a/source/ap/sqlite/sqlite.SlackBuild +++ b/source/ap/sqlite/sqlite.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sqlite -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # First, convert the .zip file if needed: if ls *.zip 1> /dev/null 2> /dev/null ; then diff --git a/source/l/libarchive/libarchive.SlackBuild b/source/l/libarchive/libarchive.SlackBuild index 5efbc40a7..3e11fa64a 100755 --- a/source/l/libarchive/libarchive.SlackBuild +++ b/source/l/libarchive/libarchive.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libarchive VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch b/source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch new file mode 100644 index 000000000..cfbc206f9 --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch @@ -0,0 +1,55 @@ +diff --git a/src/fccache.c b/src/fccache.c +index 2d398c73..7139b082 100644 +--- a/src/fccache.c ++++ b/src/fccache.c +@@ -845,7 +845,7 @@ FcCacheTimeValid (FcConfig *config, FcCache *cache, struct stat *dir_stat) + FcCacheDir (cache), cache->checksum, (int) dir_stat->st_mtime); + #endif + +- return cache->checksum == (int) dir_stat->st_mtime && fnano; ++ return dir_stat->st_mtime == 0 || (cache->checksum == (int) dir_stat->st_mtime && fnano); + } + + static FcBool +@@ -1041,17 +1041,39 @@ static FcBool + FcDirCacheMapHelper (FcConfig *config, int fd, struct stat *fd_stat, struct stat *dir_stat, struct timeval *latest_cache_mtime, void *closure) + { + FcCache *cache = FcDirCacheMapFd (config, fd, fd_stat, dir_stat); +- struct timeval cache_mtime; ++ struct timeval cache_mtime, zero_mtime = { 0, 0}, dir_mtime; + + if (!cache) + return FcFalse; + cache_mtime.tv_sec = fd_stat->st_mtime; ++ dir_mtime.tv_sec = dir_stat->st_mtime; + #ifdef HAVE_STRUCT_STAT_ST_MTIM + cache_mtime.tv_usec = fd_stat->st_mtim.tv_nsec / 1000; ++ dir_mtime.tv_usec = dir_stat->st_mtim.tv_nsec / 1000; + #else + cache_mtime.tv_usec = 0; ++ dir_mtime.tv_usec = 0; + #endif +- if (timercmp (latest_cache_mtime, &cache_mtime, <)) ++ /* special take care of OSTree */ ++ if (!timercmp (&zero_mtime, &dir_mtime, !=)) ++ { ++ if (!timercmp (&zero_mtime, &cache_mtime, !=)) ++ { ++ if (*((FcCache **) closure)) ++ FcDirCacheUnload (*((FcCache **) closure)); ++ } ++ else if (*((FcCache **) closure) && !timercmp (&zero_mtime, latest_cache_mtime, !=)) ++ { ++ FcDirCacheUnload (cache); ++ return FcFalse; ++ } ++ else if (timercmp (latest_cache_mtime, &cache_mtime, <)) ++ { ++ if (*((FcCache **) closure)) ++ FcDirCacheUnload (*((FcCache **) closure)); ++ } ++ } ++ else if (timercmp (latest_cache_mtime, &cache_mtime, <)) + { + if (*((FcCache **) closure)) + FcDirCacheUnload (*((FcCache **) closure)); diff --git a/source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch b/source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch new file mode 100644 index 000000000..8b773081f --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch @@ -0,0 +1,12 @@ +diff -pruN fontconfig-2.13.92.orig/src/fcformat.c fontconfig-2.13.92/src/fcformat.c +--- fontconfig-2.13.92.orig/src/fcformat.c 2018-07-19 12:14:39.000000000 +0900 ++++ fontconfig-2.13.92/src/fcformat.c 2020-01-20 13:05:33.626227767 +0900 +@@ -78,7 +78,7 @@ + #define FCCAT_FORMAT "\"%{file|basename|cescape}\" %{index} \"%{-file{%{=unparse|cescape}}}\"" + #define FCMATCH_FORMAT "%{file:-|basename}: \"%{family[0]:-}\" \"%{style[0]:-}\"" + #define FCLIST_FORMAT "%{?file{%{file}: }}%{-file{%{=unparse}}}" +-#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}%{[]lang{font(:lang=%{lang|downcase|translate(_,-)})\n}}" ++#define PKGKIT_FORMAT "%{[]family{font(%{family|downcase|delete( )})\n}}" + + + static void diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch new file mode 100644 index 000000000..fda5c2d65 --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-fix-1744377.patch @@ -0,0 +1,122 @@ +From fcada522913e5e07efa6367eff87ace9f06d24c8 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 28 Aug 2019 17:46:03 +0900 +Subject: [PATCH] Do not return FcFalse from FcConfigParseAndLoad*() if + complain is set to false + +https://bugzilla.redhat.com/show_bug.cgi?id=1744377 +--- + src/fcxml.c | 8 ++++--- + test/Makefile.am | 4 ++++ + test/test-bz1744377.c | 51 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+), 3 deletions(-) + create mode 100644 test/test-bz1744377.c + +diff --git a/src/fcxml.c b/src/fcxml.c +index 2e26e77a..076fa301 100644 +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -3526,7 +3526,7 @@ _FcConfigParse (FcConfig *config, + int len; + FcStrBuf sbuf; + char buf[BUFSIZ]; +- FcBool ret = FcFalse; ++ FcBool ret = FcFalse, complain_again = complain; + + #ifdef _WIN32 + if (!pGetSystemWindowsDirectory) +@@ -3605,7 +3605,7 @@ _FcConfigParse (FcConfig *config, + close (fd); + + ret = FcConfigParseAndLoadFromMemoryInternal (config, filename, FcStrBufDoneStatic (&sbuf), complain, load); +- complain = FcFalse; /* no need to reclaim here */ ++ complain_again = FcFalse; /* no need to reclaim here */ + bail1: + FcStrBufDestroy (&sbuf); + bail0: +@@ -3613,7 +3613,9 @@ bail0: + FcStrFree (filename); + if (realfilename) + FcStrFree (realfilename); +- if (!ret && complain) ++ if (!complain) ++ return FcTrue; ++ if (!ret && complain_again) + { + if (name) + FcConfigMessage (0, FcSevereError, "Cannot %s config file \"%s\"", load ? "load" : "scan", name); +diff --git a/test/Makefile.am b/test/Makefile.am +index f9c21581..a9fa089a 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -131,6 +131,10 @@ TESTS += test-d1f48f11 + endif + endif + ++check_PROGRAMS += test-bz1744377 ++test_bz1744377_LDADD = $(top_builddir)/src/libfontconfig.la ++TESTS += test-bz1744377 ++ + EXTRA_DIST=run-test.sh run-test-conf.sh $(LOG_COMPILER) $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names + + CLEANFILES=out out1 out2 fonts.conf out.expected +diff --git a/test/test-bz1744377.c b/test/test-bz1744377.c +new file mode 100644 +index 00000000..d7f10535 +--- /dev/null ++++ b/test/test-bz1744377.c +@@ -0,0 +1,51 @@ ++/* ++ * fontconfig/test/test-bz1744377.c ++ * ++ * Copyright © 2000 Keith Packard ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of the author(s) not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. The authors make no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++ * PERFORMANCE OF THIS SOFTWARE. ++ */ ++#include ++ ++int ++main (void) ++{ ++ const FcChar8 *doc = "" ++ "\n" ++ " blahblahblah\n" ++ "\n" ++ ""; ++ const FcChar8 *doc2 = "" ++ "\n" ++ " blahblahblah\n" ++ "\n" ++ ""; ++ FcConfig *cfg = FcConfigCreate (); ++ ++ if (!FcConfigParseAndLoadFromMemory (cfg, doc, FcTrue)) ++ return 1; ++ if (FcConfigParseAndLoadFromMemory (cfg, doc2, FcTrue)) ++ return 1; ++ if (!FcConfigParseAndLoadFromMemory (cfg, doc2, FcFalse)) ++ return 1; ++ ++ FcConfigDestroy (cfg); ++ ++ return 0; ++} +-- +2.23.0 + diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch new file mode 100644 index 000000000..2e337364d --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-fix-assertion.patch @@ -0,0 +1,144 @@ +From fbc05949ef52c8a8d69233eed77f6636dffec280 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 26 Feb 2020 15:42:21 +0900 +Subject: [PATCH] Fix assertion in FcFini() + +Due to the unproper initialization of `latest_mtime', the duplicate caches +was still in fcCacheChains with no references. which means no one frees +them. thus, the memory leak was happened. + +Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/227 +--- + src/fccache.c | 9 +++++---- + src/fcinit.c | 4 ++-- + 2 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/fccache.c b/src/fccache.c +index 4744a84..035458e 100644 +--- a/src/fccache.c ++++ b/src/fccache.c +@@ -365,7 +365,6 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, + struct stat file_stat, dir_stat; + FcBool ret = FcFalse; + const FcChar8 *sysroot = FcConfigGetSysRoot (config); +- struct timeval latest_mtime = (struct timeval){ 0 }; + + if (sysroot) + d = FcStrBuildFilename (sysroot, dir, NULL); +@@ -390,6 +389,8 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, + #ifndef _WIN32 + FcBool retried = FcFalse; + #endif ++ struct timeval latest_mtime = (struct timeval){ 0 }; ++ + if (sysroot) + cache_hashed = FcStrBuildFilename (sysroot, cache_dir, cache_base, NULL); + else +@@ -1081,12 +1082,12 @@ FcDirCacheLoadFile (const FcChar8 *cache_file, struct stat *file_stat) + + if (!file_stat) + file_stat = &my_file_stat; +- fd = FcDirCacheOpenFile (cache_file, file_stat); +- if (fd < 0) +- return NULL; + config = FcConfigReference (NULL); + if (!config) + return NULL; ++ fd = FcDirCacheOpenFile (cache_file, file_stat); ++ if (fd < 0) ++ return NULL; + cache = FcDirCacheMapFd (config, fd, file_stat, NULL); + FcConfigDestroy (config); + close (fd); +diff --git a/src/fcinit.c b/src/fcinit.c +index 6f82ebd..0e1421e 100644 +--- a/src/fcinit.c ++++ b/src/fcinit.c +@@ -199,10 +199,10 @@ void + FcFini (void) + { + FcConfigFini (); +- FcCacheFini (); ++ FcConfigPathFini (); + FcDefaultFini (); + FcObjectFini (); +- FcConfigPathFini (); ++ FcCacheFini (); + } + + /* +-- +2.24.1 + +From 6f6b39780215714386606ca1c5457a7106639ff4 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 23 Mar 2020 14:03:47 +0900 +Subject: [PATCH] Fix assertion in FcCacheFini() again + +The previous fix in fbc05949ef52c8a8d69233eed77f6636dffec280 was wrong. reverting. + +When reading older caches, FcDirCacheMapHelper() returns FcFalse and +it became the return value from FcDirCacheProcess() too, which is wrong. +Actually one of calls for FcDirCacheMapHelper() should be successfully +finished and closure should have a valid pointer for cache. + +Due to this, the proper finalization process wasn't running against +cache in closure. + +Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/227 +--- + src/fccache.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/fccache.c b/src/fccache.c +index 035458e..2d398c7 100644 +--- a/src/fccache.c ++++ b/src/fccache.c +@@ -365,6 +365,7 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, + struct stat file_stat, dir_stat; + FcBool ret = FcFalse; + const FcChar8 *sysroot = FcConfigGetSysRoot (config); ++ struct timeval latest_mtime = (struct timeval){ 0 }; + + if (sysroot) + d = FcStrBuildFilename (sysroot, dir, NULL); +@@ -389,7 +390,6 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, + #ifndef _WIN32 + FcBool retried = FcFalse; + #endif +- struct timeval latest_mtime = (struct timeval){ 0 }; + + if (sysroot) + cache_hashed = FcStrBuildFilename (sysroot, cache_dir, cache_base, NULL); +@@ -445,6 +445,8 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, + } + FcStrListDone (list); + ++ if (closure) ++ return !!(*((FcCache **)closure) != NULL); + return ret; + } + +@@ -792,7 +794,18 @@ FcCacheFini (void) + int i; + + for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) +- assert (fcCacheChains[i] == NULL); ++ { ++ if (FcDebug() & FC_DBG_CACHE) ++ { ++ if (fcCacheChains[i] != NULL) ++ { ++ FcCacheSkip *s = fcCacheChains[i]; ++ printf("Fontconfig error: not freed %p (dir: %s, refcount %d)\n", s->cache, FcCacheDir(s->cache), s->ref.count); ++ } ++ } ++ else ++ assert (fcCacheChains[i] == NULL); ++ } + assert (fcCacheMaxLevel == 0); + + free_lock (); +-- +2.24.1 + diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch new file mode 100644 index 000000000..9045fc053 --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd-id.patch @@ -0,0 +1,490 @@ +diff -uNr fontconfig-2.13.92.orig/conf.d/05-reset-dirs-sample.conf fontconfig-2.13.92/conf.d/05-reset-dirs-sample.conf +--- fontconfig-2.13.92.orig/conf.d/05-reset-dirs-sample.conf 2019-05-08 10:22:25.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/05-reset-dirs-sample.conf 2020-03-28 15:53:41.792757065 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + Re-define fonts dirs sample + +diff -uNr fontconfig-2.13.92.orig/conf.d/09-autohint-if-no-hinting.conf fontconfig-2.13.92/conf.d/09-autohint-if-no-hinting.conf +--- fontconfig-2.13.92.orig/conf.d/09-autohint-if-no-hinting.conf 2019-07-30 13:03:27.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/09-autohint-if-no-hinting.conf 2020-03-28 15:53:41.764757635 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-autohint.conf fontconfig-2.13.92/conf.d/10-autohint.conf +--- fontconfig-2.13.92.orig/conf.d/10-autohint.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-autohint.conf 2020-03-28 15:53:41.829756312 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-full.conf fontconfig-2.13.92/conf.d/10-hinting-full.conf +--- fontconfig-2.13.92.orig/conf.d/10-hinting-full.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-hinting-full.conf 2020-03-28 15:53:41.714758653 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-medium.conf fontconfig-2.13.92/conf.d/10-hinting-medium.conf +--- fontconfig-2.13.92.orig/conf.d/10-hinting-medium.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-hinting-medium.conf 2020-03-28 15:53:41.809756719 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-none.conf fontconfig-2.13.92/conf.d/10-hinting-none.conf +--- fontconfig-2.13.92.orig/conf.d/10-hinting-none.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-hinting-none.conf 2020-03-28 15:53:41.796756984 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-hinting-slight.conf fontconfig-2.13.92/conf.d/10-hinting-slight.conf +--- fontconfig-2.13.92.orig/conf.d/10-hinting-slight.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-hinting-slight.conf 2020-03-28 15:53:41.760757717 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-no-sub-pixel.conf fontconfig-2.13.92/conf.d/10-no-sub-pixel.conf +--- fontconfig-2.13.92.orig/conf.d/10-no-sub-pixel.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-no-sub-pixel.conf 2020-03-28 15:53:41.743758063 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-scale-bitmap-fonts.conf fontconfig-2.13.92/conf.d/10-scale-bitmap-fonts.conf +--- fontconfig-2.13.92.orig/conf.d/10-scale-bitmap-fonts.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-scale-bitmap-fonts.conf 2020-03-28 15:53:41.727758389 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-bgr.conf fontconfig-2.13.92/conf.d/10-sub-pixel-bgr.conf +--- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-bgr.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-sub-pixel-bgr.conf 2020-03-28 15:53:41.841756068 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-rgb.conf fontconfig-2.13.92/conf.d/10-sub-pixel-rgb.conf +--- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-rgb.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-sub-pixel-rgb.conf 2020-03-28 15:53:41.723758470 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vbgr.conf fontconfig-2.13.92/conf.d/10-sub-pixel-vbgr.conf +--- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vbgr.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-sub-pixel-vbgr.conf 2020-03-28 15:53:41.772757472 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vrgb.conf fontconfig-2.13.92/conf.d/10-sub-pixel-vrgb.conf +--- fontconfig-2.13.92.orig/conf.d/10-sub-pixel-vrgb.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-sub-pixel-vrgb.conf 2020-03-28 15:53:41.706758816 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/10-unhinted.conf fontconfig-2.13.92/conf.d/10-unhinted.conf +--- fontconfig-2.13.92.orig/conf.d/10-unhinted.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/10-unhinted.conf 2020-03-28 15:53:41.739758145 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/11-lcdfilter-default.conf fontconfig-2.13.92/conf.d/11-lcdfilter-default.conf +--- fontconfig-2.13.92.orig/conf.d/11-lcdfilter-default.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/11-lcdfilter-default.conf 2020-03-28 15:53:41.731758307 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/11-lcdfilter-legacy.conf fontconfig-2.13.92/conf.d/11-lcdfilter-legacy.conf +--- fontconfig-2.13.92.orig/conf.d/11-lcdfilter-legacy.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/11-lcdfilter-legacy.conf 2020-03-28 15:53:41.837756149 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/11-lcdfilter-light.conf fontconfig-2.13.92/conf.d/11-lcdfilter-light.conf +--- fontconfig-2.13.92.orig/conf.d/11-lcdfilter-light.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/11-lcdfilter-light.conf 2020-03-28 15:53:41.768757554 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/20-unhint-small-vera.conf fontconfig-2.13.92/conf.d/20-unhint-small-vera.conf +--- fontconfig-2.13.92.orig/conf.d/20-unhint-small-vera.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/20-unhint-small-vera.conf 2020-03-28 15:53:41.784757228 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/25-unhint-nonlatin.conf fontconfig-2.13.92/conf.d/25-unhint-nonlatin.conf +--- fontconfig-2.13.92.orig/conf.d/25-unhint-nonlatin.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/25-unhint-nonlatin.conf 2020-03-28 15:53:41.817756556 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/30-metric-aliases.conf fontconfig-2.13.92/conf.d/30-metric-aliases.conf +--- fontconfig-2.13.92.orig/conf.d/30-metric-aliases.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/30-metric-aliases.conf 2020-03-28 15:53:41.718758572 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/40-nonlatin.conf fontconfig-2.13.92/conf.d/40-nonlatin.conf +--- fontconfig-2.13.92.orig/conf.d/40-nonlatin.conf 2019-05-08 10:22:25.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/40-nonlatin.conf 2020-03-28 15:53:41.735758226 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/45-generic.conf fontconfig-2.13.92/conf.d/45-generic.conf +--- fontconfig-2.13.92.orig/conf.d/45-generic.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/45-generic.conf 2020-03-28 15:53:41.833756231 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/45-latin.conf fontconfig-2.13.92/conf.d/45-latin.conf +--- fontconfig-2.13.92.orig/conf.d/45-latin.conf 2019-05-08 10:22:25.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/45-latin.conf 2020-03-28 15:53:41.756757798 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/49-sansserif.conf fontconfig-2.13.92/conf.d/49-sansserif.conf +--- fontconfig-2.13.92.orig/conf.d/49-sansserif.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/49-sansserif.conf 2020-03-28 15:53:41.845755987 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/50-user.conf fontconfig-2.13.92/conf.d/50-user.conf +--- fontconfig-2.13.92.orig/conf.d/50-user.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/50-user.conf 2020-03-28 15:53:41.710758735 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/51-local.conf fontconfig-2.13.92/conf.d/51-local.conf +--- fontconfig-2.13.92.orig/conf.d/51-local.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/51-local.conf 2020-03-28 15:53:41.805756801 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/60-generic.conf fontconfig-2.13.92/conf.d/60-generic.conf +--- fontconfig-2.13.92.orig/conf.d/60-generic.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/60-generic.conf 2020-03-28 15:53:41.702758898 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/60-latin.conf fontconfig-2.13.92/conf.d/60-latin.conf +--- fontconfig-2.13.92.orig/conf.d/60-latin.conf 2019-05-08 10:22:25.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/60-latin.conf 2020-03-28 15:53:41.752757880 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + +diff -uNr fontconfig-2.13.92.orig/conf.d/65-fonts-persian.conf fontconfig-2.13.92/conf.d/65-fonts-persian.conf +--- fontconfig-2.13.92.orig/conf.d/65-fonts-persian.conf 2018-06-05 12:36:38.000000000 +0200 ++++ fontconfig-2.13.92/conf.d/65-fonts-persian.conf 2020-03-28 15:53:41.748757961 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + + + +diff -uNr fontconfig-2.13.92.orig/doc/fonts-conf.5 fontconfig-2.13.92/doc/fonts-conf.5 +--- fontconfig-2.13.92.orig/doc/fonts-conf.5 2019-08-09 13:12:20.000000000 +0200 ++++ fontconfig-2.13.92/doc/fonts-conf.5 2020-03-28 15:53:41.685759244 +0100 +@@ -264,7 +264,7 @@ + .sp + .nf + +- ++ + + \&... + +@@ -554,7 +554,7 @@ + .sp + .nf + +- ++ + + + + + +diff -uNr fontconfig-2.13.92.orig/fonts.conf.in fontconfig-2.13.92/fonts.conf.in +--- fontconfig-2.13.92.orig/fonts.conf.in 2019-05-08 10:22:25.000000000 +0200 ++++ fontconfig-2.13.92/fonts.conf.in 2020-03-28 15:53:41.698758979 +0100 +@@ -1,5 +1,5 @@ + +- ++ + + + diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch new file mode 100644 index 000000000..51655890d --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-fix-dtd.patch @@ -0,0 +1,26 @@ +From a4aa66a858f1ecd375c5efe5916398281f73f794 Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Wed, 20 Nov 2019 02:13:58 +0000 +Subject: [PATCH] Correct reset-dirs in DTD + +Empty elements need to be declared as such in well-formed DTDs. +--- + fonts.dtd | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fonts.dtd b/fonts.dtd +index f8c9f2c..40ecb4e 100644 +--- a/fonts.dtd ++++ b/fonts.dtd +@@ -124,7 +124,7 @@ + +- ++ + + - -- @FC_DEFAULT_FONTS@ +- @FC_DEFAULT_FONTS@ - @FC_FONTPATH@ + /usr/share/fonts/OTF + /usr/share/fonts/TTF @@ -16,18 +16,20 @@ fonts ~/.fonts + + - ++ diff --git a/source/x/fontconfig/fontconfig.liberation.diff b/source/x/fontconfig/fontconfig.liberation.diff index ecb707186..b9c9daeb8 100644 --- a/source/x/fontconfig/fontconfig.liberation.diff +++ b/source/x/fontconfig/fontconfig.liberation.diff @@ -1,34 +1,34 @@ ---- ./conf.d/60-latin.conf.orig 2020-11-27 19:56:42.000000000 -0600 -+++ ./conf.d/60-latin.conf 2020-11-29 14:42:35.363035464 -0600 -@@ -5,7 +5,10 @@ +--- ./conf.d/60-latin.conf.orig 2016-07-10 21:41:05.000000000 -0500 ++++ ./conf.d/60-latin.conf 2017-04-30 14:18:52.426996569 -0500 +@@ -4,8 +4,9 @@ serif +- Bitstream Vera Serif + Liberation Serif DejaVu Serif -+ Noto Serif + Bitstream Vera Serif Times New Roman Thorndale AMT Luxi Serif -@@ -17,7 +20,10 @@ +@@ -17,8 +18,9 @@ sans-serif +- Bitstream Vera Sans + Liberation Sans DejaVu Sans -+ Noto Sans + Bitstream Vera Sans Verdana Arial Albany AMT -@@ -33,7 +39,10 @@ +@@ -34,8 +36,9 @@ monospace +- Bitstream Vera Sans Mono + Liberation Mono DejaVu Sans Mono -+ Noto Sans Mono + Bitstream Vera Sans Mono Inconsolata Andale Mono diff --git a/source/x/fontconfig/fontconfig.noto.diff b/source/x/fontconfig/fontconfig.noto.diff deleted file mode 100644 index ea8bf8baf..000000000 --- a/source/x/fontconfig/fontconfig.noto.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- ./conf.d/60-latin.conf.orig 2020-11-27 19:56:42.000000000 -0600 -+++ ./conf.d/60-latin.conf 2020-11-29 14:43:33.291036760 -0600 -@@ -5,7 +5,10 @@ - - serif - -+ Noto Serif -+ Liberation Serif - DejaVu Serif -+ Bitstream Vera Serif - Times New Roman - Thorndale AMT - Luxi Serif -@@ -17,7 +20,10 @@ - - sans-serif - -+ Noto Sans -+ Liberation Sans - DejaVu Sans -+ Bitstream Vera Sans - Verdana - Arial - Albany AMT -@@ -33,7 +39,10 @@ - - monospace - -+ Noto Sans Mono -+ Liberation Mono - DejaVu Sans Mono -+ Bitstream Vera Sans Mono - Inconsolata - Andale Mono - Courier New diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xorg-server +++ b/source/x/x11/build/xorg-server @@ -1 +1 @@ -3 +1 -- cgit v1.2.3