diff options
Diffstat (limited to 'net-fs/cifs-utils')
| -rw-r--r-- | net-fs/cifs-utils/Manifest | 5 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.11.ebuild | 126 | ||||
| -rw-r--r-- | net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild | 2 | ||||
| -rw-r--r-- | net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch | 26 |
4 files changed, 2 insertions, 157 deletions
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest index e266e65ba928..7e0b0748788f 100644 --- a/net-fs/cifs-utils/Manifest +++ b/net-fs/cifs-utils/Manifest @@ -1,9 +1,6 @@ -AUX cifs-utils-6.10-ln_in_destdir.patch 813 BLAKE2B 71ac0215407a2350c19a15545d96f77115357c04bbcae2d1e09b7fbe54fd344d40638d3778195865eff3f9686b1fa9a0a13e188fdd4cc3d25c7a100fc5c376a1 SHA512 f9ccbd0d4d14cde1d07cc165533c51cc2876ed65e651a797a8b7c69958f6ee827090731888cbc425aecbb879b41e87a0e9ed1fce6817e1907cc7b114c53b8fc9 AUX cifs-utils-6.12-ln_in_destdir.patch 629 BLAKE2B aa901b00c41a58ae21d948b3eece79914dc78782fcd49afc27ba8d7fa061f8aec43d187ce1302d67b5e5fc2cce113906545b9ae9920704f29ad3758a71079994 SHA512 354e33c91b0678e08ba9dabd989a5afdb2e558fa71dc427b283f9b987f94908d9b696c95a7e608e13f26497a52e7e8bf973290a84b2024ac9bc817ba512adf26 AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672b37a0e8ac0b999aa7aaf180ac051f6745ee68373948b266ad359e1ba3b58552eda6314b5a4339673bd04656ab6090 SHA512 e3364e05fba6aff57ea2f09b530692f4f5ec95213e91794388fff9382d210db9bacb28dae1440d3b35a570c0b3bc21084a067e0ce8333febd5246c52aa9260ae -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 -EBUILD cifs-utils-6.11.ebuild 3212 BLAKE2B a87a72d144e834998197802c23e3ad2c8f94f10fb54adc5654b1cde63d0a13104e3993ff250df710c710e5b0873a55fa823b7baa75f3f0fc04871ee32a56b50c SHA512 a4a06f59ae9f0c37c0084df205345647d1e9803e5973b54922803c5c8016607940669ed5a23ca11ae52fcef01a08d6da9c53bd809c2bc29807a357e4962941b3 -EBUILD cifs-utils-6.13-r1.ebuild 3538 BLAKE2B 4f7df30b314d8e6fd486931f168914389faffa880a6e3ce8cf94e6aeea436415ca24d5128058d5568119cf63d5d322dad5e72a513c04defb95ed61ffdda9a2a8 SHA512 949c95666acbd20b0a1560f3d6358fe9ea068b0bfd437990844ff7aebfd8921ea885b508c912586e9a234af5b677f7fb1a695efea6befabb609304662bb9aa7d +EBUILD cifs-utils-6.13-r1.ebuild 3536 BLAKE2B 01926eef53ae32a33abc2f58dcc9ea193fe7202487566db4a053d50f6f520c0ffe064738ef76d5e51c60b3864fc413a0295af99a7b55e86fa54f7b0aec8a2574 SHA512 5853aba8f877dd9f733bf222409b67a8c767f69ffb78525e1182d6dc9f2e66c40e1221202bfd526fe092322d9101ba14d65d9c43cdc0b1b79eb421fc6dc71237 MISC metadata.xml 886 BLAKE2B 2ddb0ff3b0da3392b23743f3804c1d63651904c05a17e69f105c7b062d33befca62a13a1a93f631b314143a60bca8e2b20ec9b331646f0e6804a2f8cfce3bb81 SHA512 36019a5885034309e16198a154fc0fc16de2ff507eec81f4d63840bf56e9f67cf67dbf4ba7662a6f64daeb17541604d5f588ec67cca134b7ff07e0612817072b diff --git a/net-fs/cifs-utils/cifs-utils-6.11.ebuild b/net-fs/cifs-utils/cifs-utils-6.11.ebuild deleted file mode 100644 index d33b983c63a9..000000000000 --- a/net-fs/cifs-utils/cifs-utils-6.11.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 linux-info multilib pam - -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 ~s390 sparc x86 ~x86-linux" -IUSE="+acl +ads +caps creds pam systemd" - -RDEPEND=" - !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 )" - -DOCS="doc/linux-cifs-client-guide.odt" - -PATCHES=( "${FILESDIR}/${PN}-6.10-ln_in_destdir.patch" ) - -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 -} - -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 -} - -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-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild index 1e022fd166e3..559bfa43ea7c 100644 --- a/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild +++ b/net-fs/cifs-utils/cifs-utils-6.13-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-kerberos_mount_regression_f LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" IUSE="+acl +ads +caps creds pam systemd" RDEPEND=" diff --git a/net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch b/net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch deleted file mode 100644 index 6952d72cf5c4..000000000000 --- a/net-fs/cifs-utils/files/cifs-utils-6.10-ln_in_destdir.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix sandbox violation caused by calling ln in /sbin instead of $(DESTDIR)/sbin - -Also fixed an inverted race condition when installing with MAKEOPTS="-j1" - -jer found this: - install-root_sbinPROGRAMS is called from install-data-am but - install-exec-hook is called from install-exec-am - -So moving the failing ln call into install-data-hook for now... - ---- cifs-utils-6.10/Makefile.am -+++ cifs-utils-6.10/Makefile.am -@@ -118,11 +118,9 @@ - - SUBDIRS = contrib - --install-exec-hook: -- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -- - install-data-hook: -- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) -+ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) -+ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8) - - uninstall-hook: - (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3) |