community/autofs/0001-auto.master-change-paths-in-etc.patch

+From ad88cf33e0b4c4aa5487f5f873cb2b1bb094dd61 Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Tue, 10 May 2022 18:48:22 -0700
+Subject: [PATCH 1/2] auto.master: change paths in etc
+
+---
+ samples/auto.master | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/samples/auto.master b/samples/auto.master
+index 5483e3c..2bb64d9 100644
+--- a/samples/auto.master
++++ b/samples/auto.master
+@@ -4,7 +4,7 @@
+ # mount-point [map-type[,format]:]map [options]
+ # For details of the format look at auto.master(5).
+ #
+-/misc	/etc/auto.misc
++/misc	/etc/autofs/auto.misc
+ #
+ # NOTE: mounts done from a hosts map will be mounted with the
+ #	"nosuid" and "nodev" options unless the "suid" and "dev"
+@@ -12,14 +12,14 @@
+ #
+ /net	-hosts
+ #
+-# Include /etc/auto.master.d/*.autofs
++# Include /etc/autofs/auto.master.d/*.autofs
+ # To add an extra map using this mechanism you will need to add
+ # two configuration items - one /etc/auto.master.d/extra.autofs file
+ # (using the same line format as the auto.master file)
+ # and a separate mount map (e.g. /etc/auto.extra or an auto.extra NIS map)
+ # that is referred to by the extra.autofs file.
+ #
+-+dir:/etc/auto.master.d
+++dir:/etc/autofs/auto.master.d
+ #
+ # If you have fedfs set up and the related binaries, either
+ # built as part of autofs or installed from another package,
+-- 
+2.36.1
+

community/autofs/0002-musl-backport-fixes.patch

+From f5f4eae173cfa61b3665e327d828f203fa6d72f3 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 24 Dec 2021 22:02:20 +0800
+Subject: [PATCH 2/2] autofs-5.1.8 - fix bashism in configure
+
+configure scripts need to work with a POSIX-compliant shell,
+so let's not use a bashism here.
+
+```
+checking for res_query in -lresolv... yes
+checking for libhesiod... no
+./configure: 4880: test: 0: unexpected operator
+checking how to run the C preprocessor... gcc -E
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - fix missing include in hash.h
+
+Fixes a build failure with the musl libc:
+```
+../include/hash.h:74:8: error: unknown type name '__always_inline'
+   74 | static __always_inline uint32_t hash_64(uint64_t val, unsigned int bits)
+      |        ^~~~~~~~~~~~~~~
+```
+
+We need to include stddef.h from linux-headers to ensure _always_inline
+is always defined.
+
+Bug: https://bugs.gentoo.org/828918
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - define fallback dummy NSS config path
+
+On musl, _PATH_NSSWITCH_CONF won't be defined (it doesn't support NSS),
+so let's give it a dummy path when it's not defined by glibc.
+
+Fixes build failures like:
+```
+../include/nsswitch.h:27:23: error: '_PATH_NSSWITCH_CONF' undeclared (first use in this function)
+   27 | #define NSSWITCH_FILE _PATH_NSSWITCH_CONF
+      |                       ^~~~~~~~~~~~~~~~~~~
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - avoid internal stat.h definitions
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - add missing include to hash.h for _WORDSIZE
+
+Fixes build failure on musl like:
+```
+../include/hash.h:22:2: error: #error Wordsize not 32 or 64
+   22 | #error Wordsize not 32 or 64
+      |  ^~~~~
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - add missing include to log.h for pid_t
+
+Fixes build failures on musl like:
+```
+../include/log.h:49:8: error: unknown type name 'pid_t'
+   49 | extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
+      |        ^~~~~
+../include/log.h:49:51: error: unknown type name 'pid_t'; did you mean 'gid_t'?
+   49 | extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
+      |                                                   ^~~~~
+      |                                                   gid_t
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - define _SWORD_TYPE for musl
+
+Copy the definition from glibc. Fixes build failures like:
+```
+automount.c:280:35: error: '__SWORD_TYPE' undeclared (first use in this function)
+  280 |                 if (fs.f_type != (__SWORD_TYPE) AUTOFS_SUPER_MAGIC) {
+      |                                   ^~~~~~~~~~~~
+automount.c:280:35: note: each undeclared identifier is reported only once for each function it appears in
+automount.c:280:48: error: expected ')' before numeric constant
+  280 |                 if (fs.f_type != (__SWORD_TYPE) AUTOFS_SUPER_MAGIC) {
+      |                    ~                           ^
+      |                                                )
+```
+
+Tested-by: Yixun Lan <dlan@gentoo.org>
+Signed-off-by: Sam James <sam@gentoo.org>
+
+autofs-5.1.8 - add autofs_strerror_r() helper for musl
+
+If using musl libc the XSI-compliant variant strerror_r() which returns
+an integer instead of a pointer so add a helper function to handle this
+case.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+Signed-off-by: Ian Kent <raven@themaw.net>
+
+autofs-5.1.8 - handle innetgr() not present in musl
+
+The function innetgr(3) may not be present in musl libc, add a check
+for this.
+
+Originally contributed by Fabian, modified by me.
+
+Signed-off-by: Fabian Groffen <grobian@gentoo.org>
+Signed-off-by: Ian Kent <raven@themaw.net>
+---
+ configure              |  9 +++++----
+ configure.in           |  8 ++++----
+ daemon/automount.c     | 10 ++++++++++
+ daemon/lookup.c        |  6 +++---
+ include/automount.h    |  5 +++++
+ include/config.h.in    |  3 +++
+ include/hash.h         |  6 ++++++
+ include/log.h          |  2 ++
+ include/nsswitch.h     |  4 ++++
+ lib/log.c              | 10 ++++++++++
+ modules/lookup_multi.c |  4 ++--
+ modules/parse_amd.c    |  7 +++++++
+ 12 files changed, 61 insertions(+), 13 deletions(-)
+
+diff --git a/configure b/configure
+index 394a8d5..33446b0 100755
+--- a/configure
++++ b/configure
+@@ -4227,12 +4227,13 @@ fi
+ 
+ 
+ 
+-for ac_func in pipe2
++for ac_func in pipe2 innetgr
+ do :
+-  ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
+-if test "x$ac_cv_func_pipe2" = xyes; then :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+-#define HAVE_PIPE2 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+diff --git a/configure.in b/configure.in
+index 750ffb4..68cbd44 100644
+--- a/configure.in
++++ b/configure.in
+@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_autofs.so)
+ AC_SUBST(HAVE_SSS_AUTOFS)
+ AC_SUBST(sssldir)
+ 
+-AC_CHECK_FUNCS(pipe2)
++AC_CHECK_FUNCS(pipe2 innetgr)
+ 
+ #
+ # Newer mounts have the -s (sloppy) option to ignore unknown options,
+@@ -262,7 +262,7 @@ if test -z "$HAVE_HESIOD" -o "$HAVE_HESIOD" != "0"
+ then
+ 	HAVE_HESIOD=0
+ 	AF_CHECK_LIBHESIOD()
+-	if test "$HAVE_HESIOD" == "1"; then
++	if test "$HAVE_HESIOD" = "1"; then
+ 		AC_DEFINE(WITH_HESIOD,1,
+ 			[Define if using Hesiod as a source of automount maps])
+ 	fi
+@@ -337,11 +337,11 @@ AC_ARG_WITH(sasl,
+ 		SASL_FLAGS="-I${withval}/include"
+ 	fi
+ )
+-if test -z "$HAVE_SASL" -o "$HAVE_SASL" != "0" -a "$HAVE_LIBXML" == "1"
++if test -z "$HAVE_SASL" -o "$HAVE_SASL" != "0" -a "$HAVE_LIBXML" = "1"
+ then
+ 	HAVE_SASL=0
+ 	AC_CHECK_LIB(sasl2, sasl_client_start, HAVE_SASL=1 LIBSASL="$LIBSASL -lsasl2", , -lsasl2 $LIBS)
+-	if test "$HAVE_SASL" == "1"; then
++	if test "$HAVE_SASL" = "1"; then
+ 		AC_DEFINE(WITH_SASL,1,
+ 			[Define if using SASL authentication with the LDAP module])
+ 	fi
+diff --git a/daemon/automount.c b/daemon/automount.c
+index cc28689..5dffce0 100644
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -48,6 +48,16 @@
+ #endif
+ #endif
+ 
++#ifndef __SWORD_TYPE
++#if __WORDSIZE == 32
++# define __SWORD_TYPE	int
++#elif __WORDSIZE == 64
++# define __SWORD_TYPE	long int
++#else
++#error
++#endif
++#endif
++
+ const char *program;		/* Initialized with argv[0] */
+ const char *version = VERSION_STRING;	/* Program version */
+ const char *libdir = AUTOFS_LIB_DIR;	/* Location of library modules */
+diff --git a/daemon/lookup.c b/daemon/lookup.c
+index 0b281f8..4a286d6 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 947ed16..d2d05d8 100644
+--- a/include/automount.h
++++ b/include/automount.h
+@@ -43,6 +43,11 @@
+ 
+ #define ENABLE_CORES	1
+ 
++#ifndef __GLIBC__
++# define strerror_r(N,B,S) autofs_strerror_r(N,B,S)
++char *autofs_strerror_r(int errnum, char *buf, size_t buflen);  /* GNU */
++#endif
++
+ /* We MUST have the paths to mount(8) and umount(8) */
+ #ifndef HAVE_MOUNT
+ #error Failed to locate mount(8)!
+diff --git a/include/config.h.in b/include/config.h.in
+index 4e36b39..4f8daa8 100644
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -30,6 +30,9 @@
+ /* Define to 1 if you have the `getservbyname' function. */
+ #undef HAVE_GETSERVBYNAME
+ 
++/* Define to 1 if you have the `innetgr' function. */
++#undef HAVE_INNETGR
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+diff --git a/include/hash.h b/include/hash.h
+index 2447f29..0f1d7b5 100644
+--- a/include/hash.h
++++ b/include/hash.h
+@@ -3,6 +3,12 @@
+ /* Fast hashing routine for ints,  longs and pointers.
+    (C) 2002 Nadia Yvette Chambers, IBM */
+ 
++#ifdef __GLIBC__
++#include <bits/wordsize.h>
++#else
++#include <bits/reg.h>
++#endif
++#include <linux/stddef.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+ 
+diff --git a/include/log.h b/include/log.h
+index 69eed96..a7b09f9 100644
+--- a/include/log.h
++++ b/include/log.h
+@@ -17,6 +17,8 @@
+ #ifndef LOG_H
+ #define LOG_H
+ 
++#include <unistd.h>
++
+ /* Define logging functions */
+ 
+ #define LOGOPT_NONE	0x0000
+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 <netdb.h>
+ #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/lib/log.c b/lib/log.c
+index 0cb47d7..aa4a180 100644
+--- a/lib/log.c
++++ b/lib/log.c
+@@ -364,3 +364,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) {
+ 
+ 	return ppid;
+ }
++
++#ifndef __GLIBC__
++# undef strerror_r
++char *autofs_strerror_r(int errnum, char *buf, size_t buflen) {
++	int s = strerror_r(errnum, buf, buflen);
++	if (s)
++		return NULL;
++	return buf;
++}
++#endif
+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;
+diff --git a/modules/parse_amd.c b/modules/parse_amd.c
+index 163174c..5090060 100644
+--- a/modules/parse_amd.c
++++ b/modules/parse_amd.c
+@@ -425,6 +425,7 @@ static int sel_in_network(struct autofs_point *ap,
+ 	return ret;
+ }
+ 
++#ifdef HAVE_INNETGR
+ static int sel_netgrp(struct autofs_point *ap,
+ 		      struct selector *s, struct substvar *sv)
+ {
+@@ -489,6 +490,7 @@ out:
+ 
+ 	return ret;
+ }
++#endif
+ 
+ static int eval_selector(struct autofs_point *ap,
+ 			 struct amd_entry *this, struct substvar *sv)
+@@ -628,7 +630,12 @@ static int eval_selector(struct autofs_point *ap,
+ 		switch (s->sel->selector) {
+ 		case SEL_NETGRP:
+ 		case SEL_NETGRPD:
++#ifndef HAVE_INNETGR
++			error(logopt, MODPREFIX
++			      "netgroups not available, function innetgr(3) not available");
++#else
+ 			ret = sel_netgrp(ap, s, sv);
++#endif
+ 			break;
+ 
+ 		default:
+-- 
+2.36.1
+

community/autofs/10-glibc.patch

-diff -Naur autofs-5.1.4-clean/daemon/Makefile autofs-5.1.4-patched/daemon/Makefile
---- autofs-5.1.4-clean/daemon/Makefile	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/daemon/Makefile	2018-06-15 20:58:25.362236144 +0300
-@@ -6,7 +6,7 @@
- include ../Makefile.rules
- 
- SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
--	lookup.c state.c flag.c
-+	state.c flag.c
- OBJS = automount.o indirect.o direct.o spawn.o module.o mount.o \
- 	lookup.o state.o flag.o
- 
-diff -Naur autofs-5.1.4-clean/daemon/automount.c autofs-5.1.4-patched/daemon/automount.c
---- autofs-5.1.4-clean/daemon/automount.c	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/daemon/automount.c	2018-06-15 20:58:25.365569508 +0300
-@@ -269,7 +269,7 @@
- 			return -1;
- 		}
- 
--		if (fs.f_type != (__SWORD_TYPE) AUTOFS_SUPER_MAGIC) {
-+		if (fs.f_type != (long int) AUTOFS_SUPER_MAGIC) {
- 			crit(ap->logopt, "attempt to remove directory from a "
- 			     "non-autofs filesystem!");
- 			crit(ap->logopt,
-diff -Naur autofs-5.1.4-clean/daemon/lookup.c autofs-5.1.4-patched/daemon/lookup.c
---- autofs-5.1.4-clean/daemon/lookup.c	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/daemon/lookup.c	2018-06-15 20:58:25.368902873 +0300
-@@ -382,7 +382,7 @@
- 	if (!S_ISREG(st.st_mode))
- 		return NSS_STATUS_NOTFOUND;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-@@ -942,7 +942,7 @@
- 	if (!S_ISREG(st.st_mode))
- 		return NSS_STATUS_NOTFOUND;
- 
--	if (st.st_mode & __S_IEXEC)
-+	if (st.st_mode & S_IEXEC)
- 		type = src_prog;
- 	else
- 		type = src_file;
-diff -Naur autofs-5.1.4-clean/include/nsswitch.h autofs-5.1.4-patched/include/nsswitch.h
---- autofs-5.1.4-clean/include/nsswitch.h	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/include/nsswitch.h	2018-06-15 20:58:25.372236237 +0300
-@@ -24,7 +24,7 @@
- #include <netdb.h>
- #include "list.h"
- 
--#define NSSWITCH_FILE _PATH_NSSWITCH_CONF
-+#define NSSWITCH_FILE "/dev/null"
- 
- enum nsswitch_status {
- 	NSS_STATUS_UNKNOWN = -1,
-diff -Naur autofs-5.1.4-clean/include/rpc_subs.h autofs-5.1.4-patched/include/rpc_subs.h
---- autofs-5.1.4-clean/include/rpc_subs.h	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/include/rpc_subs.h	2018-06-15 20:58:25.358902779 +0300
-@@ -18,7 +18,7 @@
- 
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
--#include <nfs/nfs.h>
-+#include <linux/nfs.h>
- #include <linux/nfs2.h>
- #include <linux/nfs3.h>
- 
-diff -Naur autofs-5.1.4-clean/modules/lookup_multi.c autofs-5.1.4-patched/modules/lookup_multi.c
---- autofs-5.1.4-clean/modules/lookup_multi.c	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/modules/lookup_multi.c	2018-06-15 20:58:25.372236237 +0300
-@@ -247,7 +247,7 @@
- 				continue;
- 			}
- 
--			if (st.st_mode & __S_IEXEC)
-+			if (st.st_mode & S_IEXEC)
- 				type = src_prog;
- 			else
- 				type = src_file;
-@@ -452,7 +452,7 @@
- 					continue;
- 				}
- 
--				if (st.st_mode & __S_IEXEC)
-+				if (st.st_mode & S_IEXEC)
- 					type = src_prog;
- 				else
- 					type = src_file;
-diff -Naur autofs-5.1.4-clean/samples/auto.master autofs-5.1.4-patched/samples/auto.master
---- autofs-5.1.4-clean/samples/auto.master	2017-12-19 05:46:44.000000000 +0300
-+++ autofs-5.1.4-patched/samples/auto.master	2018-06-15 20:58:25.362236144 +0300
-@@ -4,7 +4,7 @@
- # mount-point [map-type[,format]:]map [options]
- # For details of the format look at auto.master(5).
- #
--/misc	/etc/auto.misc
-+/misc	/etc/autofs/auto.misc
- #
- # NOTE: mounts done from a hosts map will be mounted with the
- #	"nosuid" and "nodev" options unless the "suid" and "dev"
-@@ -12,14 +12,14 @@
- #
- /net	-hosts
- #
--# Include /etc/auto.master.d/*.autofs
-+# Include /etc/autofs/auto.master.d/*.autofs
- # To add an extra map using this mechanism you will need to add
- # two configuration items - one /etc/auto.master.d/extra.autofs file
- # (using the same line format as the auto.master file)
- # and a separate mount map (e.g. /etc/auto.extra or an auto.extra NIS map)
- # that is referred to by the extra.autofs file.
- #
--+dir:/etc/auto.master.d
-++dir:/etc/autofs/auto.master.d
- #
- # If you have fedfs set up and the related binaries, either
- # built as part of autofs or installed from another package,
-

community/autofs/APKBUILD

 # Contributor: Alex Laskin <alex@lask.in>
 # Maintainer: Alex Laskin <alex@lask.in>
 pkgname=autofs
-pkgver=5.1.6
-pkgrel=1
+pkgver=5.1.8
+pkgrel=0
 pkgdesc="A kernel-based automounter for Linux"
 url="https://www.kernel.org/pub/linux/daemons/autofs/"
 arch="all"
 license="GPL-2.0-or-later"
-makedepends="linux-headers automake flex bison rpcgen libtirpc-dev libnfs-dev coreutils"
+makedepends="
+	automake
+	bison
+	coreutils
+	flex
+	libnfs-dev
+	libtirpc-dev
+	linux-headers
+	rpcgen
+	"
 subpackages="$pkgname-doc $pkgname-openrc"
 options="!check" # no test suite provided
 source="
 	https://www.kernel.org/pub/linux/daemons/$pkgname/v5/$pkgname-$pkgver.tar.xz
 	autofs.initd
 	autofs.confd
-	pid_t.patch
-	10-glibc.patch
+	0001-auto.master-change-paths-in-etc.patch
+	0002-musl-backport-fixes.patch
 	"
 
 prepare() {
@@ -55,8 +64,10 @@ package() {
 	rm -f "$pkgdir"/usr/share/man/man5/autofs.5
 }
 
-sha512sums="dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2  autofs-5.1.6.tar.xz
+sha512sums="
+6ee6283c0977c82848a654dc24745ee687f6916de441c3688fa91f67ca7295e632ee3808cc2358984a4b9f19841e6e1a91ab48aad6341ac8e63827fe8c32d223  autofs-5.1.8.tar.xz
 e7ffe40cf5f302f7de7cc59752699adad4be89fa78fa1a79c32ce4059ec2f563c0f107ca2cec850cabfb1cdebca5ff1f369167479423ab6cfe509225a799a00e  autofs.initd
 74884b94d8c5dc72579c9c0c9f13c8918ee0babe6fc1e6352bb79cfaf6f5ce3daa87a9b2ea2f34a4600c93a971b329aa0892785fe2efd42829fb7953a6130dd7  autofs.confd
-78dfd13e06a7adec4336b18a03a1c0bd9d651ce01bf5e716a75d5574e033db9c3fff3baf660c4a6ad757403db5242a7abecf68cdb4cc9bb4d005992b6fe44ca6  pid_t.patch
-0de8adc821fa59a9c5392ea5e4a3b540a39f38b8bb2ddde8d20ca4946e3d1467c80bb375d918a11e2331281e220da56e66c2aa1e974b9e6e40c7d3a3b4cdac5e  10-glibc.patch"
+562607fb77347680740a73242390cd199595779acd96033b7b9b4579ef57e8fc887bbcee227964ffeda1710798becd58e957e28c4dd875f2402c9d3989a04aef  0001-auto.master-change-paths-in-etc.patch
+e928f89147d29374b1daa97331a2aca858a2ac6de3f91e041806ebbc12ddc861d801921e20d3da3968f154bfbf916456c0cb98ac430b9dd515159436eb135f39  0002-musl-backport-fixes.patch
+"

community/autofs/pid_t.patch

-diff --git a/include/log.h b/include/log.h
-index 69eed96..14051cc 100644
---- a/include/log.h
-+++ b/include/log.h
-@@ -46,6 +46,8 @@ extern void log_crit(unsigned, const char* msg, ...);
- extern void log_debug(unsigned int, const char* msg, ...);
- extern void logmsg(const char* msg, ...);
- 
-+#include <unistd.h> /* Required for pid_t */
-+
- extern pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label);
- 
- #define debug(opt, msg, args...)	\
-

community/kiln/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Stacy Harper <contact@stacyharper.net>
 pkgname=kiln
 pkgver=0.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple static site generator for Gemini sites"
 url="https://git.sr.ht/~adnano/kiln"
 arch="all"
@@ -15,16 +15,16 @@ source="
 	"
 
 build() {
-	go build -v -o bin/$pkgname --tags extended
-	make docs
+	make VERSION=$pkgver
 }
 
 package() {
-	install -Dm755 "$builddir"/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 "$builddir"/$pkgname "$pkgdir"/usr/bin/$pkgname
 	install -Dm644 "$builddir"/docs/*.1 -t "$pkgdir"/usr/share/man/man1
 
 	cp -a "$builddir"/templates "$pkgdir"/usr/share/$pkgname
 }
+
 sha512sums="
 375b1e161a78c807619459c296945530381b900c49d446291f9152c840c080bed111c7b008414ffe151a41d8c6ca5b9cccc2009abc2dce043ad436aaea412ce6  kiln-0.3.0.tar.gz
 "

community/libcouchbase/APKBUILD

 # Contributor: Nathan Johnson <nathan@nathanjohnson.info>
 # Maintainer: Nathan Johnson <nathan@nathanjohnson.info>
 pkgname=libcouchbase
-pkgver=3.2.5
+pkgver=3.3.0
 pkgrel=0
 pkgdesc="C client library for Couchbase"
 url="https://developer.couchbase.com/community"
@@ -74,7 +74,7 @@ utils() {
 }
 
 sha512sums="
-9dc1fda01a53c9b2261d7e2a84534aedefaad478c412421f282d2ae307cfa8fd509d32a8ddeaadd1c86b1f0a84c3c46af620659055d4f20cff6b5f8b68b9a447  libcouchbase-3.2.5.tar.gz
+c2e7b51a2a211776e729d1b97388b4bbd10711d651650489b142af7a5778a1b78170dcca20ec631651a5b2907e87a4b351091242dcf6573db9012b64d5b7375f  libcouchbase-3.3.0.tar.gz
 270123c57e6e760721ad337db154b8d90bddb81e38c644b854a36e2383fe95f3214227943e7040aa409d5d5ab101681369000054e4738c2a2d1facd0eee923e3  fix_libdir.patch
 72319b86fdd91728723ccb091e72199788a84e2ec9ea12c0fcd1ed686eb155ec11e0addbff96735f83e7f31764a85650f0483b6e76d3a8bee16f71b2751fe4a9  fix_socktest.patch
 "

community/mpd/APKBUILD

@@ -4,12 +4,12 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=mpd
-pkgver=0.23.6
+pkgver=0.23.7
 case $pkgver in
 *.*.*) _branch=${pkgver%.*};;
 *.*) _branch=$pkgver;;
 esac
-pkgrel=3
+pkgrel=0
 pkgdesc="Music daemon that plays MP3, FLAC, Ogg Vorbis files and Audio CDs"
 url="https://musicpd.org/"
 pkgusers="mpd"
@@ -120,7 +120,7 @@ package() {
 }
 
 sha512sums="
-1595fcc53a67f1a68b0c0516697d242da53b91626e37bc2f49095add78eb497a52c67c961a421f20b40f3c57a571557a76559a212838de2a3ec4aec6c7a3288d  mpd-0.23.6.tar.xz
+2a6b3eb2c8b61a22861ae75fe2f62c8ec6cd391f029438577127e309b910e99d7b735e40afae96d52ed4f161195a0ce7cb89cc51ad45df5a18e04736c16ce3a6  mpd-0.23.7.tar.xz
 f60f6f3e921d20732c1a4c31a97f28660b43fd649e767d6c39661b6a90145231a79ad3f740ae0d706380b245ad040e98b661a513463c54cea161d1f64fc261e0  stacksize.patch
 8547f685adf3cdc7b2aab7bedeed8c72242011c6f1e01750415ac21eba5ecf6b416239f527adbc904f72439c5d476249148cfb89965e33de1be69421e02c18e0  mpd.initd
 41b2467f5b03f5c4dd7003cd5f56f6cfc1f67af7a9aa2538d70360f839625222bdd0c4b04c33e8cd52eeecfc354da3ca22f5aaab8aee357a5774aaf3503594e7  mpd.confd

testing/mqttui/APKBUILD → community/mqttui/APKBUILD

@@ -2,31 +2,47 @@
 # Maintainer: guddaff <guddaff@protonmail.com>
 pkgname=mqttui
 pkgver=0.16.2
-pkgrel=1
-pkgdesc="mqtt tui tool"
+pkgrel=2
+pkgdesc="Subscribe to a MQTT Topic or publish something quickly from the terminal"
 url="https://github.com/EdJoPaTo/mqttui"
-arch="all !s390x !riscv64 !ppc64le"
-# s390x and riscv64 limeted by cargo/rust
-# ppc64le blocked by ring
+# ppc64le: blocked by ring
+# riscv64, s390x: blocked by cargo/rust
+arch="all !ppc64le !riscv64 !s390x"
 license="GPL-3.0-or-later"
 makedepends="cargo"
-subpackages="$pkgname-bash-completion $pkgname-zsh-completion $pkgname-fish-completion"
-source="$pkgname-$pkgver.tar.gz::https://github.com/EdJoPaTo/mqttui/archive/refs/tags/v$pkgver.tar.gz"
+subpackages="
+	$pkgname-bash-completion
+	$pkgname-fish-completion
+	$pkgname-zsh-completion
+	"
+source="https://github.com/EdJoPaTo/mqttui/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
+
+export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
+export CARGO_PROFILE_RELEASE_LTO="true"
+export CARGO_PROFILE_RELEASE_OPT_LEVEL="s"
+export CARGO_PROFILE_RELEASE_PANIC="abort"
+
+prepare() {
+	default_prepare
+
+	cargo fetch --locked
+}
 
 build() {
-	cargo build --release --locked
+	cargo build --release --frozen
 }
 
 check() {
-	cargo test --release --locked
+	cargo test --frozen
 }
 
 package() {
 	cargo install --locked --path . --root="$pkgdir/usr"
 	rm "$pkgdir"/usr/.crates*
-	install -Dm644 "target/completions/$pkgname.bash" "$pkgdir/usr/share/bash-completion/completions/$pkgname.bash"
-	install -Dm644 "target/completions/$pkgname.fish" "$pkgdir/usr/share/fish/completions/$pkgname.fish"
-	install -Dm644 "target/completions/_$pkgname" "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
+
+	install -Dm644 "target/completions/$pkgname.bash" "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+	install -Dm644 "target/completions/$pkgname.fish" -t "$pkgdir"/usr/share/fish/completions/
+	install -Dm644 "target/completions/_$pkgname" -t "$pkgdir"/usr/share/zsh/site-functions/
 }
 
 sha512sums="

community/starship/APKBUILD

 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=starship
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.6.3
+pkgrel=0
 pkgdesc="Minimal, blazing-fast and infinitely customizable prompt for any shell"
 url="https://starship.rs"
 arch="x86_64 armv7 armhf aarch64 x86 ppc64le"  # limited by rust/cargo
@@ -27,7 +27,7 @@ source="https://github.com/starship/starship/archive/v$pkgver/$pkgname-$pkgver.t
 	"
 
 # http feature is used just for reporting bugs
-_cargo_opts="--frozen --no-default-features"
+_cargo_opts="--frozen --no-default-features --features notify"
 
 prepare() {
 	default_prepare
@@ -70,8 +70,8 @@ _zsh_plugin() {
 }
 
 sha512sums="
-3a75264bd6ac3f27eaa6ea00dd9e3a2f67ef47aba05701c99875950e19a860378f3d09b3c2ba0b48f350a0adfc0b0399b5759ffe675fcf177f2d168abd2931f8  starship-1.4.2.tar.gz
-de77384c939a36914f5c7ddb4859d1d9daafd243839703b8486443cfb54ca3b411f7aaa6cc2132daf877e45823c7e90401a01297b89121ae17c8c41991376e14  use-libdbus.patch
-dccc7bd2ad22a7caffafd2eaecc61d5b6e5d9c35a13fe644d16a9a975430562217619ca373868ef191de11dd1eef126d50470f9ccec8e8f92e98d90f31405650  minimize-size.patch
+1479764a7723460047d759dc7dab9632d80ff24ac800c43af415e02dbe551def4c0e060781dfbd25e2fba511f3d2e4e519c3b1b685d85ffb7bc8c53e9a5f1bd3  starship-1.6.3.tar.gz
+18c106d89247071eb7a9772bd48cc0d684c1bfceaebc0fb33dec4deb08d70df60e9b43df6212f4150c3ee82716181bc92dc7efff9260773e1cabb0776a0ccf48  use-libdbus.patch
+cc30cf72c8657b08efdbd299300dc5fc529a2c0899ef96a75e432ee50100c1c8c8f9692587409091bfa218d964dd4f4f07d950fa0d947649f9f8e72042b8712b  minimize-size.patch
 384a3b84b103005d347ef76c9a61f8c5e21cc97f17f195cff157f71f42dbd76fd6f54f93715cbebbee2eab70a275e39917334721fa21d130bd715a7b6334418b  starship.plugin.zsh
 "

community/starship/minimize-size.patch

@@ -2,7 +2,7 @@ Minimize size of the resulting binary.
 
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -88,6 +88,8 @@
+@@ -111,6 +111,8 @@
  [profile.release]
  codegen-units = 1
  lto = true

community/starship/use-libdbus.patch

@@ -2,6 +2,12 @@ Link with system libdbus instead of zbus-rs (Rust implementation).
 
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -45,1 +45,1 @@
--notify-rust = "4.5.6"
-+notify-rust = { version = "4.5.6", default-features = false, features = ["d"] }
+@@ -50,7 +50,7 @@
+ log = { version = "0.4.16", features = ["std"] }
+ # nofity-rust is optional (on by default) because the crate doesn't currently build for darwin with nix
+ # see: https://github.com/NixOS/nixpkgs/issues/160876
+-notify-rust = { version = "4.5.8", optional = true }
++notify-rust = { version = "4.5.8", default-features = false, features = ["d"], optional = true }
+ once_cell = "1.10.0"
+ open = "2.1.1"
+ os_info = "3.2.0"

testing/cimg/APKBUILD

 # Contributor: Grigory Kirillov <txgk@bk.ru>
 # Maintainer: Grigory Kirillov <txgk@bk.ru>
 pkgname=cimg
-pkgver=3.1.1
+pkgver=3.1.2
 pkgrel=0
 pkgdesc="Small C++ toolkit for image processing"
 url="http://cimg.eu"
@@ -19,5 +19,5 @@ package() {
 }
 
 sha512sums="
-b5e060c5780841dc752e6849fd3224253e6380f5d952ab323b37e2768b10fda5a8203a3d2d51c6e3154213b3e66f384815b7c7e1dcdfa6de58ffccc58af313b3  CImg-v.3.1.1.tar.gz
+925283ceb2da51d0622d1e7d2655c914cc68483e5f26f85a4a6ba30fb6601ebabf1ec2494042df7315f28349815748b7529e16db04baeb2fe7654ea2ec976aca  CImg-v.3.1.2.tar.gz
 "