diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template
index 93c3d473b7b0c8..0732740998180b 100644
--- a/srcpkgs/acl/template
+++ b/srcpkgs/acl/template
@@ -1,24 +1,39 @@
 # Template file for 'acl'
 pkgname=acl
-version=2.3.2
+version=2.4.0
 revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
  --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
 makedepends="attr-devel"
+checkdepends="perl"
 short_desc="Access Control List filesystem support"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://savannah.nongnu.org/projects/acl"
 distfiles="${NONGNU_SITE}/acl/acl-${version}.tar.gz"
-checksum=5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c
+checksum=73c853c3d44e1f693e5a96a986f1bd19d3d0dac2c7d453e796177774bc4e5f6a
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
 	LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
 fi
 
+do_check() {
+	case "$XBPS_TARGET_MACHINE" in
+		aarch64*)
+			make check XFAIL_TESTS="test/cp.run test/setfacl-X.run test/misc.run"
+			;;
+		*-musl)
+			make check XFAIL_TESTS="test/restore.run"
+			;;
+		*)
+			make check
+			;;
+	esac
+}
+
 acl-devel_package() {
 	depends="attr-devel acl>=${version}_${revision}"
 	short_desc+=" - development files"
diff --git a/srcpkgs/attr/patches/8a80d895dfd779373363c3a4b62ecce5a549efb2.patch b/srcpkgs/attr/patches/8a80d895dfd779373363c3a4b62ecce5a549efb2.patch
deleted file mode 100644
index 818161f1524363..00000000000000
--- a/srcpkgs/attr/patches/8a80d895dfd779373363c3a4b62ecce5a549efb2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001
-From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
-Date: Sat, 30 Mar 2024 10:17:10 +0100
-Subject: tools/attr.c: Add missing libgen.h include for basename(3)
-
-Fixes compilation issue with musl and modern C99 compilers.
-
-See: https://bugs.gentoo.org/926294
----
- tools/attr.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/attr.c b/tools/attr.c
-index f12e4af..6a3c1e9 100644
---- a/tools/attr.c
-+++ b/tools/attr.c
-@@ -28,6 +28,7 @@
- #include <errno.h>
- #include <string.h>
- #include <locale.h>
-+#include <libgen.h>
- 
- #include <attr/attributes.h>
- 
--- 
-cgit v1.1
-
diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template
index dc2b3e8e14a377..910b53d30713ea 100644
--- a/srcpkgs/attr/template
+++ b/srcpkgs/attr/template
@@ -1,7 +1,7 @@
 # Template file for 'attr'
 pkgname=attr
-version=2.5.2
-revision=2
+version=2.6.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib${XBPS_TARGET_WORDSIZE}
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://savannah.nongnu.org/projects/attr"
 distfiles="${NONGNU_SITE}/attr/attr-${version}.tar.gz"
-checksum=39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87
+checksum=d42fa374513180bb48cb11a46696f488240e5124ff1e6ad88b0abff706985612
 conf_files="/etc/xattr.conf"
 
 # The included libtool is rotten and only works with bash; easiest fix.
@@ -25,7 +25,7 @@ pre_check() {
 	# EXPECTED: Operation not supported
 	# RECIEVED: Not supported
 	case "$XBPS_TARGET_MACHINE" in
-	 *-musl* ) sed -i 's|f: Operation n|f: N|g' test/attr.test ;;
+	 *-musl* ) sed -i 's|f: Operation n|f: N|g' test/attr.run ;;
 	esac
 }