autofs: upgrade 5.1.9 -> 5.2.0

Drop 0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch,
included in this release, and refresh
0006-Do-not-hardcode-path-for-pkg.m4.patch.

AI-Generated: Uses Claude Code
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Khem Raj committed 2026-11-11 22:46:05 -08:00
1 parent b9263d0be3
commit 841f3531ce
3 files changed
+3 -71

No files matched your search

@@ -14,11 +14,11 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 1bb1a52..4cebbd2 100644
index 770c885..2af3b60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl
AC_INIT(.autofs-5.1.9)
AC_INIT(.autofs-5.2.0)
# for pkg-config macros
-m4_include([/usr/share/aclocal/pkg.m4])
@@ -26,6 +26,3 @@ index 1bb1a52..4cebbd2 100644
#
# autofs installs by default in /usr
--
2.25.1
@@ -1,64 +0,0 @@
From a6a79230110e998f780796cb1d4c5d3f59f20d1d Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 18 Dec 2023 13:48:18 +0100
Subject: [PATCH] autofs-5.1.9 - Fix incompatible function pointer types in
cyrus-sasl module
Add casts to SASL callbacks to avoid incompatible-pointer-types
errors. Avoids a build failure with stricter compilers.
Signed-off-by: Florian Weimer <fweimer@redhat.com>
Signed-off-by: Ian Kent <raven@themaw.net>
Upstream-Status: Backport
[https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=b7ff971bb8aa3fc609bb531ddc4c2ce56226383f]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
CHANGELOG | 2 ++
modules/cyrus-sasl.c | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 3e47daa..fd9d861 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
+- Fix incompatible function pointer types in cyrus-sasl module.
+
02/11/2023 autofs-5.1.9
- fix kernel mount status notification.
- fix fedfs build flags.
diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
index e742eaf..78b7794 100644
--- a/modules/cyrus-sasl.c
+++ b/modules/cyrus-sasl.c
@@ -109,17 +109,17 @@ static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **);
static int getuser_func(void *, int, const char **, unsigned *);
static sasl_callback_t callbacks[] = {
- { SASL_CB_USER, &getuser_func, NULL },
- { SASL_CB_AUTHNAME, &getuser_func, NULL },
- { SASL_CB_PASS, &getpass_func, NULL },
+ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL },
+ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL },
+ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL },
{ SASL_CB_LIST_END, NULL, NULL },
};
static sasl_callback_t debug_callbacks[] = {
- { SASL_CB_LOG, &sasl_log_func, NULL },
- { SASL_CB_USER, &getuser_func, NULL },
- { SASL_CB_AUTHNAME, &getuser_func, NULL },
- { SASL_CB_PASS, &getpass_func, NULL },
+ { SASL_CB_LOG, (int(*)(void)) &sasl_log_func, NULL },
+ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL },
+ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL },
+ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL },
{ SASL_CB_LIST_END, NULL, NULL },
};
--
2.25.1
@@ -19,9 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \
file://0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch \
file://0008-include-libgen.h-for-basename.patch \
file://0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch \
file://0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch \
"
SRC_URI[sha256sum] = "46c30b763ef896f4c4a6df6d62aaaef7afc410e0b7f50d52dbfc6cf728cacd4f"
SRC_URI[sha256sum] = "966bcacb571a7000a4d2afda0db5f7af84e4ef2444f04d7fc17898f1d2409c6b"
UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/"