From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- net-fs/autofs/Manifest | 8 +- net-fs/autofs/autofs-5.1.6-r2.ebuild | 2 +- net-fs/autofs/autofs-5.1.7-r1.ebuild | 130 ---------------------- net-fs/autofs/autofs-5.1.8-r1.ebuild | 4 +- net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch | 107 ------------------ net-fs/autofs/files/autofs-5.1.7-glibc.patch | 97 ---------------- 6 files changed, 5 insertions(+), 343 deletions(-) delete mode 100644 net-fs/autofs/autofs-5.1.7-r1.ebuild delete mode 100644 net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch delete mode 100644 net-fs/autofs/files/autofs-5.1.7-glibc.patch (limited to 'net-fs/autofs') diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest index 94f69cfc30f1..ea5d6257fea8 100644 --- a/net-fs/autofs/Manifest +++ b/net-fs/autofs/Manifest @@ -1,17 +1,13 @@ AUX autofs-5.1.6-glibc.patch 2797 BLAKE2B b6ea2fc98c0634208103208fe562f77d3cd77e212215a0a346b2a1b9997fd1dc95bf8b42bd899884fd12d735219801308e0934a31553dfda275dc3eef9e07db0 SHA512 83d4808c4f5fe811d675372f7af59c6369d93818bfdb5aac26d5372baf1ef45f71208206fe6176b577294df8ce0dac145d7afe335f028f0a0cf3e6787dfb0bbc AUX autofs-5.1.6-musl.patch 215 BLAKE2B 885442f26b482ec28734452d3a987759d761c8d21a4e1457fe9c04be928422473f9a1743b0355c5616486e74bd457faf170eb12b7bb3f790b33314205968f20a SHA512 643fb4453d89269cb2252c9e23f09da657fde4f0c14b8933b950e03c14b8723ec848ec2d5a44da4980895ff6d1cb63c3dfc6074de629a694a370410b270b3886 AUX autofs-5.1.6-pid.patch 453 BLAKE2B 292388f1d192a1e8763402dbc4d5738d112fbbf4409a9fc8215a3ba9987639381fa0ccc29b28f5fe794dc44c98ebc0177d3ecd28177ff6657201f8ba478febda SHA512 78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6 -AUX autofs-5.1.7-glibc-2.34.patch 3439 BLAKE2B 9ad024413e1bbb0c2d953ee9355dc6ac6fbf13d4475a14f9183c5092c4850441a7b7f1809452c96d0020b4fb4105f6724e3f04b817ad5b143b9074662f35a87b SHA512 e22fa260123823fa6109d8b2737877a39e15c696ab1e506a8bdeb2a1feebaec965a577a645c9e9edd19547a2b2237e06191f91107b8025b985b7f4f3137685fa -AUX autofs-5.1.7-glibc.patch 2393 BLAKE2B 3b38f6c869c5dbd29ca7835e4a46b285b6f8dd9e915b8bb0a3a13978e23675b4e695c43d8404f574f4f82a71effa5cf5cad86578893b4e148d0f69241ea3e80f SHA512 6e38ba59e2ce1d3c64ca19e3766438220fb89f3880a59443b6b3dc057f90b6b7ebf003a5cdc34fb12cf1fdc4eba990b02045bf6ee6888b9c49cfb249a77305ed AUX autofs-5.1.8-dmalloc.patch 1538 BLAKE2B be01cac480fa9e956e44f497ec0b06b824f54714e636e6394b10b551fa855d5f5901668d2079b424754e264d7d84417ff8f7009d52c1b6b7830ea2738f96cfbe SHA512 bba8122f1b183cfeea5556ae1761ec0607d8af88a0f26ca0e3926c8221c0902d9bf8c6c81afb8ce083850fda0fc882cc1660fd71a1a1e580fdbe5a7d76ee12a4 AUX autofs-5.1.8-nfsv4-mount.patch 3512 BLAKE2B cee090bbdfc65a92ddf18ed3f34d0458c89c678520cb517aaf0d44bcd3324c1650055abeac9edd915c81bb69dd9245386e1d008aa9dc536f8777b5bd41ce7c69 SHA512 09d3a4715c2e05292c48874ab4f62ce15b3110a682bfe86986341b34b52db19d92d48ee38181072b17817dec9d180f161eb4598dcff44a3ac551d25d356ec62b AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2 -DIST autofs-5.1.7.tar.xz 327752 BLAKE2B bff290048fb2849dd4c7099718f6824eac7e4f700909342f82b79a3baa752c4efe7f45be3492578fa15df6d959751be5d7fae5aafe129b52425c0d9ab19eaccc SHA512 cf994d0e68d5f6a5647235000743811a791150ece0a90ed9e1cb9bb131259f52769371c6a06d968b7191b10e709c9c90de611cc3ee310fbbea87f60034b3d4e1 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 -EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 48811e587d6a4637f6e07e9add7e3943e5063456ad91610e18a9deb379d09187d8eb62506dcafa21f06ad932b1f3c6c3fdccbbdb18befbd33e16ae724383a5a1 SHA512 e37770f987c646a2b44477f4fa50a357e2ceece27441f4a75dc3ed8b0564d3f778ba8c162c9a7f3c6fc4c78ed41f557475dda7963c6ab5e2f3297b9fac59d75d -EBUILD autofs-5.1.7-r1.ebuild 3239 BLAKE2B a329da93036678a45676f230d85ad83f88f473fccfada7d836b8c3cdd413dcc364eff7c5d2a7944336fbfa32c42a457a942ac1f29404e3fd6a6cdf019f11914d SHA512 f1e9e6aa768400a13663e15fa2c9b3a5dea0b427df1020bffa14cdadd4d941249c114156e6385748d2210c5d608647ab5b546c4e0e7ebc59d23a3351121b425d -EBUILD autofs-5.1.8-r1.ebuild 3265 BLAKE2B 331e79abeb6ec778ac7ab0511955c50e6d44a8c95f938216cb19ba00e6b3d82d9c746694cb8070e80f51b0e7f10275423309f63364c4a293bb3ebf60e334a28b SHA512 2ac85218bfab07a00ebae135636d3459f785ca1ff91cc32cf2ff4ece315c09922dc9ca04be711d249c6fb97f606362dfd831c50e6a1f2911f629abca87b25ccd +EBUILD autofs-5.1.6-r2.ebuild 3141 BLAKE2B 2e8a550f83941d0cb750c78f40fb263a62f2fc757bf59d40441353ad55d9a1887ecab2cf5ac7ca794a917cd2862b441c8146f7d2d487fbd795f77541c42fe45d SHA512 334e03b3d4fa6661c06c555081866e7a6edfe4c3bbf9edfa5e0894165e96eab43ac807128708837d2a59bf59b25cb985588efb2427cabe0b31829146548889c7 +EBUILD autofs-5.1.8-r1.ebuild 3267 BLAKE2B da9cdac27c70b1dc8e67dfce30b1e4b3143b12f75ede0612292f438cce7c65b24e5e89630e47b17c57d7859f1df6e3ec5418c4a605df68753e2789eb411ccb02 SHA512 60f61f74c9e4e8fcb9b422d2496f993293569445a319e0398006f3d90d5ebaf1ff21d01cdda7cf513c61b71ebc29f276d81b334336f4de00dcacd8e926d8abcc MISC metadata.xml 870 BLAKE2B d2813cbc47232ecb5d5726672d038d72e9e5dd3078e915552f566a61bb2db7909d8b4d7d135d7c3ebba9c8f827121de2f42bd25c7c9fd975190f8bb67635affd SHA512 b1ee8b21924f1b6ade69603deff4ff5dc954f4f9161dce592b1676cad1e01dc2a0b4802877f8d4922a037f3e10b2f2085128f86cd2cf21f691c568d6a1f3a25d diff --git a/net-fs/autofs/autofs-5.1.6-r2.ebuild b/net-fs/autofs/autofs-5.1.6-r2.ebuild index 616efb49c330..c532b488d526 100644 --- a/net-fs/autofs/autofs-5.1.6-r2.ebuild +++ b/net-fs/autofs/autofs-5.1.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/net-fs/autofs/autofs-5.1.7-r1.ebuild b/net-fs/autofs/autofs-5.1.7-r1.ebuild deleted file mode 100644 index dc05275932e3..000000000000 --- a/net-fs/autofs/autofs-5.1.7-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# 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=" - 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 - virtual/yacc -" - -PATCHES=( - "${FILESDIR}/${P}-glibc.patch" - "${FILESDIR}/${PN}-5.1.6-musl.patch" - "${FILESDIR}/${PN}-5.1.6-pid.patch" - "${FILESDIR}/${PN}-5.1.7-glibc-2.34.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() { - 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" - 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.8-r1.ebuild b/net-fs/autofs/autofs-5.1.8-r1.ebuild index d3260d26b3e2..2081b5d2a5c5 100644 --- a/net-fs/autofs/autofs-5.1.8-r1.ebuild +++ b/net-fs/autofs/autofs-5.1.8-r1.ebuild @@ -12,7 +12,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="dmalloc ldap +libtirpc mount-locking sasl systemd" # currently, sasl code assumes the presence of kerberosV @@ -96,7 +96,7 @@ src_configure() { } src_compile() { - emake DONTSTRIP=1 + emake STRIP=: DONTSTRIP=1 } src_install() { diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch b/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch deleted file mode 100644 index 8b0ddd75eb23..000000000000 --- a/net-fs/autofs/files/autofs-5.1.7-glibc-2.34.patch +++ /dev/null @@ -1,107 +0,0 @@ -https://src.fedoraproject.org/rpms/autofs/raw/rawhide/f/autofs-5.1.7-use-default-stack-size-for-threads.patch -https://bugzilla.redhat.com/show_bug.cgi?id=1984813 -https://bugs.gentoo.org/803938 - -autofs-5.1.7 - use default stack size for threads - -From: Ian Kent - -autofs uses PTHREAD_STACK_MIN to set the stack size for threads it -creates. - -In two cases it is used to reduce the stack size for long running -service threads while it's used to allocate a larger stack for worker -threads that can have larger memory requirements. - -In recent glibc releases PTHREAD_STACK_MIN is no longer a constant -which can lead to unexpectedly different stack sizes on different -architectures and the autofs assumption it's a constant causes a -compile failure. - -The need to alter the stack size was due to observed stack overflow -which was thought to be due the thread stack being too small for autofs -and glibc alloca(3) usage. - -Quite a bit of that alloca(3) usage has been eliminated from autofs now, -particularly those that might be allocating largish amounts of storage, -and there has been a lot of change in glibc too so using the thread -default stack should be ok. - -Signed-off-by: Ian Kent ---- a/daemon/automount.c -+++ b/daemon/automount.c -@@ -84,7 +84,6 @@ static size_t kpkt_len; - /* Attributes for creating detached and joinable threads */ - pthread_attr_t th_attr; - pthread_attr_t th_attr_detached; --size_t detached_thread_stack_size = PTHREAD_STACK_MIN * 144; - - struct master_readmap_cond mrc = { - PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, NULL, 0, 0, 0, 0}; -@@ -2620,34 +2619,6 @@ int main(int argc, char *argv[]) - exit(1); - } - --#ifdef _POSIX_THREAD_ATTR_STACKSIZE -- if (pthread_attr_setstacksize( -- &th_attr_detached, detached_thread_stack_size)) { -- logerr("%s: failed to set stack size thread attribute!", -- program); -- if (start_pipefd[1] != -1) { -- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); -- close(start_pipefd[1]); -- } -- release_flag_file(); -- macro_free_global_table(); -- exit(1); -- } --#endif -- -- if (pthread_attr_getstacksize( -- &th_attr_detached, &detached_thread_stack_size)) { -- logerr("%s: failed to get detached thread stack size!", -- program); -- if (start_pipefd[1] != -1) { -- res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat)); -- close(start_pipefd[1]); -- } -- release_flag_file(); -- 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", ---- a/daemon/state.c -+++ b/daemon/state.c -@@ -1177,12 +1177,8 @@ int st_start_handler(void) - status = pthread_attr_init(pattrs); - if (status) - pattrs = NULL; -- else { -+ else - pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED); --#ifdef _POSIX_THREAD_ATTR_STACKSIZE -- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4); --#endif -- } - - status = pthread_create(&thid, pattrs, st_queue_handler, NULL); - ---- a/lib/alarm.c -+++ b/lib/alarm.c -@@ -270,12 +270,8 @@ int alarm_start_handler(void) - status = pthread_attr_init(pattrs); - if (status) - pattrs = NULL; -- else { -+ else - pthread_attr_setdetachstate(pattrs, PTHREAD_CREATE_DETACHED); --#ifdef _POSIX_THREAD_ATTR_STACKSIZE -- pthread_attr_setstacksize(pattrs, PTHREAD_STACK_MIN*4); --#endif -- } - - status = pthread_condattr_init(&condattrs); - if (status) diff --git a/net-fs/autofs/files/autofs-5.1.7-glibc.patch b/net-fs/autofs/files/autofs-5.1.7-glibc.patch deleted file mode 100644 index 2a0f415fbee7..000000000000 --- a/net-fs/autofs/files/autofs-5.1.7-glibc.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff --git a/daemon/lookup.c b/daemon/lookup.c -index 2fea0c0..3b3aa3e 100644 ---- a/daemon/lookup.c -+++ b/daemon/lookup.c -@@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source - return NSS_STATUS_NOTFOUND; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ - return NSS_STATUS_NOTFOUND; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry) - if (!S_ISREG(st.st_mode)) - return NULL; - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = "program"; - else - type = "file"; -diff --git a/include/automount.h b/include/automount.h -index 1ae4078..c2e8dba 100644 ---- a/include/automount.h -+++ b/include/automount.h -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -42,6 +43,16 @@ - #include - #endif - -+#ifndef __SWORD_TYPE -+#if __WORDSIZE == 32 -+# define __SWORD_TYPE int -+#elif __WORDSIZE == 64 -+# define __SWORD_TYPE long int -+#else -+#error -+#endif -+#endif -+ - #define ENABLE_CORES 1 - - /* We MUST have the paths to mount(8) and umount(8) */ -diff --git a/include/nsswitch.h b/include/nsswitch.h -index d3e4027..8376113 100644 ---- a/include/nsswitch.h -+++ b/include/nsswitch.h -@@ -24,6 +24,10 @@ - #include - #include "list.h" - -+#ifndef _PATH_NSSWITCH_CONF -+#define _PATH_NSSWITCH_CONF "/dev/null" -+#endif -+ - #define NSSWITCH_FILE _PATH_NSSWITCH_CONF - - enum nsswitch_status { -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index fadd2ea..cf109de 100644 ---- a/modules/lookup_multi.c -+++ b/modules/lookup_multi.c -@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch - continue; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt, - continue; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -- cgit v1.2.3