[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: 664afcbb2642555a65dad44ff104e31e2f02d6ff
Author: Sam James gentoo org>
AuthorDate: Tue Dec 19 11:12:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 19 11:12:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664afcbb
net-fs/autofs: further modern C fixes
Signed-off-by: Sam James gentoo.org>
net-fs/autofs/autofs-5.1.9-r1.ebuild | 128 +
net-fs/autofs/files/autofs-5.1.9-c99.patch | 57 +
2 files changed, 185 insertions(+)
diff --git a/net-fs/autofs/autofs-5.1.9-r1.ebuild
b/net-fs/autofs/autofs-5.1.9-r1.ebuild
new file mode 100644
index ..f64950f705e7
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.9-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 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="
+ sys-devel/flex
+ virtual/pkgconfig
+ app-alternatives/yacc
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-automount )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.1.9-c99.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/files/autofs-5.1.9-c99.patch
b/net-fs/autofs/files/autofs-5.1.9-c99.patch
new file mode 100644
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: 12884bb43ef8a0352e5d80fdcd1d052089f32eaf
Author: Sam James gentoo org>
AuthorDate: Mon May 1 13:33:34 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 13:33:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12884bb4
net-fs/autofs: drop 5.1.6-r2
Signed-off-by: Sam James gentoo.org>
net-fs/autofs/Manifest | 1 -
net-fs/autofs/autofs-5.1.6-r2.ebuild | 129 ---
net-fs/autofs/files/autofs-5.1.6-glibc.patch | 110 ---
net-fs/autofs/files/autofs-5.1.6-musl.patch | 12 ---
net-fs/autofs/files/autofs-5.1.6-pid.patch | 14 ---
5 files changed, 266 deletions(-)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 503d31c38237..364aa0a32804 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,3 +1,2 @@
-DIST autofs-5.1.6.tar.xz 315316 BLAKE2B
0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4
SHA512
dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
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
diff --git a/net-fs/autofs/autofs-5.1.6-r2.ebuild
b/net-fs/autofs/autofs-5.1.6-r2.ebuild
deleted file mode 100644
index bd0b047768ec..
--- a/net-fs/autofs/autofs-5.1.6-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 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;
-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 sparc x86"
-IUSE="dmalloc ldap +libtirpc mount-locking sasl 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="
- sys-devel/flex
- virtual/pkgconfig
- app-alternatives/yacc
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-glibc.patch"
- "${FILESDIR}/${P}-musl.patch"
- "${FILESDIR}/${P}-pid.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
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- export DONTSTRIP=1
- default
-}
-
-src_install() {
- default
-
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: 2f1281ade31419d6e1f9370790faab77b7a8d1f1
Author: Yixun Lan gentoo org>
AuthorDate: Tue Aug 16 09:01:31 2022 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Aug 16 22:53:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1281ad
net-fs/autofs: fix redefinition of struct mount_attr err
Closes: https://bugs.gentoo.org/863791
Signed-off-by: Yixun Lan gentoo.org>
net-fs/autofs/autofs-5.1.8-r1.ebuild | 1 +
.../autofs/files/autofs-5.1.8-mount_conflict.patch | 30 ++
2 files changed, 31 insertions(+)
diff --git a/net-fs/autofs/autofs-5.1.8-r1.ebuild
b/net-fs/autofs/autofs-5.1.8-r1.ebuild
index acf7831595cd..908f5077ea02 100644
--- a/net-fs/autofs/autofs-5.1.8-r1.ebuild
+++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${WORKDIR}"/${P}-patches/
"${FILESDIR}/${P}-dmalloc.patch"
"${FILESDIR}/${P}-nfsv4-mount.patch"
+ "${FILESDIR}/${P}-mount_conflict.patch"
)
pkg_setup() {
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
new file mode 100644
index ..e2a94bf82542
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.8-mount_conflict.patch
@@ -0,0 +1,30 @@
+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
+--- a/modules/parse_amd.c
b/modules/parse_amd.c
+@@ -27,7 +27,6 @@
+ #include
+ #include
+ #include
+-#include
+
+ #define MODULE_PARSE
+ #include "automount.h"
+--- a/modules/parse_sun.c
b/modules/parse_sun.c
+@@ -30,7 +30,6 @@
+ #include
+ #include
+ #include
+-#include
+
+ #define MODULE_PARSE
+ #include "automount.h"
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: c91aab7ed97c3970611e11f91e4c83a230db5b98
Author: Yixun Lan gentoo org>
AuthorDate: Mon Dec 6 06:23:22 2021 +
Commit: Yixun Lan gentoo org>
CommitDate: Mon Dec 6 06:32:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91aab7e
net-fs/autofs: fix dmalloc compiling err
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan gentoo.org>
net-fs/autofs/autofs-5.1.8.ebuild | 2 +
net-fs/autofs/files/autofs-5.1.8-dmalloc.patch | 53 ++
2 files changed, 55 insertions(+)
diff --git a/net-fs/autofs/autofs-5.1.8.ebuild
b/net-fs/autofs/autofs-5.1.8.ebuild
index ede180337421..3c519f852c70 100644
--- a/net-fs/autofs/autofs-5.1.8.ebuild
+++ b/net-fs/autofs/autofs-5.1.8.ebuild
@@ -43,6 +43,8 @@ PATCHES=(
"${FILESDIR}/${PN}-5.1.7-glibc.patch"
"${FILESDIR}/${PN}-5.1.6-musl.patch"
"${FILESDIR}/${PN}-5.1.6-pid.patch"
+ "${FILESDIR}/${PN}-5.1.6-pid.patch"
+ "${FILESDIR}/${P}-dmalloc.patch"
)
pkg_setup() {
diff --git a/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
new file mode 100644
index ..e2ed58fb1766
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.1.8-dmalloc.patch
@@ -0,0 +1,53 @@
+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 = _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 = _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 = _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)
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: 647b7cae8f31d5c16c0eb90a81c08576a442dd2f
Author: Yixun Lan gentoo org>
AuthorDate: Thu Jan 28 06:32:53 2021 +
Commit: Yixun Lan gentoo org>
CommitDate: Thu Jan 28 06:45:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647b7cae
net-fs/autofs: version bump 5.1.7
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yixun Lan gentoo.org>
net-fs/autofs/Manifest | 1 +
net-fs/autofs/autofs-5.1.7.ebuild| 124 +++
net-fs/autofs/files/autofs-5.1.7-glibc.patch | 97 +
3 files changed, 222 insertions(+)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 6f533814338..2dd24948a6b 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1 +1,2 @@
DIST autofs-5.1.6.tar.xz 315316 BLAKE2B
0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4
SHA512
dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
+DIST autofs-5.1.7.tar.xz 327752 BLAKE2B
bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc
SHA512
cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1
diff --git a/net-fs/autofs/autofs-5.1.7.ebuild
b/net-fs/autofs/autofs-5.1.7.ebuild
new file mode 100644
index 000..5dfef5feafa
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.7.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 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;
+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 ~sparc ~x86"
+IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=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="
+ sys-devel/flex
+ virtual/yacc
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-glibc.patch"
+ "${FILESDIR}/${PN}-5.1.6-pid.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
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ export DONTSTRIP=1
+ default
+}
+
+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"
+
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: 78f18ab0ea1805ca5fa452896e9dd92cb100b8ae
Author: Yixun Lan gentoo org>
AuthorDate: Fri May 29 09:06:50 2020 +
Commit: Yixun Lan gentoo org>
CommitDate: Fri May 29 09:07:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f18ab0
net-fs/autofs: make it compatible with sys-libs/musl
Add patches to support alternative C lib: sys-libs/musl,
most pathes borrow and rework from alpinelinux [1]
Thanks Sam James (sec padawan) for helping on this.
[1] https://git.alpinelinux.org/aports/tree/testing/autofs/
Closes: https://bugs.gentoo.org/716660
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Yixun Lan gentoo.org>
net-fs/autofs/autofs-5.1.6-r1.ebuild | 119 +++
net-fs/autofs/files/autofs-5.1.6-glibc.patch | 110 +
net-fs/autofs/files/autofs-5.1.6-pid.patch | 14
3 files changed, 243 insertions(+)
diff --git a/net-fs/autofs/autofs-5.1.6-r1.ebuild
b/net-fs/autofs/autofs-5.1.6-r1.ebuild
new file mode 100644
index 000..6e700965b9c
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.6-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 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;
+SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=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="
+ sys-devel/flex
+ virtual/yacc
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-glibc.patch"
+ "${FILESDIR}/${P}-pid.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
+ )
+ econf "${myeconfargs[@]}"
+}
+
+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
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/
commit: 89d602ebf3cd3590bfe10c02e6d66aaef455bdd2
Author: Matt Turner gentoo org>
AuthorDate: Mon Aug 12 20:26:46 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Aug 12 21:52:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d602eb
net-fs/autofs: Depend on nfsclient
... rather than nfs and portmap.
Closes: https://bugs.gentoo.org/673330
Signed-off-by: Matt Turner gentoo.org>
net-fs/autofs/files/autofs5.initd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-fs/autofs/files/autofs5.initd
b/net-fs/autofs/files/autofs5.initd
index 119585c995e..1b9b0fadd8b 100644
--- a/net-fs/autofs/files/autofs5.initd
+++ b/net-fs/autofs/files/autofs5.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
DAEMON=/usr/sbin/automount
@@ -8,7 +8,7 @@ DEVICE=autofs
depend() {
need localmount
- use ypbind nfs slapd portmap net
+ use ypbind nfsclient slapd net
}
extra_started_commands="reload"
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/
commit: 4ba7e7b97b267038daa1c0935b1879d1eb081436
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Feb 1 17:10:55 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Apr 11 22:56:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba7e7b9
net-fs/autofs: remove unused patches.
Closes: https://bugs.gentoo.org/650196
Closes: https://github.com/gentoo/gentoo/pull/7018
net-fs/autofs/files/autofs-5.0.3-heimdal.patch | 35 -
.../files/autofs-5.0.5-fix-install-deadlink.patch | 12 --
net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch | 18 ---
...-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch | 45 ---
.../autofs/files/autofs-5.0.7-libtirpc-link.patch | 10 --
.../autofs/files/autofs-5.0.7-parallel-make.patch | 48 ---
7-respect-user-flags-and-fix-asneeded-r3.patch | 144 -
net-fs/autofs/files/autofs-5.0.7-sasl-def.patch| 43 --
.../autofs/files/autofs-5.0.7-sloppy-mount.patch | 99 --
9 files changed, 454 deletions(-)
diff --git a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
b/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
deleted file mode 100644
index 707364df2f9..000
--- a/net-fs/autofs/files/autofs-5.0.3-heimdal.patch
+++ /dev/null
@@ -1,35 +0,0 @@
autofs-5.0.3.orig/modules/cyrus-sasl.c 2008-04-28 16:17:03.0
+0200
-+++ autofs-5.0.3/modules/cyrus-sasl.c 2008-04-28 16:41:58.0 +0200
-@@ -66,6 +66,15 @@
- #endif
- #endif
-
-+/**
-+ * The type of a principal is different for MIT Krb5 and Heimdal.
-+ * These macros are provided by Heimdal, and introduced here for MIT.
-+ */
-+#ifndef krb5_realm_length
-+#define krb5_realm_length(r) ((r).length)
-+#define krb5_realm_data(r) ((r).data)
-+#endif
-+
- /*
- * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
- * environment variable so that the library knows where to find it.
-@@ -452,11 +461,11 @@
-
- /* setup a principal for the ticket granting service */
- ret = krb5_build_principal_ext(ctxt->krb5ctxt, _princ,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt,
krb5_client_princ)),
-+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt,
krb5_client_princ)),
- strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
-- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt,
krb5_client_princ)),
-+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt,
krb5_client_princ)),
- 0);
- if (ret) {
- error(logopt,
-
diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch
b/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch
deleted file mode 100644
index 8ab10fcf747..000
--- a/net-fs/autofs/files/autofs-5.0.5-fix-install-deadlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
modules/Makefile.old 2010-06-19 20:43:45.373371321 +0200
-+++ modules/Makefile 2010-06-19 20:45:26.062417092 +0200
-@@ -63,7 +63,9 @@ install: all
- -rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
- ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so
- ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so
-+ifeq ($(SASL), 1)
- ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so
-+endif
- ln -fs mount_nfs.so $(INSTALLROOT)$(autofslibdir)/mount_nfs4.so
- ifeq ($(EXT2FS), 1)
- ifeq ($(EXT3FS), 1)
diff --git a/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
deleted file mode 100644
index 49901ddfc69..000
--- a/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
modules/lookup_ldap.c
-+++ modules/lookup_ldap.c
-@@ -1488,6 +1488,7 @@ int lookup_init(const char *mapfmt, int
- }
- }
-
-+#ifdef WITH_SASL
- /*
-* First, check to see if a preferred authentication method was
-* specified by the user. parse_ldap_config will return error
-@@ -1500,7 +1501,6 @@ int lookup_init(const char *mapfmt, int
- return 1;
- }
-
--#ifdef WITH_SASL
- /* Init the sasl callbacks */
- if (!autofs_sasl_client_init(LOGOPT_NONE)) {
- error(LOGOPT_ANY, "failed to init sasl client");
diff --git
a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
b/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
deleted file mode 100644
index 366b1eaaba3..000
---
a/net-fs/autofs/files/autofs-5.0.7-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
+++
[gentoo-commits] repo/gentoo:master commit in: net-fs/autofs/files/, net-fs/autofs/
commit: 313bf81680a5f74dce64f83eab3d7aea8458084e
Author: Yixun Lan gentoo org>
AuthorDate: Wed Jun 15 06:10:16 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Wed Jun 15 06:10:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313bf816
net-fs/autofs: drop old
Package-Manager: portage-2.3.0_rc1
net-fs/autofs/Manifest | 1 -
net-fs/autofs/autofs-5.1.0-r1.ebuild | 120 -
net-fs/autofs/autofs-5.1.1.ebuild | 115
.../autofs/files/autofs-5.0.8-ldap-wo-sasl.patch | 27 -
.../files/autofs-5.1.0-fix-missing-stdarg.patch| 43
5 files changed, 306 deletions(-)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index f8aa7c3..60371f0 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,7 +1,6 @@
DIST autofs-5.0.10.tar.xz 258480 SHA256
98150c09639112a125a6d0ddc6aa1920ae4e6c41736e65d8a004c3171fcca70b SHA512
899d3b7040d1162312f9d595df0fd6c40489e4aefb7086893b51993446da78f10707d7e8caf8440ff24000d54794faca869aaf8564e5622caf8bb046af6fcf3b
WHIRLPOOL
32c964a58f5125dfbfe589345e1fdf3da357fdadead790e3adbc840f0fc1b7093a0191224ac8d07ac792184914f6630ba08d572ffdcca0423e2a41bb2892ceaf
DIST autofs-5.0.7-patches-3.tar.lzma 37967 SHA256
16de3486573a94d476f70f2c422656d6fddd79b3581ce05faeb5dd55748ba1cb SHA512
8cbb683a82d2cdc5e3c97921ba3a5bc5af5ab9fb45e4802de021a6161eaeaebb192790a351d281d48b68ed0f8ea6e3a0c0514a4f4a1c546191d8acca9e856ca7
WHIRLPOOL
a42f6d609ee4160dfb2d84d94516667f41b8dbe9bf6bdef923f424f82ec00f6115f211dc2985170c45be53bdc45ea47026cc3750c61c7e14aa02ce3384bb9908
DIST autofs-5.0.7.tar.bz2 319117 SHA256
08c4304d8076dc80c14df559bc5fd821b67ef3457b245f61068bd053d8f94ccc SHA512
672c53e0a5477097779088d8654edaad4cb01ab68ade2ee175d963c7d4895d1bdeeeabc87057ecca2f4f3a0f08014298dae40e5e8e862c20c0b1477d72431f84
WHIRLPOOL
220cbd618ee4f34c82eaad823312284cc787aa28a0a8b9638a4b495cf38a3a6f9da194e74722febe04ee2b5ac4e1e9ede1f562d0d554f1e8a5ff4b5faec8
-DIST autofs-5.1.0.tar.xz 288288 SHA256
f4b343797e6df03627a9fd41bda6fd85acb84aa3fdd15694eec03ec90a52bc27 SHA512
a455df8d93bc29aa87c3f928edea5bb3f91ab9c7bd7bbca8eb1370fdcc4c32b3a30d7f2c0d79800f65ac08716634f118c81ede7e816ef567048e4361aafac476
WHIRLPOOL
ed265b1a9e697c08e802f0a17c0de482e5f1f292aecf8ab42cd7cf7177a605b0337ff6ab81b72950fc38687d31c47f9c01ff68cd0a8f10952a59b69a590e19ca
DIST autofs-5.1.1-patches-0.tar.lzma 41178 SHA256
ef9f94aacff845d29d3118c73ca7d08199d40a7de5edae1025d341530e7dc2b4 SHA512
5c3ba26711401b3f9dc8cd36d3a85b1a8efce409621efedfc4f1caf2a15536646f6f89a79b8e12c703d3b3a4627ecda8c800386ebff34e20fdfad39041d91aa4
WHIRLPOOL
d3d91c432e643911a4d8b5463e056aa50c717c08287e6ccf75bf1d6ca071460cc709aa32387f53cbe763de27b86eef1e26ab75a2fd334c783fd024b9f1d47ba3
DIST autofs-5.1.1.tar.xz 290300 SHA256
e08ff0ef9ff365d87b6c33dca136d20e4e07675197a324f2816894cb437021c3 SHA512
37c0f10ee06bbfc76059ff9ae54d9b462f1c2bc39e8779e96dd5bfc2b07055606c0710f1c3de95e6f099edd2c5bb5a6f8a341be989d7554bf80011bfbe90c905
WHIRLPOOL
063e7bcabb3e93a17e8e7da75e6b42af59769e794e3b31240762a4617cc2ac626b4b4985a38455bdca56753fb897fed1a3173c633f1f9a594e79f891dc41f523
DIST autofs-5.1.2.tar.xz 294792 SHA256
88b7de39088aead983e02072a7b753d5ee52ce419c8913f7a3d4ff5521313f0c SHA512
435bcb41c9d467947c194d879e46692b5976131b8e923793bdeac34f70420ede740c4d70ec393413fff0b1010495ac7fe5fa8b45a59d15a2430ecae9ec3fe7e1
WHIRLPOOL
d0e53d1d41bf31c8bf6358053b1a0668dcc0a84ee92ff69ade86a6731bfb0945f41cab5b2dd62d7c086219095c20db43c91a074ce321fd5db870a5f16af7bce0
diff --git a/net-fs/autofs/autofs-5.1.0-r1.ebuild
b/net-fs/autofs/autofs-5.1.0-r1.ebuild
deleted file mode 100644
index 4bae7e2..000
--- a/net-fs/autofs/autofs-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-AUTOTOOLS_IN_SOURCE_BUILD=true
-
-inherit autotools-utils linux-info multilib systemd toolchain-funcs
-
-PATCH_VER=
-[[ -n ${PATCH_VER} ]] && \
-
PATCHSET_URI="https://dev.gentoo.org/~jlec/distfiles/${P}-patches-${PATCH_VER}.tar.lzma;
-
-DESCRIPTION="Kernel based automounter"
-HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html;
-SRC_URI="
- mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz
- ${PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="-dmalloc hesiod ldap libtirpc mount-locking sasl"
-
-# USE="sasl" adds SASL support to the LDAP module which will not be build. If
-# SASL support should be available, please add "ldap" to the USE flags.
-REQUIRED_USE="sasl? ( ldap )"
-
-# currently, sasl code assumes the presence of kerberosV
-RDEPEND=">=sys-apps/util-linux-2.20
- dmalloc? ( dev-libs/dmalloc[threads] )
- hesiod? ( net-dns/hesiod )
- ldap? ( >=net-nds/openldap-2.0
-
