aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-12-03 10:36:28 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-12-03 10:36:28 +0000
commitf0d431f386d79d2654ca2a681c78e5edef7baebd (patch)
tree9d1caeda9422c4e8b8793c03c91498390ed6fdbb
parent6f459fc0bcc4f19e6a92644c4b4ad490f7cb7ff1 (diff)
downloadaports-f0d431f386d79d2654ca2a681c78e5edef7baebd.tar.gz
aports-f0d431f386d79d2654ca2a681c78e5edef7baebd.tar.bz2
aports-f0d431f386d79d2654ca2a681c78e5edef7baebd.tar.xz
main/zfs: fix build with busybox mktemp
upstream report: https://github.com/openzfs/zfs/issues/11274
-rw-r--r--main/zfs/APKBUILD6
-rw-r--r--main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch29
2 files changed, 33 insertions, 2 deletions
diff --git a/main/zfs/APKBUILD b/main/zfs/APKBUILD
index ea34cda377..46e63eb4e9 100644
--- a/main/zfs/APKBUILD
+++ b/main/zfs/APKBUILD
@@ -15,7 +15,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-libs $pkgname-dr
$pkgname-udev $pkgname-scripts $pkgname-utils-py:utils_py:noarch py3-pyzfs:pyzfs:noarch"
source="https://github.com/zfsonlinux/zfs/releases/download/zfs-$pkgver/zfs-$pkgver.tar.gz
0001-etc-zfs-Makefile.am-set-initconfdir.patch
- "
+ fix-check-for-sed--in-place-with-busybox-mktemp.patch
+ "
prepare() {
default_prepare
@@ -80,4 +81,5 @@ pyzfs() {
}
sha512sums="2706ae1aa54b882b272502e7a46e57ff41f9db9b123e8cd5dafbdd7f61975d05538167016f943804145d22aa018a1f11c884f692dc3992b28c24eac08112650f zfs-2.0.0.tar.gz
-ba46770660f1e0cac3c6d621185036b9cf3274c655b373a398f6a8420194d39e53c72a32155064b1998635d754f2ad4641ab6b74c7adeeedd9105e124dd40f9d 0001-etc-zfs-Makefile.am-set-initconfdir.patch"
+ba46770660f1e0cac3c6d621185036b9cf3274c655b373a398f6a8420194d39e53c72a32155064b1998635d754f2ad4641ab6b74c7adeeedd9105e124dd40f9d 0001-etc-zfs-Makefile.am-set-initconfdir.patch
+ffee593eefb9472c0dd783b822dfb66938ccbb56f211b361c0d5bb61e36926a4f3d02ac50d0e4102168ab577b5aba6719a8ff918ae6bb3f4211a920300721590 fix-check-for-sed--in-place-with-busybox-mktemp.patch"
diff --git a/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch b/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
new file mode 100644
index 0000000000..c65aa93fb6
--- /dev/null
+++ b/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
@@ -0,0 +1,29 @@
+From cc5f362cbf927d5b7f902c3a582f11ceb3f789ad Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 3 Dec 2020 11:16:47 +0100
+Subject: [PATCH] Fix check for sed --in-place with busybox mktemp
+
+Fix build on Alpine Linux which uses busybox, and busybox mktemp
+requires 6 trailing Xes.
+
+Fixes commit 4313a5b4c51e (Detect if sed supports --in-place)
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+Closes #11274
+---
+ config/always-sed.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/always-sed.m4 b/config/always-sed.m4
+index 19633e118ae..3d7ae285ba1 100644
+--- a/config/always-sed.m4
++++ b/config/always-sed.m4
+@@ -4,7 +4,7 @@ dnl #
+ AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [
+ AC_REQUIRE([AC_PROG_SED])dnl
+ AC_CACHE_CHECK([for sed --in-place], [ac_cv_inplace], [
+- tmpfile=$(mktemp conftest.XXX)
++ tmpfile=$(mktemp conftest.XXXXXX)
+ echo foo >$tmpfile
+ AS_IF([$SED --in-place 's#foo#bar#' $tmpfile 2>/dev/null],
+ [ac_cv_inplace="--in-place"],