aboutsummaryrefslogtreecommitdiffstats
path: root/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2021-01-06 23:52:35 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2021-01-07 15:05:37 +0000
commit0114d980979232104aeb64ddb3f052d394528d2e (patch)
tree7fed922522ff3495c02ee6df58a77511aec9c020 /main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
parent42c6733553798740f1313c0f820107d069daf141 (diff)
downloadaports-0114d980979232104aeb64ddb3f052d394528d2e.tar.gz
aports-0114d980979232104aeb64ddb3f052d394528d2e.tar.bz2
aports-0114d980979232104aeb64ddb3f052d394528d2e.tar.xz
main/zfs: upgrade to 2.0.1
- 0001-etc.....patch no longer needed with https://github.com/openzfs/zfs/commit/38e2e9ce8327284b2d516874308300aa96102fe9 - fix-check-for-sec....patch no longer needed with https://github.com/openzfs/zfs/commit/49ba502f9960cb26d4cf552777f0ccdff1a94848
Diffstat (limited to 'main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch')
-rw-r--r--main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch29
1 files changed, 0 insertions, 29 deletions
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
deleted file mode 100644
index c65aa93fb6..0000000000
--- a/main/zfs/fix-check-for-sed--in-place-with-busybox-mktemp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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"],