diff options
Diffstat (limited to 'user/xfsprogs')
| -rw-r--r-- | user/xfsprogs/APKBUILD | 10 | ||||
| -rw-r--r-- | user/xfsprogs/scrub.patch | 21 |
2 files changed, 7 insertions, 24 deletions
diff --git a/user/xfsprogs/APKBUILD b/user/xfsprogs/APKBUILD index 8d717f51e..4233634b8 100644 --- a/user/xfsprogs/APKBUILD +++ b/user/xfsprogs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xfsprogs -pkgver=6.9.0 +pkgver=6.15.0 pkgrel=0 pkgdesc="XFS filesystem utilities" url="https://xfs.org/index.php/Main_Page" @@ -26,7 +26,9 @@ build() { --prefix=/usr \ --sbindir=/sbin \ --libexecdir=/usr/lib \ - --enable-editline + --localstatedir=/var \ + --enable-editline \ + --with-udev-rule-dir=/lib/udev/rules.d make SHELL=/bin/bash } @@ -49,6 +51,6 @@ base() { mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/ } -sha512sums="bfb3c98e7571180f1c5c130ca9aece5dde97bc6c628dc3d6560b0da75e5b43e8febe3eec193d3db2ec877b3a27258c53c033c7ed3d881efd2d4e3216033aaf2b xfsprogs-6.9.0.tar.gz +sha512sums="9568935dcac86a111b5b7905bd593db61520adb66bba44871bcef288419d445ab8375ef1c62eef5e816bb7fd4d128eed061106aac87e6544a797427589b8dd3d xfsprogs-6.15.0.tar.gz 29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae no-utmp-header.patch -d83e2ae819a338273fae7999a0ae1376faa593308974f93abc6db140b134ec98f855a2ea5585583f739b041fbb5d4b8a0d4d27ecd73df6c34cd799b2cee55b9a scrub.patch" +ee3bafc60ff0535b7305552cb7cb5da27bd364ff6deea957a533926aa56d04a24c7e69048db2dbd76f59936e11b469fdee24e8994d370e89e2c8d04aa6dc8b1e scrub.patch" diff --git a/user/xfsprogs/scrub.patch b/user/xfsprogs/scrub.patch index a466aab34..6333869af 100644 --- a/user/xfsprogs/scrub.patch +++ b/user/xfsprogs/scrub.patch @@ -18,7 +18,7 @@ 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( +@@ -126,7 +126,8 @@ __str_out( fprintf(stream, "%s%s: %s: ", stream_start(stream), _(err_levels[level].string), descr); if (error) { @@ -28,22 +28,3 @@ index 283ac84e..bd8bde35 100644 } 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 - |