gentoo resync : 30.05.2020

3 files changed, 41 insertions, 2 deletions

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 670a59725f7d..adfb32ca0c27 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,6 +1,7 @@
 AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
 AUX 0.8.3-fno-common.patch 2377 BLAKE2B 61390e1c64b212b94060777154f5cf18942d4c22ba845f85ae91e81cdb6978e6d01cc9f90b1739bf3503bc40f26a98389659dbc0f83d3cedc954b802792b3b55 SHA512 7b2b066d0f4def5950c031ef87626ef68e0eccfe388f451dd6e5a36874674020ed2e4658bf24ab3977673b77aa7631822ef12318381f7785f310a0b24a61dfbc
 AUX 0.8.3-zfs-functions.patch 1707 BLAKE2B 6ead7415be7dbeff6377b8d4074bb4e1cf6b154cf145e77b876e514c57d05cc041c5a66cfd6ab4c0bbb4931fa2553680c5749c4e06810ebd5658941088f9e7cf SHA512 cda47f5ef47ab86b2fda87e9ac2ab26d08431b2bd7420ecdd8ab9625a283c48278caa794b2aaa4c5f9341e08a2751b5b4a7b93a3b53491ccbdf2f085a0cb86ec
+AUX 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
@@ -11,6 +12,6 @@ DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957
 EBUILD zfs-0.7.13-r1.ebuild 6276 BLAKE2B b2aafe81b97e72249710bbed0282afe8e03aaf5029236d5b12d3089ef58458b9615f1f60f89b1473097321b8182704a5ba2964fb94b86f03a20d269029351264 SHA512 3547d9918e2b082299dbbaf39310ecaa780f44c2c7ece907b6149b3cff98ce68fc73846c303d579112453aaa6763bd029ccd24ab330c1578432a44da73a0d816
 EBUILD zfs-0.7.13-r2.ebuild 6340 BLAKE2B a351568c54fecd31574471e164f41e1909fe6096ac68211664ef6a90435c59c4189a5ed9a1356867a81941a17874c8580b6a27ec0caef49976afdda655bb8571 SHA512 4a17ca33411e286f19ae8d4c6eaee42cad9a2db024a83b6355f0f33db0fcbd83ca138f3e4b88a2b14cc3fded942edf4bd22f4588afc6082e608e02ced2d59b10
 EBUILD zfs-0.8.3-r1.ebuild 5631 BLAKE2B bddee093199db937dfb3803c959fcad9d7a582bdd662f73c03653a9a1024f72dc117204cf13939e130cc4c0580db7b5266b03f4561e96c2caed2cf349bfa766c SHA512 ec01abfbe7ca3661dcfe6b9acb7a7d6cce59bd81f9a8d14175cf196ee523c6f2dea315d6b4f22c77d4322f663b9087b4e5dac9ba52105e69447dba4dffc2eebb
-EBUILD zfs-0.8.4.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055
+EBUILD zfs-0.8.4-r1.ebuild 5197 BLAKE2B a26eda5c79de67dfb2b7873de472c976e5e2983972aaee347a2b39ed85239bf42b7125108c0d0452cba2f02330d5f2c7ff729b2c512a9f437c5ce4d5a1fc558e SHA512 579dbe8d0cc66cbb63a2641a10779aeb00a47be24955037767608c303b5223e4ba5cabeba7b5b567d258affa99c4e52c14542f779d33e187759a6937a4a2564f
 EBUILD zfs-9999.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch
new file mode 100644
index 000000000000..aac40896f39b
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.4-initconfdir.patch
@@ -0,0 +1,35 @@
+From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 26 May 2020 16:44:54 -0700
+Subject: [PATCH] 0.8.4 initconfdir
+
+fix for https://github.com/openzfs/zfs/issues/10375
+
+---
+ etc/zfs/Makefile.am | 1 +
+ etc/zfs/Makefile.in | 9 +++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am
+index 81567a4..5370f41 100644
+--- a/etc/zfs/Makefile.am
++++ b/etc/zfs/Makefile.am
+@@ -1,4 +1,5 @@
+ pkgsysconfdir = $(sysconfdir)/zfs
++initconfdir = $(DEFAULT_INITCONF_DIR)
+ 
+ pkgsysconf_DATA = \
+ 	vdev_id.conf.alias.example \
+diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
+index fb02811..795d3b1 100644
+@@ -571,6 +571,7 @@ udevdir = @udevdir@
+ udevruledir = @udevruledir@
+ zfsexecdir = @zfsexecdir@
+ pkgsysconfdir = $(sysconfdir)/zfs
++initconfdir = $(DEFAULT_INITCONF_DIR)
+ pkgsysconf_DATA = \
+ 	vdev_id.conf.alias.example \
+ 	vdev_id.conf.sas_direct.example \
+-- 
+2.26.2
+
diff --git a/sys-fs/zfs/zfs-0.8.4.ebuild b/sys-fs/zfs/zfs-0.8.4-r1.ebuild
index c7cc180b9ea0..5f7c23109c09 100644
--- a/sys-fs/zfs/zfs-0.8.4.ebuild
+++ b/sys-fs/zfs/zfs-0.8.4-r1.ebuild
@@ -68,7 +68,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+PATCHES=( 
+	"${FILESDIR}/bash-completion-sudo.patch"
+	"${FILESDIR}/${PV}-initconfdir.patch"
+)
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then