summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2023-05-08 00:36:01 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2023-09-22 06:20:40 -0500
commitdaf2bbda0c216dce2caa8f75d70996fbc8547555 (patch)
tree433962cd795a66c29bf924bfed82a16317f6710d
parentad0f521e3fa7b69656f64ff4ea00a3cc3ea3ad9a (diff)
downloadpackages-daf2bbda0c216dce2caa8f75d70996fbc8547555.tar.gz
packages-daf2bbda0c216dce2caa8f75d70996fbc8547555.tar.bz2
packages-daf2bbda0c216dce2caa8f75d70996fbc8547555.tar.xz
packages-daf2bbda0c216dce2caa8f75d70996fbc8547555.zip
system/acl: add patch for 64-bit dirent/readdirawilfox/musl-next
Fixes: #1021
-rw-r--r--system/acl/APKBUILD7
-rw-r--r--system/acl/lfs64.patch38
2 files changed, 43 insertions, 2 deletions
diff --git a/system/acl/APKBUILD b/system/acl/APKBUILD
index 3689d26df..5a1b15e0f 100644
--- a/system/acl/APKBUILD
+++ b/system/acl/APKBUILD
@@ -13,7 +13,9 @@ makedepends_build="gettext-tiny"
makedepends_host="attr-dev gettext-tiny-dev"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang libacl"
-source="https://download.savannah.nongnu.org/releases/acl/acl-$pkgver.tar.gz"
+source="https://download.savannah.nongnu.org/releases/acl/acl-$pkgver.tar.gz
+ lfs64.patch
+ "
prepare() {
default_prepare
@@ -42,4 +44,5 @@ libacl() {
mv "$pkgdir"/lib/libacl.so.* "$subpkgdir"/lib/
}
-sha512sums="f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892 acl-2.3.1.tar.gz"
+sha512sums="f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892 acl-2.3.1.tar.gz
+ec5a983ddc662b450f0e76a18262cb25174dcd537687ffd9d356b2f7b0e52371798e5a0a2df3b0a2c9f8496304c769bdd66f7dd70c9fa2e44291f1c0aa75fdf9 lfs64.patch"
diff --git a/system/acl/lfs64.patch b/system/acl/lfs64.patch
new file mode 100644
index 000000000..dee951f41
--- /dev/null
+++ b/system/acl/lfs64.patch
@@ -0,0 +1,38 @@
+From 2b42f64737adf6a2ddd491213580d6e9cdd2f5af Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 10 Nov 2022 18:04:15 -0800
+Subject: chacl: Use portable version of dirent and readdir
+
+Using 64bit versions on 32bit architectures should be enabled with
+--enable-largefile, this makes it portable across musl and glibc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tools/chacl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/chacl.c b/tools/chacl.c
+index 525a7ff..8fff875 100644
+--- a/tools/chacl.c
++++ b/tools/chacl.c
+@@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname)
+ {
+ int failed = 0;
+ DIR *dir;
+- struct dirent64 *d;
++ struct dirent *d;
+ char *name;
+
+ if ((dir = opendir(fname)) == NULL) {
+@@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname)
+ return(0); /* got a file, not an error */
+ }
+
+- while ((d = readdir64(dir)) != NULL) {
++ while ((d = readdir(dir)) != NULL) {
+ /* skip "." and ".." entries */
+ if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0)
+ continue;
+--
+cgit v1.1
+