From 75552f491a85395c574577e9dbdb5fdb4e1131cc Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 19 Aug 2021 11:03:46 +0200 Subject: net-fs/cifs-utils: Revbump to fix kerberos mount regression Thanks-to: Bernd Feige Closes: https://bugs.gentoo.org/809023 Signed-off-by: Lars Wendler --- net-fs/cifs-utils/Manifest | 1 + net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild | 140 ++++++++++++++++++++++++++++ net-fs/cifs-utils/cifs-utils-6.13.ebuild | 137 --------------------------- 3 files changed, 141 insertions(+), 137 deletions(-) create mode 100644 net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild delete mode 100644 net-fs/cifs-utils/cifs-utils-6.13.ebuild (limited to 'net-fs/cifs-utils') diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index 4ba50d8044ef..5068f96d5670 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -1,2 +1,3 @@ DIST cifs-utils-6.11.tar.bz2 408903 BLAKE2B 5ee7cd87b54a266750bf938396ee90b3f20c2a3446aca295ccb58cb667fbfb68be9aa0e2bbc20aa5e18ffd7f1fcd5fbb0aef3bc25fd13bb96abc5a57a0b45b4b SHA512 064c0ac75572fb44908390508462e4fdfe0686751149fd8b656a209dd961a5a24a7d9774c38c0e72fa5f9875b43aea7bf2de038c4e4a63a11664e71d9003100e +DIST cifs-utils-6.13-kerberos_mount_regression_fix.patch.xz 4336 BLAKE2B de268f815ee4fbb750bf8b7d7110a69a808682c239a7c9196468ecc4d55a26eed3b63f8d8539569e16131060f57de389ef92e1063283eb2f41e65be00ed21bb1 SHA512 13d1fb8ff7c31100bfa481e647e9d3b90d61633173b3a71683246d7bb4b68c7e147d21697a17b7ad60e1ac8da2d48d6f4b51762370536a32d14da6c9a6db7e5e DIST cifs-utils-6.13.tar.bz2 414584 BLAKE2B 5133ea39fc65acaf2a9791f8ac97dee681dd12f509e0abd095542ce663e7c62002b033dcf35f0a8eec214cb9940597fb568fd50d4cfe5271ca4e433afbe1a7bc SHA512 1337ac4b69f0c3e8d0241eb608207ba81dfa35f84c661649d25da78637882c4d73467b0f632be0bd120362e0b786e40eb340bffcf21c8a09629c441100fd10de diff --git a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild new file mode 100644 index 000000000000..db149b9b4b89 --- /dev/null +++ b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools bash-completion-r1 linux-info multilib pam python-single-r1 + +DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" +HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" +SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" + +SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-kerberos_mount_regression_fix.patch.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" +IUSE="+acl +ads +caps creds pam systemd" + +RDEPEND=" + ${PYTHON_DEPS} + !net-fs/mount-cifs + sys-apps/keyutils:= + ads? ( + sys-libs/talloc + virtual/krb5 + ) + caps? ( sys-libs/libcap-ng ) + pam? ( sys-libs/pam ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-python/docutils" +PDEPEND=" + acl? ( >=net-fs/samba-4.0.0_alpha1 ) +" + +REQUIRED_USE=" + acl? ( ads ) + ${PYTHON_REQUIRED_USE} +" + +DOCS="doc/linux-cifs-client-guide.odt" + +PATCHES=( + "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594 + "${WORKDIR}/${P}-kerberos_mount_regression_fix.patch" #809023 +) + +pkg_setup() { + linux-info_pkg_setup + + if ! linux_config_exists || ! linux_chkconfig_present CIFS; then + ewarn "You must enable CIFS support in your kernel config, " + ewarn "to be able to mount samba shares. You can find it at" + ewarn + ewarn " File systems" + ewarn " Network File Systems" + ewarn " CIFS support" + ewarn + ewarn "and recompile your kernel ..." + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if has_version app-crypt/heimdal ; then + # https://bugs.gentoo.org/612584 + eapply "${FILESDIR}/${PN}-6.7-heimdal.patch" + fi + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-man + --enable-smbinfo + $(use_enable acl cifsacl cifsidmap) + $(use_enable ads cifsupcall) + $(use_with caps libcap) + $(use_enable creds cifscreds) + $(use_enable pam) + $(use_with pam pamdir $(getpam_mod_dir)) + # mount.cifs can get passwords from systemd + $(use_enable systemd) + ) + ROOTSBINDIR="${EPREFIX}"/sbin \ + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # remove empty directories + find "${ED}" -type d -empty -delete || die + + if use acl ; then + dodir /etc/cifs-utils + dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \ + /etc/cifs-utils/idmap-plugin + dodir /etc/request-key.d + echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \ + > "${ED}/etc/request-key.d/cifs.idmap.conf" + fi + + if use ads ; then + dodir /etc/request-key.d + echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \ + > "${ED}/etc/request-key.d/cifs.upcall.conf" + echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \ + > "${ED}/etc/request-key.d/cifs.spnego.conf" + fi + + dobashcomp bash-completion/smbinfo + python_fix_shebang "${ED}" +} + +pkg_postinst() { + # Inform about set-user-ID bit of mount.cifs + ewarn "setuid use flag was dropped due to multiple security implications" + ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586" + ewarn "You are free to set setuid flags by yourself" + + # Inform about upcall usage + if use acl ; then + einfo "The cifs.idmap utility has been enabled by creating the" + einfo "configuration file /etc/request-key.d/cifs.idmap.conf" + einfo "This enables you to get and set CIFS acls." + fi + + if use ads ; then + einfo "The cifs.upcall utility has been enabled by creating the" + einfo "configuration file /etc/request-key.d/cifs.upcall.conf" + einfo "This enables you to mount DFS shares." + fi +} diff --git a/net-fs/cifs-utils/cifs-utils-6.13.ebuild b/net-fs/cifs-utils/cifs-utils-6.13.ebuild deleted file mode 100644 index 18941f359b9c..000000000000 --- a/net-fs/cifs-utils/cifs-utils-6.13.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools bash-completion-r1 linux-info multilib pam python-single-r1 - -DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" -HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils" -SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" -IUSE="+acl +ads +caps creds pam systemd" - -RDEPEND=" - ${PYTHON_DEPS} - !net-fs/mount-cifs - sys-apps/keyutils:= - ads? ( - sys-libs/talloc - virtual/krb5 - ) - caps? ( sys-libs/libcap-ng ) - pam? ( sys-libs/pam ) -" -DEPEND="${RDEPEND}" -BDEPEND="dev-python/docutils" -PDEPEND=" - acl? ( >=net-fs/samba-4.0.0_alpha1 ) -" - -REQUIRED_USE=" - acl? ( ads ) - ${PYTHON_REQUIRED_USE} -" - -DOCS="doc/linux-cifs-client-guide.odt" - -PATCHES=( - "${FILESDIR}/${PN}-6.12-ln_in_destdir.patch" #766594 -) - -pkg_setup() { - linux-info_pkg_setup - - if ! linux_config_exists || ! linux_chkconfig_present CIFS; then - ewarn "You must enable CIFS support in your kernel config, " - ewarn "to be able to mount samba shares. You can find it at" - ewarn - ewarn " File systems" - ewarn " Network File Systems" - ewarn " CIFS support" - ewarn - ewarn "and recompile your kernel ..." - fi - - python-single-r1_pkg_setup -} - -src_prepare() { - default - - if has_version app-crypt/heimdal ; then - # https://bugs.gentoo.org/612584 - eapply "${FILESDIR}/${PN}-6.7-heimdal.patch" - fi - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-man - --enable-smbinfo - $(use_enable acl cifsacl cifsidmap) - $(use_enable ads cifsupcall) - $(use_with caps libcap) - $(use_enable creds cifscreds) - $(use_enable pam) - $(use_with pam pamdir $(getpam_mod_dir)) - # mount.cifs can get passwords from systemd - $(use_enable systemd) - ) - ROOTSBINDIR="${EPREFIX}"/sbin \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # remove empty directories - find "${ED}" -type d -empty -delete || die - - if use acl ; then - dodir /etc/cifs-utils - dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \ - /etc/cifs-utils/idmap-plugin - dodir /etc/request-key.d - echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \ - > "${ED}/etc/request-key.d/cifs.idmap.conf" - fi - - if use ads ; then - dodir /etc/request-key.d - echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \ - > "${ED}/etc/request-key.d/cifs.upcall.conf" - echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \ - > "${ED}/etc/request-key.d/cifs.spnego.conf" - fi - - dobashcomp bash-completion/smbinfo - python_fix_shebang "${ED}" -} - -pkg_postinst() { - # Inform about set-user-ID bit of mount.cifs - ewarn "setuid use flag was dropped due to multiple security implications" - ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586" - ewarn "You are free to set setuid flags by yourself" - - # Inform about upcall usage - if use acl ; then - einfo "The cifs.idmap utility has been enabled by creating the" - einfo "configuration file /etc/request-key.d/cifs.idmap.conf" - einfo "This enables you to get and set CIFS acls." - fi - - if use ads ; then - einfo "The cifs.upcall utility has been enabled by creating the" - einfo "configuration file /etc/request-key.d/cifs.upcall.conf" - einfo "This enables you to mount DFS shares." - fi -} -- cgit v1.2.3-65-gdbad