From 98da28576517634e745ac6a4b65cf869a14bce79 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 8 Apr 2019 20:39:32 +0000 Subject: Mon Apr 8 20:39:32 UTC 2019 a/glibc-zoneinfo-2019a-noarch-1.txz: Upgraded. a/grub-2.02-x86_64-5.txz: Rebuilt. Support F2FS filesystem. Thanks to Nille_kungen. ap/cups-filters-1.22.5-x86_64-1.txz: Upgraded. ap/itstool-2.0.6-x86_64-1.txz: Upgraded. d/python-setuptools-41.0.0-x86_64-1.txz: Upgraded. l/gobject-introspection-1.60.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_39-x86_64-1.txz: Upgraded. l/libcroco-0.6.13-x86_64-1.txz: Upgraded. l/libnotify-0.7.8-x86_64-1.txz: Upgraded. n/cifs-utils-6.9-x86_64-1.txz: Upgraded. n/nfs-utils-2.3.3-x86_64-2.txz: Rebuilt. Include recovery directory. Thanks to upnort. n/samba-4.10.2-x86_64-1.txz: Upgraded. This is a security release in order to address the following defects: World writable files in Samba AD DC private/ dir. Save registry file outside share as unprivileged user. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3870 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3880 (* Security fix *) x/libva-2.4.1-x86_64-1.txz: Upgraded. x/pixman-0.38.2-x86_64-1.txz: Upgraded. xap/gimp-2.10.10-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 38 +- ChangeLog.txt | 26 + FILELIST.TXT | 224 +-- recompress.sh | 1 + source/a/grub/grub.SlackBuild | 10 +- source/a/grub/grub.f2fs.patch | 1514 ++++++++++++++++++++ source/l/libcroco/898e3a8c8c03.patch | 58 - source/l/libcroco/libcroco.SlackBuild | 5 +- source/l/libnotify/libnotify.SlackBuild | 33 +- source/n/nfs-utils/nfs-utils.SlackBuild | 5 +- source/n/nfs-utils/rc.nfsd | 8 + source/n/samba/samba.url | 4 +- .../pixman.remove.tests.that.fail.to.compile.diff | 194 ++- 13 files changed, 1863 insertions(+), 257 deletions(-) create mode 100644 source/a/grub/grub.f2fs.patch delete mode 100644 source/l/libcroco/898e3a8c8c03.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 6559b931d..1c7408c55 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,43 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Sat, 6 Apr 2019 17:21:20 GMT - Sun, 7 Apr 2019 15:59:42 GMT + Mon, 8 Apr 2019 20:39:32 GMT + Tue, 9 Apr 2019 06:59:42 GMT maintain_current_git.sh v 1.10 + + Mon, 8 Apr 2019 20:39:32 GMT + Mon, 8 Apr 2019 20:39:32 GMT + https://git.slackware.nl/current/tag/?h=20190408203932 + 20190408203932 + + +a/glibc-zoneinfo-2019a-noarch-1.txz: Upgraded. +a/grub-2.02-x86_64-5.txz: Rebuilt. + Support F2FS filesystem. Thanks to Nille_kungen. +ap/cups-filters-1.22.5-x86_64-1.txz: Upgraded. +ap/itstool-2.0.6-x86_64-1.txz: Upgraded. +d/python-setuptools-41.0.0-x86_64-1.txz: Upgraded. +l/gobject-introspection-1.60.1-x86_64-1.txz: Upgraded. +l/imagemagick-6.9.10_39-x86_64-1.txz: Upgraded. +l/libcroco-0.6.13-x86_64-1.txz: Upgraded. +l/libnotify-0.7.8-x86_64-1.txz: Upgraded. +n/cifs-utils-6.9-x86_64-1.txz: Upgraded. +n/nfs-utils-2.3.3-x86_64-2.txz: Rebuilt. + Include recovery directory. Thanks to upnort. +n/samba-4.10.2-x86_64-1.txz: Upgraded. + This is a security release in order to address the following defects: + World writable files in Samba AD DC private/ dir. + Save registry file outside share as unprivileged user. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3870 + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3880 + (* Security fix *) +x/libva-2.4.1-x86_64-1.txz: Upgraded. +x/pixman-0.38.2-x86_64-1.txz: Upgraded. +xap/gimp-2.10.10-x86_64-1.txz: Upgraded. + ]]> + + Sat, 6 Apr 2019 17:21:20 GMT Sat, 6 Apr 2019 17:21:20 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 1a0b15562..4523b2ce6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,29 @@ +Mon Apr 8 20:39:32 UTC 2019 +a/glibc-zoneinfo-2019a-noarch-1.txz: Upgraded. +a/grub-2.02-x86_64-5.txz: Rebuilt. + Support F2FS filesystem. Thanks to Nille_kungen. +ap/cups-filters-1.22.5-x86_64-1.txz: Upgraded. +ap/itstool-2.0.6-x86_64-1.txz: Upgraded. +d/python-setuptools-41.0.0-x86_64-1.txz: Upgraded. +l/gobject-introspection-1.60.1-x86_64-1.txz: Upgraded. +l/imagemagick-6.9.10_39-x86_64-1.txz: Upgraded. +l/libcroco-0.6.13-x86_64-1.txz: Upgraded. +l/libnotify-0.7.8-x86_64-1.txz: Upgraded. +n/cifs-utils-6.9-x86_64-1.txz: Upgraded. +n/nfs-utils-2.3.3-x86_64-2.txz: Rebuilt. + Include recovery directory. Thanks to upnort. +n/samba-4.10.2-x86_64-1.txz: Upgraded. + This is a security release in order to address the following defects: + World writable files in Samba AD DC private/ dir. + Save registry file outside share as unprivileged user. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3870 + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-3880 + (* Security fix *) +x/libva-2.4.1-x86_64-1.txz: Upgraded. +x/pixman-0.38.2-x86_64-1.txz: Upgraded. +xap/gimp-2.10.10-x86_64-1.txz: Upgraded. ++--------------------------+ Sat Apr 6 17:21:20 UTC 2019 a/kernel-generic-4.19.34-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.34-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 9f04a703b..5a6ac241f 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Sat Apr 6 19:55:46 UTC 2019 +Mon Apr 8 21:02:38 UTC 2019 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 2019-04-06 17:34 . +drwxr-xr-x 12 root root 4096 2019-04-08 20:39 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14341 2018-11-29 05:40 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 912866 2019-04-06 17:34 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-04-06 17:34 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 912866 2019-04-06 19:57 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-04-06 19:57 ./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 606354 2019-04-06 19:38 ./ChangeLog.txt +-rw-r--r-- 1 root root 607535 2019-04-08 20:39 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-04-06 05:37 ./EFI/BOOT -rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-04-06 05:37 ./EFI/BOOT -rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./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 1200590 2019-04-06 17:33 ./FILELIST.TXT +-rw-r--r-- 1 root root 1200590 2019-04-06 19:55 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 732375 2019-04-06 17:31 ./PACKAGES.TXT +-rw-r--r-- 1 root root 732376 2019-04-08 21:00 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-04-06 03:38 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -787,13 +787,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 2019-04-06 17:32 ./slackware64 --rw-r--r-- 1 root root 290566 2019-04-06 17:32 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-04-06 17:32 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361941 2019-04-06 17:29 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3636525 2019-04-06 17:30 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-04-08 21:01 ./slackware64 +-rw-r--r-- 1 root root 290569 2019-04-08 21:01 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-04-08 21:01 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361944 2019-04-08 20:58 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3639295 2019-04-08 20:59 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 28672 2019-04-06 17:29 ./slackware64/a +drwxr-xr-x 2 root root 28672 2019-04-08 20:58 ./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 @@ -902,9 +902,9 @@ drwxr-xr-x 2 root root 28672 2019-04-06 17:29 ./slackware64/a -rw-r--r-- 1 root root 323 2019-02-16 20:39 ./slackware64/a/glibc-solibs-2.29-x86_64-3.txt -rw-r--r-- 1 root root 2748280 2019-02-16 20:39 ./slackware64/a/glibc-solibs-2.29-x86_64-3.txz -rw-r--r-- 1 root root 163 2019-02-16 20:39 ./slackware64/a/glibc-solibs-2.29-x86_64-3.txz.asc --rw-r--r-- 1 root root 502 2019-01-11 20:29 ./slackware64/a/glibc-zoneinfo-2018i-noarch-1.txt --rw-r--r-- 1 root root 197988 2019-01-11 20:29 ./slackware64/a/glibc-zoneinfo-2018i-noarch-1.txz --rw-r--r-- 1 root root 163 2019-01-11 20:29 ./slackware64/a/glibc-zoneinfo-2018i-noarch-1.txz.asc +-rw-r--r-- 1 root root 502 2019-04-07 20:28 ./slackware64/a/glibc-zoneinfo-2019a-noarch-1.txt +-rw-r--r-- 1 root root 197800 2019-04-07 20:28 ./slackware64/a/glibc-zoneinfo-2019a-noarch-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:28 ./slackware64/a/glibc-zoneinfo-2019a-noarch-1.txz.asc -rw-r--r-- 1 root root 324 2018-04-28 19:24 ./slackware64/a/gpm-1.20.7-x86_64-7.txt -rw-r--r-- 1 root root 165620 2018-04-28 19:24 ./slackware64/a/gpm-1.20.7-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-28 19:24 ./slackware64/a/gpm-1.20.7-x86_64-7.txz.asc @@ -914,9 +914,9 @@ drwxr-xr-x 2 root root 28672 2019-04-06 17:29 ./slackware64/a -rw-r--r-- 1 root root 291 2018-12-21 16:49 ./slackware64/a/grep-3.3-x86_64-1.txt -rw-r--r-- 1 root root 263364 2018-12-21 16:49 ./slackware64/a/grep-3.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-21 16:49 ./slackware64/a/grep-3.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 182 2018-09-22 18:41 ./slackware64/a/grub-2.02-x86_64-4.txt --rw-r--r-- 1 root root 10964500 2018-09-22 18:41 ./slackware64/a/grub-2.02-x86_64-4.txz --rw-r--r-- 1 root root 163 2018-09-22 18:41 ./slackware64/a/grub-2.02-x86_64-4.txz.asc +-rw-r--r-- 1 root root 182 2019-04-08 19:42 ./slackware64/a/grub-2.02-x86_64-5.txt +-rw-r--r-- 1 root root 10991440 2019-04-08 19:42 ./slackware64/a/grub-2.02-x86_64-5.txz +-rw-r--r-- 1 root root 163 2019-04-08 19:42 ./slackware64/a/grub-2.02-x86_64-5.txz.asc -rw-r--r-- 1 root root 314 2018-12-30 19:21 ./slackware64/a/gzip-1.10-x86_64-1.txt -rw-r--r-- 1 root root 109628 2018-12-30 19:21 ./slackware64/a/gzip-1.10-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-30 19:21 ./slackware64/a/gzip-1.10-x86_64-1.txz.asc @@ -1144,7 +1144,7 @@ drwxr-xr-x 2 root root 28672 2019-04-06 17:29 ./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 2019-04-05 20:38 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2019-04-08 20:58 ./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 @@ -1181,9 +1181,9 @@ drwxr-xr-x 2 root root 20480 2019-04-05 20:38 ./slackware64/ap -rw-r--r-- 1 root root 642 2019-03-23 19:11 ./slackware64/ap/cups-2.2.11-x86_64-1.txt -rw-r--r-- 1 root root 1464412 2019-03-23 19:11 ./slackware64/ap/cups-2.2.11-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-03-23 19:11 ./slackware64/ap/cups-2.2.11-x86_64-1.txz.asc --rw-r--r-- 1 root root 416 2019-03-26 18:29 ./slackware64/ap/cups-filters-1.22.3-x86_64-1.txt --rw-r--r-- 1 root root 757200 2019-03-26 18:29 ./slackware64/ap/cups-filters-1.22.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-03-26 18:29 ./slackware64/ap/cups-filters-1.22.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 416 2019-04-07 20:39 ./slackware64/ap/cups-filters-1.22.5-x86_64-1.txt +-rw-r--r-- 1 root root 757484 2019-04-07 20:39 ./slackware64/ap/cups-filters-1.22.5-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:39 ./slackware64/ap/cups-filters-1.22.5-x86_64-1.txz.asc -rw-r--r-- 1 root root 576 2018-11-07 23:24 ./slackware64/ap/dash-0.5.10.2-x86_64-1.txt -rw-r--r-- 1 root root 85340 2018-11-07 23:24 ./slackware64/ap/dash-0.5.10.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-07 23:24 ./slackware64/ap/dash-0.5.10.2-x86_64-1.txz.asc @@ -1240,9 +1240,9 @@ drwxr-xr-x 2 root root 20480 2019-04-05 20:38 ./slackware64/ap -rw-r--r-- 1 root root 597 2018-04-13 13:22 ./slackware64/ap/ispell-3.4.00-x86_64-2.txt -rw-r--r-- 1 root root 341992 2018-04-13 13:22 ./slackware64/ap/ispell-3.4.00-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:22 ./slackware64/ap/ispell-3.4.00-x86_64-2.txz.asc --rw-r--r-- 1 root root 381 2018-11-24 19:12 ./slackware64/ap/itstool-2.0.5-x86_64-1.txt --rw-r--r-- 1 root root 40824 2018-11-24 19:12 ./slackware64/ap/itstool-2.0.5-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-11-24 19:12 ./slackware64/ap/itstool-2.0.5-x86_64-1.txz.asc +-rw-r--r-- 1 root root 381 2019-04-08 19:08 ./slackware64/ap/itstool-2.0.6-x86_64-1.txt +-rw-r--r-- 1 root root 40800 2019-04-08 19:08 ./slackware64/ap/itstool-2.0.6-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-08 19:08 ./slackware64/ap/itstool-2.0.6-x86_64-1.txz.asc -rw-r--r-- 1 root root 478 2018-04-13 13:22 ./slackware64/ap/jed-0.99_19-x86_64-3.txt -rw-r--r-- 1 root root 530360 2018-04-13 13:22 ./slackware64/ap/jed-0.99_19-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:22 ./slackware64/ap/jed-0.99_19-x86_64-3.txz.asc @@ -1390,7 +1390,7 @@ drwxr-xr-x 2 root root 20480 2019-04-05 20:38 ./slackware64/ap -rw-r--r-- 1 root root 506 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txt -rw-r--r-- 1 root root 3008036 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 20480 2019-04-06 17:29 ./slackware64/d +drwxr-xr-x 2 root root 20480 2019-04-08 20:58 ./slackware64/d -rw-r--r-- 1 root root 360 2019-02-28 19:27 ./slackware64/d/Cython-0.29.6-x86_64-1.txt -rw-r--r-- 1 root root 3074148 2019-02-28 19:27 ./slackware64/d/Cython-0.29.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-28 19:27 ./slackware64/d/Cython-0.29.6-x86_64-1.txz.asc @@ -1545,9 +1545,9 @@ drwxr-xr-x 2 root root 20480 2019-04-06 17:29 ./slackware64/d -rw-r--r-- 1 root root 270 2019-02-21 19:57 ./slackware64/d/python-pip-19.0.3-x86_64-1.txt -rw-r--r-- 1 root root 2104760 2019-02-21 19:57 ./slackware64/d/python-pip-19.0.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-21 19:57 ./slackware64/d/python-pip-19.0.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 562 2019-04-04 18:32 ./slackware64/d/python-setuptools-40.9.0-x86_64-1.txt --rw-r--r-- 1 root root 666204 2019-04-04 18:32 ./slackware64/d/python-setuptools-40.9.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-04-04 18:32 ./slackware64/d/python-setuptools-40.9.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 562 2019-04-07 20:16 ./slackware64/d/python-setuptools-41.0.0-x86_64-1.txt +-rw-r--r-- 1 root root 665816 2019-04-07 20:16 ./slackware64/d/python-setuptools-41.0.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:16 ./slackware64/d/python-setuptools-41.0.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 663 2019-04-03 21:38 ./slackware64/d/python3-3.7.3-x86_64-2.txt -rw-r--r-- 1 root root 14458724 2019-04-03 21:38 ./slackware64/d/python3-3.7.3-x86_64-2.txz -rw-r--r-- 1 root root 163 2019-04-03 21:38 ./slackware64/d/python3-3.7.3-x86_64-2.txz.asc @@ -2455,7 +2455,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 69632 2019-04-05 21:10 ./slackware64/l +drwxr-xr-x 2 root root 69632 2019-04-08 20:58 ./slackware64/l -rw-r--r-- 1 root root 338 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txt -rw-r--r-- 1 root root 149752 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz.asc @@ -2708,9 +2708,9 @@ drwxr-xr-x 2 root root 69632 2019-04-05 21:10 ./slackware64/l -rw-r--r-- 1 root root 280 2018-11-07 23:36 ./slackware64/l/gnu-efi-3.0.9-x86_64-1.txt -rw-r--r-- 1 root root 113544 2018-11-07 23:36 ./slackware64/l/gnu-efi-3.0.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-07 23:36 ./slackware64/l/gnu-efi-3.0.9-x86_64-1.txz.asc --rw-r--r-- 1 root root 634 2019-03-10 20:53 ./slackware64/l/gobject-introspection-1.60.0-x86_64-1.txt --rw-r--r-- 1 root root 1245732 2019-03-10 20:53 ./slackware64/l/gobject-introspection-1.60.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-03-10 20:53 ./slackware64/l/gobject-introspection-1.60.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 634 2019-04-07 20:40 ./slackware64/l/gobject-introspection-1.60.1-x86_64-1.txt +-rw-r--r-- 1 root root 1246464 2019-04-07 20:40 ./slackware64/l/gobject-introspection-1.60.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:40 ./slackware64/l/gobject-introspection-1.60.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 439 2018-04-17 07:42 ./slackware64/l/grantlee-0.5.1-x86_64-2.txt -rw-r--r-- 1 root root 285392 2018-04-17 07:42 ./slackware64/l/grantlee-0.5.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-17 07:42 ./slackware64/l/grantlee-0.5.1-x86_64-2.txz.asc @@ -2786,9 +2786,9 @@ drwxr-xr-x 2 root root 69632 2019-04-05 21:10 ./slackware64/l -rw-r--r-- 1 root root 370 2018-04-17 07:49 ./slackware64/l/ilmbase-2.2.0-x86_64-2.txt -rw-r--r-- 1 root root 138092 2018-04-17 07:49 ./slackware64/l/ilmbase-2.2.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-17 07:49 ./slackware64/l/ilmbase-2.2.0-x86_64-2.txz.asc --rw-r--r-- 1 root root 537 2019-04-04 18:48 ./slackware64/l/imagemagick-6.9.10_37-x86_64-1.txt --rw-r--r-- 1 root root 6750168 2019-04-04 18:48 ./slackware64/l/imagemagick-6.9.10_37-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-04-04 18:48 ./slackware64/l/imagemagick-6.9.10_37-x86_64-1.txz.asc +-rw-r--r-- 1 root root 537 2019-04-07 20:44 ./slackware64/l/imagemagick-6.9.10_39-x86_64-1.txt +-rw-r--r-- 1 root root 6747940 2019-04-07 20:44 ./slackware64/l/imagemagick-6.9.10_39-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:44 ./slackware64/l/imagemagick-6.9.10_39-x86_64-1.txz.asc -rwxr-xr-x 1 root root 2897 2009-06-24 22:06 ./slackware64/l/install-packages -rw-r--r-- 1 root root 446 2006-09-18 10:41 ./slackware64/l/install.end -rw-r--r-- 1 root root 403 2019-01-26 19:42 ./slackware64/l/iso-codes-4.2-noarch-1.txt @@ -2875,9 +2875,9 @@ drwxr-xr-x 2 root root 69632 2019-04-05 21:10 ./slackware64/l -rw-r--r-- 1 root root 327 2018-12-30 00:07 ./slackware64/l/libclc-20181127_1ecb16d-x86_64-1.txt -rw-r--r-- 1 root root 5060772 2018-12-30 00:07 ./slackware64/l/libclc-20181127_1ecb16d-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-30 00:07 ./slackware64/l/libclc-20181127_1ecb16d-x86_64-1.txz.asc --rw-r--r-- 1 root root 402 2018-04-13 14:56 ./slackware64/l/libcroco-0.6.12-x86_64-2.txt --rw-r--r-- 1 root root 215592 2018-04-13 14:56 ./slackware64/l/libcroco-0.6.12-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-04-13 14:56 ./slackware64/l/libcroco-0.6.12-x86_64-2.txz.asc +-rw-r--r-- 1 root root 402 2019-04-07 20:51 ./slackware64/l/libcroco-0.6.13-x86_64-1.txt +-rw-r--r-- 1 root root 216200 2019-04-07 20:51 ./slackware64/l/libcroco-0.6.13-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:51 ./slackware64/l/libcroco-0.6.13-x86_64-1.txz.asc -rw-r--r-- 1 root root 458 2018-04-17 07:55 ./slackware64/l/libdbusmenu-qt-0.9.2-x86_64-3.txt -rw-r--r-- 1 root root 157540 2018-04-17 07:55 ./slackware64/l/libdbusmenu-qt-0.9.2-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-17 07:55 ./slackware64/l/libdbusmenu-qt-0.9.2-x86_64-3.txz.asc @@ -2980,9 +2980,9 @@ drwxr-xr-x 2 root root 69632 2019-04-05 21:10 ./slackware64/l -rw-r--r-- 1 root root 518 2018-04-14 22:41 ./slackware64/l/libnl3-3.4.0-x86_64-2.txt -rw-r--r-- 1 root root 363764 2018-04-14 22:41 ./slackware64/l/libnl3-3.4.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-14 22:41 ./slackware64/l/libnl3-3.4.0-x86_64-2.txz.asc --rw-r--r-- 1 root root 244 2018-04-13 15:01 ./slackware64/l/libnotify-0.7.7-x86_64-2.txt --rw-r--r-- 1 root root 46848 2018-04-13 15:01 ./slackware64/l/libnotify-0.7.7-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-04-13 15:01 ./slackware64/l/libnotify-0.7.7-x86_64-2.txz.asc +-rw-r--r-- 1 root root 244 2019-04-07 20:48 ./slackware64/l/libnotify-0.7.8-x86_64-1.txt +-rw-r--r-- 1 root root 47356 2019-04-07 20:48 ./slackware64/l/libnotify-0.7.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:48 ./slackware64/l/libnotify-0.7.8-x86_64-1.txz.asc -rw-r--r-- 1 root root 315 2018-11-08 00:11 ./slackware64/l/libodfgen-0.1.7-x86_64-1.txt -rw-r--r-- 1 root root 371544 2018-11-08 00:11 ./slackware64/l/libodfgen-0.1.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-08 00:11 ./slackware64/l/libodfgen-0.1.7-x86_64-1.txz.asc @@ -3421,7 +3421,7 @@ drwxr-xr-x 2 root root 69632 2019-04-05 21:10 ./slackware64/l -rw-r--r-- 1 root root 463 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txt -rw-r--r-- 1 root root 385208 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2019-04-05 20:38 ./slackware64/n +drwxr-xr-x 2 root root 36864 2019-04-08 20:58 ./slackware64/n -rw-r--r-- 1 root root 357 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txt -rw-r--r-- 1 root root 1644036 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txz.asc @@ -3458,9 +3458,9 @@ drwxr-xr-x 2 root root 36864 2019-04-05 20:38 ./slackware64/n -rw-r--r-- 1 root root 367 2019-03-08 17:47 ./slackware64/n/ca-certificates-20190308-noarch-1.txt -rw-r--r-- 1 root root 135672 2019-03-08 17:47 ./slackware64/n/ca-certificates-20190308-noarch-1.txz -rw-r--r-- 1 root root 163 2019-03-08 17:47 ./slackware64/n/ca-certificates-20190308-noarch-1.txz.asc --rw-r--r-- 1 root root 603 2018-11-15 17:51 ./slackware64/n/cifs-utils-6.8-x86_64-1.txt --rw-r--r-- 1 root root 187076 2018-11-15 17:51 ./slackware64/n/cifs-utils-6.8-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-11-15 17:51 ./slackware64/n/cifs-utils-6.8-x86_64-1.txz.asc +-rw-r--r-- 1 root root 603 2019-04-07 20:38 ./slackware64/n/cifs-utils-6.9-x86_64-1.txt +-rw-r--r-- 1 root root 195704 2019-04-07 20:38 ./slackware64/n/cifs-utils-6.9-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:38 ./slackware64/n/cifs-utils-6.9-x86_64-1.txz.asc -rw-r--r-- 1 root root 597 2018-05-28 18:01 ./slackware64/n/conntrack-tools-1.4.5-x86_64-1.txt -rw-r--r-- 1 root root 156000 2018-05-28 18:01 ./slackware64/n/conntrack-tools-1.4.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-05-28 18:01 ./slackware64/n/conntrack-tools-1.4.5-x86_64-1.txz.asc @@ -3708,9 +3708,9 @@ drwxr-xr-x 2 root root 36864 2019-04-05 20:38 ./slackware64/n -rw-r--r-- 1 root root 456 2018-04-13 15:43 ./slackware64/n/nfacct-1.0.2-x86_64-2.txt -rw-r--r-- 1 root root 13920 2018-04-13 15:43 ./slackware64/n/nfacct-1.0.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 15:43 ./slackware64/n/nfacct-1.0.2-x86_64-2.txz.asc --rw-r--r-- 1 root root 322 2018-11-15 18:05 ./slackware64/n/nfs-utils-2.3.3-x86_64-1.txt --rw-r--r-- 1 root root 234052 2018-11-15 18:05 ./slackware64/n/nfs-utils-2.3.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-11-15 18:05 ./slackware64/n/nfs-utils-2.3.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 322 2019-04-08 19:32 ./slackware64/n/nfs-utils-2.3.3-x86_64-2.txt +-rw-r--r-- 1 root root 234424 2019-04-08 19:32 ./slackware64/n/nfs-utils-2.3.3-x86_64-2.txz +-rw-r--r-- 1 root root 163 2019-04-08 19:32 ./slackware64/n/nfs-utils-2.3.3-x86_64-2.txz.asc -rw-r--r-- 1 root root 535 2019-04-03 21:31 ./slackware64/n/nftables-0.9.0-x86_64-3.txt -rw-r--r-- 1 root root 199348 2019-04-03 21:31 ./slackware64/n/nftables-0.9.0-x86_64-3.txz -rw-r--r-- 1 root root 163 2019-04-03 21:31 ./slackware64/n/nftables-0.9.0-x86_64-3.txz.asc @@ -3795,9 +3795,9 @@ drwxr-xr-x 2 root root 36864 2019-04-05 20:38 ./slackware64/n -rw-r--r-- 1 root root 443 2019-03-08 16:52 ./slackware64/n/s-nail-14.9.13-x86_64-1.txt -rw-r--r-- 1 root root 507596 2019-03-08 16:52 ./slackware64/n/s-nail-14.9.13-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-03-08 16:52 ./slackware64/n/s-nail-14.9.13-x86_64-1.txz.asc --rw-r--r-- 1 root root 507 2019-04-03 22:00 ./slackware64/n/samba-4.10.1-x86_64-1.txt --rw-r--r-- 1 root root 12748228 2019-04-03 22:00 ./slackware64/n/samba-4.10.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-04-03 22:00 ./slackware64/n/samba-4.10.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 507 2019-04-08 19:35 ./slackware64/n/samba-4.10.2-x86_64-1.txt +-rw-r--r-- 1 root root 12752552 2019-04-08 19:35 ./slackware64/n/samba-4.10.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-08 19:35 ./slackware64/n/samba-4.10.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 346 2018-11-08 00:52 ./slackware64/n/slrn-1.0.3a-x86_64-1.txt -rw-r--r-- 1 root root 470008 2018-11-08 00:52 ./slackware64/n/slrn-1.0.3a-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-08 00:52 ./slackware64/n/slrn-1.0.3a-x86_64-1.txz.asc @@ -3901,7 +3901,7 @@ drwxr-xr-x 2 root root 4096 2018-11-24 20:50 ./slackware64/tcl -rw-r--r-- 1 root root 227 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txt -rw-r--r-- 1 root root 1771556 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2019-03-29 18:32 ./slackware64/x +drwxr-xr-x 2 root root 65536 2019-04-08 20:58 ./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 @@ -4222,9 +4222,9 @@ drwxr-xr-x 2 root root 65536 2019-03-29 18:32 ./slackware64/x -rw-r--r-- 1 root root 536 2018-10-01 22:34 ./slackware64/x/libpthread-stubs-0.4-x86_64-3.txt -rw-r--r-- 1 root root 3160 2018-10-01 22:34 ./slackware64/x/libpthread-stubs-0.4-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-10-01 22:34 ./slackware64/x/libpthread-stubs-0.4-x86_64-3.txz.asc --rw-r--r-- 1 root root 423 2019-01-30 19:41 ./slackware64/x/libva-2.4.0-x86_64-1.txt --rw-r--r-- 1 root root 139920 2019-01-30 19:41 ./slackware64/x/libva-2.4.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-01-30 19:41 ./slackware64/x/libva-2.4.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 423 2019-04-08 19:11 ./slackware64/x/libva-2.4.1-x86_64-1.txt +-rw-r--r-- 1 root root 140700 2019-04-08 19:11 ./slackware64/x/libva-2.4.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-08 19:11 ./slackware64/x/libva-2.4.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 294 2019-02-02 21:49 ./slackware64/x/libva-utils-2.4.0-x86_64-1.txt -rw-r--r-- 1 root root 426512 2019-02-02 21:49 ./slackware64/x/libva-utils-2.4.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-02 21:49 ./slackware64/x/libva-utils-2.4.0-x86_64-1.txz.asc @@ -4284,9 +4284,9 @@ drwxr-xr-x 2 root root 65536 2019-03-29 18:32 ./slackware64/x -rw-r--r-- 1 root root 222 2018-04-13 06:03 ./slackware64/x/oclock-1.0.4-x86_64-2.txt -rw-r--r-- 1 root root 21468 2018-04-13 06:03 ./slackware64/x/oclock-1.0.4-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:03 ./slackware64/x/oclock-1.0.4-x86_64-2.txz.asc --rw-r--r-- 1 root root 366 2019-02-12 19:55 ./slackware64/x/pixman-0.38.0-x86_64-1.txt --rw-r--r-- 1 root root 237264 2019-02-12 19:55 ./slackware64/x/pixman-0.38.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-02-12 19:55 ./slackware64/x/pixman-0.38.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 366 2019-04-08 17:41 ./slackware64/x/pixman-0.38.2-x86_64-1.txt +-rw-r--r-- 1 root root 237204 2019-04-08 17:41 ./slackware64/x/pixman-0.38.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-08 17:41 ./slackware64/x/pixman-0.38.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 235 2019-02-23 19:55 ./slackware64/x/pyxdg-0.26-x86_64-1.txt -rw-r--r-- 1 root root 112080 2019-02-23 19:55 ./slackware64/x/pyxdg-0.26-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-23 19:55 ./slackware64/x/pyxdg-0.26-x86_64-1.txz.asc @@ -4762,7 +4762,7 @@ drwxr-xr-x 2 root root 65536 2019-03-29 18:32 ./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 2019-04-05 20:38 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2019-04-08 20:58 ./slackware64/xap -rw-r--r-- 1 root root 625 2018-07-20 18:36 ./slackware64/xap/MPlayer-20180720-x86_64-1.txt -rw-r--r-- 1 root root 2733036 2018-07-20 18:36 ./slackware64/xap/MPlayer-20180720-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-07-20 18:36 ./slackware64/xap/MPlayer-20180720-x86_64-1.txz.asc @@ -4799,9 +4799,9 @@ drwxr-xr-x 2 root root 12288 2019-04-05 20:38 ./slackware64/xap -rw-r--r-- 1 root root 443 2019-04-03 21:18 ./slackware64/xap/gftp-2.0.19-x86_64-8.txt -rw-r--r-- 1 root root 584320 2019-04-03 21:18 ./slackware64/xap/gftp-2.0.19-x86_64-8.txz -rw-r--r-- 1 root root 163 2019-04-03 21:18 ./slackware64/xap/gftp-2.0.19-x86_64-8.txz.asc --rw-r--r-- 1 root root 471 2018-11-08 22:38 ./slackware64/xap/gimp-2.10.8-x86_64-1.txt --rw-r--r-- 1 root root 18697076 2018-11-08 22:38 ./slackware64/xap/gimp-2.10.8-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-11-08 22:38 ./slackware64/xap/gimp-2.10.8-x86_64-1.txz.asc +-rw-r--r-- 1 root root 471 2019-04-07 20:27 ./slackware64/xap/gimp-2.10.10-x86_64-1.txt +-rw-r--r-- 1 root root 18925848 2019-04-07 20:27 ./slackware64/xap/gimp-2.10.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-07 20:27 ./slackware64/xap/gimp-2.10.10-x86_64-1.txz.asc -rw-r--r-- 1 root root 513 2018-11-26 22:12 ./slackware64/xap/gkrellm-2.3.10-x86_64-5.txt -rw-r--r-- 1 root root 567300 2018-11-26 22:12 ./slackware64/xap/gkrellm-2.3.10-x86_64-5.txz -rw-r--r-- 1 root root 163 2018-11-26 22:12 ./slackware64/xap/gkrellm-2.3.10-x86_64-5.txz.asc @@ -5002,11 +5002,11 @@ 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 2019-04-06 17:33 ./source --rw-r--r-- 1 root root 462200 2019-04-06 17:33 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-04-06 17:33 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 653090 2019-04-06 17:33 ./source/FILE_LIST --rw-r--r-- 1 root root 16756276 2019-04-06 17:33 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-04-08 21:02 ./source +-rw-r--r-- 1 root root 462197 2019-04-08 21:02 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-04-08 21:02 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 653087 2019-04-08 21:02 ./source/FILE_LIST +-rw-r--r-- 1 root root 16750107 2019-04-08 21:02 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 111 root root 4096 2019-03-16 20:25 ./source/a -rw-r--r-- 1 root root 877 2018-11-21 18:49 ./source/a/FTBFSlog @@ -5301,7 +5301,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/getty-ps -rw-r--r-- 1 root root 1223 2002-10-04 05:00 ./source/a/getty-ps/getty_ps-2.1.0.lsm -rw-r--r-- 1 root root 117414 2005-07-21 12:27 ./source/a/getty-ps/getty_ps-2.1.0b.tar.gz -rw-r--r-- 1 root root 966 2018-02-27 06:13 ./source/a/getty-ps/slack-desc -drwxr-xr-x 3 root root 4096 2019-01-11 20:29 ./source/a/glibc-zoneinfo +drwxr-xr-x 3 root root 4096 2019-04-07 20:28 ./source/a/glibc-zoneinfo -rw-r--r-- 1 root root 1147 2018-06-14 04:54 ./source/a/glibc-zoneinfo/doinst.sh.gz -rwxr-xr-x 1 root root 5383 2018-10-19 17:33 ./source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild -rw-r--r-- 1 root root 964 2018-02-27 06:13 ./source/a/glibc-zoneinfo/slack-desc @@ -5316,10 +5316,10 @@ drwxr-xr-x 2 root root 4096 2006-12-03 23:10 ./source/a/glibc-zoneinfo/tim -rw-r--r-- 1 root root 87 2006-12-03 23:10 ./source/a/glibc-zoneinfo/timezone-scripts/parts/README -rw-r--r-- 1 root root 66 2003-02-16 21:17 ./source/a/glibc-zoneinfo/timezone-scripts/setup.timeconfig -rw-r--r-- 1 root root 28652 2018-04-28 19:21 ./source/a/glibc-zoneinfo/timezone-scripts/timeconfig --rw-r--r-- 1 root root 242962 2018-12-31 01:25 ./source/a/glibc-zoneinfo/tzcode2018i.tar.gz --rw-r--r-- 1 root root 833 2018-12-31 01:25 ./source/a/glibc-zoneinfo/tzcode2018i.tar.gz.asc --rw-r--r-- 1 root root 377009 2018-12-31 01:25 ./source/a/glibc-zoneinfo/tzdata2018i.tar.gz --rw-r--r-- 1 root root 833 2018-12-31 01:25 ./source/a/glibc-zoneinfo/tzdata2018i.tar.gz.asc +-rw-r--r-- 1 root root 246449 2019-03-26 05:40 ./source/a/glibc-zoneinfo/tzcode2019a.tar.gz +-rw-r--r-- 1 root root 833 2019-03-26 05:40 ./source/a/glibc-zoneinfo/tzcode2019a.tar.gz.asc +-rw-r--r-- 1 root root 378961 2019-03-26 05:40 ./source/a/glibc-zoneinfo/tzdata2019a.tar.gz +-rw-r--r-- 1 root root 833 2019-03-26 05:40 ./source/a/glibc-zoneinfo/tzdata2019a.tar.gz.asc drwxr-xr-x 2 root root 4096 2018-04-28 19:23 ./source/a/gpm -rw-r--r-- 1 root root 361 2013-02-13 03:15 ./source/a/gpm/gpm-1.20.1-lib-silent.patch.gz -rw-r--r-- 1 root root 587 2013-02-13 22:19 ./source/a/gpm/gpm-1.20.1-select-1.patch.gz @@ -5342,16 +5342,17 @@ drwxr-xr-x 2 root root 4096 2018-12-21 16:48 ./source/a/grep -rw-r--r-- 1 root root 833 2018-12-21 04:40 ./source/a/grep/grep-3.3.tar.xz.sig -rwxr-xr-x 1 root root 4371 2018-12-20 17:55 ./source/a/grep/grep.SlackBuild -rw-r--r-- 1 root root 743 2018-02-27 06:13 ./source/a/grep/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-22 18:36 ./source/a/grub +drwxr-xr-x 2 root root 4096 2019-04-08 19:34 ./source/a/grub -rw-r--r-- 1 root root 645 2015-12-15 11:05 ./source/a/grub/0001-Fix-CVE-2015-8370-Grub2-user-pass-vulnerability.patch.gz -rw-r--r-- 1 root root 639 2018-05-16 15:18 ./source/a/grub/0198-align-struct-efi_variable-better.patch.gz -rw-r--r-- 1 root root 289 2013-09-17 06:50 ./source/a/grub/doinst.sh.gz -rw-r--r-- 1 root root 926 2016-06-13 03:14 ./source/a/grub/etc.default.grub -rw-r--r-- 1 root root 6113260 2017-04-26 10:44 ./source/a/grub/grub-2.02.tar.xz -rw-r--r-- 1 root root 119 2017-04-26 10:44 ./source/a/grub/grub-2.02.tar.xz.sig --rwxr-xr-x 1 root root 7522 2018-09-22 18:37 ./source/a/grub/grub.SlackBuild +-rwxr-xr-x 1 root root 7700 2019-04-08 19:37 ./source/a/grub/grub.SlackBuild -rw-r--r-- 1 root root 303 2018-09-22 18:36 ./source/a/grub/grub.binutils.fix.diff.gz -rw-r--r-- 1 root root 704 2016-12-25 09:49 ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff.gz +-rw-r--r-- 1 root root 10997 2019-04-08 19:34 ./source/a/grub/grub.f2fs.patch.gz -rw-r--r-- 1 root root 1273 2018-09-21 17:47 ./source/a/grub/grub.xfs.sparse.inodes.patch.gz -rw-r--r-- 1 root root 299 2012-09-29 04:34 ./source/a/grub/initrd_naming.patch.gz -rw-r--r-- 1 root root 634 2018-11-29 19:15 ./source/a/grub/slack-desc @@ -5648,7 +5649,7 @@ drwxr-xr-x 2 root root 4096 2018-07-09 19:21 ./source/a/pkgtools/manpages drwxr-xr-x 2 root root 4096 2018-09-06 22:16 ./source/a/pkgtools/scripts -rw-r--r-- 1 root root 3608 2018-06-19 19:28 ./source/a/pkgtools/scripts/explodepkg -rw-r--r-- 1 root root 26417 2018-09-06 22:14 ./source/a/pkgtools/scripts/installpkg --rw-r--r-- 1 root root 13672 2018-06-19 19:28 ./source/a/pkgtools/scripts/makebootdisk +-rw-r--r-- 1 root root 13672 2018-06-19 19:28 ./source/a/pkgtools/scripts/makebootdisk -rw-r--r-- 1 root root 16183 2018-07-09 19:20 ./source/a/pkgtools/scripts/makepkg -rw-r--r-- 1 root root 4712 2018-04-11 20:28 ./source/a/pkgtools/scripts/pkgdiff -rw-r--r-- 1 root root 21938 2018-06-19 19:28 ./source/a/pkgtools/scripts/pkgtool @@ -5987,8 +5988,8 @@ drwxr-xr-x 2 root root 4096 2015-11-21 23:21 ./source/ap/cgmanager/config -rw-r--r-- 1 root root 334 2015-11-20 01:59 ./source/ap/cgmanager/doinst.sh.gz -rw-r--r-- 1 root root 988 2018-02-27 06:13 ./source/ap/cgmanager/slack-desc drwxr-xr-x 2 root root 4096 2019-03-23 19:09 ./source/ap/cups -drwxr-xr-x 2 root root 4096 2019-03-26 18:28 ./source/ap/cups-filters --rw-r--r-- 1 root root 1476460 2019-03-26 12:20 ./source/ap/cups-filters/cups-filters-1.22.3.tar.xz +drwxr-xr-x 2 root root 4096 2019-04-07 20:38 ./source/ap/cups-filters +-rw-r--r-- 1 root root 1473978 2019-04-07 14:55 ./source/ap/cups-filters/cups-filters-1.22.5.tar.lz -rwxr-xr-x 1 root root 4441 2018-09-18 22:04 ./source/ap/cups-filters/cups-filters.SlackBuild -rw-r--r-- 1 root root 51 2014-07-21 02:53 ./source/ap/cups-filters/cups-filters.url -rw-r--r-- 1 root root 339 2018-01-08 22:54 ./source/ap/cups-filters/doinst.sh.gz @@ -6104,8 +6105,8 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/ispell -rwxr-xr-x 1 root root 3730 2018-04-23 17:20 ./source/ap/ispell/ispell.SlackBuild -rw-r--r-- 1 root root 306 2017-01-10 22:32 ./source/ap/ispell/local.h.linux.diff.gz -rw-r--r-- 1 root root 1051 2018-02-27 06:12 ./source/ap/ispell/slack-desc -drwxr-xr-x 2 root root 4096 2018-11-24 19:12 ./source/ap/itstool --rw-r--r-- 1 root root 93832 2018-10-28 21:00 ./source/ap/itstool/itstool-2.0.5.tar.lz +drwxr-xr-x 2 root root 4096 2019-04-08 19:08 ./source/ap/itstool +-rw-r--r-- 1 root root 94066 2019-04-06 18:40 ./source/ap/itstool/itstool-2.0.6.tar.lz -rwxr-xr-x 1 root root 3830 2018-11-24 19:12 ./source/ap/itstool/itstool.SlackBuild -rw-r--r-- 1 root root 868 2018-02-27 06:12 ./source/ap/itstool/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/ap/jed @@ -6761,10 +6762,10 @@ drwxr-xr-x 2 root root 4096 2019-02-21 19:57 ./source/d/python-pip -rw-r--r-- 1 root root 33 2018-03-29 06:10 ./source/d/python-pip/pip.url -rwxr-xr-x 1 root root 3066 2019-02-21 19:57 ./source/d/python-pip/python-pip.SlackBuild -rw-r--r-- 1 root root 760 2018-02-27 06:13 ./source/d/python-pip/slack-desc -drwxr-xr-x 2 root root 4096 2019-04-04 18:32 ./source/d/python-setuptools +drwxr-xr-x 2 root root 4096 2019-04-07 20:16 ./source/d/python-setuptools -rwxr-xr-x 1 root root 3414 2019-04-04 18:32 ./source/d/python-setuptools/python-setuptools.SlackBuild -rw-r--r-- 1 root root 40 2017-11-28 22:11 ./source/d/python-setuptools/python-setuptools.url --rw-r--r-- 1 root root 454713 2019-04-03 18:54 ./source/d/python-setuptools/setuptools-40.9.0.tar.lz +-rw-r--r-- 1 root root 454853 2019-04-05 17:33 ./source/d/python-setuptools/setuptools-41.0.0.tar.lz -rw-r--r-- 1 root root 1059 2018-02-27 06:13 ./source/d/python-setuptools/slack-desc -rw-r--r-- 1 root root 12752104 2019-03-02 18:40 ./source/d/python/Python-2.7.16.tar.xz -rw-r--r-- 1 root root 833 2019-03-02 18:40 ./source/d/python/Python-2.7.16.tar.xz.asc @@ -8516,8 +8517,8 @@ drwxr-xr-x 2 root root 4096 2018-11-07 23:35 ./source/l/gnu-efi -rwxr-xr-x 1 root root 3583 2018-06-12 19:37 ./source/l/gnu-efi/gnu-efi.SlackBuild -rw-r--r-- 1 root root 64 2018-11-07 23:35 ./source/l/gnu-efi/gnu-efi.url -rw-r--r-- 1 root root 734 2018-02-27 06:12 ./source/l/gnu-efi/slack-desc -drwxr-xr-x 2 root root 4096 2019-03-10 20:52 ./source/l/gobject-introspection --rw-r--r-- 1 root root 1283732 2019-03-10 14:51 ./source/l/gobject-introspection/gobject-introspection-1.60.0.tar.xz +drwxr-xr-x 2 root root 4096 2019-04-07 20:39 ./source/l/gobject-introspection +-rw-r--r-- 1 root root 1284460 2019-04-07 16:04 ./source/l/gobject-introspection/gobject-introspection-1.60.1.tar.xz -rwxr-xr-x 1 root root 4349 2018-11-17 06:06 ./source/l/gobject-introspection/gobject-introspection.SlackBuild -rw-r--r-- 1 root root 1103 2018-02-27 06:12 ./source/l/gobject-introspection/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/grantlee @@ -8694,9 +8695,9 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/ilmbase -rw-r--r-- 1 root root 326876 2014-11-29 16:17 ./source/l/ilmbase/ilmbase-2.2.0.tar.xz -rwxr-xr-x 1 root root 3609 2018-09-18 22:04 ./source/l/ilmbase/ilmbase.SlackBuild -rw-r--r-- 1 root root 825 2018-02-27 06:12 ./source/l/ilmbase/slack-desc -drwxr-xr-x 2 root root 4096 2019-04-04 18:41 ./source/l/imagemagick --rw-r--r-- 1 root root 8903844 2019-04-03 21:12 ./source/l/imagemagick/ImageMagick-6.9.10-37.tar.lz --rw-r--r-- 1 root root 836 2019-04-04 00:50 ./source/l/imagemagick/ImageMagick-6.9.10-37.tar.lz.asc +drwxr-xr-x 2 root root 4096 2019-04-07 20:40 ./source/l/imagemagick +-rw-r--r-- 1 root root 8900381 2019-04-06 22:39 ./source/l/imagemagick/ImageMagick-6.9.10-39.tar.lz +-rw-r--r-- 1 root root 836 2019-04-07 12:11 ./source/l/imagemagick/ImageMagick-6.9.10-39.tar.lz.asc -rw-r--r-- 1 root root 309 2016-05-17 04:08 ./source/l/imagemagick/doinst.sh.gz -rwxr-xr-x 1 root root 7092 2018-10-26 18:39 ./source/l/imagemagick/imagemagick.SlackBuild -rw-r--r-- 1 root root 512 2017-07-18 01:14 ./source/l/imagemagick/policy.xml.diff.gz @@ -8825,10 +8826,9 @@ drwxr-xr-x 2 root root 4096 2018-12-30 00:03 ./source/l/libclc -rw-r--r-- 1 root root 125816 2018-12-30 00:03 ./source/l/libclc/libclc-20181127_1ecb16d.tar.xz -rwxr-xr-x 1 root root 3479 2018-12-30 00:03 ./source/l/libclc/libclc.SlackBuild -rw-r--r-- 1 root root 813 2018-02-27 06:12 ./source/l/libclc/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/libcroco --rw-r--r-- 1 root root 1928 2017-04-23 19:40 ./source/l/libcroco/898e3a8c8c03.patch --rw-r--r-- 1 root root 482028 2017-04-06 13:34 ./source/l/libcroco/libcroco-0.6.12.tar.xz --rwxr-xr-x 1 root root 3810 2018-09-18 22:04 ./source/l/libcroco/libcroco.SlackBuild +drwxr-xr-x 2 root root 4096 2019-04-07 20:50 ./source/l/libcroco +-rw-r--r-- 1 root root 487840 2019-04-06 19:31 ./source/l/libcroco/libcroco-0.6.13.tar.xz +-rwxr-xr-x 1 root root 3664 2019-04-07 20:50 ./source/l/libcroco/libcroco.SlackBuild -rw-r--r-- 1 root root 49 2012-05-03 16:28 ./source/l/libcroco/libcroco.url -rw-r--r-- 1 root root 890 2018-02-27 06:12 ./source/l/libcroco/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/libdbusmenu-qt @@ -8982,9 +8982,9 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/libnl3 -rw-r--r-- 1 root root 662140 2017-10-09 11:28 ./source/l/libnl3/libnl-3.4.0.tar.xz -rwxr-xr-x 1 root root 4143 2018-09-18 22:04 ./source/l/libnl3/libnl3.SlackBuild -rw-r--r-- 1 root root 1004 2018-02-27 06:12 ./source/l/libnl3/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/libnotify --rw-r--r-- 1 root root 285356 2016-10-13 22:49 ./source/l/libnotify/libnotify-0.7.7.tar.xz --rwxr-xr-x 1 root root 3509 2018-09-18 22:04 ./source/l/libnotify/libnotify.SlackBuild +drwxr-xr-x 2 root root 4096 2019-04-07 20:42 ./source/l/libnotify +-rw-r--r-- 1 root root 108436 2019-04-05 21:11 ./source/l/libnotify/libnotify-0.7.8.tar.xz +-rwxr-xr-x 1 root root 3753 2019-04-07 20:48 ./source/l/libnotify/libnotify.SlackBuild -rw-r--r-- 1 root root 697 2018-02-27 06:12 ./source/l/libnotify/slack-desc drwxr-xr-x 2 root root 4096 2018-11-08 00:10 ./source/l/libodfgen -rw-r--r-- 1 root root 384760 2018-06-13 07:21 ./source/l/libodfgen/libodfgen-0.1.7.tar.xz @@ -9911,8 +9911,8 @@ drwxr-xr-x 2 root root 4096 2019-03-08 17:41 ./source/n/ca-certificates -rw-r--r-- 1 root root 128 2012-09-11 21:12 ./source/n/ca-certificates/setup.11.cacerts -rw-r--r-- 1 root root 829 2019-02-26 23:30 ./source/n/ca-certificates/slack-desc -rw-r--r-- 1 root root 229 2019-02-26 20:33 ./source/n/ca-certificates/update-ca-certificates.c_rehash.diff.gz -drwxr-xr-x 2 root root 4096 2018-11-15 17:50 ./source/n/cifs-utils --rw-r--r-- 1 root root 298295 2018-03-13 18:31 ./source/n/cifs-utils/cifs-utils-6.8.tar.lz +drwxr-xr-x 2 root root 4096 2019-04-07 20:38 ./source/n/cifs-utils +-rw-r--r-- 1 root root 307363 2019-04-05 17:45 ./source/n/cifs-utils/cifs-utils-6.9.tar.lz -rwxr-xr-x 1 root root 4635 2018-11-15 17:51 ./source/n/cifs-utils/cifs-utils.SlackBuild -rw-r--r-- 1 root root 48 2018-11-15 17:49 ./source/n/cifs-utils/cifs-utils.url -rw-r--r-- 1 root root 1061 2018-02-27 06:13 ./source/n/cifs-utils/slack-desc @@ -10439,11 +10439,11 @@ drwxr-xr-x 2 root root 4096 2018-11-15 18:04 ./source/n/nfs-utils -rw-r--r-- 1 root root 154 1994-08-20 23:14 ./source/n/nfs-utils/exports -rw-r--r-- 1 root root 543 2018-09-07 14:09 ./source/n/nfs-utils/nfs-utils-2.3.3.tar.sign -rw-r--r-- 1 root root 662280 2018-09-07 14:09 ./source/n/nfs-utils/nfs-utils-2.3.3.tar.xz --rwxr-xr-x 1 root root 5573 2018-11-15 18:04 ./source/n/nfs-utils/nfs-utils.SlackBuild +-rwxr-xr-x 1 root root 5638 2019-04-08 19:31 ./source/n/nfs-utils/nfs-utils.SlackBuild -rw-r--r-- 1 root root 255 2008-03-31 22:19 ./source/n/nfs-utils/nfs-utils.lwrap.needs.lnsl.diff.gz -rw-r--r-- 1 root root 49 2018-11-15 18:04 ./source/n/nfs-utils/nfs-utils.url -rw-r--r-- 1 root root 292 2017-12-29 05:37 ./source/n/nfs-utils/nfs.default --rw-r--r-- 1 root root 3017 2017-12-29 05:45 ./source/n/nfs-utils/rc.nfsd +-rw-r--r-- 1 root root 3323 2019-04-08 19:27 ./source/n/nfs-utils/rc.nfsd -rw-r--r-- 1 root root 779 2018-02-27 06:13 ./source/n/nfs-utils/slack-desc drwxr-xr-x 2 root root 4096 2019-04-03 20:42 ./source/n/nftables -rw-r--r-- 1 root root 617803 2018-06-08 15:36 ./source/n/nftables/nftables-0.9.0.tar.lz @@ -10667,14 +10667,14 @@ drwxr-xr-x 2 root root 4096 2019-03-08 16:51 ./source/n/s-nail -rwxr-xr-x 1 root root 4203 2019-03-08 16:51 ./source/n/s-nail/s-nail.SlackBuild -rw-r--r-- 1 root root 32 2018-11-24 18:36 ./source/n/s-nail/s-nail.url -rw-r--r-- 1 root root 930 2018-11-24 18:35 ./source/n/s-nail/slack-desc -drwxr-xr-x 2 root root 4096 2019-04-03 20:36 ./source/n/samba +drwxr-xr-x 2 root root 4096 2019-04-08 19:14 ./source/n/samba -rw-r--r-- 1 root root 703 2016-06-13 04:19 ./source/n/samba/doinst.sh.gz -rw-r--r-- 1 root root 940 2016-06-04 17:50 ./source/n/samba/rc.samba --rw-r--r-- 1 root root 224 2019-04-03 08:42 ./source/n/samba/samba-4.10.1.tar.asc --rw-r--r-- 1 root root 11393202 2019-04-03 08:42 ./source/n/samba/samba-4.10.1.tar.lz +-rw-r--r-- 1 root root 224 2019-04-05 08:37 ./source/n/samba/samba-4.10.2.tar.asc +-rw-r--r-- 1 root root 11392519 2019-04-05 08:37 ./source/n/samba/samba-4.10.2.tar.lz -rwxr-xr-x 1 root root 7136 2019-04-03 20:36 ./source/n/samba/samba.SlackBuild -rw-r--r-- 1 root root 227 2019-02-06 20:36 ./source/n/samba/samba.libsmbclient.h.ffmpeg.compat.diff.gz --rw-r--r-- 1 root root 129 2019-04-03 20:35 ./source/n/samba/samba.url +-rw-r--r-- 1 root root 129 2019-04-08 19:12 ./source/n/samba/samba.url -rw-r--r-- 1 root root 960 2018-02-27 06:13 ./source/n/samba/slack-desc -rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./source/n/samba/smb.conf.default -rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./source/n/samba/smb.conf.default.orig @@ -10965,13 +10965,13 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/x/libmypaint -rwxr-xr-x 1 root root 4279 2018-09-18 22:04 ./source/x/libmypaint/libmypaint.SlackBuild -rw-r--r-- 1 root root 47 2018-05-01 17:27 ./source/x/libmypaint/libmypaint.url -rw-r--r-- 1 root root 783 2018-05-01 17:32 ./source/x/libmypaint/slack-desc -drwxr-xr-x 2 root root 4096 2019-01-30 19:40 ./source/x/libva +drwxr-xr-x 2 root root 4096 2019-04-08 19:10 ./source/x/libva drwxr-xr-x 2 root root 4096 2019-02-02 19:15 ./source/x/libva-utils -rw-r--r-- 1 root root 934042 2019-02-01 15:51 ./source/x/libva-utils/libva-utils-2.4.0.tar.lz -rwxr-xr-x 1 root root 3483 2018-09-18 22:04 ./source/x/libva-utils/libva-utils.SlackBuild -rw-r--r-- 1 root root 37 2018-11-08 00:17 ./source/x/libva-utils/libva-utils.url -rw-r--r-- 1 root root 785 2018-02-27 06:13 ./source/x/libva-utils/slack-desc --rw-r--r-- 1 root root 388381 2019-01-25 11:39 ./source/x/libva/libva-2.4.0.tar.lz +-rw-r--r-- 1 root root 170861 2019-04-08 19:10 ./source/x/libva/libva-2.4.1.tar.lz -rwxr-xr-x 1 root root 3477 2018-09-18 22:04 ./source/x/libva/libva.SlackBuild -rw-r--r-- 1 root root 31 2018-11-08 00:15 ./source/x/libva/libva.url -rw-r--r-- 1 root root 908 2018-02-27 06:13 ./source/x/libva/slack-desc @@ -11524,9 +11524,9 @@ drwxr-xr-x 15 root root 4096 2019-03-05 19:33 ./source/x/x11/patch drwxr-xr-x 2 root root 4096 2014-07-14 23:09 ./source/x/x11/patch/luit -rw-r--r-- 1 root root 170 2014-07-14 23:09 ./source/x/x11/patch/luit.patch -rw-r--r-- 1 root root 596 2014-07-14 23:22 ./source/x/x11/patch/luit/luit_use_system_extensions.diff.gz -drwxr-xr-x 2 root root 4096 2019-02-12 19:55 ./source/x/x11/patch/pixman +drwxr-xr-x 2 root root 4096 2019-04-08 20:07 ./source/x/x11/patch/pixman -rw-r--r-- 1 root root 173 2018-11-21 22:34 ./source/x/x11/patch/pixman.patch --rw-r--r-- 1 root root 3436 2019-02-12 19:54 ./source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz +-rw-r--r-- 1 root root 3700 2019-04-08 20:07 ./source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff.gz drwxr-xr-x 2 root root 4096 2018-08-27 18:45 ./source/x/x11/patch/xauth -rw-r--r-- 1 root root 240 2018-08-27 18:48 ./source/x/x11/patch/xauth.patch -rw-r--r-- 1 root root 849 2018-08-27 18:44 ./source/x/x11/patch/xauth/xauth.bc78aa61cfbddaa27dee275f639ba40de6981b17.patch.gz @@ -11951,7 +11951,7 @@ drwxr-xr-x 2 root root 12288 2018-11-11 20:32 ./source/x/x11/slack-desc -rw-r--r-- 1 root root 716 2012-04-08 02:21 ./source/x/x11/slack-desc/xwd -rw-r--r-- 1 root root 702 2012-04-08 02:21 ./source/x/x11/slack-desc/xwininfo -rw-r--r-- 1 root root 668 2012-04-07 23:42 ./source/x/x11/slack-desc/xwud -drwxr-xr-x 12 root root 4096 2019-03-25 18:53 ./source/x/x11/src +drwxr-xr-x 12 root root 4096 2019-04-08 17:35 ./source/x/x11/src drwxr-xr-x 2 root root 4096 2019-03-25 18:53 ./source/x/x11/src/app -rw-r--r-- 1 root root 115464 2018-03-05 03:32 ./source/x/x11/src/app/appres-1.0.5.tar.xz -rw-r--r-- 1 root root 139452 2017-11-07 19:12 ./source/x/x11/src/app/bdftopcf-1.1.tar.xz @@ -12144,7 +12144,7 @@ drwxr-xr-x 2 root root 4096 2015-03-15 21:33 ./source/x/x11/src/font -rwxr-xr-x 1 root root 2048 2018-06-30 22:12 ./source/x/x11/src/get-xf86-video-savage.sh -rwxr-xr-x 1 root root 2006 2018-06-30 22:12 ./source/x/x11/src/get-xf86-video-sis.sh -rwxr-xr-x 1 root root 2006 2018-07-03 17:40 ./source/x/x11/src/get-xf86-video-v4l.sh -drwxr-xr-x 2 root root 4096 2019-03-17 18:32 ./source/x/x11/src/lib +drwxr-xr-x 2 root root 4096 2019-04-08 17:35 ./source/x/x11/src/lib -rw-r--r-- 1 root root 280640 2019-03-10 22:43 ./source/x/x11/src/lib/libFS-1.0.8.tar.xz -rw-r--r-- 1 root root 309088 2014-06-07 01:31 ./source/x/x11/src/lib/libICE-1.0.9.tar.xz -rw-r--r-- 1 root root 300712 2018-10-10 15:05 ./source/x/x11/src/lib/libSM-1.2.3.tar.xz @@ -12184,7 +12184,7 @@ drwxr-xr-x 2 root root 4096 2019-03-17 18:32 ./source/x/x11/src/lib -rw-r--r-- 1 root root 314872 2017-10-23 15:49 ./source/x/x11/src/lib/libpciaccess-0.14.tar.xz -rw-r--r-- 1 root root 302836 2019-03-16 18:36 ./source/x/x11/src/lib/libxkbfile-1.1.0.tar.xz -rw-r--r-- 1 root root 250612 2018-02-26 17:27 ./source/x/x11/src/lib/libxshmfence-1.3.tar.xz --rw-r--r-- 1 root root 622200 2019-02-11 12:32 ./source/x/x11/src/lib/pixman-0.38.0.tar.xz +-rw-r--r-- 1 root root 624068 2019-04-07 20:34 ./source/x/x11/src/lib/pixman-0.38.2.tar.xz -rw-r--r-- 1 root root 169464 2019-03-16 21:30 ./source/x/x11/src/lib/xtrans-1.4.0.tar.xz drwxr-xr-x 2 root root 4096 2018-03-12 18:04 ./source/x/x11/src/proto -rw-r--r-- 1 root root 352044 2018-02-28 16:45 ./source/x/x11/src/proto/xorgproto-2018.4.tar.xz @@ -12318,8 +12318,8 @@ drwxr-xr-x 2 root root 4096 2019-04-03 20:40 ./source/xap/gftp -rwxr-xr-x 1 root root 3764 2019-04-03 20:40 ./source/xap/gftp/gftp.SlackBuild -rw-r--r-- 1 root root 304 2008-12-02 20:08 ./source/xap/gftp/gftp.desktop.gz -rw-r--r-- 1 root root 895 2018-02-27 06:13 ./source/xap/gftp/slack-desc -drwxr-xr-x 2 root root 4096 2018-11-08 22:29 ./source/xap/gimp --rw-r--r-- 1 root root 24409904 2018-11-08 19:35 ./source/xap/gimp/gimp-2.10.8.tar.lz +drwxr-xr-x 2 root root 4096 2019-04-07 20:19 ./source/xap/gimp +-rw-r--r-- 1 root root 24864734 2019-04-07 16:58 ./source/xap/gimp/gimp-2.10.10.tar.lz -rwxr-xr-x 1 root root 4603 2018-09-18 22:04 ./source/xap/gimp/gimp.SlackBuild -rw-r--r-- 1 root root 923 2018-02-27 06:13 ./source/xap/gimp/slack-desc drwxr-xr-x 2 root root 4096 2018-05-06 19:33 ./source/xap/gkrellm diff --git a/recompress.sh b/recompress.sh index f95a743fb..91b09c817 100755 --- a/recompress.sh +++ b/recompress.sh @@ -120,6 +120,7 @@ gzip ./source/a/grub/initrd_naming.patch gzip ./source/a/grub/grub.binutils.fix.diff gzip ./source/a/grub/0198-align-struct-efi_variable-better.patch gzip ./source/a/grub/doinst.sh +gzip ./source/a/grub/grub.f2fs.patch gzip ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff gzip ./source/a/devs/makedev_2.3.1.hd.diff gzip ./source/a/devs/makedev_2.3.1-46.2.diff diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index 4b00083b3..efbb99a7f 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2013, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2013, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,7 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -121,6 +121,12 @@ zcat $CWD/grub.xfs.sparse.inodes.patch.gz | patch -p1 --verbose || exit 1 # Fix breakage when compiled with recent binutils: zcat $CWD/grub.binutils.fix.diff.gz | patch -p1 --verbose || exit 1 +# Support F2FS filesystem: +zcat $CWD/grub.f2fs.patch.gz | patch -p1 --verbose || exit 1 + +# Regenerate build system to fix dependency on outdated automake: +autoreconf -vif + build_grub() { EFI_DO="$*" # Configure: diff --git a/source/a/grub/grub.f2fs.patch b/source/a/grub/grub.f2fs.patch new file mode 100644 index 000000000..527715303 --- /dev/null +++ b/source/a/grub/grub.f2fs.patch @@ -0,0 +1,1514 @@ +From 71f9e4ac44142af52c3fc1860436cf9e432bf764 Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Thu, 29 Mar 2018 16:37:39 +0100 +Subject: fs: Add F2FS support + +"F2FS (Flash-Friendly File System) is flash-friendly file system which was merged +into Linux kernel v3.8 in 2013. + +The motive for F2FS was to build a file system that from the start, takes into +account the characteristics of NAND flash memory-based storage devices (such as +solid-state disks, eMMC, and SD cards). + +F2FS was designed on a basis of a log-structured file system approach, which +remedies some known issues of the older log structured file systems, such as +the snowball effect of wandering trees and high cleaning overhead. In addition, +since a NAND-based storage device shows different characteristics according to +its internal geometry or flash memory management scheme (such as the Flash +Translation Layer or FTL), it supports various parameters not only for +configuring on-disk layout, but also for selecting allocation and cleaning +algorithm.", quote by https://en.wikipedia.org/wiki/F2FS. + +The source codes for F2FS are available from: + +http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs.git +http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git + +This patch has been integrated in OpenMandriva Lx 3. + https://www.openmandriva.org/ + +Signed-off-by: Jaegeuk Kim +Signed-off-by: Pete Batard +Signed-off-by: Daniel Kiper +Reviewed-by: Daniel Kiper +--- + Makefile.util.def | 7 + + docs/grub.texi | 7 +- + grub-core/Makefile.core.def | 5 + + grub-core/fs/f2fs.c | 1314 ++++++++++++++++++++++++++++++++++++++++++ + po/exclude.pot | 1 + + tests/f2fs_test.in | 19 + + tests/util/grub-fs-tester.in | 10 +- + 7 files changed, 1358 insertions(+), 5 deletions(-) + create mode 100644 grub-core/fs/f2fs.c + create mode 100644 tests/f2fs_test.in + +diff --git a/Makefile.util.def b/Makefile.util.def +index f9caccb..3180ac8 100644 +--- a/Makefile.util.def ++++ b/Makefile.util.def +@@ -99,6 +99,7 @@ library = { + common = grub-core/fs/ext2.c; + common = grub-core/fs/fat.c; + common = grub-core/fs/exfat.c; ++ common = grub-core/fs/f2fs.c; + common = grub-core/fs/fshelp.c; + common = grub-core/fs/hfs.c; + common = grub-core/fs/hfsplus.c; +@@ -776,6 +777,12 @@ script = { + + script = { + testcase; ++ name = f2fs_test; ++ common = tests/f2fs_test.in; ++}; ++ ++script = { ++ testcase; + name = nilfs2_test; + common = tests/nilfs2_test.in; + }; +diff --git a/docs/grub.texi b/docs/grub.texi +index 65b4bbe..0f2ab91 100644 +--- a/docs/grub.texi ++++ b/docs/grub.texi +@@ -360,8 +360,9 @@ blocklist notation. The currently supported filesystem types are @dfn{Amiga + Fast FileSystem (AFFS)}, @dfn{AtheOS fs}, @dfn{BeFS}, + @dfn{BtrFS} (including raid0, raid1, raid10, gzip and lzo), + @dfn{cpio} (little- and big-endian bin, odc and newc variants), +-@dfn{Linux ext2/ext3/ext4}, @dfn{DOS FAT12/FAT16/FAT32}, @dfn{exFAT}, @dfn{HFS}, +-@dfn{HFS+}, @dfn{ISO9660} (including Joliet, Rock-ridge and multi-chunk files), ++@dfn{Linux ext2/ext3/ext4}, @dfn{DOS FAT12/FAT16/FAT32}, ++@dfn{exFAT}, @dfn{F2FS}, @dfn{HFS}, @dfn{HFS+}, ++@dfn{ISO9660} (including Joliet, Rock-ridge and multi-chunk files), + @dfn{JFS}, @dfn{Minix fs} (versions 1, 2 and 3), @dfn{nilfs2}, + @dfn{NTFS} (including compression), @dfn{ReiserFS}, @dfn{ROMFS}, + @dfn{Amiga Smart FileSystem (SFS)}, @dfn{Squash4}, @dfn{tar}, @dfn{UDF}, +@@ -5375,7 +5376,7 @@ NTFS, JFS, UDF, HFS+, exFAT, long filenames in FAT, Joliet part of + ISO9660 are treated as UTF-16 as per specification. AFS and BFS are read + as UTF-8, again according to specification. BtrFS, cpio, tar, squash4, minix, + minix2, minix3, ROMFS, ReiserFS, XFS, ext2, ext3, ext4, FAT (short names), +-RockRidge part of ISO9660, nilfs2, UFS1, UFS2 and ZFS are assumed ++F2FS, RockRidge part of ISO9660, nilfs2, UFS1, UFS2 and ZFS are assumed + to be UTF-8. This might be false on systems configured with legacy charset + but as long as the charset used is superset of ASCII you should be able to + access ASCII-named files. And it's recommended to configure your system to use +diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def +index 2c1d62c..fc4767f 100644 +--- a/grub-core/Makefile.core.def ++++ b/grub-core/Makefile.core.def +@@ -1315,6 +1315,11 @@ module = { + }; + + module = { ++ name = f2fs; ++ common = fs/f2fs.c; ++}; ++ ++module = { + name = fshelp; + common = fs/fshelp.c; + }; +diff --git a/grub-core/fs/f2fs.c b/grub-core/fs/f2fs.c +new file mode 100644 +index 0000000..1cad261 +--- /dev/null ++++ b/grub-core/fs/f2fs.c +@@ -0,0 +1,1314 @@ ++/* ++ * f2fs.c - Flash-Friendly File System ++ * ++ * Written by Jaegeuk Kim ++ * ++ * Copyright (C) 2015 Free Software Foundation, Inc. ++ * ++ * GRUB is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GRUB is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GRUB. If not, see . ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++GRUB_MOD_LICENSE ("GPLv3+"); ++ ++/* F2FS Magic Number. */ ++#define F2FS_SUPER_MAGIC 0xf2f52010 ++ ++#define CHECKSUM_OFFSET 4092 /* Must be aligned 4 bytes. */ ++#define U32_CHECKSUM_OFFSET (CHECKSUM_OFFSET >> 2) ++#define CRCPOLY_LE 0xedb88320 ++ ++/* Byte-size offset. */ ++#define F2FS_SUPER_OFFSET ((grub_disk_addr_t)1024) ++#define F2FS_SUPER_OFFSET0 (F2FS_SUPER_OFFSET >> GRUB_DISK_SECTOR_BITS) ++#define F2FS_SUPER_OFFSET1 ((F2FS_SUPER_OFFSET + F2FS_BLKSIZE) >> \ ++ GRUB_DISK_SECTOR_BITS) ++ ++/* 9 bits for 512 bytes. */ ++#define F2FS_MIN_LOG_SECTOR_SIZE 9 ++ ++/* Support only 4KB block. */ ++#define F2FS_BLK_BITS 12 ++#define F2FS_BLKSIZE (1 << F2FS_BLK_BITS) ++#define F2FS_BLK_SEC_BITS (F2FS_BLK_BITS - GRUB_DISK_SECTOR_BITS) ++ ++#define VERSION_LEN 256 ++#define F2FS_MAX_EXTENSION 64 ++ ++#define CP_COMPACT_SUM_FLAG 0x00000004 ++#define CP_UMOUNT_FLAG 0x00000001 ++ ++#define MAX_ACTIVE_LOGS 16 ++#define MAX_ACTIVE_NODE_LOGS 8 ++#define MAX_ACTIVE_DATA_LOGS 8 ++#define NR_CURSEG_DATA_TYPE 3 ++#define NR_CURSEG_NODE_TYPE 3 ++#define NR_CURSEG_TYPE (NR_CURSEG_DATA_TYPE + NR_CURSEG_NODE_TYPE) ++ ++#define ENTRIES_IN_SUM 512 ++#define SUMMARY_SIZE 7 ++#define SUM_FOOTER_SIZE 5 ++#define JENTRY_SIZE (sizeof(struct grub_f2fs_nat_jent)) ++#define SUM_ENTRIES_SIZE (SUMMARY_SIZE * ENTRIES_IN_SUM) ++#define SUM_JOURNAL_SIZE (F2FS_BLKSIZE - SUM_FOOTER_SIZE - SUM_ENTRIES_SIZE) ++#define NAT_JOURNAL_ENTRIES ((SUM_JOURNAL_SIZE - 2) / JENTRY_SIZE) ++#define NAT_JOURNAL_RESERVED ((SUM_JOURNAL_SIZE - 2) % JENTRY_SIZE) ++ ++#define NAT_ENTRY_SIZE (sizeof(struct grub_f2fs_nat_entry)) ++#define NAT_ENTRY_PER_BLOCK (F2FS_BLKSIZE / NAT_ENTRY_SIZE) ++ ++#define F2FS_NAME_LEN 255 ++#define F2FS_SLOT_LEN 8 ++#define NR_DENTRY_IN_BLOCK 214 ++#define SIZE_OF_DIR_ENTRY 11 /* By byte. */ ++#define BITS_PER_BYTE 8 ++#define SIZE_OF_DENTRY_BITMAP ((NR_DENTRY_IN_BLOCK + BITS_PER_BYTE - 1) / \ ++ BITS_PER_BYTE) ++#define SIZE_OF_RESERVED (F2FS_BLKSIZE - \ ++ ((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * \ ++ NR_DENTRY_IN_BLOCK + SIZE_OF_DENTRY_BITMAP)) ++ ++#define F2FS_INLINE_XATTR_ADDRS 50 /* 200 bytes for inline xattrs. */ ++#define DEF_ADDRS_PER_INODE 923 /* Address Pointers in an Inode. */ ++ ++#define ADDRS_PER_BLOCK 1018 /* Address Pointers in a Direct Block. */ ++#define NIDS_PER_BLOCK 1018 /* Node IDs in an Indirect Block. */ ++#define NODE_DIR1_BLOCK (DEF_ADDRS_PER_INODE + 1) ++#define NODE_DIR2_BLOCK (DEF_ADDRS_PER_INODE + 2) ++#define NODE_IND1_BLOCK (DEF_ADDRS_PER_INODE + 3) ++#define NODE_IND2_BLOCK (DEF_ADDRS_PER_INODE + 4) ++#define NODE_DIND_BLOCK (DEF_ADDRS_PER_INODE + 5) ++ ++#define MAX_INLINE_DATA (4 * (DEF_ADDRS_PER_INODE - \ ++ F2FS_INLINE_XATTR_ADDRS - 1)) ++#define NR_INLINE_DENTRY (MAX_INLINE_DATA * BITS_PER_BYTE / \ ++ ((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * \ ++ BITS_PER_BYTE + 1)) ++#define INLINE_DENTRY_BITMAP_SIZE ((NR_INLINE_DENTRY + BITS_PER_BYTE - 1) / \ ++ BITS_PER_BYTE) ++#define INLINE_RESERVED_SIZE (MAX_INLINE_DATA - \ ++ ((SIZE_OF_DIR_ENTRY + F2FS_SLOT_LEN) * \ ++ NR_INLINE_DENTRY + \ ++ INLINE_DENTRY_BITMAP_SIZE)) ++#define CURSEG_HOT_DATA 0 ++ ++#define CKPT_FLAG_SET(ckpt, f) (ckpt)->ckpt_flags & \ ++ grub_cpu_to_le32_compile_time (f) ++ ++#define F2FS_INLINE_XATTR 0x01 /* File inline xattr flag. */ ++#define F2FS_INLINE_DATA 0x02 /* File inline data flag. */ ++#define F2FS_INLINE_DENTRY 0x04 /* File inline dentry flag. */ ++#define F2FS_DATA_EXIST 0x08 /* File inline data exist flag. */ ++#define F2FS_INLINE_DOTS 0x10 /* File having implicit dot dentries. */ ++ ++#define MAX_VOLUME_NAME 512 ++ ++enum FILE_TYPE ++{ ++ F2FS_FT_UNKNOWN, ++ F2FS_FT_REG_FILE = 1, ++ F2FS_FT_DIR = 2, ++ F2FS_FT_SYMLINK = 7 ++}; ++ ++struct grub_f2fs_superblock ++{ ++ grub_uint32_t magic; ++ grub_uint16_t dummy1[2]; ++ grub_uint32_t log_sectorsize; ++ grub_uint32_t log_sectors_per_block; ++ grub_uint32_t log_blocksize; ++ grub_uint32_t log_blocks_per_seg; ++ grub_uint32_t segs_per_sec; ++ grub_uint32_t secs_per_zone; ++ grub_uint32_t checksum_offset; ++ grub_uint8_t dummy2[40]; ++ grub_uint32_t cp_blkaddr; ++ grub_uint32_t sit_blkaddr; ++ grub_uint32_t nat_blkaddr; ++ grub_uint32_t ssa_blkaddr; ++ grub_uint32_t main_blkaddr; ++ grub_uint32_t root_ino; ++ grub_uint32_t node_ino; ++ grub_uint32_t meta_ino; ++ grub_uint8_t uuid[16]; ++ grub_uint16_t volume_name[MAX_VOLUME_NAME]; ++ grub_uint32_t extension_count; ++ grub_uint8_t extension_list[F2FS_MAX_EXTENSION][8]; ++ grub_uint32_t cp_payload; ++ grub_uint8_t version[VERSION_LEN]; ++ grub_uint8_t init_version[VERSION_LEN]; ++} GRUB_PACKED; ++ ++struct grub_f2fs_checkpoint ++{ ++ grub_uint64_t checkpoint_ver; ++ grub_uint64_t user_block_count; ++ grub_uint64_t valid_block_count; ++ grub_uint32_t rsvd_segment_count; ++ grub_uint32_t overprov_segment_count; ++ grub_uint32_t free_segment_count; ++ grub_uint32_t cur_node_segno[MAX_ACTIVE_NODE_LOGS]; ++ grub_uint16_t cur_node_blkoff[MAX_ACTIVE_NODE_LOGS]; ++ grub_uint32_t cur_data_segno[MAX_ACTIVE_DATA_LOGS]; ++ grub_uint16_t cur_data_blkoff[MAX_ACTIVE_DATA_LOGS]; ++ grub_uint32_t ckpt_flags; ++ grub_uint32_t cp_pack_total_block_count; ++ grub_uint32_t cp_pack_start_sum; ++ grub_uint32_t valid_node_count; ++ grub_uint32_t valid_inode_count; ++ grub_uint32_t next_free_nid; ++ grub_uint32_t sit_ver_bitmap_bytesize; ++ grub_uint32_t nat_ver_bitmap_bytesize; ++ grub_uint32_t checksum_offset; ++ grub_uint64_t elapsed_time; ++ grub_uint8_t alloc_type[MAX_ACTIVE_LOGS]; ++ grub_uint8_t sit_nat_version_bitmap[3900]; ++ grub_uint32_t checksum; ++} GRUB_PACKED; ++ ++struct grub_f2fs_nat_entry { ++ grub_uint8_t version; ++ grub_uint32_t ino; ++ grub_uint32_t block_addr; ++} GRUB_PACKED; ++ ++struct grub_f2fs_nat_jent ++{ ++ grub_uint32_t nid; ++ struct grub_f2fs_nat_entry ne; ++} GRUB_PACKED; ++ ++struct grub_f2fs_nat_journal { ++ grub_uint16_t n_nats; ++ struct grub_f2fs_nat_jent entries[NAT_JOURNAL_ENTRIES]; ++ grub_uint8_t reserved[NAT_JOURNAL_RESERVED]; ++} GRUB_PACKED; ++ ++struct grub_f2fs_nat_block { ++ struct grub_f2fs_nat_entry ne[NAT_ENTRY_PER_BLOCK]; ++} GRUB_PACKED; ++ ++struct grub_f2fs_dir_entry ++{ ++ grub_uint32_t hash_code; ++ grub_uint32_t ino; ++ grub_uint16_t name_len; ++ grub_uint8_t file_type; ++} GRUB_PACKED; ++ ++struct grub_f2fs_inline_dentry ++{ ++ grub_uint8_t dentry_bitmap[INLINE_DENTRY_BITMAP_SIZE]; ++ grub_uint8_t reserved[INLINE_RESERVED_SIZE]; ++ struct grub_f2fs_dir_entry dentry[NR_INLINE_DENTRY]; ++ grub_uint8_t filename[NR_INLINE_DENTRY][F2FS_SLOT_LEN]; ++} GRUB_PACKED; ++ ++struct grub_f2fs_dentry_block { ++ grub_uint8_t dentry_bitmap[SIZE_OF_DENTRY_BITMAP]; ++ grub_uint8_t reserved[SIZE_OF_RESERVED]; ++ struct grub_f2fs_dir_entry dentry[NR_DENTRY_IN_BLOCK]; ++ grub_uint8_t filename[NR_DENTRY_IN_BLOCK][F2FS_SLOT_LEN]; ++} GRUB_PACKED; ++ ++struct grub_f2fs_inode ++{ ++ grub_uint16_t i_mode; ++ grub_uint8_t i_advise; ++ grub_uint8_t i_inline; ++ grub_uint32_t i_uid; ++ grub_uint32_t i_gid; ++ grub_uint32_t i_links; ++ grub_uint64_t i_size; ++ grub_uint64_t i_blocks; ++ grub_uint64_t i_atime; ++ grub_uint64_t i_ctime; ++ grub_uint64_t i_mtime; ++ grub_uint32_t i_atime_nsec; ++ grub_uint32_t i_ctime_nsec; ++ grub_uint32_t i_mtime_nsec; ++ grub_uint32_t i_generation; ++ grub_uint32_t i_current_depth; ++ grub_uint32_t i_xattr_nid; ++ grub_uint32_t i_flags; ++ grub_uint32_t i_pino; ++ grub_uint32_t i_namelen; ++ grub_uint8_t i_name[F2FS_NAME_LEN]; ++ grub_uint8_t i_dir_level; ++ grub_uint8_t i_ext[12]; ++ grub_uint32_t i_addr[DEF_ADDRS_PER_INODE]; ++ grub_uint32_t i_nid[5]; ++} GRUB_PACKED; ++ ++struct grub_direct_node { ++ grub_uint32_t addr[ADDRS_PER_BLOCK]; ++} GRUB_PACKED; ++ ++struct grub_indirect_node { ++ grub_uint32_t nid[NIDS_PER_BLOCK]; ++} GRUB_PACKED; ++ ++struct grub_f2fs_node ++{ ++ union ++ { ++ struct grub_f2fs_inode i; ++ struct grub_direct_node dn; ++ struct grub_indirect_node in; ++ /* Should occupy F2FS_BLKSIZE totally. */ ++ char buf[F2FS_BLKSIZE - 40]; ++ }; ++ grub_uint8_t dummy[40]; ++} GRUB_PACKED; ++ ++struct grub_fshelp_node ++{ ++ struct grub_f2fs_data *data; ++ struct grub_f2fs_node inode; ++ grub_uint32_t ino; ++ int inode_read; ++}; ++ ++struct grub_f2fs_data ++{ ++ struct grub_f2fs_superblock sblock; ++ struct grub_f2fs_checkpoint ckpt; ++ ++ grub_uint32_t root_ino; ++ grub_uint32_t blocks_per_seg; ++ grub_uint32_t cp_blkaddr; ++ grub_uint32_t nat_blkaddr; ++ ++ struct grub_f2fs_nat_journal nat_j; ++ char *nat_bitmap; ++ ++ grub_disk_t disk; ++ struct grub_f2fs_node *inode; ++ struct grub_fshelp_node diropen; ++}; ++ ++struct grub_f2fs_dir_iter_ctx ++{ ++ struct grub_f2fs_data *data; ++ grub_fshelp_iterate_dir_hook_t hook; ++ void *hook_data; ++ grub_uint8_t *bitmap; ++ grub_uint8_t (*filename)[F2FS_SLOT_LEN]; ++ struct grub_f2fs_dir_entry *dentry; ++ int max; ++}; ++ ++struct grub_f2fs_dir_ctx ++{ ++ grub_fs_dir_hook_t hook; ++ void *hook_data; ++ struct grub_f2fs_data *data; ++}; ++ ++static grub_dl_t my_mod; ++ ++static int ++grub_f2fs_test_bit_le (int nr, const grub_uint8_t *addr) ++{ ++ return addr[nr >> 3] & (1 << (nr & 7)); ++} ++ ++static char * ++get_inline_addr (struct grub_f2fs_inode *inode) ++{ ++ return (char *) &inode->i_addr[1]; ++} ++ ++static grub_uint64_t ++grub_f2fs_file_size (struct grub_f2fs_inode *inode) ++{ ++ return grub_le_to_cpu64 (inode->i_size); ++} ++ ++static grub_uint32_t ++start_cp_addr (struct grub_f2fs_data *data) ++{ ++ struct grub_f2fs_checkpoint *ckpt = &data->ckpt; ++ grub_uint32_t start_addr = data->cp_blkaddr; ++ ++ if (!(ckpt->checkpoint_ver & grub_cpu_to_le64_compile_time(1))) ++ return start_addr + data->blocks_per_seg; ++ ++ return start_addr; ++} ++ ++static grub_uint32_t ++start_sum_block (struct grub_f2fs_data *data) ++{ ++ struct grub_f2fs_checkpoint *ckpt = &data->ckpt; ++ ++ return start_cp_addr (data) + grub_le_to_cpu32 (ckpt->cp_pack_start_sum); ++} ++ ++static grub_uint32_t ++sum_blk_addr (struct grub_f2fs_data *data, int base, int type) ++{ ++ struct grub_f2fs_checkpoint *ckpt = &data->ckpt; ++ ++ return start_cp_addr (data) + ++ grub_le_to_cpu32 (ckpt->cp_pack_total_block_count) - ++ (base + 1) + type; ++} ++ ++static void * ++nat_bitmap_ptr (struct grub_f2fs_data *data) ++{ ++ struct grub_f2fs_checkpoint *ckpt = &data->ckpt; ++ grub_uint32_t offset; ++ ++ if (grub_le_to_cpu32 (data->sblock.cp_payload) > 0) ++ return ckpt->sit_nat_version_bitmap; ++ ++ offset = grub_le_to_cpu32 (ckpt->sit_ver_bitmap_bytesize); ++ ++ return ckpt->sit_nat_version_bitmap + offset; ++} ++ ++static grub_uint32_t ++get_node_id (struct grub_f2fs_node *rn, int off, int inode_block) ++{ ++ if (inode_block) ++ return grub_le_to_cpu32 (rn->i.i_nid[off - NODE_DIR1_BLOCK]); ++ ++ return grub_le_to_cpu32 (rn->in.nid[off]); ++} ++ ++static grub_err_t ++grub_f2fs_block_read (struct grub_f2fs_data *data, grub_uint32_t blkaddr, ++ void *buf) ++{ ++ return grub_disk_read (data->disk, ++ ((grub_disk_addr_t)blkaddr) << F2FS_BLK_SEC_BITS, ++ 0, F2FS_BLKSIZE, buf); ++} ++ ++/* CRC32 */ ++static grub_uint32_t ++grub_f2fs_cal_crc32 (const void *buf, const grub_uint32_t len) ++{ ++ grub_uint32_t crc = F2FS_SUPER_MAGIC; ++ unsigned char *p = (unsigned char *)buf; ++ grub_uint32_t tmp = len; ++ int i; ++ ++ while (tmp--) ++ { ++ crc ^= *p++; ++ for (i = 0; i < 8; i++) ++ crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY_LE : 0); ++ } ++ ++ return crc; ++} ++ ++static int ++grub_f2fs_crc_valid (grub_uint32_t blk_crc, void *buf, const grub_uint32_t len) ++{ ++ grub_uint32_t cal_crc = 0; ++ ++ cal_crc = grub_f2fs_cal_crc32 (buf, len); ++ ++ return (cal_crc == blk_crc) ? 1 : 0; ++} ++ ++static int ++grub_f2fs_test_bit (grub_uint32_t nr, const char *p) ++{ ++ int mask; ++ ++ p += (nr >> 3); ++ mask = 1 << (7 - (nr & 0x07)); ++ ++ return mask & *p; ++} ++ ++static int ++grub_f2fs_sanity_check_sb (struct grub_f2fs_superblock *sb) ++{ ++ grub_uint32_t log_sectorsize, log_sectors_per_block; ++ ++ if (sb->magic != grub_cpu_to_le32_compile_time (F2FS_SUPER_MAGIC)) ++ return -1; ++ ++ if (sb->log_blocksize != grub_cpu_to_le32_compile_time (F2FS_BLK_BITS)) ++ return -1; ++ ++ log_sectorsize = grub_le_to_cpu32 (sb->log_sectorsize); ++ log_sectors_per_block = grub_le_to_cpu32 (sb->log_sectors_per_block); ++ ++ if (log_sectorsize > F2FS_BLK_BITS) ++ return -1; ++ ++ if (log_sectorsize < F2FS_MIN_LOG_SECTOR_SIZE) ++ return -1; ++ ++ if (log_sectors_per_block + log_sectorsize != F2FS_BLK_BITS) ++ return -1; ++ ++ return 0; ++} ++ ++static int ++grub_f2fs_read_sb (struct grub_f2fs_data *data, grub_disk_addr_t offset) ++{ ++ grub_disk_t disk = data->disk; ++ grub_err_t err; ++ ++ /* Read first super block. */ ++ err = grub_disk_read (disk, offset, 0, sizeof (data->sblock), &data->sblock); ++ if (err) ++ return -1; ++ ++ return grub_f2fs_sanity_check_sb (&data->sblock); ++} ++ ++static void * ++validate_checkpoint (struct grub_f2fs_data *data, grub_uint32_t cp_addr, ++ grub_uint64_t *version) ++{ ++ grub_uint32_t *cp_page_1, *cp_page_2; ++ struct grub_f2fs_checkpoint *cp_block; ++ grub_uint64_t cur_version = 0, pre_version = 0; ++ grub_uint32_t crc = 0; ++ grub_uint32_t crc_offset; ++ grub_err_t err; ++ ++ /* Read the 1st cp block in this CP pack. */ ++ cp_page_1 = grub_malloc (F2FS_BLKSIZE); ++ if (!cp_page_1) ++ return NULL; ++ ++ err = grub_f2fs_block_read (data, cp_addr, cp_page_1); ++ if (err) ++ goto invalid_cp1; ++ ++ cp_block = (struct grub_f2fs_checkpoint *)cp_page_1; ++ crc_offset = grub_le_to_cpu32 (cp_block->checksum_offset); ++ if (crc_offset != CHECKSUM_OFFSET) ++ goto invalid_cp1; ++ ++ crc = grub_le_to_cpu32 (*(cp_page_1 + U32_CHECKSUM_OFFSET)); ++ if (!grub_f2fs_crc_valid (crc, cp_block, crc_offset)) ++ goto invalid_cp1; ++ ++ pre_version = grub_le_to_cpu64 (cp_block->checkpoint_ver); ++ ++ /* Read the 2nd cp block in this CP pack. */ ++ cp_page_2 = grub_malloc (F2FS_BLKSIZE); ++ if (!cp_page_2) ++ goto invalid_cp1; ++ ++ cp_addr += grub_le_to_cpu32 (cp_block->cp_pack_total_block_count) - 1; ++ ++ err = grub_f2fs_block_read (data, cp_addr, cp_page_2); ++ if (err) ++ goto invalid_cp2; ++ ++ cp_block = (struct grub_f2fs_checkpoint *)cp_page_2; ++ crc_offset = grub_le_to_cpu32 (cp_block->checksum_offset); ++ if (crc_offset != CHECKSUM_OFFSET) ++ goto invalid_cp2; ++ ++ crc = grub_le_to_cpu32 (*(cp_page_2 + U32_CHECKSUM_OFFSET)); ++ if (!grub_f2fs_crc_valid (crc, cp_block, crc_offset)) ++ goto invalid_cp2; ++ ++ cur_version = grub_le_to_cpu64 (cp_block->checkpoint_ver); ++ if (cur_version == pre_version) ++ { ++ *version = cur_version; ++ grub_free (cp_page_2); ++ ++ return cp_page_1; ++ } ++ ++ invalid_cp2: ++ grub_free (cp_page_2); ++ ++ invalid_cp1: ++ grub_free (cp_page_1); ++ ++ return NULL; ++} ++ ++static grub_err_t ++grub_f2fs_read_cp (struct grub_f2fs_data *data) ++{ ++ void *cp1, *cp2, *cur_page; ++ grub_uint64_t cp1_version = 0, cp2_version = 0; ++ grub_uint64_t cp_start_blk_no; ++ ++ /* ++ * Finding out valid cp block involves read both ++ * sets (cp pack1 and cp pack 2). ++ */ ++ cp_start_blk_no = data->cp_blkaddr; ++ cp1 = validate_checkpoint (data, cp_start_blk_no, &cp1_version); ++ if (!cp1 && grub_errno) ++ return grub_errno; ++ ++ /* The second checkpoint pack should start at the next segment. */ ++ cp_start_blk_no += data->blocks_per_seg; ++ cp2 = validate_checkpoint (data, cp_start_blk_no, &cp2_version); ++ if (!cp2 && grub_errno) ++ { ++ grub_free (cp1); ++ return grub_errno; ++ } ++ ++ if (cp1 && cp2) ++ cur_page = (cp2_version > cp1_version) ? cp2 : cp1; ++ else if (cp1) ++ cur_page = cp1; ++ else if (cp2) ++ cur_page = cp2; ++ else ++ return grub_error (GRUB_ERR_BAD_FS, "no checkpoints"); ++ ++ grub_memcpy (&data->ckpt, cur_page, F2FS_BLKSIZE); ++ ++ grub_free (cp1); ++ grub_free (cp2); ++ ++ return 0; ++} ++ ++static grub_err_t ++get_nat_journal (struct grub_f2fs_data *data) ++{ ++ grub_uint32_t block; ++ char *buf; ++ grub_err_t err; ++ ++ buf = grub_malloc (F2FS_BLKSIZE); ++ if (!buf) ++ return grub_errno; ++ ++ if (CKPT_FLAG_SET(&data->ckpt, CP_COMPACT_SUM_FLAG)) ++ block = start_sum_block (data); ++ else if (CKPT_FLAG_SET (&data->ckpt, CP_UMOUNT_FLAG)) ++ block = sum_blk_addr (data, NR_CURSEG_TYPE, CURSEG_HOT_DATA); ++ else ++ block = sum_blk_addr (data, NR_CURSEG_DATA_TYPE, CURSEG_HOT_DATA); ++ ++ err = grub_f2fs_block_read (data, block, buf); ++ if (err) ++ goto fail; ++ ++ if (CKPT_FLAG_SET (&data->ckpt, CP_COMPACT_SUM_FLAG)) ++ grub_memcpy (&data->nat_j, buf, SUM_JOURNAL_SIZE); ++ else ++ grub_memcpy (&data->nat_j, buf + SUM_ENTRIES_SIZE, SUM_JOURNAL_SIZE); ++ ++ fail: ++ grub_free (buf); ++ ++ return err; ++} ++ ++static grub_uint32_t ++get_blkaddr_from_nat_journal (struct grub_f2fs_data *data, grub_uint32_t nid) ++{ ++ grub_uint16_t n = grub_le_to_cpu16 (data->nat_j.n_nats); ++ grub_uint32_t blkaddr = 0; ++ grub_uint16_t i; ++ ++ for (i = 0; i < n; i++) ++ { ++ if (grub_le_to_cpu32 (data->nat_j.entries[i].nid) == nid) ++ { ++ blkaddr = grub_le_to_cpu32 (data->nat_j.entries[i].ne.block_addr); ++ break; ++ } ++ } ++ ++ return blkaddr; ++} ++ ++static grub_uint32_t ++get_node_blkaddr (struct grub_f2fs_data *data, grub_uint32_t nid) ++{ ++ struct grub_f2fs_nat_block *nat_block; ++ grub_uint32_t seg_off, block_off, entry_off, block_addr; ++ grub_uint32_t blkaddr; ++ grub_err_t err; ++ ++ blkaddr = get_blkaddr_from_nat_journal (data, nid); ++ if (blkaddr) ++ return blkaddr; ++ ++ nat_block = grub_malloc (F2FS_BLKSIZE); ++ if (!nat_block) ++ return 0; ++ ++ block_off = nid / NAT_ENTRY_PER_BLOCK; ++ entry_off = nid % NAT_ENTRY_PER_BLOCK; ++ ++ seg_off = block_off / data->blocks_per_seg; ++ block_addr = data->nat_blkaddr + ++ ((seg_off * data->blocks_per_seg) << 1) + ++ (block_off & (data->blocks_per_seg - 1)); ++ ++ if (grub_f2fs_test_bit (block_off, data->nat_bitmap)) ++ block_addr += data->blocks_per_seg; ++ ++ err = grub_f2fs_block_read (data, block_addr, nat_block); ++ if (err) ++ { ++ grub_free (nat_block); ++ return 0; ++ } ++ ++ blkaddr = grub_le_to_cpu32 (nat_block->ne[entry_off].block_addr); ++ ++ grub_free (nat_block); ++ ++ return blkaddr; ++} ++ ++static int ++grub_get_node_path (struct grub_f2fs_inode *inode, grub_uint32_t block, ++ grub_uint32_t offset[4], grub_uint32_t noffset[4]) ++{ ++ grub_uint32_t direct_blks = ADDRS_PER_BLOCK; ++ grub_uint32_t dptrs_per_blk = NIDS_PER_BLOCK; ++ grub_uint32_t indirect_blks = ADDRS_PER_BLOCK * NIDS_PER_BLOCK; ++ grub_uint32_t dindirect_blks = indirect_blks * NIDS_PER_BLOCK; ++ grub_uint32_t direct_index = DEF_ADDRS_PER_INODE; ++ int n = 0; ++ int level = 0; ++ ++ if (inode->i_inline & F2FS_INLINE_XATTR) ++ direct_index -= F2FS_INLINE_XATTR_ADDRS; ++ ++ noffset[0] = 0; ++ ++ if (block < direct_index) ++ { ++ offset[n] = block; ++ goto got; ++ } ++ ++ block -= direct_index; ++ if (block < direct_blks) ++ { ++ offset[n++] = NODE_DIR1_BLOCK; ++ noffset[n] = 1; ++ offset[n] = block; ++ level = 1; ++ goto got; ++ } ++ ++ block -= direct_blks; ++ if (block < direct_blks) ++ { ++ offset[n++] = NODE_DIR2_BLOCK; ++ noffset[n] = 2; ++ offset[n] = block; ++ level = 1; ++ goto got; ++ } ++ ++ block -= direct_blks; ++ if (block < indirect_blks) ++ { ++ offset[n++] = NODE_IND1_BLOCK; ++ noffset[n] = 3; ++ offset[n++] = block / direct_blks; ++ noffset[n] = 4 + offset[n - 1]; ++ offset[n] = block % direct_blks; ++ level = 2; ++ goto got; ++ } ++ ++ block -= indirect_blks; ++ if (block < indirect_blks) ++ { ++ offset[n++] = NODE_IND2_BLOCK; ++ noffset[n] = 4 + dptrs_per_blk; ++ offset[n++] = block / direct_blks; ++ noffset[n] = 5 + dptrs_per_blk + offset[n - 1]; ++ offset[n] = block % direct_blks; ++ level = 2; ++ goto got; ++ } ++ ++ block -= indirect_blks; ++ if (block < dindirect_blks) ++ { ++ offset[n++] = NODE_DIND_BLOCK; ++ noffset[n] = 5 + (dptrs_per_blk * 2); ++ offset[n++] = block / indirect_blks; ++ noffset[n] = 6 + (dptrs_per_blk * 2) + ++ offset[n - 1] * (dptrs_per_blk + 1); ++ offset[n++] = (block / direct_blks) % dptrs_per_blk; ++ noffset[n] = 7 + (dptrs_per_blk * 2) + ++ offset[n - 2] * (dptrs_per_blk + 1) + offset[n - 1]; ++ offset[n] = block % direct_blks; ++ level = 3; ++ goto got; ++ } ++ ++ got: ++ return level; ++} ++ ++static grub_err_t ++grub_f2fs_read_node (struct grub_f2fs_data *data, ++ grub_uint32_t nid, struct grub_f2fs_node *np) ++{ ++ grub_uint32_t blkaddr; ++ ++ blkaddr = get_node_blkaddr (data, nid); ++ if (!blkaddr) ++ return grub_errno; ++ ++ return grub_f2fs_block_read (data, blkaddr, np); ++} ++ ++static struct grub_f2fs_data * ++grub_f2fs_mount (grub_disk_t disk) ++{ ++ struct grub_f2fs_data *data; ++ grub_err_t err; ++ ++ data = grub_malloc (sizeof (*data)); ++ if (!data) ++ return NULL; ++ ++ data->disk = disk; ++ ++ if (grub_f2fs_read_sb (data, F2FS_SUPER_OFFSET0)) ++ { ++ if (grub_f2fs_read_sb (data, F2FS_SUPER_OFFSET1)) ++ { ++ if (grub_errno == GRUB_ERR_NONE) ++ grub_error (GRUB_ERR_BAD_FS, ++ "not a F2FS filesystem (no superblock)"); ++ goto fail; ++ } ++ } ++ ++ data->root_ino = grub_le_to_cpu32 (data->sblock.root_ino); ++ data->cp_blkaddr = grub_le_to_cpu32 (data->sblock.cp_blkaddr); ++ data->nat_blkaddr = grub_le_to_cpu32 (data->sblock.nat_blkaddr); ++ data->blocks_per_seg = 1 << ++ grub_le_to_cpu32 (data->sblock.log_blocks_per_seg); ++ ++ err = grub_f2fs_read_cp (data); ++ if (err) ++ goto fail; ++ ++ data->nat_bitmap = nat_bitmap_ptr (data); ++ ++ err = get_nat_journal (data); ++ if (err) ++ goto fail; ++ ++ data->diropen.data = data; ++ data->diropen.ino = data->root_ino; ++ data->diropen.inode_read = 1; ++ data->inode = &data->diropen.inode; ++ ++ err = grub_f2fs_read_node (data, data->root_ino, data->inode); ++ if (err) ++ goto fail; ++ ++ return data; ++ ++ fail: ++ grub_free (data); ++ ++ return NULL; ++} ++ ++/* Guarantee inline_data was handled by caller. */ ++static grub_disk_addr_t ++grub_f2fs_get_block (grub_fshelp_node_t node, grub_disk_addr_t block_ofs) ++{ ++ struct grub_f2fs_data *data = node->data; ++ struct grub_f2fs_inode *inode = &node->inode.i; ++ grub_uint32_t offset[4], noffset[4], nids[4]; ++ struct grub_f2fs_node *node_block; ++ grub_uint32_t block_addr = -1; ++ int level, i; ++ ++ level = grub_get_node_path (inode, block_ofs, offset, noffset); ++ if (level == 0) ++ return grub_le_to_cpu32 (inode->i_addr[offset[0]]); ++ ++ node_block = grub_malloc (F2FS_BLKSIZE); ++ if (!node_block) ++ return -1; ++ ++ nids[1] = get_node_id (&node->inode, offset[0], 1); ++ ++ /* Get indirect or direct nodes. */ ++ for (i = 1; i <= level; i++) ++ { ++ grub_f2fs_read_node (data, nids[i], node_block); ++ if (grub_errno) ++ goto fail; ++ ++ if (i < level) ++ nids[i + 1] = get_node_id (node_block, offset[i], 0); ++ } ++ ++ block_addr = grub_le_to_cpu32 (node_block->dn.addr[offset[level]]); ++ ++ fail: ++ grub_free (node_block); ++ ++ return block_addr; ++} ++ ++static grub_ssize_t ++grub_f2fs_read_file (grub_fshelp_node_t node, ++ grub_disk_read_hook_t read_hook, void *read_hook_data, ++ grub_off_t pos, grub_size_t len, char *buf) ++{ ++ struct grub_f2fs_inode *inode = &node->inode.i; ++ grub_off_t filesize = grub_f2fs_file_size (inode); ++ char *inline_addr = get_inline_addr (inode); ++ ++ if (inode->i_inline & F2FS_INLINE_DATA) ++ { ++ if (filesize > MAX_INLINE_DATA) ++ return -1; ++ ++ if (len > filesize - pos) ++ len = filesize - pos; ++ ++ grub_memcpy (buf, inline_addr + pos, len); ++ return len; ++ } ++ ++ return grub_fshelp_read_file (node->data->disk, node, ++ read_hook, read_hook_data, ++ pos, len, buf, grub_f2fs_get_block, ++ filesize, ++ F2FS_BLK_SEC_BITS, 0); ++} ++ ++static char * ++grub_f2fs_read_symlink (grub_fshelp_node_t node) ++{ ++ char *symlink; ++ struct grub_fshelp_node *diro = node; ++ grub_uint64_t filesize; ++ ++ if (!diro->inode_read) ++ { ++ grub_f2fs_read_node (diro->data, diro->ino, &diro->inode); ++ if (grub_errno) ++ return 0; ++ } ++ ++ filesize = grub_f2fs_file_size(&diro->inode.i); ++ ++ symlink = grub_malloc (filesize + 1); ++ if (!symlink) ++ return 0; ++ ++ grub_f2fs_read_file (diro, 0, 0, 0, filesize, symlink); ++ if (grub_errno) ++ { ++ grub_free (symlink); ++ return 0; ++ } ++ ++ symlink[filesize] = '\0'; ++ ++ return symlink; ++} ++ ++static int ++grub_f2fs_check_dentries (struct grub_f2fs_dir_iter_ctx *ctx) ++{ ++ struct grub_fshelp_node *fdiro; ++ int i; ++ ++ for (i = 0; i < ctx->max;) ++ { ++ char *filename; ++ enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN; ++ enum FILE_TYPE ftype; ++ int name_len; ++ int ret; ++ ++ if (grub_f2fs_test_bit_le (i, ctx->bitmap) == 0) ++ { ++ i++; ++ continue; ++ } ++ ++ ftype = ctx->dentry[i].file_type; ++ name_len = grub_le_to_cpu16 (ctx->dentry[i].name_len); ++ filename = grub_malloc (name_len + 1); ++ if (!filename) ++ return 0; ++ ++ grub_memcpy (filename, ctx->filename[i], name_len); ++ filename[name_len] = 0; ++ ++ fdiro = grub_malloc (sizeof (struct grub_fshelp_node)); ++ if (!fdiro) ++ { ++ grub_free(filename); ++ return 0; ++ } ++ ++ if (ftype == F2FS_FT_DIR) ++ type = GRUB_FSHELP_DIR; ++ else if (ftype == F2FS_FT_SYMLINK) ++ type = GRUB_FSHELP_SYMLINK; ++ else if (ftype == F2FS_FT_REG_FILE) ++ type = GRUB_FSHELP_REG; ++ ++ fdiro->data = ctx->data; ++ fdiro->ino = grub_le_to_cpu32 (ctx->dentry[i].ino); ++ fdiro->inode_read = 0; ++ ++ ret = ctx->hook (filename, type, fdiro, ctx->hook_data); ++ grub_free(filename); ++ if (ret) ++ return 1; ++ ++ i += (name_len + F2FS_SLOT_LEN - 1) / F2FS_SLOT_LEN; ++ } ++ ++ return 0; ++} ++ ++static int ++grub_f2fs_iterate_inline_dir (struct grub_f2fs_inode *dir, ++ struct grub_f2fs_dir_iter_ctx *ctx) ++{ ++ struct grub_f2fs_inline_dentry *de_blk; ++ ++ de_blk = (struct grub_f2fs_inline_dentry *) get_inline_addr (dir); ++ ++ ctx->bitmap = de_blk->dentry_bitmap; ++ ctx->dentry = de_blk->dentry; ++ ctx->filename = de_blk->filename; ++ ctx->max = NR_INLINE_DENTRY; ++ ++ return grub_f2fs_check_dentries (ctx); ++} ++ ++static int ++grub_f2fs_iterate_dir (grub_fshelp_node_t dir, ++ grub_fshelp_iterate_dir_hook_t hook, void *hook_data) ++{ ++ struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir; ++ struct grub_f2fs_inode *inode; ++ struct grub_f2fs_dir_iter_ctx ctx = { ++ .data = diro->data, ++ .hook = hook, ++ .hook_data = hook_data ++ }; ++ grub_off_t fpos = 0; ++ ++ if (!diro->inode_read) ++ { ++ grub_f2fs_read_node (diro->data, diro->ino, &diro->inode); ++ if (grub_errno) ++ return 0; ++ } ++ ++ inode = &diro->inode.i; ++ ++ if (inode->i_inline & F2FS_INLINE_DENTRY) ++ return grub_f2fs_iterate_inline_dir (inode, &ctx); ++ ++ while (fpos < grub_f2fs_file_size (inode)) ++ { ++ struct grub_f2fs_dentry_block *de_blk; ++ char *buf; ++ int ret; ++ ++ buf = grub_zalloc (F2FS_BLKSIZE); ++ if (!buf) ++ return 0; ++ ++ grub_f2fs_read_file (diro, 0, 0, fpos, F2FS_BLKSIZE, buf); ++ if (grub_errno) ++ { ++ grub_free (buf); ++ return 0; ++ } ++ ++ de_blk = (struct grub_f2fs_dentry_block *) buf; ++ ++ ctx.bitmap = de_blk->dentry_bitmap; ++ ctx.dentry = de_blk->dentry; ++ ctx.filename = de_blk->filename; ++ ctx.max = NR_DENTRY_IN_BLOCK; ++ ++ ret = grub_f2fs_check_dentries (&ctx); ++ grub_free (buf); ++ if (ret) ++ return 1; ++ ++ fpos += F2FS_BLKSIZE; ++ } ++ ++ return 0; ++} ++ ++static int ++grub_f2fs_dir_iter (const char *filename, enum grub_fshelp_filetype filetype, ++ grub_fshelp_node_t node, void *data) ++{ ++ struct grub_f2fs_dir_ctx *ctx = data; ++ struct grub_dirhook_info info; ++ ++ grub_memset (&info, 0, sizeof (info)); ++ if (!node->inode_read) ++ { ++ grub_f2fs_read_node (ctx->data, node->ino, &node->inode); ++ if (!grub_errno) ++ node->inode_read = 1; ++ grub_errno = GRUB_ERR_NONE; ++ } ++ if (node->inode_read) ++ { ++ info.mtimeset = 1; ++ info.mtime = grub_le_to_cpu64 (node->inode.i.i_mtime); ++ } ++ ++ info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR); ++ grub_free (node); ++ ++ return ctx->hook (filename, &info, ctx->hook_data); ++} ++ ++static grub_err_t ++grub_f2fs_dir (grub_device_t device, const char *path, ++ grub_fs_dir_hook_t hook, void *hook_data) ++{ ++ struct grub_f2fs_dir_ctx ctx = { ++ .hook = hook, ++ .hook_data = hook_data ++ }; ++ struct grub_fshelp_node *fdiro = 0; ++ ++ grub_dl_ref (my_mod); ++ ++ ctx.data = grub_f2fs_mount (device->disk); ++ if (!ctx.data) ++ goto fail; ++ ++ grub_fshelp_find_file (path, &ctx.data->diropen, &fdiro, ++ grub_f2fs_iterate_dir, grub_f2fs_read_symlink, ++ GRUB_FSHELP_DIR); ++ if (grub_errno) ++ goto fail; ++ ++ grub_f2fs_iterate_dir (fdiro, grub_f2fs_dir_iter, &ctx); ++ ++ fail: ++ if (fdiro != &ctx.data->diropen) ++ grub_free (fdiro); ++ grub_free (ctx.data); ++ grub_dl_unref (my_mod); ++ ++ return grub_errno; ++} ++ ++/* Open a file named NAME and initialize FILE. */ ++static grub_err_t ++grub_f2fs_open (struct grub_file *file, const char *name) ++{ ++ struct grub_f2fs_data *data = NULL; ++ struct grub_fshelp_node *fdiro = 0; ++ struct grub_f2fs_inode *inode; ++ ++ grub_dl_ref (my_mod); ++ ++ data = grub_f2fs_mount (file->device->disk); ++ if (!data) ++ goto fail; ++ ++ grub_fshelp_find_file (name, &data->diropen, &fdiro, ++ grub_f2fs_iterate_dir, grub_f2fs_read_symlink, ++ GRUB_FSHELP_REG); ++ if (grub_errno) ++ goto fail; ++ ++ if (!fdiro->inode_read) ++ { ++ grub_f2fs_read_node (data, fdiro->ino, &fdiro->inode); ++ if (grub_errno) ++ goto fail; ++ } ++ ++ grub_memcpy (data->inode, &fdiro->inode, sizeof (*data->inode)); ++ grub_free (fdiro); ++ ++ inode = &(data->inode->i); ++ file->size = grub_f2fs_file_size (inode); ++ file->data = data; ++ file->offset = 0; ++ ++ if (inode->i_inline & F2FS_INLINE_DATA && file->size > MAX_INLINE_DATA) ++ grub_error (GRUB_ERR_BAD_FS, "corrupted inline_data: need fsck"); ++ ++ return 0; ++ ++ fail: ++ if (fdiro != &data->diropen) ++ grub_free (fdiro); ++ grub_free (data); ++ ++ grub_dl_unref (my_mod); ++ ++ return grub_errno; ++} ++ ++static grub_ssize_t ++grub_f2fs_read (grub_file_t file, char *buf, grub_size_t len) ++{ ++ struct grub_f2fs_data *data = (struct grub_f2fs_data *) file->data; ++ ++ return grub_f2fs_read_file (&data->diropen, ++ file->read_hook, file->read_hook_data, ++ file->offset, len, buf); ++} ++ ++static grub_err_t ++grub_f2fs_close (grub_file_t file) ++{ ++ struct grub_f2fs_data *data = (struct grub_f2fs_data *) file->data; ++ ++ grub_free (data); ++ ++ grub_dl_unref (my_mod); ++ ++ return GRUB_ERR_NONE; ++} ++ ++static grub_uint8_t * ++grub_f2fs_utf16_to_utf8 (grub_uint16_t *in_buf_le) ++{ ++ grub_uint16_t in_buf[MAX_VOLUME_NAME]; ++ grub_uint8_t *out_buf; ++ int len = 0; ++ ++ out_buf = grub_malloc (MAX_VOLUME_NAME * GRUB_MAX_UTF8_PER_UTF16 + 1); ++ if (!out_buf) ++ return NULL; ++ ++ while (*in_buf_le != 0 && len < MAX_VOLUME_NAME) { ++ in_buf[len] = grub_le_to_cpu16 (in_buf_le[len]); ++ len++; ++ } ++ ++ *grub_utf16_to_utf8 (out_buf, in_buf, len) = '\0'; ++ ++ return out_buf; ++} ++ ++static grub_err_t ++grub_f2fs_label (grub_device_t device, char **label) ++{ ++ struct grub_f2fs_data *data; ++ grub_disk_t disk = device->disk; ++ ++ grub_dl_ref (my_mod); ++ ++ data = grub_f2fs_mount (disk); ++ if (data) ++ *label = (char *) grub_f2fs_utf16_to_utf8 (data->sblock.volume_name); ++ else ++ *label = NULL; ++ ++ grub_free (data); ++ grub_dl_unref (my_mod); ++ ++ return grub_errno; ++} ++ ++static grub_err_t ++grub_f2fs_uuid (grub_device_t device, char **uuid) ++{ ++ struct grub_f2fs_data *data; ++ grub_disk_t disk = device->disk; ++ ++ grub_dl_ref (my_mod); ++ ++ data = grub_f2fs_mount (disk); ++ if (data) ++ { ++ *uuid = ++ grub_xasprintf ++ ("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", ++ data->sblock.uuid[0], data->sblock.uuid[1], ++ data->sblock.uuid[2], data->sblock.uuid[3], ++ data->sblock.uuid[4], data->sblock.uuid[5], ++ data->sblock.uuid[6], data->sblock.uuid[7], ++ data->sblock.uuid[8], data->sblock.uuid[9], ++ data->sblock.uuid[10], data->sblock.uuid[11], ++ data->sblock.uuid[12], data->sblock.uuid[13], ++ data->sblock.uuid[14], data->sblock.uuid[15]); ++ } ++ else ++ *uuid = NULL; ++ ++ grub_free (data); ++ grub_dl_unref (my_mod); ++ ++ return grub_errno; ++} ++ ++static struct grub_fs grub_f2fs_fs = { ++ .name = "f2fs", ++ .dir = grub_f2fs_dir, ++ .open = grub_f2fs_open, ++ .read = grub_f2fs_read, ++ .close = grub_f2fs_close, ++ .label = grub_f2fs_label, ++ .uuid = grub_f2fs_uuid, ++#ifdef GRUB_UTIL ++ .reserved_first_sector = 1, ++ .blocklist_install = 0, ++#endif ++ .next = 0 ++}; ++ ++GRUB_MOD_INIT (f2fs) ++{ ++ grub_fs_register (&grub_f2fs_fs); ++ my_mod = mod; ++} ++ ++GRUB_MOD_FINI (f2fs) ++{ ++ grub_fs_unregister (&grub_f2fs_fs); ++} +diff --git a/po/exclude.pot b/po/exclude.pot +index 0a9b215..816089c 100644 +--- a/po/exclude.pot ++++ b/po/exclude.pot +@@ -1214,6 +1214,7 @@ msgstr "" + + #: grub-core/commands/xnu_uuid.c:75 grub-core/fs/jfs.c:924 + #: grub-core/fs/nilfs2.c:1135 ++#: grub-core/fs/f2fs.c:1259 + #, c-format + msgid "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" + msgstr "" +diff --git a/tests/f2fs_test.in b/tests/f2fs_test.in +new file mode 100644 +index 0000000..1ea77c8 +--- /dev/null ++++ b/tests/f2fs_test.in +@@ -0,0 +1,19 @@ ++#!/bin/sh ++ ++set -e ++ ++if [ "x$EUID" = "x" ] ; then ++ EUID=`id -u` ++fi ++ ++if [ "$EUID" != 0 ] ; then ++ exit 77 ++fi ++ ++if ! which mkfs.f2fs >/dev/null 2>&1; then ++ echo "mkfs.f2fs not installed; cannot test f2fs." ++ exit 77 ++fi ++ ++ ++"@builddir@/grub-fs-tester" f2fs +diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in +index 15969d7..26bd57a 100644 +--- a/tests/util/grub-fs-tester.in ++++ b/tests/util/grub-fs-tester.in +@@ -172,7 +172,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do + xsquash*) + MINBLKSIZE=4096 + MAXBLKSIZE=1048576;; +- xxfs) ++ xxfs|xf2fs) + MINBLKSIZE=$SECSIZE + # OS Limitation: GNU/Linux doesn't accept > 4096 + MAXBLKSIZE=4096;; +@@ -299,6 +299,10 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do + x"btrfs"*) + FSLABEL="grub_;/testé莭莽😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoi";; + ++ # FS LIMITATION: f2fs label is at most 512 UTF-16 chars ++ x"f2fs") ++ FSLABEL="grub_;/testé䏌䐓䏕киритiurewfceniuewruewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoirvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoircreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoiq";; ++ + # FS LIMITATION: exfat is at most 15 UTF-16 chars + x"exfat") + FSLABEL="géт ;/莭莽😁кир";; +@@ -508,7 +512,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do + # FIXME: Not sure about BtrFS, NTFS, JFS, AFS, UDF and SFS. Check it. + # FS LIMITATION: as far as I know those FS don't store their last modification date. + x"jfs_caseins" | x"jfs" | x"xfs" | x"xfs_crc" | x"btrfs"* | x"reiserfs_old" | x"reiserfs" \ +- | x"bfs" | x"afs" \ ++ | x"bfs" | x"afs" | x"f2fs" \ + | x"tarfs" | x"cpio_"* | x"minix" | x"minix2" \ + | x"minix3" | x"ntfs"* | x"udf" | x"sfs"*) + NOFSTIME=y;; +@@ -792,6 +796,8 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do + MOUNTDEVICE="/dev/mapper/grub_test-testvol" + MOUNTFS=ext2 + "mkfs.ext2" -L "$FSLABEL" -q "${MOUNTDEVICE}" ;; ++ xf2fs) ++ "mkfs.f2fs" -l "$FSLABEL" -q "${LODEVICES[0]}" ;; + xnilfs2) + "mkfs.nilfs2" -L "$FSLABEL" -b $BLKSIZE -q "${MOUNTDEVICE}" ;; + xext2_old) +-- +cgit v1.0-41-gc330 + + diff --git a/source/l/libcroco/898e3a8c8c03.patch b/source/l/libcroco/898e3a8c8c03.patch deleted file mode 100644 index b669339ce..000000000 --- a/source/l/libcroco/898e3a8c8c03.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 898e3a8c8c0314d2e6b106809a8e3e93cf9d4394 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Sun, 16 Apr 2017 13:13:43 +0200 -Subject: input: check end of input before reading a byte - -When reading bytes we weren't check that the index wasn't -out of bound and this could produce an invalid read which -could deal to a security bug. ---- - src/cr-input.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/cr-input.c b/src/cr-input.c -index 49000b1..3b63a88 100644 ---- a/src/cr-input.c -+++ b/src/cr-input.c -@@ -256,7 +256,7 @@ cr_input_new_from_uri (const gchar * a_file_uri, enum CREncoding a_enc) - *we should free buf here because it's own by CRInput. - *(see the last parameter of cr_input_new_from_buf(). - */ -- buf = NULL ; -+ buf = NULL; - } - - cleanup: -@@ -404,6 +404,8 @@ cr_input_get_nb_bytes_left (CRInput const * a_this) - enum CRStatus - cr_input_read_byte (CRInput * a_this, guchar * a_byte) - { -+ gulong nb_bytes_left = 0; -+ - g_return_val_if_fail (a_this && PRIVATE (a_this) - && a_byte, CR_BAD_PARAM_ERROR); - -@@ -413,6 +415,12 @@ cr_input_read_byte (CRInput * a_this, guchar * a_byte) - if (PRIVATE (a_this)->end_of_input == TRUE) - return CR_END_OF_INPUT_ERROR; - -+ nb_bytes_left = cr_input_get_nb_bytes_left (a_this); -+ -+ if (nb_bytes_left < 1) { -+ return CR_END_OF_INPUT_ERROR; -+ } -+ - *a_byte = PRIVATE (a_this)->in_buf[PRIVATE (a_this)->next_byte_index]; - - if (PRIVATE (a_this)->nb_bytes - -@@ -477,7 +485,6 @@ cr_input_read_char (CRInput * a_this, guint32 * a_char) - if (*a_char == '\n') { - PRIVATE (a_this)->end_of_line = TRUE; - } -- - } - - return status; --- -cgit v0.12 - diff --git a/source/l/libcroco/libcroco.SlackBuild b/source/l/libcroco/libcroco.SlackBuild index 25a7652b3..eda23051b 100755 --- a/source/l/libcroco/libcroco.SlackBuild +++ b/source/l/libcroco/libcroco.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libcroco VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -78,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://blogs.gentoo.org/ago/2017/04/17/libcroco-heap-overflow-and-undefined-behavior/ -patch -p1 --verbose < $CWD/898e3a8c8c03.patch || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/libnotify/libnotify.SlackBuild b/source/l/libnotify/libnotify.SlackBuild index 98c4d3f64..53a69c039 100755 --- a/source/l/libnotify/libnotify.SlackBuild +++ b/source/l/libnotify/libnotify.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for libnotify # # Copyright 2009 Erik W. Hanson, Minneapolis, MN, USA -# Copyright 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libnotify VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -73,18 +73,29 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . -CFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static=no \ - --enable-shared=yes \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --buildtype=release \ + -Ddocbook_docs=disabled \ + -Dtests=false \ + .. || exit 1 + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild index 217ed6f2f..336ffb296 100755 --- a/source/n/nfs-utils/nfs-utils.SlackBuild +++ b/source/n/nfs-utils/nfs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nfs-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -132,6 +132,9 @@ mkdir -p $PKG/sbin mv $PKG/usr/sbin/rpc.statd $PKG/sbin ( cd $PKG/usr/sbin ; ln -sf ../../sbin/rpc.statd . ) +# Make recovery directory: +mkdir -p $PKG/var/lib/nfs/v4recovery + # Chown /var/lib/nfs so that rpc.statd runs as rpc:rpc: chown -R rpc:rpc $PKG/var/lib/nfs diff --git a/source/n/nfs-utils/rc.nfsd b/source/n/nfs-utils/rc.nfsd index 965db6b4c..06c34b018 100644 --- a/source/n/nfs-utils/rc.nfsd +++ b/source/n/nfs-utils/rc.nfsd @@ -24,6 +24,14 @@ nfsd_start() { exit # no uncommented shares in /etc/exports fi + # Without this directory the logs will complain with + # 'NFSD: Unable to end grace period'. + NFSV4RECOVERYDIR=$(cat /proc/fs/nfsd/nfsv4recoverydir) + if [ -r /proc/fs/nfsd/nfsv4recoverydir -a ! -d "$NFSV4RECOVERYDIR" ]; then + mkdir "$NFSV4RECOVERYDIR" + chown -R rpc:rpc "$NFSV4RECOVERYDIR" + fi + # If we do not detect nfsd support built into the kernel (or previously # loaded as a module), we will try to load the nfsd.ko kernel module: if [ ! -r /proc/1/net/rpc/nfsd ]; then diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 4eba19fa7..221981517 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.10.1.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.10.1.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.10.2.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.10.2.tar.asc diff --git a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff index 113f8ca6c..86d01e898 100644 --- a/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff +++ b/source/x/x11/patch/pixman/pixman.remove.tests.that.fail.to.compile.diff @@ -1,16 +1,16 @@ ---- ./test/Makefile.in.orig 2019-02-11 06:24:53.000000000 -0600 -+++ ./test/Makefile.in 2019-02-12 13:54:42.157995706 -0600 -@@ -106,19 +106,18 @@ +--- ./test/Makefile.in.orig 2019-04-07 15:31:45.000000000 -0500 ++++ ./test/Makefile.in 2019-04-08 15:06:58.331894784 -0500 +@@ -106,19 +106,17 @@ region-translate-test$(EXEEXT) fetch-test$(EXEEXT) \ a1-trap-test$(EXEEXT) prng-test$(EXEEXT) \ radial-invalid$(EXEEXT) pdf-op-test$(EXEEXT) \ - region-test$(EXEEXT) combiner-test$(EXEEXT) \ -+ combiner-test$(EXEEXT) \ - scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \ +- scaling-crash-test$(EXEEXT) alpha-loop$(EXEEXT) \ - scaling-helpers-test$(EXEEXT) thread-test$(EXEEXT) \ - rotate-test$(EXEEXT) alphamap$(EXEEXT) \ ++ combiner-test$(EXEEXT) \ ++ scaling-crash-test$(EXEEXT) \ + thread-test$(EXEEXT) \ -+ alphamap$(EXEEXT) \ gradient-crash-test$(EXEEXT) pixel-test$(EXEEXT) \ - matrix-test$(EXEEXT) filter-reduction-test$(EXEEXT) \ - composite-traps-test$(EXEEXT) region-contains-test$(EXEEXT) \ @@ -21,14 +21,14 @@ - affine-test$(EXEEXT) scaling-test$(EXEEXT) composite$(EXEEXT) \ - tolerance-test$(EXEEXT) + cover-test$(EXEEXT) \ -+ scaling-test$(EXEEXT) composite$(EXEEXT) ++ scaling-test$(EXEEXT) am__EXEEXT_2 = lowlevel-blt-bench$(EXEEXT) radial-perf-test$(EXEEXT) \ - check-formats$(EXEEXT) scaling-bench$(EXEEXT) \ + check-formats$(EXEEXT) \ affine-bench$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) LTLIBRARIES = $(noinst_LTLIBRARIES) -@@ -144,12 +143,6 @@ +@@ -144,30 +142,6 @@ affine_bench_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -38,13 +38,18 @@ -affine_test_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - alpha_loop_SOURCES = alpha-loop.c - alpha_loop_OBJECTS = alpha-loop.$(OBJEXT) - alpha_loop_LDADD = $(LDADD) -@@ -162,12 +155,6 @@ - alphamap_DEPENDENCIES = libutils.la \ - $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +-alpha_loop_SOURCES = alpha-loop.c +-alpha_loop_OBJECTS = alpha-loop.$(OBJEXT) +-alpha_loop_LDADD = $(LDADD) +-alpha_loop_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) +-alphamap_SOURCES = alphamap.c +-alphamap_OBJECTS = alphamap.$(OBJEXT) +-alphamap_LDADD = $(LDADD) +-alphamap_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) -blitters_test_SOURCES = blitters-test.c -blitters_test_OBJECTS = blitters-test.$(OBJEXT) -blitters_test_LDADD = $(LDADD) @@ -54,7 +59,20 @@ check_formats_SOURCES = check-formats.c check_formats_OBJECTS = check-formats.$(OBJEXT) check_formats_LDADD = $(LDADD) -@@ -240,12 +227,6 @@ +@@ -180,12 +154,6 @@ + combiner_test_DEPENDENCIES = libutils.la \ + $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +-composite_SOURCES = composite.c +-composite_OBJECTS = composite.$(OBJEXT) +-composite_LDADD = $(LDADD) +-composite_DEPENDENCIES = libutils.la \ +- $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ +- $(am__DEPENDENCIES_1) + composite_traps_test_SOURCES = composite-traps-test.c + composite_traps_test_OBJECTS = composite-traps-test.$(OBJEXT) + composite_traps_test_LDADD = $(LDADD) +@@ -240,12 +208,6 @@ lowlevel_blt_bench_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -67,7 +85,7 @@ oob_test_SOURCES = oob-test.c oob_test_OBJECTS = oob-test.$(OBJEXT) oob_test_LDADD = $(LDADD) -@@ -282,48 +263,18 @@ +@@ -282,48 +244,18 @@ radial_perf_test_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -116,7 +134,7 @@ scaling_test_SOURCES = scaling-test.c scaling_test_OBJECTS = scaling-test.$(OBJEXT) scaling_test_LDADD = $(LDADD) -@@ -348,12 +299,6 @@ +@@ -348,12 +280,6 @@ thread_test_DEPENDENCIES = libutils.la \ $(top_builddir)/pixman/libpixman-1.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -129,17 +147,18 @@ trap_crasher_SOURCES = trap-crasher.c trap_crasher_OBJECTS = trap-crasher.$(OBJEXT) trap_crasher_LDADD = $(LDADD) -@@ -376,27 +321,24 @@ +@@ -376,27 +302,23 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/a1-trap-test.Po \ - ./$(DEPDIR)/affine-bench.Po ./$(DEPDIR)/affine-test.Po \ -+ ./$(DEPDIR)/affine-bench.Po \ - ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \ +- ./$(DEPDIR)/alpha-loop.Po ./$(DEPDIR)/alphamap.Po \ - ./$(DEPDIR)/blitters-test.Po ./$(DEPDIR)/check-formats.Po \ ++ ./$(DEPDIR)/affine-bench.Po \ + ./$(DEPDIR)/check-formats.Po \ ./$(DEPDIR)/combiner-test.Po \ - ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \ +- ./$(DEPDIR)/composite-traps-test.Po ./$(DEPDIR)/composite.Po \ ++ ./$(DEPDIR)/composite-traps-test.Po \ ./$(DEPDIR)/cover-test.Po ./$(DEPDIR)/fence-image-self-test.Po \ ./$(DEPDIR)/fetch-test.Po ./$(DEPDIR)/filter-reduction-test.Po \ ./$(DEPDIR)/glyph-test.Po ./$(DEPDIR)/gradient-crash-test.Po \ @@ -161,13 +180,13 @@ ./$(DEPDIR)/utils-prng.Plo ./$(DEPDIR)/utils.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -418,29 +360,29 @@ +@@ -418,29 +340,27 @@ am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \ - affine-test.c alpha-loop.c alphamap.c blitters-test.c \ -+ alpha-loop.c alphamap.c \ - check-formats.c combiner-test.c composite.c \ +- check-formats.c combiner-test.c composite.c \ ++ check-formats.c combiner-test.c \ composite-traps-test.c cover-test.c fence-image-self-test.c \ fetch-test.c filter-reduction-test.c glyph-test.c \ gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \ @@ -184,8 +203,8 @@ + stress-test.c thread-test.c trap-crasher.c DIST_SOURCES = $(libutils_la_SOURCES) a1-trap-test.c affine-bench.c \ - affine-test.c alpha-loop.c alphamap.c blitters-test.c \ -+ alpha-loop.c alphamap.c \ - check-formats.c combiner-test.c composite.c \ +- check-formats.c combiner-test.c composite.c \ ++ check-formats.c combiner-test.c \ composite-traps-test.c cover-test.c fence-image-self-test.c \ fetch-test.c filter-reduction-test.c glyph-test.c \ gradient-crash-test.c infinite-loop.c lowlevel-blt-bench.c \ @@ -203,18 +222,18 @@ am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ -@@ -834,29 +776,21 @@ +@@ -833,29 +753,18 @@ prng-test \ radial-invalid \ pdf-op-test \ - region-test \ combiner-test \ scaling-crash-test \ - alpha-loop \ +- alpha-loop \ - scaling-helpers-test \ thread-test \ - rotate-test \ - alphamap \ +- alphamap \ gradient-crash-test \ pixel-test \ - matrix-test \ @@ -228,12 +247,12 @@ - blitters-test \ - affine-test \ scaling-test \ - composite \ +- composite \ - tolerance-test \ $(NULL) -@@ -865,7 +799,6 @@ +@@ -864,7 +773,6 @@ lowlevel-blt-bench \ radial-perf-test \ check-formats \ @@ -241,7 +260,7 @@ affine-bench \ $(NULL) -@@ -957,10 +890,6 @@ +@@ -956,22 +864,6 @@ @rm -f affine-bench$(EXEEXT) $(AM_V_CCLD)$(LINK) $(affine_bench_OBJECTS) $(affine_bench_LDADD) $(LIBS) @@ -249,13 +268,14 @@ - @rm -f affine-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(affine_test_OBJECTS) $(affine_test_LDADD) $(LIBS) - - alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES) - @rm -f alpha-loop$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS) -@@ -969,10 +898,6 @@ - @rm -f alphamap$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS) - +-alpha-loop$(EXEEXT): $(alpha_loop_OBJECTS) $(alpha_loop_DEPENDENCIES) $(EXTRA_alpha_loop_DEPENDENCIES) +- @rm -f alpha-loop$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(alpha_loop_OBJECTS) $(alpha_loop_LDADD) $(LIBS) +- +-alphamap$(EXEEXT): $(alphamap_OBJECTS) $(alphamap_DEPENDENCIES) $(EXTRA_alphamap_DEPENDENCIES) +- @rm -f alphamap$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(alphamap_OBJECTS) $(alphamap_LDADD) $(LIBS) +- -blitters-test$(EXEEXT): $(blitters_test_OBJECTS) $(blitters_test_DEPENDENCIES) $(EXTRA_blitters_test_DEPENDENCIES) - @rm -f blitters-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(blitters_test_OBJECTS) $(blitters_test_LDADD) $(LIBS) @@ -263,7 +283,18 @@ check-formats$(EXEEXT): $(check_formats_OBJECTS) $(check_formats_DEPENDENCIES) $(EXTRA_check_formats_DEPENDENCIES) @rm -f check-formats$(EXEEXT) $(AM_V_CCLD)$(LINK) $(check_formats_OBJECTS) $(check_formats_LDADD) $(LIBS) -@@ -1021,10 +946,6 @@ +@@ -980,10 +872,6 @@ + @rm -f combiner-test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(combiner_test_OBJECTS) $(combiner_test_LDADD) $(LIBS) + +-composite$(EXEEXT): $(composite_OBJECTS) $(composite_DEPENDENCIES) $(EXTRA_composite_DEPENDENCIES) +- @rm -f composite$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(composite_OBJECTS) $(composite_LDADD) $(LIBS) +- + composite-traps-test$(EXEEXT): $(composite_traps_test_OBJECTS) $(composite_traps_test_DEPENDENCIES) $(EXTRA_composite_traps_test_DEPENDENCIES) + @rm -f composite-traps-test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(composite_traps_test_OBJECTS) $(composite_traps_test_LDADD) $(LIBS) +@@ -1020,10 +908,6 @@ @rm -f lowlevel-blt-bench$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lowlevel_blt_bench_OBJECTS) $(lowlevel_blt_bench_LDADD) $(LIBS) @@ -274,7 +305,7 @@ oob-test$(EXEEXT): $(oob_test_OBJECTS) $(oob_test_DEPENDENCIES) $(EXTRA_oob_test_DEPENDENCIES) @rm -f oob-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(oob_test_OBJECTS) $(oob_test_LDADD) $(LIBS) -@@ -1049,34 +970,14 @@ +@@ -1048,34 +932,14 @@ @rm -f radial-perf-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(radial_perf_test_OBJECTS) $(radial_perf_test_LDADD) $(LIBS) @@ -309,7 +340,7 @@ scaling-test$(EXEEXT): $(scaling_test_OBJECTS) $(scaling_test_DEPENDENCIES) $(EXTRA_scaling_test_DEPENDENCIES) @rm -f scaling-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(scaling_test_OBJECTS) $(scaling_test_LDADD) $(LIBS) -@@ -1093,10 +994,6 @@ +@@ -1092,10 +956,6 @@ @rm -f thread-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS) @@ -320,18 +351,22 @@ trap-crasher$(EXEEXT): $(trap_crasher_OBJECTS) $(trap_crasher_DEPENDENCIES) $(EXTRA_trap_crasher_DEPENDENCIES) @rm -f trap-crasher$(EXEEXT) $(AM_V_CCLD)$(LINK) $(trap_crasher_OBJECTS) $(trap_crasher_LDADD) $(LIBS) -@@ -1109,10 +1006,8 @@ +@@ -1108,14 +968,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a1-trap-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-bench.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/affine-test.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alpha-loop.Po@am__quote@ # am--include-marker +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alphamap.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/blitters-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check-formats.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/combiner-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite-traps-test.Po@am__quote@ # am--include-marker -@@ -1125,25 +1020,18 @@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/composite.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cover-test.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fence-image-self-test.Po@am__quote@ # am--include-marker + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fetch-test.Po@am__quote@ # am--include-marker +@@ -1124,25 +979,18 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-crash-test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infinite-loop.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lowlevel-blt-bench.Po@am__quote@ # am--include-marker @@ -357,7 +392,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap-crasher.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils-prng.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Plo@am__quote@ # am--include-marker -@@ -1444,13 +1332,6 @@ +@@ -1443,13 +1291,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -371,10 +406,17 @@ combiner-test.log: combiner-test$(EXEEXT) @p='combiner-test$(EXEEXT)'; \ b='combiner-test'; \ -@@ -1472,13 +1353,6 @@ +@@ -1464,20 +1305,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +-alpha-loop.log: alpha-loop$(EXEEXT) +- @p='alpha-loop$(EXEEXT)'; \ +- b='alpha-loop'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) -scaling-helpers-test.log: scaling-helpers-test$(EXEEXT) - @p='scaling-helpers-test$(EXEEXT)'; \ - b='scaling-helpers-test'; \ @@ -385,7 +427,7 @@ thread-test.log: thread-test$(EXEEXT) @p='thread-test$(EXEEXT)'; \ b='thread-test'; \ -@@ -1486,13 +1360,6 @@ +@@ -1485,20 +1312,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -396,10 +438,17 @@ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) - alphamap.log: alphamap$(EXEEXT) - @p='alphamap$(EXEEXT)'; \ - b='alphamap'; \ -@@ -1514,13 +1381,6 @@ +-alphamap.log: alphamap$(EXEEXT) +- @p='alphamap$(EXEEXT)'; \ +- b='alphamap'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) + gradient-crash-test.log: gradient-crash-test$(EXEEXT) + @p='gradient-crash-test$(EXEEXT)'; \ + b='gradient-crash-test'; \ +@@ -1513,13 +1326,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -413,7 +462,7 @@ filter-reduction-test.log: filter-reduction-test$(EXEEXT) @p='filter-reduction-test$(EXEEXT)'; \ b='filter-reduction-test'; \ -@@ -1535,13 +1395,6 @@ +@@ -1534,13 +1340,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -427,7 +476,7 @@ glyph-test.log: glyph-test$(EXEEXT) @p='glyph-test$(EXEEXT)'; \ b='glyph-test'; \ -@@ -1570,20 +1423,6 @@ +@@ -1569,20 +1368,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) @@ -448,10 +497,17 @@ scaling-test.log: scaling-test$(EXEEXT) @p='scaling-test$(EXEEXT)'; \ b='scaling-test'; \ -@@ -1598,13 +1437,6 @@ +@@ -1590,20 +1375,6 @@ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) +-composite.log: composite$(EXEEXT) +- @p='composite$(EXEEXT)'; \ +- b='composite'; \ +- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ +- --log-file $$b.log --trs-file $$b.trs \ +- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ +- "$$tst" $(AM_TESTS_FD_REDIRECT) -tolerance-test.log: tolerance-test$(EXEEXT) - @p='tolerance-test$(EXEEXT)'; \ - b='tolerance-test'; \ @@ -462,18 +518,22 @@ .test.log: @p='$<'; \ $(am__set_b); \ -@@ -1699,10 +1531,8 @@ +@@ -1698,14 +1469,9 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/a1-trap-test.Po -rm -f ./$(DEPDIR)/affine-bench.Po - -rm -f ./$(DEPDIR)/affine-test.Po - -rm -f ./$(DEPDIR)/alpha-loop.Po - -rm -f ./$(DEPDIR)/alphamap.Po +- -rm -f ./$(DEPDIR)/alpha-loop.Po +- -rm -f ./$(DEPDIR)/alphamap.Po - -rm -f ./$(DEPDIR)/blitters-test.Po -rm -f ./$(DEPDIR)/check-formats.Po -rm -f ./$(DEPDIR)/combiner-test.Po -rm -f ./$(DEPDIR)/composite-traps-test.Po -@@ -1715,25 +1545,18 @@ +- -rm -f ./$(DEPDIR)/composite.Po + -rm -f ./$(DEPDIR)/cover-test.Po + -rm -f ./$(DEPDIR)/fence-image-self-test.Po + -rm -f ./$(DEPDIR)/fetch-test.Po +@@ -1714,25 +1480,18 @@ -rm -f ./$(DEPDIR)/gradient-crash-test.Po -rm -f ./$(DEPDIR)/infinite-loop.Po -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po @@ -499,18 +559,22 @@ -rm -f ./$(DEPDIR)/trap-crasher.Po -rm -f ./$(DEPDIR)/utils-prng.Plo -rm -f ./$(DEPDIR)/utils.Plo -@@ -1784,10 +1607,8 @@ +@@ -1783,14 +1542,9 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/a1-trap-test.Po -rm -f ./$(DEPDIR)/affine-bench.Po - -rm -f ./$(DEPDIR)/affine-test.Po - -rm -f ./$(DEPDIR)/alpha-loop.Po - -rm -f ./$(DEPDIR)/alphamap.Po +- -rm -f ./$(DEPDIR)/alpha-loop.Po +- -rm -f ./$(DEPDIR)/alphamap.Po - -rm -f ./$(DEPDIR)/blitters-test.Po -rm -f ./$(DEPDIR)/check-formats.Po -rm -f ./$(DEPDIR)/combiner-test.Po -rm -f ./$(DEPDIR)/composite-traps-test.Po -@@ -1800,25 +1621,18 @@ +- -rm -f ./$(DEPDIR)/composite.Po + -rm -f ./$(DEPDIR)/cover-test.Po + -rm -f ./$(DEPDIR)/fence-image-self-test.Po + -rm -f ./$(DEPDIR)/fetch-test.Po +@@ -1799,25 +1553,18 @@ -rm -f ./$(DEPDIR)/gradient-crash-test.Po -rm -f ./$(DEPDIR)/infinite-loop.Po -rm -f ./$(DEPDIR)/lowlevel-blt-bench.Po -- cgit v1.2.3