From 2632d3e217e6b2d79c6541919996c75f696998ee Mon Sep 17 00:00:00 2001 From: ghpzin Date: Wed, 1 Oct 2025 15:11:10 +0300 Subject: [PATCH] cyrus_sasl: fix build with gcc15 - add patch from fedora that combines merged upstream PR: https://www.github.com/cyrusimap/cyrus-sasl/pull/869 with extra fixes for md5 that was removed upstream on master: https://www.github.com/cyrusimap/cyrus-sasl/pull/789 Fixes build failure with gcc15: ``` 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 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ md5.c:62:13: note: declared here 62 | static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int)); | ^~~~~~~~~~ md5.c:140:69: error: too many arguments to function 'MD5Transform'; expected 0, have 2 140 | ((POINTER)&context->buffer[index], (POINTER)input, partLen); MD5Transform | ^~~~~~~~~~~~ 141 | (context->state, context->buffer); | ~~~~~~~~~~~~~~ md5.c:57:13: note: declared here 57 | static void MD5Transform PROTO_LIST ((UINT4 [4], const unsigned char [64])); | ^~~~~~~~~~~~ ``` --- pkgs/by-name/cy/cyrus_sasl/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/cy/cyrus_sasl/package.nix b/pkgs/by-name/cy/cyrus_sasl/package.nix index c6dc04e136f3..bb2ea8c196ac 100644 --- a/pkgs/by-name/cy/cyrus_sasl/package.nix +++ b/pkgs/by-name/cy/cyrus_sasl/package.nix @@ -39,6 +39,11 @@ stdenv.mkDerivation rec { url = "https://github.com/cyrusimap/cyrus-sasl/compare/cb549ef71c5bb646fe583697ebdcaba93267a237...dfaa62392e7caecc6ecf0097b4d73738ec4fc0a8.patch"; hash = "sha256-pc0cZqj1QoxDqgd/j/5q3vWONEPrTm4Pr6MzHlfjRCc="; }) + # Fix build with gcc15 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/cyrus-sasl/raw/388b80c6a8f93667587b4ac2e7992d0aa1c431f9/f/cyrus-sasl-2.1.28-gcc15.patch"; + hash = "sha256-AfSQXFtVh0IHG8Uw9nWMWlkQnyaX3ZMsdZLd7hTru7Q="; + }) ]; outputs = [