Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2024-06-07 15:02:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autofs" Fri Jun 7 15:02:29 2024 rev:135 rq:1179026 version:5.1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2024-05-07 18:02:52.829365347 +0200 +++ /work/SRC/openSUSE:Factory/.autofs.new.24587/autofs.changes 2024-06-07 15:02:46.278471206 +0200 @@ -1,0 +2,9 @@ +Mon Jun 3 02:21:09 UTC 2024 - David Disseldorp <ddiss@suse.com> + +- Fix xmlStructuredErrorFunc callback parameter type (bsc#1221682) + * Refresh autofs-5.1.1-dbus-udisks-monitor.patch +- Use upstream sasl_callback_t patch + * Remove autofs-5.1.9-cast-sasl_callback_t-function-pointers.patch + * Add autofs-5.1.9-Fix-incompatible-function-pointer-types.patch + +------------------------------------------------------------------- Old: ---- autofs-5.1.9-cast-sasl_callback_t-function-pointers.patch New: ---- autofs-5.1.9-Fix-incompatible-function-pointer-types.patch BETA DEBUG BEGIN: Old:- Use upstream sasl_callback_t patch * Remove autofs-5.1.9-cast-sasl_callback_t-function-pointers.patch * Add autofs-5.1.9-Fix-incompatible-function-pointer-types.patch BETA DEBUG END: BETA DEBUG BEGIN: New: * Remove autofs-5.1.9-cast-sasl_callback_t-function-pointers.patch * Add autofs-5.1.9-Fix-incompatible-function-pointer-types.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.oyrro6/_old 2024-06-07 15:02:47.050499331 +0200 +++ /var/tmp/diff_new_pack.oyrro6/_new 2024-06-07 15:02:47.050499331 +0200 @@ -61,7 +61,7 @@ Patch108: autofs-suse-manpage-remove-initdir.patch # bsc#1221682 - GCC 14: autofs package fails Patch109: autofs-5.1.9-fix-ldap_parse_page_control-check.patch -Patch110: autofs-5.1.9-cast-sasl_callback_t-function-pointers.patch +Patch110: autofs-5.1.9-Fix-incompatible-function-pointer-types.patch BuildRequires: autoconf BuildRequires: bison BuildRequires: cyrus-sasl-devel ++++++ autofs-5.1.1-dbus-udisks-monitor.patch ++++++ --- /var/tmp/diff_new_pack.oyrro6/_old 2024-06-07 15:02:47.110501517 +0200 +++ /var/tmp/diff_new_pack.oyrro6/_new 2024-06-07 15:02:47.110501517 +0200 @@ -1,5 +1,6 @@ ddiss: rebase atop 37fda2c ("autofs-5.1.8 - add soucre parameter to module functions") + Fix xmlStructuredErrorFunc callback parameter type (bsc#1221682) --- Makefile.conf.in | 3 @@ -1970,7 +1971,7 @@ +} + +#ifdef LIBXML_TREE_ENABLED -+static void xmlerror(void *context, xmlErrorPtr err) ++static void xmlerror(void *context, const xmlError *err) +{ + struct lookup_context *ctxt = (struct lookup_context*)context; + char *message = err->message; ++++++ autofs-5.1.9-Fix-incompatible-function-pointer-types.patch ++++++ From b7ff971bb8aa3fc609bb531ddc4c2ce56226383f 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> Reviewed-by: David Disseldorp <ddiss@suse.de> --- 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.35.3