[gentoo-commits] proj/musl:master commit in: net-fs/autofs/, net-fs/autofs/files/
commit: 0f0fe4a9fe32132921f21dcf87a3a5f0e648d99e
Author: Dave Hughes gmail com>
AuthorDate: Sat Mar 13 17:21:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 13 21:25:51 2021 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=0f0fe4a9
net-fs/autofs: remove from overlay
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xA1919C830E9498E0
Signed-off-by: Dave Hughes gmail.com>
Closes: https://github.com/gentoo/musl/pull/422
Signed-off-by: Sam James gentoo.org>
net-fs/autofs/Manifest | 1 -
net-fs/autofs/autofs-5.1.4.ebuild | 114 -
.../files/autofs-5.1.2-libtirpc-as-need.patch | 28 -
.../files/autofs-early-pthread_key_create.patch| 42
net-fs/autofs/files/autofs-musl.patch | 90
net-fs/autofs/files/autofs5-auto.master| 23 -
net-fs/autofs/files/autofs5.initd | 69 -
net-fs/autofs/metadata.xml | 20
8 files changed, 387 deletions(-)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
deleted file mode 100644
index b42b207..000
--- a/net-fs/autofs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST autofs-5.1.4.tar.xz 304864 BLAKE2B
7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f
SHA512
1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589
diff --git a/net-fs/autofs/autofs-5.1.4.ebuild
b/net-fs/autofs/autofs-5.1.4.ebuild
deleted file mode 100644
index 25ba663..000
--- a/net-fs/autofs/autofs-5.1.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="-dmalloc 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] )
- ldap? ( >=net-nds/openldap-2.0
- sasl? (
- dev-libs/cyrus-sasl
- dev-libs/libxml2
- virtual/krb5
- )
- )
- libtirpc? ( net-libs/libtirpc )
- !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
-"
-DEPEND="${RDEPEND}
- sys-devel/flex
- virtual/yacc
- libtirpc? ( >net-libs/rpcsvc-proto-0 )
-"
-
-CONFIG_CHECK="~AUTOFS4_FS"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-musl.patch
- "${FILESDIR}"/${PN}-early-pthread_key_create.patch
-)
-
-src_prepare() {
- # Upstream's patchset
- if [[ -n ${PATCH_VER} ]]; then
- EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}"/patches
- fi
-
- sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die
#bug #479492
- 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)
- --without-hesiod
- --disable-ext-env
- --enable-sloppy-mount # bug #453778
- --enable-force-shutdown
- --enable-ignore-busy
- --with-systemd="$(systemd_get_systemunitdir)" #bug #479492
- RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- 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}
[gentoo-commits] proj/musl:master commit in: net-fs/autofs/, net-fs/autofs/files/
commit: 7b16ed130f2ab2a38562726023fda23d40634038
Author: Neula famsim de>
AuthorDate: Sun Oct 28 13:45:08 2018 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Mon Oct 29 11:42:31 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=7b16ed13
net-fs/autofs: fix segfault when using automount with --debug flag
net-fs/autofs/autofs-5.1.4.ebuild | 3 +-
.../files/autofs-early-pthread_key_create.patch| 42 ++
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/net-fs/autofs/autofs-5.1.4.ebuild
b/net-fs/autofs/autofs-5.1.4.ebuild
index 3546185..71bf379 100644
--- a/net-fs/autofs/autofs-5.1.4.ebuild
+++ b/net-fs/autofs/autofs-5.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -47,6 +47,7 @@ CONFIG_CHECK="~AUTOFS4_FS"
PATCHES=(
"${FILESDIR}"/${PN}-musl.patch
+ "${FILESDIR}"/${PN}-early-pthread_key_create.patch
)
src_prepare() {
diff --git a/net-fs/autofs/files/autofs-early-pthread_key_create.patch
b/net-fs/autofs/files/autofs-early-pthread_key_create.patch
new file mode 100644
index 000..6e59812
--- /dev/null
+++ b/net-fs/autofs/files/autofs-early-pthread_key_create.patch
@@ -0,0 +1,42 @@
+Fixes segfault when launching autofs with debugging info
+
+--- autofs-5.1.4/daemon/automount.c2017-12-19 03:46:44.0 +0100
autofs-5.1.4/daemon/automount.c2018-10-28 12:45:28.388254819 +0100
+@@ -2495,16 +2495,10 @@ int main(int argc, char *argv[])
+ macro_free_global_table();
+ exit(1);
+ }
+-
+- info(logging, "Starting automounter version %s, master map %s",
+- version, master_list->name);
+- info(logging, "using kernel protocol version %d.%02d",
+- get_kver_major(), get_kver_minor());
+-
+- status = pthread_key_create(_thread_stdenv_vars,
+- key_thread_stdenv_vars_destroy);
++
++ status = pthread_key_create(_thread_attempt_id, free);
+ if (status) {
+- logerr("%s: failed to create thread data key for std env vars!",
++ logerr("%s: failed to create thread data key for attempt ID!",
+ program);
+ master_kill(master_list);
+ res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+@@ -2513,10 +2507,15 @@ int main(int argc, char *argv[])
+ macro_free_global_table();
+ exit(1);
+ }
++ info(logging, "Starting automounter version %s, master map %s",
++ version, master_list->name);
++ info(logging, "using kernel protocol version %d.%02d",
++ get_kver_major(), get_kver_minor());
+
+- status = pthread_key_create(_thread_attempt_id, free);
++ status = pthread_key_create(_thread_stdenv_vars,
++ key_thread_stdenv_vars_destroy);
+ if (status) {
+- logerr("%s: failed to create thread data key for attempt ID!",
++ logerr("%s: failed to create thread data key for std env vars!",
+ program);
+ master_kill(master_list);
+ res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
[gentoo-commits] proj/musl:master commit in: net-fs/autofs/, net-fs/autofs/files/
commit: acca4e086d138cbad282fbfe3123c394e90e0346
Author: S. Lockwood-Childs vctlabs com>
AuthorDate: Wed May 23 09:25:56 2018 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Fri Jun 8 11:08:58 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=acca4e08
net-fs/autofs: add package
* satisfying net-libs/rpcsvc-proto dependency with version 0 is useless,
(it is just a stub that does not provide rpcgen tool) so require
greater than 0
* compiler patch based on musl-related patches from meta-openembedded
net-fs/autofs/Manifest | 1 +
net-fs/autofs/autofs-5.1.4.ebuild | 113 +
.../files/autofs-5.1.2-libtirpc-as-need.patch | 28 +
net-fs/autofs/files/autofs-musl.patch | 90
net-fs/autofs/files/autofs5-auto.master| 23 +
net-fs/autofs/files/autofs5.initd | 69 +
net-fs/autofs/metadata.xml | 20
7 files changed, 344 insertions(+)
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
new file mode 100644
index 000..b42b207
--- /dev/null
+++ b/net-fs/autofs/Manifest
@@ -0,0 +1 @@
+DIST autofs-5.1.4.tar.xz 304864 BLAKE2B
7348aa1106554eb765919c765c0585b5d975d7a0ea036dec5b509711bf33cefd0f3e1e857a6865434adabbd1e323cfe8ffb09eb234495672e81101f79b8f4d0f
SHA512
1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589
diff --git a/net-fs/autofs/autofs-5.1.4.ebuild
b/net-fs/autofs/autofs-5.1.4.ebuild
new file mode 100644
index 000..81f6b76
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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 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] )
+ ldap? ( >=net-nds/openldap-2.0
+ sasl? (
+ dev-libs/cyrus-sasl
+ dev-libs/libxml2
+ virtual/krb5
+ )
+ )
+ libtirpc? ( net-libs/libtirpc )
+ !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ libtirpc? ( >net-libs/rpcsvc-proto-0 )
+"
+
+CONFIG_CHECK="~AUTOFS4_FS"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-musl.patch
+)
+
+src_prepare() {
+ # Upstream's patchset
+ if [[ -n ${PATCH_VER} ]]; then
+ EPATCH_SUFFIX="patch" \
+ epatch "${WORKDIR}"/patches
+ fi
+
+ sed -i -e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die
#bug #479492
+ 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)
+ --without-hesiod
+ --disable-ext-env
+ --enable-sloppy-mount # bug #453778
+ --enable-force-shutdown
+ --enable-ignore-busy
+ --with-systemd="$(systemd_get_systemunitdir)" #bug #479492
+ RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ 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
