Skip to contentSkip to conversation

cyrus-sasl: fix error with gcc-15

PATCH New [email protected] 1 participant 1 message Apr 9, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cyrus-sasl: fix error with gcc-15

From: "mark.yang" <[email protected]>

* Submitted 2 Patches:
- 0001-configure-prototypes.patch
- 0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch
* Backported 1 Patch:
- 0003-Add-compatibility-for-gcc-15-869.patch

* To fix the error with gcc-15.
http://errors.yoctoproject.org/Errors/Details/851188/

---
 .../0001-configure-prototypes.patch           |  39 ++
 ...ible-pointer-types-error-with-gcc-15.patch | 122 ++++
 ...003-Add-compatibility-for-gcc-15-869.patch | 530 ++++++++++++++++++
 .../cyrus-sasl/cyrus-sasl_2.1.28.bb           |  24 +-
 4 files changed, 705 insertions(+), 10 deletions(-)
 create mode 100644 meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-configure-prototypes.patch
 create mode 100644 meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch
 create mode 100644 meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0003-Add-compatibility-for-gcc-15-869.patch
meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0001-configure-prototypes.patch new file +39 -0
new file mode 100644
index 0000000000..e1b7c6e8d5
@@ -0,0 +1,39 @@
+From 3982a8925e15ea16df49891a700e7f9d9a10541c Mon Sep 17 00:00:00 2001
+From: "mark.yang" <[email protected]>
+Date: Wed, 9 Apr 2025 11:46:36 +0900
+Subject: [PATCH 1/3] configure prototypes
+
+  * Set to use function prototypes for ANSI_C
+  If PROTOTYPES is set in md5global.h, it uses PROTO_LIST(list) list instead of PROTO_LIST(list) ()
+  to provide parameterized prototyping.
+  Therefore, at the configure.ac stage, when using ANSI_C, PROTOTYPES should be defined.
+
+  * to fix the build error with gcc-15
+    Even though I added this configuration to fix the error, the error shown in the following patch still occurs.
+../../git/lib/md5.c:139:8: error: too many arguments to function 'MD5_memcpy'; expected 0, have 3
+  139 |        MD5_memcpy
+      |        ^~~~~~~~~~
+  140 |        ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform
+      |         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+../../git/lib/md5.c:62:13: note: declared here
+   62 | static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
+      |             ^~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/cyrusimap/cyrus-sasl/pull/873]
+Signed-off-by: mark.yang <[email protected]>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 2a0cf878..657e178b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,6 +88,7 @@ AC_ARG_ENABLE(obsolete_digest_attr,
+               enable_obsolete_digest_attr=yes)
+ 
+ AC_PROG_CC
++AC_C_PROTOTYPES
+ AX_PROG_CC_FOR_BUILD
+ AC_PROG_CPP
+ AC_PROG_AWK
meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch new file +122 -0

122 lines not on this page · raw message

meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl/0003-Add-compatibility-for-gcc-15-869.patch new file +530 -0

530 lines not on this page · raw message

meta-oe/recipes-networking/cyrus-sasl/cyrus-sasl_2.1.28.bb +14 -10
index 1f4b4bf732..40e51a6a43 100644
@@ -7,16 +7,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396"
 
 SRCREV = "7a6b45b177070198fed0682bea5fa87c18abb084"
 
-SRC_URI = "git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=cyrus-sasl-2.1 \
-           file://avoid-to-call-AC_TRY_RUN.patch \
-           file://debian_patches_0014_avoid_pic_overwrite.diff \
-           file://0001-sample-Rename-dprintf-to-cyrus_dprintf.patch \
-           file://saslauthd.service \
-           file://saslauthd.conf \
-           file://CVE-2019-19906.patch \
-	   file://CVE-2022-24407.patch \
-           file://0001-Fix-time.h-check.patch \
-           "
+SRC_URI = " \
+    git://github.com/cyrusimap/cyrus-sasl;protocol=https;branch=cyrus-sasl-2.1 \
+    file://avoid-to-call-AC_TRY_RUN.patch \
+    file://debian_patches_0014_avoid_pic_overwrite.diff \
+    file://0001-sample-Rename-dprintf-to-cyrus_dprintf.patch \
+    file://saslauthd.service \
+    file://saslauthd.conf \
+    file://CVE-2019-19906.patch \
+    file://CVE-2022-24407.patch \
+    file://0001-Fix-time.h-check.patch \
+    file://0001-configure-prototypes.patch \
+    file://0002-Fix-incompatible-pointer-types-error-with-gcc-15.patch \
+    file://0003-Add-compatibility-for-gcc-15-869.patch \
+"
 
 UPSTREAM_CHECK_URI = "https://github.com/cyrusimap/cyrus-sasl/archives"