Control: tags 1078408 + pending

Dear maintainer,

I've prepared an NMU for autofs (versioned as 5.1.9-1.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards,
Salvatore
diff -Nru autofs-5.1.9/debian/changelog autofs-5.1.9/debian/changelog
--- autofs-5.1.9/debian/changelog	2024-03-10 13:06:17.000000000 +0100
+++ autofs-5.1.9/debian/changelog	2024-09-11 20:56:38.000000000 +0200
@@ -1,3 +1,11 @@
+autofs (5.1.9-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix incompatible function pointer types in cyrus-sasl module (Closes:
+    #1078408)
+
+ -- Salvatore Bonaccorso <car...@debian.org>  Wed, 11 Sep 2024 20:56:38 +0200
+
 autofs (5.1.9-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru autofs-5.1.9/debian/patches/autofs-5.1.9-Fix-incompatible-function-pointer-types.patch autofs-5.1.9/debian/patches/autofs-5.1.9-Fix-incompatible-function-pointer-types.patch
--- autofs-5.1.9/debian/patches/autofs-5.1.9-Fix-incompatible-function-pointer-types.patch	1970-01-01 01:00:00.000000000 +0100
+++ autofs-5.1.9/debian/patches/autofs-5.1.9-Fix-incompatible-function-pointer-types.patch	2024-09-11 20:56:38.000000000 +0200
@@ -0,0 +1,49 @@
+From: Florian Weimer <fwei...@redhat.com>
+Date: Mon, 18 Dec 2023 13:48:18 +0100
+Subject: autofs-5.1.9 - Fix incompatible function pointer types in cyrus-sasl
+ module
+Origin: https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit?id=b7ff971bb8aa3fc609bb531ddc4c2ce56226383f
+Bug-Debian: https://bugs.debian.org/1078408
+
+Add casts to SASL callbacks to avoid incompatible-pointer-types
+errors.  Avoids a build failure with stricter compilers.
+
+Signed-off-by: Florian Weimer <fwei...@redhat.com>
+Signed-off-by: Ian Kent <ra...@themaw.net>
+---
+ CHANGELOG            |  2 ++
+ modules/cyrus-sasl.c | 14 +++++++-------
+ 2 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c
+index e742eaf8ebe6..78b77942ba3e 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.45.2
+
diff -Nru autofs-5.1.9/debian/patches/series autofs-5.1.9/debian/patches/series
--- autofs-5.1.9/debian/patches/series	2024-02-11 18:45:01.000000000 +0100
+++ autofs-5.1.9/debian/patches/series	2024-09-11 20:56:38.000000000 +0200
@@ -11,3 +11,4 @@
 spelling-error-fixes.patch
 fix-lookup-ldap-crash.patch
 fix-nfs4-mounts-in-auto-net.patch
+autofs-5.1.9-Fix-incompatible-function-pointer-types.patch

Reply via email to