diff options
| -rw-r--r-- | sys-fs/zfs-utils/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch | 12 | ||||
| -rw-r--r-- | sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild) | 5 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-0.8.3.ebuild (renamed from sys-fs/zfs/zfs-0.8.2.ebuild) | 0 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch | 12 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/files/dkms.conf | 2 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/zfs-dkms-0.8.3.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-0.8.2-r1.ebuild) | 2 |
7 files changed, 4 insertions, 31 deletions
diff --git a/sys-fs/zfs-utils/Manifest b/sys-fs/zfs-utils/Manifest index 11f4cae8..9e5ed996 100644 --- a/sys-fs/zfs-utils/Manifest +++ b/sys-fs/zfs-utils/Manifest @@ -1 +1 @@ -DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496 +DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010 diff --git a/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch b/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch deleted file mode 100644 index ad612d26..00000000 --- a/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c ---- a/module/zfs/vdev_disk.c 2019-09-25 21:44:42.626286618 +0100 -+++ b/module/zfs/vdev_disk.c 2020-01-02 10:29:56.356741395 +0000 -@@ -220,7 +220,7 @@ - char *envp[] = { NULL }; - - argv[2] = kmem_asprintf(SET_SCHEDULER_CMD, device, elevator); -- error = call_usermodehelper(argv[0], argv, envp, UMH_NO_WAIT); -+ error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); - strfree(argv[2]); - #endif /* HAVE_ELEVATOR_CHANGE */ - if (error) { diff --git a/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild b/sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild index 35ca27f8..389c5743 100644 --- a/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild +++ b/sys-fs/zfs-utils/zfs-utils-0.8.3.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) inherit bash-completion-r1 flag-o-matic distutils-r1 toolchain-funcs udev @@ -61,8 +61,7 @@ RESTRICT="test" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" - "${FILESDIR}/Use_NMH_WAIT_EXEC_with_call.patch" ) +PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" ) src_prepare() { default diff --git a/sys-fs/zfs/zfs-0.8.2.ebuild b/sys-fs/zfs/zfs-0.8.3.ebuild index c91d103c..c91d103c 100644 --- a/sys-fs/zfs/zfs-0.8.2.ebuild +++ b/sys-fs/zfs/zfs-0.8.3.ebuild diff --git a/sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch b/sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch deleted file mode 100644 index ad612d26..00000000 --- a/sys-kernel/zfs-dkms/files/Use_NMH_WAIT_EXEC_with_call.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c ---- a/module/zfs/vdev_disk.c 2019-09-25 21:44:42.626286618 +0100 -+++ b/module/zfs/vdev_disk.c 2020-01-02 10:29:56.356741395 +0000 -@@ -220,7 +220,7 @@ - char *envp[] = { NULL }; - - argv[2] = kmem_asprintf(SET_SCHEDULER_CMD, device, elevator); -- error = call_usermodehelper(argv[0], argv, envp, UMH_NO_WAIT); -+ error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC); - strfree(argv[2]); - #endif /* HAVE_ELEVATOR_CHANGE */ - if (error) { diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf index 647ee321..31227a82 100644 --- a/sys-kernel/zfs-dkms/files/dkms.conf +++ b/sys-kernel/zfs-dkms/files/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="zfs-dkms" -PACKAGE_VERSION="0.8.2" +PACKAGE_VERSION="0.8.3" PACKAGE_CONFIG="/etc/sysconfig/zfs" PRE_BUILD="configure --prefix=/usr diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.8.2-r1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.8.3.ebuild index a4ee98ab..7e448719 100644 --- a/sys-kernel/zfs-dkms/zfs-dkms-0.8.2-r1.ebuild +++ b/sys-kernel/zfs-dkms/zfs-dkms-0.8.3.ebuild @@ -22,8 +22,6 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}"/Use_NMH_WAIT_EXEC_with_call.patch ) - src_configure() { : } |