diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-11-26 20:04:41 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-11-27 08:59:50 +0100 |
commit | dcb09037c6d84f27932186ec03741d52d60862e5 (patch) | |
tree | ee505e48b8533b49d70ee59d68efc3335ec3c0e1 | |
parent | 9b6fab2c3603408615a3a733985c7a7002cebfa1 (diff) | |
download | current-dcb09037c6d84f27932186ec03741d52d60862e5.tar.gz |
Tue Nov 26 20:04:41 UTC 201920191126200441
ap/xfsdump-3.1.8-x86_64-4.txz: Rebuilt.
Patched for new xfsprogs-5.3.0 API. Thanks to nobodino.
d/cmake-3.16.0-x86_64-1.txz: Upgraded.
n/gnupg2-2.2.18-x86_64-1.txz: Upgraded.
gpg: Prepare against chosen-prefix SHA-1 collisions in key signatures.
This change removes all SHA-1 based key signature newer than 2019-01-19
from the web-of-trust. Note that this includes all key signatures
created with dsa1024 keys. The new option --allow-weak-key-signatures
can be used to override the new and safer behaviour.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14855
(* Security fix *)
n/iproute2-5.4.0-x86_64-1.txz: Upgraded.
x/libepoxy-1.5.4-x86_64-1.txz: Upgraded.
-rw-r--r-- | ChangeLog.rss | 28 | ||||
-rw-r--r-- | ChangeLog.txt | 16 | ||||
-rw-r--r-- | FILELIST.TXT | 122 | ||||
-rwxr-xr-x | recompress.sh | 6 | ||||
-rw-r--r-- | source/ap/xfsdump/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch | 11 | ||||
-rw-r--r-- | source/ap/xfsdump/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch | 660 | ||||
-rw-r--r-- | source/ap/xfsdump/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch | 14 | ||||
-rw-r--r-- | source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch | 81 | ||||
-rw-r--r-- | source/ap/xfsdump/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch | 49 | ||||
-rwxr-xr-x | source/ap/xfsdump/xfsdump.SlackBuild | 10 | ||||
-rw-r--r-- | source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff | 11 | ||||
-rw-r--r-- | source/x/libepoxy/libepoxy.url | 2 |
12 files changed, 933 insertions, 77 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index 5b2c94a1..80e08d07 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,34 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Mon, 25 Nov 2019 19:17:07 GMT</pubDate> - <lastBuildDate>Tue, 26 Nov 2019 16:59:45 GMT</lastBuildDate> + <pubDate>Tue, 26 Nov 2019 20:04:41 GMT</pubDate> + <lastBuildDate>Wed, 27 Nov 2019 07:59:45 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.11</generator> <item> + <title>Tue, 26 Nov 2019 20:04:41 GMT</title> + <pubDate>Tue, 26 Nov 2019 20:04:41 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20191126200441</link> + <guid isPermaLink="false">20191126200441</guid> + <description> + <![CDATA[<pre> +ap/xfsdump-3.1.8-x86_64-4.txz: Rebuilt. + Patched for new xfsprogs-5.3.0 API. Thanks to nobodino. +d/cmake-3.16.0-x86_64-1.txz: Upgraded. +n/gnupg2-2.2.18-x86_64-1.txz: Upgraded. + gpg: Prepare against chosen-prefix SHA-1 collisions in key signatures. + This change removes all SHA-1 based key signature newer than 2019-01-19 + from the web-of-trust. Note that this includes all key signatures + created with dsa1024 keys. The new option --allow-weak-key-signatures + can be used to override the new and safer behaviour. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14855 + (* Security fix *) +n/iproute2-5.4.0-x86_64-1.txz: Upgraded. +x/libepoxy-1.5.4-x86_64-1.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> <title>Mon, 25 Nov 2019 19:17:07 GMT</title> <pubDate>Mon, 25 Nov 2019 19:17:07 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20191125191707</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index e60e4777..1378bacd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,19 @@ +Tue Nov 26 20:04:41 UTC 2019 +ap/xfsdump-3.1.8-x86_64-4.txz: Rebuilt. + Patched for new xfsprogs-5.3.0 API. Thanks to nobodino. +d/cmake-3.16.0-x86_64-1.txz: Upgraded. +n/gnupg2-2.2.18-x86_64-1.txz: Upgraded. + gpg: Prepare against chosen-prefix SHA-1 collisions in key signatures. + This change removes all SHA-1 based key signature newer than 2019-01-19 + from the web-of-trust. Note that this includes all key signatures + created with dsa1024 keys. The new option --allow-weak-key-signatures + can be used to override the new and safer behaviour. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14855 + (* Security fix *) +n/iproute2-5.4.0-x86_64-1.txz: Upgraded. +x/libepoxy-1.5.4-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Nov 25 19:17:07 UTC 2019 e/emacs-26.3-x86_64-3.txz: Rebuilt. Compiled adding --with-modules option. Thanks to cycojesus. diff --git a/FILELIST.TXT b/FILELIST.TXT index e24458a7..9ad52455 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Tue Nov 26 03:46:59 UTC 2019 +Tue Nov 26 20:15:49 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-11-26 03:46 . +drwxr-xr-x 12 root root 4096 2019-11-26 20:04 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14642 2019-10-18 21:18 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 929464 2019-11-25 19:28 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-25 19:28 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 929426 2019-11-26 03:47 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-26 03:47 ./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 741623 2019-11-25 19:17 ./ChangeLog.txt +-rw-r--r-- 1 root root 742404 2019-11-26 20:04 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-11-24 23:40 ./EFI/BOOT -rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-11-24 23:40 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1222064 2019-11-26 03:46 ./FILELIST.TXT +-rw-r--r-- 1 root root 1222009 2019-11-26 03:46 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 732546 2019-11-25 19:26 ./PACKAGES.TXT +-rw-r--r-- 1 root root 732546 2019-11-26 20:14 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-11-24 20:12 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -830,11 +830,11 @@ 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-11-25 19:26 ./slackware64 --rw-r--r-- 1 root root 290527 2019-11-25 19:26 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-25 19:26 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361906 2019-11-25 19:24 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3643934 2019-11-25 19:24 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-11-26 20:14 ./slackware64 +-rw-r--r-- 1 root root 290527 2019-11-26 20:14 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-26 20:14 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361906 2019-11-26 20:11 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3646659 2019-11-26 20:12 ./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-11-25 01:15 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt @@ -1184,7 +1184,7 @@ drwxr-xr-x 2 root root 28672 2019-11-25 01:15 ./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-11-25 01:14 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2019-11-26 20:11 ./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 @@ -1421,16 +1421,16 @@ drwxr-xr-x 2 root root 20480 2019-11-25 01:14 ./slackware64/ap -rw-r--r-- 1 root root 604 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txt -rw-r--r-- 1 root root 180908 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txz.asc --rw-r--r-- 1 root root 523 2019-09-15 20:40 ./slackware64/ap/xfsdump-3.1.8-x86_64-3.txt --rw-r--r-- 1 root root 338676 2019-09-15 20:40 ./slackware64/ap/xfsdump-3.1.8-x86_64-3.txz --rw-r--r-- 1 root root 163 2019-09-15 20:40 ./slackware64/ap/xfsdump-3.1.8-x86_64-3.txz.asc +-rw-r--r-- 1 root root 523 2019-11-26 19:41 ./slackware64/ap/xfsdump-3.1.8-x86_64-4.txt +-rw-r--r-- 1 root root 338684 2019-11-26 19:41 ./slackware64/ap/xfsdump-3.1.8-x86_64-4.txz +-rw-r--r-- 1 root root 163 2019-11-26 19:41 ./slackware64/ap/xfsdump-3.1.8-x86_64-4.txz.asc -rw-r--r-- 1 root root 570 2019-10-27 20:13 ./slackware64/ap/xorriso-1.5.2-x86_64-1.txt -rw-r--r-- 1 root root 973720 2019-10-27 20:13 ./slackware64/ap/xorriso-1.5.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-10-27 20:13 ./slackware64/ap/xorriso-1.5.2-x86_64-1.txz.asc -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-11-25 01:15 ./slackware64/d +drwxr-xr-x 2 root root 20480 2019-11-26 20:11 ./slackware64/d -rw-r--r-- 1 root root 360 2019-11-01 21:37 ./slackware64/d/Cython-0.29.14-x86_64-1.txt -rw-r--r-- 1 root root 3223688 2019-11-01 21:37 ./slackware64/d/Cython-0.29.14-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-01 21:37 ./slackware64/d/Cython-0.29.14-x86_64-1.txz.asc @@ -1455,9 +1455,9 @@ drwxr-xr-x 2 root root 20480 2019-11-25 01:15 ./slackware64/d -rw-r--r-- 1 root root 663 2019-04-03 21:09 ./slackware64/d/clisp-2.49_20181112_df3b9f6fd-x86_64-2.txt -rw-r--r-- 1 root root 3103124 2019-04-03 21:09 ./slackware64/d/clisp-2.49_20181112_df3b9f6fd-x86_64-2.txz -rw-r--r-- 1 root root 163 2019-04-03 21:09 ./slackware64/d/clisp-2.49_20181112_df3b9f6fd-x86_64-2.txz.asc --rw-r--r-- 1 root root 379 2019-10-31 17:07 ./slackware64/d/cmake-3.15.5-x86_64-1.txt --rw-r--r-- 1 root root 6239488 2019-10-31 17:07 ./slackware64/d/cmake-3.15.5-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-10-31 17:07 ./slackware64/d/cmake-3.15.5-x86_64-1.txz.asc +-rw-r--r-- 1 root root 379 2019-11-26 19:49 ./slackware64/d/cmake-3.16.0-x86_64-1.txt +-rw-r--r-- 1 root root 6401260 2019-11-26 19:49 ./slackware64/d/cmake-3.16.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-26 19:49 ./slackware64/d/cmake-3.16.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 332 2018-11-08 22:13 ./slackware64/d/cscope-15.9-x86_64-1.txt -rw-r--r-- 1 root root 143528 2018-11-08 22:13 ./slackware64/d/cscope-15.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-08 22:13 ./slackware64/d/cscope-15.9-x86_64-1.txz.asc @@ -3470,7 +3470,7 @@ drwxr-xr-x 2 root root 69632 2019-11-25 19:23 ./slackware64/l -rw-r--r-- 1 root root 463 2019-11-06 20:20 ./slackware64/l/zstd-1.4.4-x86_64-1.txt -rw-r--r-- 1 root root 405740 2019-11-06 20:20 ./slackware64/l/zstd-1.4.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-06 20:20 ./slackware64/l/zstd-1.4.4-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2019-11-25 19:24 ./slackware64/n +drwxr-xr-x 2 root root 36864 2019-11-26 20:11 ./slackware64/n -rw-r--r-- 1 root root 357 2019-11-06 20:26 ./slackware64/n/ModemManager-1.12.0-x86_64-1.txt -rw-r--r-- 1 root root 1781156 2019-11-06 20:26 ./slackware64/n/ModemManager-1.12.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-06 20:26 ./slackware64/n/ModemManager-1.12.0-x86_64-1.txz.asc @@ -3555,9 +3555,9 @@ drwxr-xr-x 2 root root 36864 2019-11-25 19:24 ./slackware64/n -rw-r--r-- 1 root root 369 2019-04-03 21:20 ./slackware64/n/gnupg-1.4.23-x86_64-2.txt -rw-r--r-- 1 root root 1171844 2019-04-03 21:20 ./slackware64/n/gnupg-1.4.23-x86_64-2.txz -rw-r--r-- 1 root root 163 2019-04-03 21:20 ./slackware64/n/gnupg-1.4.23-x86_64-2.txz.asc --rw-r--r-- 1 root root 598 2019-07-10 05:49 ./slackware64/n/gnupg2-2.2.17-x86_64-1.txt --rw-r--r-- 1 root root 2237364 2019-07-10 05:49 ./slackware64/n/gnupg2-2.2.17-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-07-10 05:49 ./slackware64/n/gnupg2-2.2.17-x86_64-1.txz.asc +-rw-r--r-- 1 root root 598 2019-11-26 04:02 ./slackware64/n/gnupg2-2.2.18-x86_64-1.txt +-rw-r--r-- 1 root root 2243112 2019-11-26 04:02 ./slackware64/n/gnupg2-2.2.18-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-26 04:02 ./slackware64/n/gnupg2-2.2.18-x86_64-1.txz.asc -rw-r--r-- 1 root root 492 2019-09-30 17:03 ./slackware64/n/gnutls-3.6.10-x86_64-1.txt -rw-r--r-- 1 root root 2703860 2019-09-30 17:03 ./slackware64/n/gnutls-3.6.10-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-09-30 17:03 ./slackware64/n/gnutls-3.6.10-x86_64-1.txz.asc @@ -3584,9 +3584,9 @@ drwxr-xr-x 2 root root 36864 2019-11-25 19:24 ./slackware64/n -rw-r--r-- 1 root root 163 2018-04-13 15:37 ./slackware64/n/inetd-1.79s-x86_64-11.txz.asc -rwxr-xr-x 1 root root 2897 2009-06-24 22:06 ./slackware64/n/install-packages -rw-r--r-- 1 root root 446 2006-09-18 10:41 ./slackware64/n/install.end --rw-r--r-- 1 root root 476 2019-09-25 18:56 ./slackware64/n/iproute2-5.3.0-x86_64-1.txt --rw-r--r-- 1 root root 845480 2019-09-25 18:56 ./slackware64/n/iproute2-5.3.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-09-25 18:56 ./slackware64/n/iproute2-5.3.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 476 2019-11-26 04:07 ./slackware64/n/iproute2-5.4.0-x86_64-1.txt +-rw-r--r-- 1 root root 843400 2019-11-26 04:07 ./slackware64/n/iproute2-5.4.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-26 04:07 ./slackware64/n/iproute2-5.4.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 442 2019-11-04 20:31 ./slackware64/n/ipset-7.4-x86_64-1.txt -rw-r--r-- 1 root root 85416 2019-11-04 20:31 ./slackware64/n/ipset-7.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-04 20:31 ./slackware64/n/ipset-7.4-x86_64-1.txz.asc @@ -3950,7 +3950,7 @@ drwxr-xr-x 2 root root 4096 2019-11-22 22:16 ./slackware64/tcl -rw-r--r-- 1 root root 227 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txt -rw-r--r-- 1 root root 1780348 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-11-22 21:51 ./slackware64/tcl/tk-8.6.10-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2019-11-23 20:41 ./slackware64/x +drwxr-xr-x 2 root root 65536 2019-11-26 20:11 ./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 @@ -4244,9 +4244,9 @@ drwxr-xr-x 2 root root 65536 2019-11-23 20:41 ./slackware64/x -rw-r--r-- 1 root root 259 2019-10-17 18:00 ./slackware64/x/libdrm-2.4.100-x86_64-1.txt -rw-r--r-- 1 root root 241196 2019-10-17 18:00 ./slackware64/x/libdrm-2.4.100-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-10-17 18:00 ./slackware64/x/libdrm-2.4.100-x86_64-1.txz.asc --rw-r--r-- 1 root root 277 2018-10-24 20:41 ./slackware64/x/libepoxy-1.5.3-x86_64-1.txt --rw-r--r-- 1 root root 297504 2018-10-24 20:41 ./slackware64/x/libepoxy-1.5.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-10-24 20:41 ./slackware64/x/libepoxy-1.5.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 277 2019-11-26 04:13 ./slackware64/x/libepoxy-1.5.4-x86_64-1.txt +-rw-r--r-- 1 root root 302412 2019-11-26 04:13 ./slackware64/x/libepoxy-1.5.4-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-26 04:13 ./slackware64/x/libepoxy-1.5.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 599 2019-03-12 17:38 ./slackware64/x/liberation-fonts-ttf-2.00.5-noarch-1.txt -rw-r--r-- 1 root root 1454156 2019-03-12 17:38 ./slackware64/x/liberation-fonts-ttf-2.00.5-noarch-1.txz -rw-r--r-- 1 root root 163 2019-03-12 17:38 ./slackware64/x/liberation-fonts-ttf-2.00.5-noarch-1.txz.asc @@ -5045,11 +5045,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-11-25 19:28 ./source --rw-r--r-- 1 root root 471584 2019-11-25 19:28 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-25 19:28 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 665409 2019-11-25 19:27 ./source/FILE_LIST --rw-r--r-- 1 root root 17877485 2019-11-25 19:27 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-11-26 20:15 ./source +-rw-r--r-- 1 root root 472002 2019-11-26 20:15 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-26 20:15 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 665899 2019-11-26 20:15 ./source/FILE_LIST +-rw-r--r-- 1 root root 17880402 2019-11-26 20:15 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 110 root root 4096 2019-11-23 20:13 ./source/a -rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog @@ -5960,7 +5960,7 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/zoo -rw-r--r-- 1 root root 173607 1994-12-30 20:19 ./source/a/zoo/zoo-2.10.tar.gz -rwxr-xr-x 1 root root 3143 2019-09-29 23:48 ./source/a/zoo/zoo.SlackBuild -rw-r--r-- 1 root root 14136 2010-05-22 09:49 ./source/a/zoo/zoo_2.10-22.debian.tar.gz -drwxr-xr-x 82 root root 4096 2019-10-15 19:34 ./source/ap +drwxr-xr-x 82 root root 4096 2019-11-26 19:41 ./source/ap -rw-r--r-- 1 root root 399 2019-09-10 17:52 ./source/ap/FTBFSlog drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/a2ps -rw-r--r-- 1 root root 1521 2017-10-01 17:59 ./source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch.gz @@ -6506,12 +6506,16 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/vorbis-tools -rw-r--r-- 1 root root 1064 2018-02-27 06:12 ./source/ap/vorbis-tools/slack-desc -rw-r--r-- 1 root root 677868 2010-03-26 07:14 ./source/ap/vorbis-tools/vorbis-tools-1.4.0.tar.xz -rwxr-xr-x 1 root root 3787 2019-09-29 23:48 ./source/ap/vorbis-tools/vorbis-tools.SlackBuild -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/xfsdump +drwxr-xr-x 2 root root 4096 2019-11-26 19:40 ./source/ap/xfsdump +-rw-r--r-- 1 root root 214 2019-11-26 19:32 ./source/ap/xfsdump/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch.gz +-rw-r--r-- 1 root root 4848 2019-11-26 19:29 ./source/ap/xfsdump/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch.gz +-rw-r--r-- 1 root root 336 2019-11-26 19:30 ./source/ap/xfsdump/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch.gz +-rw-r--r-- 1 root root 901 2019-11-26 19:34 ./source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch.gz +-rw-r--r-- 1 root root 471 2019-11-26 19:39 ./source/ap/xfsdump/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch.gz -rw-r--r-- 1 root root 978 2018-02-27 06:12 ./source/ap/xfsdump/slack-desc -rw-r--r-- 1 root root 836 2017-09-21 21:27 ./source/ap/xfsdump/xfsdump-3.1.8.tar.sign -rw-r--r-- 1 root root 603304 2017-09-21 21:27 ./source/ap/xfsdump/xfsdump-3.1.8.tar.xz --rwxr-xr-x 1 root root 4321 2019-09-29 23:48 ./source/ap/xfsdump/xfsdump.SlackBuild --rw-r--r-- 1 root root 248 2019-09-15 20:38 ./source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff.gz +-rwxr-xr-x 1 root root 4719 2019-11-26 19:41 ./source/ap/xfsdump/xfsdump.SlackBuild drwxr-xr-x 2 root root 4096 2019-10-27 20:13 ./source/ap/xorriso -rw-r--r-- 1 root root 1025 2018-02-27 06:12 ./source/ap/xorriso/slack-desc -rw-r--r-- 1 root root 1586238 2019-10-27 16:58 ./source/ap/xorriso/xorriso-1.5.2.tar.lz @@ -6582,10 +6586,10 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/d/clisp -rw-r--r-- 1 root root 496777 2018-02-17 12:34 ./source/d/clisp/libffcall-2.1.tar.lz -rw-r--r-- 1 root root 1116 2018-02-27 06:13 ./source/d/clisp/slack-desc -rwxr-xr-x 1 root root 1890 2018-06-17 19:34 ./source/d/clisp/source.download -drwxr-xr-x 2 root root 4096 2019-10-31 17:04 ./source/d/cmake --rw-r--r-- 1 root root 6145880 2019-10-30 15:44 ./source/d/cmake/cmake-3.15.5.tar.lz +drwxr-xr-x 2 root root 4096 2019-11-26 19:45 ./source/d/cmake +-rw-r--r-- 1 root root 6181876 2019-11-26 15:40 ./source/d/cmake/cmake-3.16.0.tar.lz -rwxr-xr-x 1 root root 4277 2019-09-29 23:48 ./source/d/cmake/cmake.SlackBuild --rw-r--r-- 1 root root 362582 2019-10-31 17:03 ./source/d/cmake/cmake.manpages.tar.lz +-rw-r--r-- 1 root root 377214 2019-11-26 19:44 ./source/d/cmake/cmake.manpages.tar.lz -rw-r--r-- 1 root root 42 2019-02-02 19:08 ./source/d/cmake/cmake.url -rwxr-xr-x 1 root root 1591 2018-01-19 18:52 ./source/d/cmake/extract-manpages-from-binary.sh -rw-r--r-- 1 root root 832 2018-11-29 19:16 ./source/d/cmake/slack-desc @@ -10159,8 +10163,8 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/gnupg -rw-r--r-- 1 root root 2663136 2018-06-11 08:48 ./source/n/gnupg/gnupg-1.4.23.tar.xz -rwxr-xr-x 1 root root 3739 2019-09-29 23:48 ./source/n/gnupg/gnupg.SlackBuild -rw-r--r-- 1 root root 822 2018-02-27 06:13 ./source/n/gnupg/slack-desc.gnupg -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/gnupg2 --rw-r--r-- 1 root root 4756029 2019-07-09 13:44 ./source/n/gnupg2/gnupg-2.2.17.tar.lz +drwxr-xr-x 2 root root 4096 2019-11-26 04:01 ./source/n/gnupg2 +-rw-r--r-- 1 root root 4769945 2019-11-25 20:09 ./source/n/gnupg2/gnupg-2.2.18.tar.lz -rwxr-xr-x 1 root root 4251 2019-09-29 23:48 ./source/n/gnupg2/gnupg2.SlackBuild -rw-r--r-- 1 root root 1052 2018-08-27 17:38 ./source/n/gnupg2/slack-desc drwxr-xr-x 2 root root 4096 2019-09-30 16:59 ./source/n/gnutls @@ -10215,10 +10219,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/inetd -rw-r--r-- 1 root root 889 2003-09-06 23:32 ./source/n/inetd/inetd.loopingdos.diff.gz -rw-r--r-- 1 root root 497 2003-09-12 03:27 ./source/n/inetd/rc.inetd -rw-r--r-- 1 root root 905 2018-02-27 06:13 ./source/n/inetd/slack-desc -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/iproute2 +drwxr-xr-x 2 root root 4096 2019-11-26 04:07 ./source/n/iproute2 -rw-r--r-- 1 root root 280 2017-02-07 19:00 ./source/n/iproute2/doinst.sh.gz --rw-r--r-- 1 root root 566 2019-09-24 19:32 ./source/n/iproute2/iproute2-5.3.0.tar.sign --rw-r--r-- 1 root root 742660 2019-09-24 19:32 ./source/n/iproute2/iproute2-5.3.0.tar.xz +-rw-r--r-- 1 root root 566 2019-11-25 20:11 ./source/n/iproute2/iproute2-5.4.0.tar.sign +-rw-r--r-- 1 root root 741328 2019-11-25 20:11 ./source/n/iproute2/iproute2-5.4.0.tar.xz -rwxr-xr-x 1 root root 4945 2019-09-29 23:48 ./source/n/iproute2/iproute2.SlackBuild -rw-r--r-- 1 root root 53 2017-11-12 22:05 ./source/n/iproute2/iproute2.url -rw-r--r-- 1 root root 932 2018-02-27 06:13 ./source/n/iproute2/slack-desc @@ -11077,10 +11081,10 @@ drwxr-xr-x 2 root root 4096 2019-10-17 18:00 ./source/x/libdrm -rwxr-xr-x 1 root root 4011 2019-09-29 23:48 ./source/x/libdrm/libdrm.SlackBuild -rw-r--r-- 1 root root 36 2017-04-17 19:01 ./source/x/libdrm/libdrm.url -rw-r--r-- 1 root root 713 2018-02-27 06:13 ./source/x/libdrm/slack-desc -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/libepoxy --rw-r--r-- 1 root root 220540 2018-10-04 23:48 ./source/x/libepoxy/libepoxy-1.5.3.tar.xz +drwxr-xr-x 2 root root 4096 2019-11-26 04:12 ./source/x/libepoxy +-rw-r--r-- 1 root root 227180 2019-11-25 22:52 ./source/x/libepoxy/libepoxy-1.5.4.tar.xz -rwxr-xr-x 1 root root 3741 2019-09-29 23:48 ./source/x/libepoxy/libepoxy.SlackBuild --rw-r--r-- 1 root root 81 2018-07-14 19:00 ./source/x/libepoxy/libepoxy.url +-rw-r--r-- 1 root root 81 2019-11-26 04:12 ./source/x/libepoxy/libepoxy.url -rw-r--r-- 1 root root 765 2018-02-27 06:13 ./source/x/libepoxy/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/liberation-fonts-ttf -rw-r--r-- 1 root root 1123 2011-03-23 05:07 ./source/x/liberation-fonts-ttf/60-liberation.conf @@ -12407,14 +12411,14 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/audacious-plugi -rw-r--r-- 1 root root 121 2010-04-09 21:15 ./source/xap/audacious/doinst.sh.gz -rw-r--r-- 1 root root 1048 2018-10-24 20:29 ./source/xap/audacious/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/blackbox --rw-r--r-- 1 root root 175764 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.lz --rw-r--r-- 1 root root 562326 2019-09-06 13:17 ./source/xap/blackbox/blackbox-0.75.tar.lz --rwxr-xr-x 1 root root 7034 2019-09-29 23:48 ./source/xap/blackbox/blackbox.SlackBuild --rw-r--r-- 1 root root 2199 2018-06-22 21:26 ./source/xap/blackbox/blackbox.menu.gz --rw-r--r-- 1 root root 40 2018-06-22 17:25 ./source/xap/blackbox/blackbox.url --rw-r--r-- 1 root root 271 2018-06-22 21:32 ./source/xap/blackbox/doinst.sh.gz --rw-r--r-- 1 root root 887 2018-11-07 23:03 ./source/xap/blackbox/slack-desc --rw-r--r-- 1 root root 221 2012-08-08 17:58 ./source/xap/blackbox/startblackbox.gz +-rw-r--r-- 1 root root 175764 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.lz +-rw-r--r-- 1 root root 562326 2019-09-06 13:17 ./source/xap/blackbox/blackbox-0.75.tar.lz +-rwxr-xr-x 1 root root 7034 2019-09-29 23:48 ./source/xap/blackbox/blackbox.SlackBuild +-rw-r--r-- 1 root root 2199 2018-06-22 21:26 ./source/xap/blackbox/blackbox.menu.gz +-rw-r--r-- 1 root root 40 2018-06-22 17:25 ./source/xap/blackbox/blackbox.url +-rw-r--r-- 1 root root 271 2018-06-22 21:32 ./source/xap/blackbox/doinst.sh.gz +-rw-r--r-- 1 root root 887 2018-11-07 23:03 ./source/xap/blackbox/slack-desc +-rw-r--r-- 1 root root 221 2012-08-08 17:58 ./source/xap/blackbox/startblackbox.gz -rw-r--r-- 1 root root 341 2012-08-08 17:58 ./source/xap/blackbox/xinitrc.blackbox.gz drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/blueman -rw-r--r-- 1 root root 290 2018-08-04 01:09 ./source/xap/blueman/30-blueman-netdev-allow-access.rules.gz diff --git a/recompress.sh b/recompress.sh index 45b97bef..f435b81a 100755 --- a/recompress.sh +++ b/recompress.sh @@ -691,7 +691,11 @@ gzip ./source/ap/slackpkg/files/dialog-functions.sh gzip ./source/ap/slackpkg/doinst.sh gzip ./source/ap/dmapi/bug799162.patch gzip ./source/ap/ksh93/ksh93.use.clang.for.tests.diff -gzip ./source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff +gzip ./source/ap/xfsdump/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch +gzip ./source/ap/xfsdump/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch +gzip ./source/ap/xfsdump/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch +gzip ./source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch +gzip ./source/ap/xfsdump/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch gzip ./source/ap/dc3dd/dc3dd.glibc228.diff gzip ./source/ap/flac/flac.man.diff gzip ./source/ap/sqlite/COPYRIGHT diff --git a/source/ap/xfsdump/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch b/source/ap/xfsdump/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch new file mode 100644 index 00000000..56ca54b8 --- /dev/null +++ b/source/ap/xfsdump/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch @@ -0,0 +1,11 @@ +--- ./common/fs.c.orig 2019-11-26 13:31:51.074763965 -0600 ++++ ./common/fs.c 2019-11-26 13:32:44.304759560 -0600 +@@ -204,7 +204,7 @@ + int + fs_getid( char *mnts, uuid_t *idb ) + { +- xfs_fsop_geom_v1_t geo; ++ struct xfs_fsop_geom geo; + int fd; + + fd = open( mnts, O_RDONLY ); diff --git a/source/ap/xfsdump/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch b/source/ap/xfsdump/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch new file mode 100644 index 00000000..7e8c99d6 --- /dev/null +++ b/source/ap/xfsdump/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch @@ -0,0 +1,660 @@ +--- ./dump/content.c.orig 2017-09-21 16:21:55.000000000 -0500 ++++ ./dump/content.c 2019-11-26 13:21:05.434817390 -0600 +@@ -262,30 +262,30 @@ + /* file dumpers + */ + static rv_t dump_dirs( ix_t strmix, +- xfs_bstat_t *bstatbufp, ++ struct xfs_bstat *bstatbufp, + size_t bstatbuflen, + void *inomap_contextp ); + static rv_t dump_dir( ix_t strmix, + jdm_fshandle_t *, + int, +- xfs_bstat_t * ); ++ struct xfs_bstat * ); + static rv_t dump_file( void *, + jdm_fshandle_t *, + int, +- xfs_bstat_t * ); ++ struct xfs_bstat * ); + static rv_t dump_file_reg( drive_t *drivep, + context_t *contextp, + content_inode_hdr_t *scwhdrp, + jdm_fshandle_t *, +- xfs_bstat_t *, ++ struct xfs_bstat *, + bool_t *); + static rv_t dump_file_spec( drive_t *drivep, + context_t *contextp, + jdm_fshandle_t *, +- xfs_bstat_t * ); ++ struct xfs_bstat * ); + static rv_t dump_filehdr( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *, ++ struct xfs_bstat *, + off64_t, + int ); + static rv_t dump_extenthdr( drive_t *drivep, +@@ -296,18 +296,18 @@ + off64_t ); + static rv_t dump_dirent( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *, ++ struct xfs_bstat *, + xfs_ino_t, + gen_t, + char *, + size_t ); + static rv_t init_extent_group_context( jdm_fshandle_t *, +- xfs_bstat_t *, ++ struct xfs_bstat *, + extent_group_context_t * ); + static void cleanup_extent_group_context( extent_group_context_t * ); + static rv_t dump_extent_group( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *, ++ struct xfs_bstat *, + extent_group_context_t *, + off64_t, + off64_t, +@@ -352,15 +352,15 @@ + static rv_t dump_extattrs( drive_t *drivep, + context_t *contextp, + jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp); ++ struct xfs_bstat *statp); + static rv_t dump_extattr_list( drive_t *drivep, + context_t *contextp, + jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + attrlist_t *listp, + int flag, + bool_t *abortprp ); +-static char *dump_extattr_buildrecord( xfs_bstat_t *statp, ++static char *dump_extattr_buildrecord( struct xfs_bstat *statp, + char *dumpbufp, + char *dumpbufendp, + char *namesrcp, +@@ -369,7 +369,7 @@ + char **valuepp ); + static rv_t dump_extattrhdr( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + size_t recsz, + size_t valoff, + ix_t flags, +@@ -432,7 +432,7 @@ + static int sc_fsfd = -1; + /* open file descriptor for root directory + */ +-static xfs_bstat_t *sc_rootxfsstatp = 0; ++static struct xfs_bstat *sc_rootxfsstatp = 0; + /* pointer to loaded bulkstat for root directory + */ + static startpt_t *sc_startptp = 0; +@@ -1382,7 +1382,7 @@ + } + + /* figure out the ino for the root directory of the fs +- * and get its xfs_bstat_t for inomap_build(). This could ++ * and get its struct xfs_bstat for inomap_build(). This could + * be a bind mount; don't ask for the mount point inode, + * find the actual lowest inode number in the filesystem. + */ +@@ -1401,7 +1401,7 @@ + return BOOL_FALSE; + } + sc_rootxfsstatp = +- ( xfs_bstat_t * )calloc( 1, sizeof( xfs_bstat_t )); ++ ( struct xfs_bstat * )calloc( 1, sizeof( struct xfs_bstat )); + assert( sc_rootxfsstatp ); + + /* Get the first valid (i.e. root) inode in this fs */ +@@ -2119,7 +2119,7 @@ + bool_t empty_mediafile; + time_t elapsed; + inv_stmtoken_t inv_stmt; +- xfs_bstat_t *bstatbufp; ++ struct xfs_bstat *bstatbufp; + const size_t bstatbuflen = BSTATBUFLEN; + int rval; + rv_t rv; +@@ -2130,8 +2130,8 @@ + + /* allocate a buffer for use by bstat_iter + */ +- bstatbufp = ( xfs_bstat_t * )calloc( bstatbuflen, +- sizeof( xfs_bstat_t )); ++ bstatbufp = ( struct xfs_bstat * )calloc( bstatbuflen, ++ sizeof( struct xfs_bstat )); + assert( bstatbufp ); + + /* allocate an inomap context */ +@@ -2806,7 +2806,7 @@ + + static rv_t + dump_dirs( ix_t strmix, +- xfs_bstat_t *bstatbufp, ++ struct xfs_bstat *bstatbufp, + size_t bstatbuflen, + void *inomap_contextp ) + { +@@ -2820,8 +2820,8 @@ + */ + lastino = 0; + for ( bulkstatcallcnt = 0 ; ; bulkstatcallcnt++ ) { +- xfs_bstat_t *p; +- xfs_bstat_t *endp; ++ struct xfs_bstat *p; ++ struct xfs_bstat *endp; + __s32 buflenout; + int rval; + +@@ -2928,7 +2928,7 @@ + dump_dir( ix_t strmix, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp ) ++ struct xfs_bstat *statp ) + { + context_t *contextp = &sc_contextp[ strmix ]; + drive_t *drivep = drivepp[ strmix ]; +@@ -3110,7 +3110,7 @@ + * if it's not there, we have to get it the slow way. + */ + if ( inomap_get_gen( NULL, p->d_ino, &gen) ) { +- xfs_bstat_t statbuf; ++ struct xfs_bstat statbuf; + int scrval; + + scrval = bigstat_one( fsfd, +@@ -3169,7 +3169,7 @@ + dump_extattrs( drive_t *drivep, + context_t *contextp, + jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp) ++ struct xfs_bstat *statp) + { + ix_t pass; + int flag; +@@ -3269,7 +3269,7 @@ + dump_extattr_list( drive_t *drivep, + context_t *contextp, + jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + attrlist_t *listp, + int flag, + bool_t *abortprp ) +@@ -3572,7 +3572,7 @@ + } + + static char * +-dump_extattr_buildrecord( xfs_bstat_t *statp, ++dump_extattr_buildrecord( struct xfs_bstat *statp, + char *dumpbufp, + char *dumpbufendp, + char *namesrcp, +@@ -3655,7 +3655,7 @@ + static rv_t + dump_extattrhdr( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + size_t recsz, + size_t valoff, + ix_t flags, +@@ -3712,7 +3712,7 @@ + dump_file( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp ) ++ struct xfs_bstat *statp ) + { + ix_t strmix = ( ix_t )arg1; + context_t *contextp = &sc_contextp[ strmix ]; +@@ -3942,7 +3942,7 @@ + context_t *contextp, + content_inode_hdr_t *scwhdrp, + jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + bool_t *file_skippedp ) + { + startpt_t *startptp = &scwhdrp->cih_startpt; +@@ -4163,7 +4163,7 @@ + dump_file_spec( drive_t *drivep, + context_t *contextp, + jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp ) ++ struct xfs_bstat *statp ) + { + int rval; + rv_t rv; +@@ -4277,7 +4277,7 @@ + */ + static rv_t + init_extent_group_context( jdm_fshandle_t *fshandlep, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + extent_group_context_t *gcp ) + { + bool_t isrealtime; +@@ -4340,7 +4340,7 @@ + static rv_t + dump_extent_group( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + extent_group_context_t *gcp, + off64_t maxcnt, + off64_t stopoffset, +@@ -4932,7 +4932,7 @@ + + /* Note: assumes the pad fields in dst have been zeroed. */ + static void +-copy_xfs_bstat(bstat_t *dst, xfs_bstat_t *src) ++copy_xfs_bstat(bstat_t *dst, struct xfs_bstat *src) + { + dst->bs_ino = src->bs_ino; + dst->bs_mode = src->bs_mode; +@@ -4963,7 +4963,7 @@ + static rv_t + dump_filehdr( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + off64_t offset, + int flags ) + { +@@ -5086,7 +5086,7 @@ + static rv_t + dump_dirent( drive_t *drivep, + context_t *contextp, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + xfs_ino_t ino, + gen_t gen, + char *name, +--- ./dump/inomap.c.orig 2017-08-18 17:54:06.000000000 -0500 ++++ ./dump/inomap.c 2019-11-26 13:21:05.442817390 -0600 +@@ -81,7 +81,7 @@ + static void cb_context_free( void ); + static int cb_count_inogrp( void *, int, xfs_inogrp_t *); + static int cb_add_inogrp( void *, int, xfs_inogrp_t * ); +-static int cb_add( void *, jdm_fshandle_t *, int, xfs_bstat_t * ); ++static int cb_add( void *, jdm_fshandle_t *, int, struct xfs_bstat * ); + static bool_t cb_inoinresumerange( xfs_ino_t ); + static bool_t cb_inoresumed( xfs_ino_t ); + static void cb_accuminit_sz( void ); +@@ -89,14 +89,14 @@ + static int cb_startpt( void *, + jdm_fshandle_t *, + int, +- xfs_bstat_t * ); ++ struct xfs_bstat * ); + static int supprt_prune( void *, + jdm_fshandle_t *, + int, +- xfs_bstat_t *, ++ struct xfs_bstat *, + char * ); +-static off64_t quantity2offset( jdm_fshandle_t *, xfs_bstat_t *, off64_t ); +-static off64_t estimate_dump_space( xfs_bstat_t * ); ++static off64_t quantity2offset( jdm_fshandle_t *, struct xfs_bstat *, off64_t ); ++static off64_t estimate_dump_space( struct xfs_bstat * ); + + /* inomap primitives + */ +@@ -110,16 +110,16 @@ + static int subtree_descend_cb( void *, + jdm_fshandle_t *, + int fsfd, +- xfs_bstat_t *, ++ struct xfs_bstat *, + char * ); + static int subtreelist_parse_cb( void *, + jdm_fshandle_t *, + int fsfd, +- xfs_bstat_t *, ++ struct xfs_bstat *, + char * ); + static int subtreelist_parse( jdm_fshandle_t *, + int, +- xfs_bstat_t *, ++ struct xfs_bstat *, + char *[], + ix_t ); + +@@ -144,7 +144,7 @@ + bool_t + inomap_build( jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *rootstatp, ++ struct xfs_bstat *rootstatp, + bool_t last, + time32_t lasttime, + bool_t resume, +@@ -161,7 +161,7 @@ + size64_t statcnt, + size64_t *statdonep ) + { +- xfs_bstat_t *bstatbufp; ++ struct xfs_bstat *bstatbufp; + size_t bstatbuflen; + bool_t pruneneeded = BOOL_FALSE; + int igrpcnt = 0; +@@ -185,10 +185,10 @@ + /* allocate a bulkstat buf + */ + bstatbuflen = BSTATBUFLEN; +- bstatbufp = ( xfs_bstat_t * )memalign( pgsz, ++ bstatbufp = ( struct xfs_bstat * )memalign( pgsz, + bstatbuflen + * +- sizeof( xfs_bstat_t )); ++ sizeof( struct xfs_bstat )); + assert( bstatbufp ); + + /* count the number of inode groups, which will serve as a +@@ -505,7 +505,7 @@ + cb_add( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp ) ++ struct xfs_bstat *statp ) + { + register time32_t mtime = statp->bs_mtime.tv_sec; + register time32_t ctime = statp->bs_ctime.tv_sec; +@@ -691,7 +691,7 @@ + supprt_prune( void *arg1, /* ancestors marked as changed? */ + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + char *name ) + { + static bool_t cbrval = BOOL_FALSE; +@@ -812,7 +812,7 @@ + cb_startpt( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp ) ++ struct xfs_bstat *statp ) + { + register int state; + +@@ -1472,7 +1472,7 @@ + static int + subtreelist_parse( jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *rootstatp, ++ struct xfs_bstat *rootstatp, + char *subtreebuf[], + ix_t subtreecnt ) + { +@@ -1513,7 +1513,7 @@ + subtreelist_parse_cb( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + char *name ) + { + int cbrval = 0; +@@ -1596,7 +1596,7 @@ + subtree_descend_cb( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + char *name ) + { + int cbrval = 0; +@@ -1624,7 +1624,7 @@ + #define BMAP_LEN 512 + + static off64_t +-quantity2offset( jdm_fshandle_t *fshandlep, xfs_bstat_t *statp, off64_t qty ) ++quantity2offset( jdm_fshandle_t *fshandlep, struct xfs_bstat *statp, off64_t qty ) + { + int fd; + getbmapx_t bmap[ BMAP_LEN ]; +@@ -1699,7 +1699,7 @@ + + + static off64_t +-estimate_dump_space( xfs_bstat_t *statp ) ++estimate_dump_space( struct xfs_bstat *statp ) + { + switch ( statp->bs_mode & S_IFMT ) { + case S_IFREG: +--- ./common/content_inode.h.orig 2017-09-21 16:21:55.000000000 -0500 ++++ ./common/content_inode.h 2019-11-26 13:21:05.397817393 -0600 +@@ -150,8 +150,8 @@ + + /* bstat_t - bulk stat structure + * +- * used in filehdr_t below. derived from xfs_bstat_t, to achieve independence +- * from changes to xfs_bstat_t. ++ * used in filehdr_t below. derived from struct xfs_bstat, to achieve independence ++ * from changes to struct xfs_bstat. + */ + #define BSTAT_SZ 128 + #define MODE_SZ 4 +--- ./common/hsmapi.h.orig 2015-11-10 13:40:23.000000000 -0600 ++++ ./common/hsmapi.h 2019-11-26 13:21:05.391817394 -0600 +@@ -186,15 +186,15 @@ + + /****************************************************************************** + * Name +-* HsmModifyInode - modify a xfs_bstat_t to make a file appear offline ++* HsmModifyInode - modify a struct xfs_bstat to make a file appear offline + * + * Description + * HsmModifyInode uses the context provided by a previous +-* HsmInitFileContext call to determine how to modify a xfs_bstat_t ++* HsmInitFileContext call to determine how to modify a struct xfs_bstat + * structure to make a dual-residency HSM file appear to be offline. + * + * Returns +-* != 0, xfs_bstat_t structure was modified. ++* != 0, struct xfs_bstat structure was modified. + * == 0, if something is wrong with the file and it should not be dumped. + ******************************************************************************/ + +--- ./common/util.h.orig 2017-08-18 17:54:06.000000000 -0500 ++++ ./common/util.h 2019-11-26 13:21:05.411817392 -0600 +@@ -87,7 +87,7 @@ + typedef int (*bstat_cbfp_t)(void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp ); ++ struct xfs_bstat *statp ); + + typedef xfs_ino_t (*bstat_seekfp_t)(void *arg1, + xfs_ino_t lastino); +@@ -102,12 +102,12 @@ + void * seek_arg1, + int *statp, + bool_t ( pfp )( int ), /* preemption chk func */ +- xfs_bstat_t *buf, ++ struct xfs_bstat *buf, + size_t buflen ); + + extern int bigstat_one( int fsfd, + xfs_ino_t ino, +- xfs_bstat_t *statp ); ++ struct xfs_bstat *statp ); + + extern int inogrp_iter( int fsfd, + int ( * fp )( void *arg1, +@@ -131,11 +131,11 @@ + */ + extern int diriter( jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + int ( *cbfp )( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + char *namep ), + void *arg1, + int *cbrvalp, +--- ./common/hsmapi.c.orig 2017-09-21 16:21:55.000000000 -0500 ++++ ./common/hsmapi.c 2019-11-26 13:21:05.404817393 -0600 +@@ -108,7 +108,7 @@ + #define DM_EVENT_TRUNCATE 18 + #define DM_EVENT_DESTROY 20 + +- /* Interesting bit combinations within the bs_dmevmask field of xfs_bstat_t: ++ /* Interesting bit combinations within the bs_dmevmask field of struct xfs_bstat: + * OFL, UNM, and PAR files have exactly these bits set. + * DUL and MIG files have all but the DM_EVENT_READ bit set */ + #define DMF_EV_BITS ( (1<<DM_EVENT_DESTROY) | \ +@@ -270,7 +270,7 @@ + HsmEstimateFileSpace( + hsm_fs_ctxt_t *fscontextp, + hsm_f_ctxt_t *fcontextp, +-const xfs_bstat_t *statp, ++const struct xfs_bstat *statp, + off64_t *bytes, + int accurate) + { +@@ -353,7 +353,7 @@ + extern int + HsmEstimateFileOffset( + hsm_fs_ctxt_t *contextp, +-const xfs_bstat_t *statp, ++const struct xfs_bstat *statp, + off64_t bytecount, + off64_t *byteoffset) + { +@@ -458,7 +458,7 @@ + extern int + HsmInitFileContext( + hsm_f_ctxt_t *contextp, +-const xfs_bstat_t *statp) ++const struct xfs_bstat *statp) + { + dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp; + XFSattrvalue0_t *dmfattrp; +@@ -492,7 +492,7 @@ + attr_op.am_flags = ATTR_ROOT; + + error = jdm_attr_multi(dmf_f_ctxtp->fsys.fshanp, +- (xfs_bstat_t *)statp, ++ (struct xfs_bstat *)statp, + (char *)&attr_op, + 1, + 0); +@@ -538,22 +538,22 @@ + + /****************************************************************************** + * Name +-* HsmModifyInode - modify a xfs_bstat_t to make a file appear offline ++* HsmModifyInode - modify a struct xfs_bstat to make a file appear offline + * + * Description + * HsmModifyInode uses the context provided by a previous +-* HsmInitFileContext call to determine how to modify a xfs_bstat_t ++* HsmInitFileContext call to determine how to modify a struct xfs_bstat + * structure to make a dual-residency HSM file appear to be offline. + * + * Returns +-* != 0, xfs_bstat_t structure was modified. ++* != 0, struct xfs_bstat structure was modified. + * == 0, if something is wrong with the file and it should not be dumped. + ******************************************************************************/ + + extern int + HsmModifyInode( + hsm_f_ctxt_t *contextp, +- xfs_bstat_t *statp) ++ struct xfs_bstat *statp) + { + dmf_f_ctxt_t *dmf_f_ctxtp = (dmf_f_ctxt_t *)contextp; + +--- ./common/util.c.orig 2015-11-10 13:40:23.000000000 -0600 ++++ ./common/util.c 2019-11-26 13:21:05.418817392 -0600 +@@ -125,7 +125,7 @@ + void * seek_arg1, + int *statp, + bool_t ( pfp )( int ), +- xfs_bstat_t *buf, ++ struct xfs_bstat *buf, + size_t buflenin ) + { + __s32 buflenout; +@@ -162,8 +162,8 @@ + bulkreq.ubuffer = buf; + bulkreq.ocount = &buflenout; + while (!ioctl(fsfd, XFS_IOC_FSBULKSTAT, &bulkreq)) { +- xfs_bstat_t *p; +- xfs_bstat_t *endp; ++ struct xfs_bstat *p; ++ struct xfs_bstat *endp; + + if ( buflenout == 0 ) { + mlog( MLOG_NITTY + 1, +@@ -254,7 +254,7 @@ + int + bigstat_one( int fsfd, + xfs_ino_t ino, +- xfs_bstat_t *statp ) ++ struct xfs_bstat *statp ) + { + xfs_fsop_bulkreq_t bulkreq; + int count = 0; +@@ -339,11 +339,11 @@ + int + diriter( jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + int ( *cbfp )( void *arg1, + jdm_fshandle_t *fshandlep, + int fsfd, +- xfs_bstat_t *statp, ++ struct xfs_bstat *statp, + char *namep ), + void *arg1, + int *cbrvalp, +@@ -428,7 +428,7 @@ + assert( nread >= 0 ), + p = ( struct dirent * )( ( char * )p + reclen ), + reclen = ( size_t )p->d_reclen ) { +- xfs_bstat_t statbuf; ++ struct xfs_bstat statbuf; + assert( scrval == 0 ); + assert( cbrval == 0 ); + +--- ./doc/xfsdump.html.orig 2017-09-21 16:21:55.000000000 -0500 ++++ ./doc/xfsdump.html 2019-11-26 13:21:05.425817391 -0600 +@@ -513,9 +513,9 @@ + - bigstat_init on cb_add() + - loops doing bulkstats (using syssgi() or ioctl()) + until system call returns non-zero value +- - each bulkstat returns a buffer of xfs_bstat_t records ++ - each bulkstat returns a buffer of struct xfs_bstat records + (buffer of size bulkreq.ocount) +- - loop thru each xfs_bstat_t record for an inode ++ - loop thru each struct xfs_bstat record for an inode + calling cb_add() + * cb_add + - looks at latest mtime|ctime and +@@ -629,7 +629,7 @@ + * dump_filehdr() + - write out 256 padded file header + - header = <offset, flags, checksum, 128-byte bulk stat structure > +- - bulkstat struct derived from xfs_bstat_t ++ - bulkstat struct derived from struct xfs_bstat + - stnd. stat stuff + extent size, #of extents, DMI stuff + - if HSM context then + - modify bstat struct to make it offline diff --git a/source/ap/xfsdump/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch b/source/ap/xfsdump/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch new file mode 100644 index 00000000..5c5eefea --- /dev/null +++ b/source/ap/xfsdump/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch @@ -0,0 +1,14 @@ +--- ./common/types.h.orig 2017-09-21 16:21:55.000000000 -0500 ++++ ./common/types.h 2019-11-26 13:23:41.819804450 -0600 +@@ -32,11 +32,6 @@ + + #define XFSDUMP_DIRPATH inv_basepath() + +-/* +- * Should be, but isn't, defined in uuid/uuid.h +- */ +-#define UUID_STR_LEN 36 +- + /* fundamental page size - probably should not be hardwired, but + * for now we will + */ diff --git a/source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch b/source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch new file mode 100644 index 00000000..750433be --- /dev/null +++ b/source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch @@ -0,0 +1,81 @@ +--- ./dump/inomap.c.orig 2019-11-26 13:32:54.382758726 -0600 ++++ ./dump/inomap.c 2019-11-26 13:34:21.686751502 -0600 +@@ -79,8 +79,8 @@ + bool_t, + bool_t *); + static void cb_context_free( void ); +-static int cb_count_inogrp( void *, int, xfs_inogrp_t *); +-static int cb_add_inogrp( void *, int, xfs_inogrp_t * ); ++static int cb_count_inogrp( void *, int, struct xfs_inogrp *); ++static int cb_add_inogrp( void *, int, struct xfs_inogrp * ); + static int cb_add( void *, jdm_fshandle_t *, int, struct xfs_bstat * ); + static bool_t cb_inoinresumerange( xfs_ino_t ); + static bool_t cb_inoresumed( xfs_ino_t ); +@@ -488,7 +488,7 @@ + } + + static int +-cb_count_inogrp( void *arg1, int fsfd, xfs_inogrp_t *inogrp ) ++cb_count_inogrp( void *arg1, int fsfd, struct xfs_inogrp *inogrp ) + { + int *count = (int *)arg1; + (*count)++; +@@ -1116,7 +1116,7 @@ + * order. adds a new segment to the inomap and ino-to-gen map. + */ + static int +-cb_add_inogrp( void *arg1, int fsfd, xfs_inogrp_t *inogrp ) ++cb_add_inogrp( void *arg1, int fsfd, struct xfs_inogrp *inogrp ) + { + hnk_t *hunk; + seg_t *segp; +--- ./common/util.h.orig 2019-11-26 13:32:54.397758725 -0600 ++++ ./common/util.h 2019-11-26 13:34:21.685751502 -0600 +@@ -112,7 +112,7 @@ + extern int inogrp_iter( int fsfd, + int ( * fp )( void *arg1, + int fsfd, +- xfs_inogrp_t *inogrp ), ++ struct xfs_inogrp *inogrp ), + void * arg1, + int *statp ); + +--- ./common/util.c.orig 2019-11-26 13:32:54.415758723 -0600 ++++ ./common/util.c 2019-11-26 13:34:21.685751502 -0600 +@@ -274,23 +274,23 @@ + inogrp_iter( int fsfd, + int ( * fp )( void *arg1, + int fsfd, +- xfs_inogrp_t *inogrp ), ++ struct xfs_inogrp *inogrp ), + void * arg1, + int *statp ) + { + xfs_ino_t lastino; + int inogrpcnt; +- xfs_inogrp_t *igrp; ++ struct xfs_inogrp *igrp; + xfs_fsop_bulkreq_t bulkreq; + + /* stat set with return from callback func */ + *statp = 0; + +- igrp = malloc(INOGRPLEN * sizeof(xfs_inogrp_t)); ++ igrp = malloc(INOGRPLEN * sizeof(struct xfs_inogrp)); + if (!igrp) { + mlog(MLOG_NORMAL | MLOG_ERROR, + _("malloc of stream context failed (%d bytes): %s\n"), +- INOGRPLEN * sizeof(xfs_inogrp_t), ++ INOGRPLEN * sizeof(struct xfs_inogrp), + strerror(errno)); + return -1; + } +@@ -302,7 +302,7 @@ + bulkreq.ubuffer = igrp; + bulkreq.ocount = &inogrpcnt; + while (!ioctl(fsfd, XFS_IOC_FSINUMBERS, &bulkreq)) { +- xfs_inogrp_t *p, *endp; ++ struct xfs_inogrp *p, *endp; + + if ( inogrpcnt == 0 ) { + free(igrp); diff --git a/source/ap/xfsdump/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch b/source/ap/xfsdump/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch new file mode 100644 index 00000000..98c6805c --- /dev/null +++ b/source/ap/xfsdump/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch @@ -0,0 +1,49 @@ +--- ./dump/content.c.orig 2019-11-26 13:37:51.425734146 -0600 ++++ ./dump/content.c 2019-11-26 13:38:52.482729094 -0600 +@@ -1390,7 +1390,7 @@ + stat64_t rootstat; + xfs_ino_t lastino = 0; + int ocount = 0; +- xfs_fsop_bulkreq_t bulkreq; ++ struct xfs_fsop_bulkreq bulkreq; + + /* Get the inode of the mount point */ + rval = fstat64( sc_fsfd, &rootstat ); +@@ -2812,7 +2812,7 @@ + { + xfs_ino_t lastino; + size_t bulkstatcallcnt; +- xfs_fsop_bulkreq_t bulkreq; ++ struct xfs_fsop_bulkreq bulkreq; + + inomap_reset_context(inomap_contextp); + +--- ./common/util.c.orig 2019-11-26 13:37:51.523734138 -0600 ++++ ./common/util.c 2019-11-26 13:38:52.481729094 -0600 +@@ -132,7 +132,7 @@ + xfs_ino_t lastino; + int saved_errno; + int bulkstatcnt; +- xfs_fsop_bulkreq_t bulkreq; ++ struct xfs_fsop_bulkreq bulkreq; + + /* stat set with return from callback func + */ +@@ -256,7 +256,7 @@ + xfs_ino_t ino, + struct xfs_bstat *statp ) + { +- xfs_fsop_bulkreq_t bulkreq; ++ struct xfs_fsop_bulkreq bulkreq; + int count = 0; + + assert( ino > 0 ); +@@ -281,7 +281,7 @@ + xfs_ino_t lastino; + int inogrpcnt; + struct xfs_inogrp *igrp; +- xfs_fsop_bulkreq_t bulkreq; ++ struct xfs_fsop_bulkreq bulkreq; + + /* stat set with return from callback func */ + *statp = 0; diff --git a/source/ap/xfsdump/xfsdump.SlackBuild b/source/ap/xfsdump/xfsdump.SlackBuild index 8cc6c1fc..10509532 100755 --- a/source/ap/xfsdump/xfsdump.SlackBuild +++ b/source/ap/xfsdump/xfsdump.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfsdump VERSION=${VERSION:-$(echo xfsdump-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -68,8 +68,12 @@ find . \ # developers did... ;-) #autoreconf -vif -# Fix build against xfsprogs-5.2.1: -zcat $CWD/xfsdump.xfsprogs-5.2.1.diff.gz | patch -p1 --verbose || exit 1 +# Fix build against xfsprogs-5.3.0: +zcat $CWD/0001-xfsdump.xfsprogs-5.3.0.xfs_fsop_geom_v1_t.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0002-xfsdump.xfsprogs-5.3.0.xfs_bstat_t.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0003-xfsdump.xfsprogs-5.3.0.UUID_STR_LEN.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0005-xfsdump.xfsprogs-5.3.0.xfs_fsop_bulkreq_t.patch.gz | patch -p1 --verbose || exit 1 ./configure \ --prefix=/usr \ diff --git a/source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff b/source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff deleted file mode 100644 index d12be1b3..00000000 --- a/source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./common/fs.c.orig 2015-11-10 13:40:23.000000000 -0600 -+++ ./common/fs.c 2019-09-15 15:30:26.633808720 -0500 -@@ -204,7 +204,7 @@ - int - fs_getid( char *mnts, uuid_t *idb ) - { -- xfs_fsop_geom_v1_t geo; -+ struct xfs_fsop_geom_v1 geo; - int fd; - - fd = open( mnts, O_RDONLY ); diff --git a/source/x/libepoxy/libepoxy.url b/source/x/libepoxy/libepoxy.url index 1ae44a1c..c354027c 100644 --- a/source/x/libepoxy/libepoxy.url +++ b/source/x/libepoxy/libepoxy.url @@ -1 +1 @@ -https://github.com/anholt/libepoxy/releases/download/1.5.2/libepoxy-1.5.2.tar.xz +https://github.com/anholt/libepoxy/releases/download/1.5.4/libepoxy-1.5.4.tar.xz |