[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/files/, sys-fs/zfs/

[Georgy Yakovlev]

commit:     7446901e6d95c269957690ad0ded4a901bb2174f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 23:55:12 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 23:57:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7446901e

sys-fs/zfs: drop old rc

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs/Manifest                                |   1 -
 .../files/2.0.0_rc2-exports-d-permissions.patch    | 189 -----------------
 sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild                 | 232 ---------------------
 3 files changed, 422 deletions(-)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index e722910db54..238f7e1e23d 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,4 +1,3 @@
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
 DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
-DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
 DIST zfs-2.0.0-rc3.tar.gz 12860212 BLAKE2B bd29ceb17938180ffda9a26cfee97f4b9b42752cd7a3bf5d72705d94967d219889cc84a71d4c0f59aaf718d596011ecdbf07000788aa39a424087eb7cf62a944 SHA512 c09bebb1d1b19079b51305eea1b3d1a428a46bf1301afc9dfa20871ac670d94dc9f7f9127384b2db501fd909f22a16fad0c1b7383eb9ce31a7c0e696e66a097f

diff --git a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch b/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
deleted file mode 100644
index 4acaf465a7b..00000000000
--- a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From fe413a4d901a243d98cfef16ea330f7114a104ea Mon Sep 17 00:00:00 2001
-From: George Wilson <george.wilson@×××××××.com>
-Date: Tue, 15 Sep 2020 22:57:16 -0400
-Subject: [PATCH] zpool command complains about /etc/exports.d
-
-If the /etc/exports.d directory does not exist, then we should only
-create it when we're performing an action which already requires root
-privileges.
-
-This commit moves the directory creation to the enable/disable code
-path which ensures that we have the appropriate privileges.
-
-Signed-off-by: George Wilson <gwilson@×××××××.com>
-Closes #10785
----
- lib/libshare/os/freebsd/nfs.c | 36 +++++++++++-------
- lib/libshare/os/linux/nfs.c   | 71 ++++++++++++++++++++---------------
- 2 files changed, 64 insertions(+), 43 deletions(-)
-
-diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c
-index 65f3b11bf9b..5951b9eafa2 100644
---- a/lib/libshare/os/freebsd/nfs.c
-+++ b/lib/libshare/os/freebsd/nfs.c
-@@ -228,21 +228,33 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 	int error = SA_OK;
- 	char *line;
- 
--	/*
--	 * If the file doesn't exist then there is nothing more
--	 * we need to do.
--	 */
- 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
--	if (oldfp == NULL)
--		return (SA_OK);
--
- 	FILE *newfp = fopen(filename, "w+");
-+	if (newfp == NULL) {
-+		fprintf(stderr, "failed to open %s file: %s", filename,
-+		    strerror(errno));
-+		fclose(oldfp);
-+		return (SA_SYSTEM_ERR);
-+	}
- 	fputs(FILE_HEADER, newfp);
--	while ((line = zgetline(oldfp, mountpoint)) != NULL)
--		fprintf(newfp, "%s\n", line);
--	if (ferror(oldfp) != 0) {
--		error = ferror(oldfp);
-+
-+	/*
-+	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
-+	 * case then just write out the new file.
-+	 */
-+	if (oldfp != NULL) {
-+		while ((line = zgetline(oldfp, mountpoint)) != NULL)
-+			fprintf(newfp, "%s\n", line);
-+		if (ferror(oldfp) != 0) {
-+			error = ferror(oldfp);
-+		}
-+		if (fclose(oldfp) != 0) {
-+			fprintf(stderr, "Unable to close file %s: %s\n",
-+			    filename, strerror(errno));
-+			error = error != 0 ? error : SA_SYSTEM_ERR;
-+		}
- 	}
-+
- 	if (error == 0 && ferror(newfp) != 0) {
- 		error = ferror(newfp);
- 	}
-@@ -252,8 +264,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 		    filename, strerror(errno));
- 		error = error != 0 ? error : SA_SYSTEM_ERR;
- 	}
--	fclose(oldfp);
--
- 	return (error);
- }
- 
-diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
-index a6a9b33d765..1efa321b7bc 100644
---- a/lib/libshare/os/linux/nfs.c
-+++ b/lib/libshare/os/linux/nfs.c
-@@ -393,6 +393,14 @@ static char *
- nfs_init_tmpfile(void)
- {
- 	char *tmpfile = NULL;
-+	struct stat sb;
-+
-+	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
-+	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
-+		fprintf(stderr, "failed to create %s: %s\n",
-+		    ZFS_EXPORTS_DIR, strerror(errno));
-+		return (NULL);
-+	}
- 
- 	if (asprintf(&tmpfile, "%s%s", ZFS_EXPORTS_FILE, ".XXXXXXXX") == -1) {
- 		fprintf(stderr, "Unable to allocate temporary file\n");
-@@ -481,36 +489,49 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 	size_t buflen = 0;
- 	int error = SA_OK;
- 
--	/*
--	 * If the file doesn't exist then there is nothing more
--	 * we need to do.
--	 */
- 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
--	if (oldfp == NULL)
--		return (SA_OK);
--
- 	FILE *newfp = fopen(filename, "w+");
-+	if (newfp == NULL) {
-+		fprintf(stderr, "failed to open %s file: %s", filename,
-+		    strerror(errno));
-+		fclose(oldfp);
-+		return (SA_SYSTEM_ERR);
-+	}
- 	fputs(FILE_HEADER, newfp);
--	while ((getline(&buf, &buflen, oldfp)) != -1) {
--		char *space = NULL;
- 
--		if (buf[0] == '\n' || buf[0] == '#')
--			continue;
--
--		if ((space = strchr(buf, ' ')) != NULL) {
--			int mountpoint_len = strlen(mountpoint);
-+	/*
-+	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
-+	 * case then just write out the new file.
-+	 */
-+	if (oldfp != NULL) {
-+		while (getline(&buf, &buflen, oldfp) != -1) {
-+			char *space = NULL;
- 
--			if (space - buf == mountpoint_len &&
--			    strncmp(mountpoint, buf, mountpoint_len) == 0) {
-+			if (buf[0] == '\n' || buf[0] == '#')
- 				continue;
-+
-+			if ((space = strchr(buf, ' ')) != NULL) {
-+				int mountpoint_len = strlen(mountpoint);
-+
-+				if (space - buf == mountpoint_len &&
-+				    strncmp(mountpoint, buf,
-+				    mountpoint_len) == 0) {
-+					continue;
-+				}
- 			}
-+			fputs(buf, newfp);
- 		}
--		fputs(buf, newfp);
--	}
- 
--	if (oldfp != NULL && ferror(oldfp) != 0) {
--		error = ferror(oldfp);
-+		if (ferror(oldfp) != 0) {
-+			error = ferror(oldfp);
-+		}
-+		if (fclose(oldfp) != 0) {
-+			fprintf(stderr, "Unable to close file %s: %s\n",
-+			    filename, strerror(errno));
-+			error = error != 0 ? error : SA_SYSTEM_ERR;
-+		}
- 	}
-+
- 	if (error == 0 && ferror(newfp) != 0) {
- 		error = ferror(newfp);
- 	}
-@@ -521,8 +542,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 		    filename, strerror(errno));
- 		error = error != 0 ? error : SA_SYSTEM_ERR;
- 	}
--	fclose(oldfp);
--
- 	return (error);
- }
- 
-@@ -701,13 +720,5 @@ static const sa_share_ops_t nfs_shareops = {
- void
- libshare_nfs_init(void)
- {
--	struct stat sb;
--
- 	nfs_fstype = register_fstype("nfs", &nfs_shareops);
--
--	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
--	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
--		fprintf(stderr, "failed to create %s: %s\n",
--		    ZFS_EXPORTS_DIR, strerror(errno));
--	}
- }

diff --git a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild
deleted file mode 100644
index 1f9d81f16e6..00000000000
--- a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://github.com/openzfs/zfs"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
-else
-	MY_P="${P/_rc/-rc}"
-	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/${P%_rc?}"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
-
-DEPEND="
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	!minimal? ( ${PYTHON_DEPS} )
-	pam? ( sys-libs/pam )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/kmod[tools]
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-	)
-"
-
-REQUIRED_USE="
-	!minimal? ( ${PYTHON_REQUIRED_USE} )
-	python? ( !minimal )
-	test-suite? ( !minimal )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/${PV}-exports-d-permissions.patch"
-)
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	use minimal || python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
-		--with-pammoduledir="$(getpam_mod_dir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		--with-vendor=gentoo
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable pam)
-		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
-		$(usex minimal --without-python --with-python="${EPYTHON}")
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
-
-	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
-
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	use minimal || python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
-		einfo "for default zfs systemd service configuration"
-	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-			einfo "You should add zfs-share to the default runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}