From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/, net-fs/autofs/files/
Date: Wed, 10 Jul 2024 14:56:10 +0000 (UTC) [thread overview]
Message-ID: <1720623299.4300e0dc2b19deeb7b2ddbbd98997e65c13142b5.dlan@gentoo> (raw)
commit: 4300e0dc2b19deeb7b2ddbbd98997e65c13142b5
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 14:54:59 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 14:54:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4300e0dc
net-fs/autofs: drop 5.1.8-r1, 5.1.9
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-fs/autofs/Manifest | 2 -
net-fs/autofs/autofs-5.1.8-r1.ebuild | 132 ---------------------
net-fs/autofs/autofs-5.1.9.ebuild | 124 -------------------
net-fs/autofs/files/autofs-5.1.8-dmalloc.patch | 53 ---------
.../autofs/files/autofs-5.1.8-mount_conflict.patch | 30 -----
net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch | 88 --------------
6 files changed, 429 deletions(-)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 4ca9807f25d5..fa7faaca461e 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,3 +1 @@
-DIST autofs-5.1.8-patches-0.tar.xz 3476 BLAKE2B a7fb146542f9cb0a8e93240d9c3f68ff7b569f4dc0e829103ae67ced6d04e110331d320ff429f6e6af03b7265a068ee648738691cd637080cf976f441fe10444 SHA512 73023735bf269e3214e38a4841b6b3a1edff30e5d925a62d3ca9e841726835793c1e242804233e696e946e63720f522ceeb82f78449d3597d3d39b727f4b8d24
-DIST autofs-5.1.8.tar.xz 327396 BLAKE2B 22ef626cc867c1ed4f1f859aebe2547c497c35dea712967de70158e85db590f5ffc26165e1479cfc64eb8070a9c43fd06b1570a82bd8bbbac70f2930e1841718 SHA512 6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223
DIST autofs-5.1.9.tar.xz 331872 BLAKE2B baa2fd57fb4ac9f7390cad74d16ef6ef2e484d40061f4f894e5968277747b6852d98e089e904229d5fb08bef7e1810a7b5f14f0ea0adae8e40e317636c8a1f89 SHA512 81eb04270727c3fbf9dfb4b07a8dd39beac9068d6289f2f3bb0eabf723c14bec36860d3b2759c46b597bd77e8f3fa521646445e926c95ab63859a3a6c8588dcc
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild
deleted file mode 100644
index 490ca32bfe1b..000000000000
--- a/net-fs/autofs/autofs-5.1.8-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz
- https://dev.gentoo.org/~dlan/distfiles/${CATEGORY}/${PN}/${P}-patches-0.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND="
- net-libs/libnsl:=
- >=sys-apps/util-linux-2.20
- dmalloc? ( dev-libs/dmalloc[threads] )
- ldap? (
- >=net-nds/openldap-2.0:=
- sasl? (
- dev-libs/cyrus-sasl
- dev-libs/libxml2
- virtual/krb5
- )
- )
- systemd? ( sys-apps/systemd )
- libtirpc? ( net-libs/libtirpc:= )
- !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
- libtirpc? ( net-libs/rpcsvc-proto )
-"
-BDEPEND="
- app-alternatives/lex
- virtual/pkgconfig
- app-alternatives/yacc
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-automount )"
-
-PATCHES=(
- "${WORKDIR}"/${P}-patches/
- "${FILESDIR}/${P}-dmalloc.patch"
- "${FILESDIR}/${P}-nfsv4-mount.patch"
- "${FILESDIR}/${P}-mount_conflict.patch"
-)
-
-pkg_setup() {
- linux-info_pkg_setup
-
- local CONFIG_CHECK
-
- if kernel_is -ge 4 18; then
- CONFIG_CHECK="~AUTOFS_FS"
- else
- CONFIG_CHECK="~AUTOFS4_FS"
- fi
-
- check_extra_config
-}
-
-src_prepare() {
- sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
- sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334
-
- # Install samples including autofs.service
- sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
- default
-}
-
-src_configure() {
- # bug #483716
- tc-export AR
- # --with-confdir is for bug #361481
- # --with-mapdir is for bug #385113
- local myeconfargs=(
- --with-confdir=/etc/conf.d
- --with-mapdir=/etc/autofs
- $(use_with dmalloc)
- $(use_with ldap openldap)
- $(use_with libtirpc)
- $(use_with sasl)
- $(use_enable mount-locking)
- $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
- --without-hesiod
- --disable-ext-env
- --enable-sloppy-mount # bug #453778
- --enable-force-shutdown
- --enable-ignore-busy
- RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
- )
-
- CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake STRIP=: DONTSTRIP=1
-}
-
-src_install() {
- default
- rmdir "${D}"/run
-
- if kernel_is -lt 2 6 30; then
- # kernel patches
- docinto patches
- dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
- fi
- newinitd "${FILESDIR}"/autofs5.initd autofs
- insinto etc/autofs
- newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
- if kernel_is -lt 2 6 30; then
- elog "This version of ${PN} requires a kernel with autofs4 supporting"
- elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
- elog "been installed into"
- elog "${EROOT}/usr/share/doc/${P}/patches."
- elog "For further instructions how to patch the kernel, please refer to"
- elog "${EROOT}/usr/share/doc/${P}/INSTALL."
- elog
- fi
- elog "If you plan on using autofs for automounting remote NFS mounts,"
- elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
- elog "are running."
-}
diff --git a/net-fs/autofs/autofs-5.1.9.ebuild b/net-fs/autofs/autofs-5.1.9.ebuild
deleted file mode 100644
index f21b6430b76e..000000000000
--- a/net-fs/autofs/autofs-5.1.9.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info systemd toolchain-funcs
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git"
-SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl selinux systemd"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND="
- net-libs/libnsl:=
- >=sys-apps/util-linux-2.20
- dmalloc? ( dev-libs/dmalloc[threads] )
- ldap? (
- >=net-nds/openldap-2.0:=
- sasl? (
- dev-libs/cyrus-sasl
- dev-libs/libxml2
- virtual/krb5
- )
- )
- systemd? ( sys-apps/systemd )
- libtirpc? ( net-libs/libtirpc:= )
- !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
- libtirpc? ( net-libs/rpcsvc-proto )
-"
-BDEPEND="
- app-alternatives/lex
- virtual/pkgconfig
- app-alternatives/yacc
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-automount )"
-
-pkg_setup() {
- linux-info_pkg_setup
-
- local CONFIG_CHECK
-
- if kernel_is -ge 4 18; then
- CONFIG_CHECK="~AUTOFS_FS"
- else
- CONFIG_CHECK="~AUTOFS4_FS"
- fi
-
- check_extra_config
-}
-
-src_prepare() {
- sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
- sed -i -e "/^EnvironmentFile/d" samples/autofs.service.in || die # bug #592334
-
- # Install samples including autofs.service
- sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
-
- default
-}
-
-src_configure() {
- # bug #483716
- tc-export AR
- # --with-confdir is for bug #361481
- # --with-mapdir is for bug #385113
- local myeconfargs=(
- --with-confdir=/etc/conf.d
- --with-mapdir=/etc/autofs
- $(use_with dmalloc)
- $(use_with ldap openldap)
- $(use_with libtirpc)
- $(use_with sasl)
- $(use_enable mount-locking)
- $(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
- --without-hesiod
- --disable-ext-env
- --enable-sloppy-mount # bug #453778
- --enable-force-shutdown
- --enable-ignore-busy
- RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
- )
-
- CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake STRIP=: DONTSTRIP=1
-}
-
-src_install() {
- default
- rmdir "${D}"/run
-
- if kernel_is -lt 2 6 30; then
- # kernel patches
- docinto patches
- dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
- fi
- newinitd "${FILESDIR}"/autofs5.initd autofs
- insinto etc/autofs
- newins "${FILESDIR}"/autofs5-auto.master auto.master
-}
-
-pkg_postinst() {
- if kernel_is -lt 2 6 30; then
- elog "This version of ${PN} requires a kernel with autofs4 supporting"
- elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
- elog "been installed into"
- elog "${EROOT}/usr/share/doc/${P}/patches."
- elog "For further instructions how to patch the kernel, please refer to"
- elog "${EROOT}/usr/share/doc/${P}/INSTALL."
- elog
- fi
- elog "If you plan on using autofs for automounting remote NFS mounts,"
- elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
- elog "are running."
-}
diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
deleted file mode 100644
index e2ed58fb1766..000000000000
--- a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/include/mounts.h b/include/mounts.h
-index ddb7e4c..854e1fb 100644
---- a/include/mounts.h
-+++ b/include/mounts.h
-@@ -84,7 +84,7 @@ typedef void (*tree_free_t) (struct tree_node *n);
- struct tree_ops {
- tree_new_t new;
- tree_cmp_t cmp;
-- tree_free_t free;
-+ tree_free_t set_free;
- };
-
- typedef int (*tree_work_fn_t) (struct tree_node *n, void *ptr);
-diff --git a/lib/mounts.c b/lib/mounts.c
-index 4c86688..1e54a33 100644
---- a/lib/mounts.c
-+++ b/lib/mounts.c
-@@ -75,7 +75,7 @@ static void tree_mnt_free(struct tree_node *n);
- static struct tree_ops mnt_ops = {
- .new = tree_mnt_new,
- .cmp = tree_mnt_cmp,
-- .free = tree_mnt_free,
-+ .set_free = tree_mnt_free,
- };
- static struct tree_ops *tree_mnt_ops = &mnt_ops;
-
-@@ -86,7 +86,7 @@ static void tree_host_free(struct tree_node *n);
- static struct tree_ops host_ops = {
- .new = tree_host_new,
- .cmp = tree_host_cmp,
-- .free = tree_host_free,
-+ .set_free = tree_host_free,
- };
- static struct tree_ops *tree_host_ops = &host_ops;
-
-@@ -97,7 +97,7 @@ static void tree_mapent_free(struct tree_node *n);
- static struct tree_ops mapent_ops = {
- .new = tree_mapent_new,
- .cmp = tree_mapent_cmp,
-- .free = tree_mapent_free,
-+ .set_free = tree_mapent_free,
- };
- static struct tree_ops *tree_mapent_ops = &mapent_ops;
-
-@@ -1360,7 +1360,7 @@ void tree_free(struct tree_node *root)
- tree_free(root->right);
- if (root->left)
- tree_free(root->left);
-- ops->free(root);
-+ ops->set_free(root);
- }
-
- int tree_traverse_inorder(struct tree_node *n, tree_work_fn_t work, void *ptr)
diff --git a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch
deleted file mode 100644
index e2a94bf82542..000000000000
--- a/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Avoid conflicts between sys/mount.h and linux/mount.h
-
-linux/fs.h includes linux/mount.h and this include file is unused so
-do not include it and avoid conflict too with glibc 2.36+ see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
---- a/modules/parse_amd.c
-+++ b/modules/parse_amd.c
-@@ -27,7 +27,6 @@
- #include <sys/utsname.h>
- #include <netinet/in.h>
- #include <sys/mount.h>
--#include <linux/fs.h>
-
- #define MODULE_PARSE
- #include "automount.h"
---- a/modules/parse_sun.c
-+++ b/modules/parse_sun.c
-@@ -30,7 +30,6 @@
- #include <sys/utsname.h>
- #include <netinet/in.h>
- #include <sys/mount.h>
--#include <linux/fs.h>
-
- #define MODULE_PARSE
- #include "automount.h"
diff --git a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch b/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
deleted file mode 100644
index eb1bc6cb4241..000000000000
--- a/net-fs/autofs/files/autofs-5.1.8-nfsv4-mount.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-autofs-5.1.8 - fix nfsv4 only mounts should not use rpcbind
-
-From: Ian Kent <raven@xxxxxxxxxx>
-
-Commit 606795ecfaa1 ("autofs-5.1.7 - also require TCP_REQUESTED when
-setting NFS port" together with commit 26fb6b5408be) caused NFSv4 only
-mounts to also use rpcbind to probe availability which breaks the
-requirememt that this type of mount not use rpcbind at all.
-
-Fix this by treating fstype=nfs4 mounts as a special case which doesn't
-use rpcbind.
----
- CHANGELOG | 1 +
- include/replicated.h | 2 ++
- modules/mount_nfs.c | 13 +++++++------
- modules/replicated.c | 4 ++--
- 4 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/include/replicated.h b/include/replicated.h
-index 95ff1f0d..f889a56a 100644
---- a/include/replicated.h
-+++ b/include/replicated.h
-@@ -35,6 +35,8 @@
- #define NFS3_REQUESTED NFS3_SUPPORTED
- #define NFS4_REQUESTED NFS4_SUPPORTED
-
-+#define NFS4_ONLY_REQUESTED 0x0800
-+
- #define TCP_SUPPORTED 0x0001
- #define UDP_SUPPORTED 0x0002
- #define TCP_REQUESTED TCP_SUPPORTED
-diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c
-index 0ab87dcf..feb5afcd 100644
---- a/modules/mount_nfs.c
-+++ b/modules/mount_nfs.c
-@@ -92,7 +92,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
- mount_default_proto = defaults_get_mount_nfs_default_proto();
- vers = NFS_VERS_DEFAULT | NFS_PROTO_DEFAULT;
- if (strcmp(fstype, "nfs4") == 0)
-- vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED;
-+ vers = NFS4_VERS_DEFAULT | TCP_SUPPORTED | NFS4_ONLY_REQUESTED;
- else if (mount_default_proto == 4)
- vers = vers | NFS4_VERS_DEFAULT;
-
-@@ -157,15 +157,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int
- } else {
- /* Is any version of NFSv4 in the options */
- if (_strncmp("vers=4", cp, 6) == 0 ||
-- _strncmp("nfsvers=4", cp, 9) == 0)
-- vers = NFS4_VERS_MASK | TCP_SUPPORTED;
-- else if (_strncmp("vers=3", cp, o_len) == 0 ||
-+ _strncmp("nfsvers=4", cp, 9) == 0) {
-+ vers &= ~(NFS_VERS_MASK);
-+ vers |= NFS4_VERS_MASK | TCP_SUPPORTED | NFS4_ONLY_REQUESTED;
-+ } else if (_strncmp("vers=3", cp, o_len) == 0 ||
- _strncmp("nfsvers=3", cp, o_len) == 0) {
-- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
-+ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED);
- vers |= NFS3_REQUESTED;
- } else if (_strncmp("vers=2", cp, o_len) == 0 ||
- _strncmp("nfsvers=2", cp, o_len) == 0) {
-- vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK);
-+ vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK | NFS4_ONLY_REQUESTED);
- vers |= NFS2_REQUESTED;
- } else if (strstr(cp, "port=") == cp &&
- o_len - 5 < 25) {
-diff --git a/modules/replicated.c b/modules/replicated.c
-index 09075dd0..cdb7c617 100644
---- a/modules/replicated.c
-+++ b/modules/replicated.c
-@@ -291,7 +291,7 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host,
-
- rpc_info->proto = proto;
- if (port < 0) {
-- if ((version & NFS4_REQUESTED) && (version & TCP_REQUESTED))
-+ if (version & NFS4_REQUESTED && (version & NFS4_ONLY_REQUESTED))
- rpc_info->port = NFS_PORT;
- else
- port = 0;
-@@ -525,7 +525,7 @@ static int get_vers_and_cost(unsigned logopt, struct host *host,
- {
- struct conn_info pm_info, rpc_info;
- time_t timeout = RPC_TIMEOUT;
-- unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK);
-+ unsigned int supported, vers = (NFS_VERS_MASK | NFS4_VERS_MASK | NFS4_ONLY_REQUESTED);
- int ret = 0;
-
- if (!check_address_proto(logopt, host, version))
next reply other threads:[~2024-07-10 14:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 14:56 Yixun Lan [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-12 1:46 [gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/, net-fs/autofs/files/ Yixun Lan
2022-01-10 22:33 Yixun Lan
2021-12-22 13:18 Yixun Lan
2021-10-17 5:24 Sam James
2021-05-21 1:07 Yixun Lan
2019-08-25 4:15 Matt Turner
2016-07-05 23:21 Yixun Lan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1720623299.4300e0dc2b19deeb7b2ddbbd98997e65c13142b5.dlan@gentoo \
--to=dlan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox