diff options
Diffstat (limited to 'system/findutils')
| -rw-r--r-- | system/findutils/APKBUILD | 13 | ||||
| -rw-r--r-- | system/findutils/xargs-test-hashbang.patch | 11 |
2 files changed, 7 insertions, 17 deletions
diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD index 2b2877abc..8a54ade09 100644 --- a/system/findutils/APKBUILD +++ b/system/findutils/APKBUILD @@ -1,21 +1,20 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Contributor: Michael Mason <ms13sp@gmail.com> -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=findutils pkgver=4.8.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNU utilities to locate files" url="https://www.gnu.org/software/findutils/" arch="all" license="GPL-3.0+" depends="" -checkdepends="bash coreutils diffutils dejagnu" +checkdepends="coreutils diffutils dejagnu" makedepends="" subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch sysmacros.patch - xargs-test-hashbang.patch " build() { @@ -31,6 +30,9 @@ build() { } check() { + sed -i Makefile \ + -e '\@tests/xargs/verbose-quote.sh@d' \ + ; make check } @@ -41,5 +43,4 @@ package() { sha512sums="eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e findutils-4.8.0.tar.xz dc7e9c4fdd36d05ca230e3456a8005a5fcd353db07181e0d17ab66db4eb967e6bdfe3b6f1da0edbb38e973fea89ae174ea31e6839f59d3084b15f08de363f139 gnulib-tests-dont-require-gpg-passphrase.patch -2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch -05402edd764c068c90765ced7322cca7c2d41061fb68b6d412e4010b32aad148489d367bcc447a11fa774cf959d122ec6c63cc7a846d35dea936f1e0bad7aa1c xargs-test-hashbang.patch" +2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch" diff --git a/system/findutils/xargs-test-hashbang.patch b/system/findutils/xargs-test-hashbang.patch deleted file mode 100644 index 53b3f34a0..000000000 --- a/system/findutils/xargs-test-hashbang.patch +++ /dev/null @@ -1,11 +0,0 @@ -This test fails when using dash as /bin/sh. - -This workaround is also being used by Guix. ---- findutils-4.8.0/tests/xargs/verbose-quote.sh.old 2021-01-01 18:46:51.000000000 -0600 -+++ findutils-4.8.0/tests/xargs/verbose-quote.sh 2021-09-11 01:01:01.090000000 -0500 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # Verify that 'xargs -t' quotes the command properly when needed. - - # Copyright (C) 2019-2021 Free Software Foundation, Inc. |