diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-08-10 22:08:47 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-11-19 00:56:58 -0600 |
| commit | 43e842ea9b26ad44c88000cc4d9bd6cf8473afca (patch) | |
| tree | e5ecb36db2b8f90b282efa175f431c3a8bf6a60c | |
| parent | 76658d4f3875b12d88ed796c5508e334f2eec4f5 (diff) | |
| download | packages-43e842ea9b26ad44c88000cc4d9bd6cf8473afca.tar.gz packages-43e842ea9b26ad44c88000cc4d9bd6cf8473afca.tar.bz2 packages-43e842ea9b26ad44c88000cc4d9bd6cf8473afca.tar.xz packages-43e842ea9b26ad44c88000cc4d9bd6cf8473afca.zip | |
system/xfsprogs: Update to 6.9.0
| -rw-r--r-- | system/xfsprogs/APKBUILD | 13 | ||||
| -rw-r--r-- | system/xfsprogs/fix-mmap.patch | 17 | ||||
| -rw-r--r-- | system/xfsprogs/scrub.patch | 49 |
3 files changed, 56 insertions, 23 deletions
diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD index 7ba5af832..8d717f51e 100644 --- a/system/xfsprogs/APKBUILD +++ b/system/xfsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsprogs -pkgver=5.7.0 +pkgver=6.9.0 pkgrel=0 pkgdesc="XFS filesystem utilities" url="https://xfs.org/index.php/Main_Page" @@ -9,11 +9,12 @@ arch="all" options="!check" # No test suite. license="GPL-1.0-only" depends="$pkgname-base" -makedepends="attr-dev bash icu-dev libedit-dev linux-headers util-linux-dev" +makedepends="attr-dev bash icu-dev inih-dev libedit-dev linux-headers + userspace-rcu-dev util-linux-dev" subpackages="$pkgname-base $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="https://www.kernel.org/pub/linux/utils/fs/xfs/$pkgname/$pkgname-$pkgver.tar.gz - fix-mmap.patch no-utmp-header.patch + scrub.patch " build() { @@ -48,6 +49,6 @@ base() { mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ } -sha512sums="81e0be0aad0024e7b36c93de30a737677bb244510b4f1e010838dfad900b2b96d59d500e3b89c6e1f9b64c5f86ef7b502a676b8f5c3d064a9e8e75ec69f61785 xfsprogs-5.7.0.tar.gz -c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4 fix-mmap.patch -29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch" +sha512sums="bfb3c98e7571180f1c5c130ca9aece5dde97bc6c628dc3d6560b0da75e5b43e8febe3eec193d3db2ec877b3a27258c53c033c7ed3d881efd2d4e3216033aaf2b xfsprogs-6.9.0.tar.gz +29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch +d83e2ae819a338273fae7999a0ae1376faa593308974f93abc6db140b134ec98f855a2ea5585583f739b041fbb5d4b8a0d4d27ecd73df6c34cd799b2cee55b9a scrub.patch" diff --git a/system/xfsprogs/fix-mmap.patch b/system/xfsprogs/fix-mmap.patch deleted file mode 100644 index be2704107..000000000 --- a/system/xfsprogs/fix-mmap.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- xfsprogs-4.18.0/io/mmap.c.old 2018-08-24 20:17:05.000000000 +0000 -+++ xfsprogs-4.18.0/io/mmap.c 2018-11-03 22:13:06.790000000 +0000 -@@ -20,6 +20,14 @@ - static cmdinfo_t mremap_cmd; - #endif /* HAVE_MREMAP */ - -+#ifndef HAVE_MAP_SYNC -+#define MAP_SYNC 0 -+#define MAP_SHARED_VALIDATE 0 -+#else -+#include <asm-generic/mman.h> -+#include <asm-generic/mman-common.h> -+#endif /* HAVE_MAP_SYNC */ -+ - mmap_region_t *maptable; - int mapcount; - mmap_region_t *mapping; diff --git a/system/xfsprogs/scrub.patch b/system/xfsprogs/scrub.patch new file mode 100644 index 000000000..a466aab34 --- /dev/null +++ b/system/xfsprogs/scrub.patch @@ -0,0 +1,49 @@ +From da3ad6ffc9ecf75ebb734bbb863c1412d11b9beb Mon Sep 17 00:00:00 2001 +From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> +Date: Sat, 10 Aug 2024 21:26:57 -0500 +Subject: [PATCH] xfs_scrub: Use POSIX-conformant strerror_r + +When building xfsprogs with musl libc, strerror_r returns int as +specified in POSIX. This differs from the glibc extension that returns +char*. Successful calls will return 0, which will be dereferenced as a +NULL pointer by (v)fprintf. + +Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> +--- + scrub/common.c | 3 ++- + scrub/inodes.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/scrub/common.c b/scrub/common.c +index 283ac84e..bd8bde35 100644 +--- a/scrub/common.c ++++ b/scrub/common.c +@@ -122,7 +122,8 @@ __str_out( + fprintf(stream, "%s%s: %s: ", stream_start(stream), + _(err_levels[level].string), descr); + if (error) { +- fprintf(stream, _("%s."), strerror_r(error, buf, DESCR_BUFSZ)); ++ strerror_r(error, buf, DESCR_BUFSZ); ++ fprintf(stream, _("%s."), buf); + } else { + va_start(args, format); + vfprintf(stream, format, args); +diff --git a/scrub/inodes.c b/scrub/inodes.c +index 16c79cf4..f0e7289c 100644 +--- a/scrub/inodes.c ++++ b/scrub/inodes.c +@@ -65,9 +65,9 @@ bulkstat_for_inumbers( + error = -xfrog_bulkstat(&ctx->mnt, breq); + if (error) { + char errbuf[DESCR_BUFSZ]; ++ strerror_r(error, errbuf, DESCR_BUFSZ); + +- str_info(ctx, descr_render(dsc), "%s", +- strerror_r(error, errbuf, DESCR_BUFSZ)); ++ str_info(ctx, descr_render(dsc), "%s", errbuf); + } + + /* +-- +2.40.0 + |