From c6e55fa98b0ca5495b67baa2ac721db68df96dab03ea4e27b4db0f4881638f6c Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Tue, 7 May 2024 08:43:13 +0000 Subject: [PATCH] - GCC 14: cyrus-sasl package fails (bsc#1221863) Apply upstream patch: 0001-Fix-time.h-check.patch - GCC 14: cyrus-sasl package fails (bsc#1221863) Apply upstream patch: 0001-Fix-time.h-check.patch - GCC 14: cyrus-sasl package fails (bsc#1221863) Apply upstream patch: 0001-Fix-time.h-check.patch - GCC 14: cyrus-sasl package fails (bsc#1221863) Apply upstream patch: 0001-Fix-time.h-check.patch OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=108 --- 0001-Fix-time.h-check.patch | 60 ++++++++++++++++++++++++++++++++ cyrus-sasl-bdb.changes | 7 ++++ cyrus-sasl-bdb.spec | 6 ++-- cyrus-sasl-saslauthd-bdb.changes | 7 ++++ cyrus-sasl-saslauthd-bdb.spec | 6 ++-- cyrus-sasl-saslauthd.changes | 7 ++++ cyrus-sasl-saslauthd.spec | 6 ++-- cyrus-sasl.changes | 7 ++++ cyrus-sasl.spec | 4 ++- 9 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 0001-Fix-time.h-check.patch diff --git a/0001-Fix-time.h-check.patch b/0001-Fix-time.h-check.patch new file mode 100644 index 0000000..0dce629 --- /dev/null +++ b/0001-Fix-time.h-check.patch @@ -0,0 +1,60 @@ +From 266f0acf7f5e029afbb3e263437039e50cd6c262 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 23 Feb 2022 00:45:15 +0000 +Subject: [PATCH 1/1] Fix check +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We're conditionally including based on HAVE_TIME_H in a bunch of places, +but we're not actually checking for time.h, so that's never going to be defined. + +While at it, add in a missing include in the cram plugin. + +This fixes a bunch of implicit declaration warnings: +``` + * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] + * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration] + * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] + * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] + * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of function ‘clock’ [-Wimplicit-function-declaration] + * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of function ‘time’ [-Wimplicit-function-declaration] +``` + +Signed-off-by: Sam James +--- + configure.ac | 2 +- + plugins/cram.c | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index e1bf53b6..ad781830 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h]) + + AC_HEADER_DIRENT + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h) ++AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h krb5.h) + + IPv6_CHECK_SS_FAMILY() + IPv6_CHECK_SA_LEN() +diff --git a/plugins/cram.c b/plugins/cram.c +index d02e9baa..695aaa91 100644 +--- a/plugins/cram.c ++++ b/plugins/cram.c +@@ -53,6 +53,10 @@ + #endif + #include + ++#ifdef HAVE_TIME_H ++#include ++#endif ++ + #include + #include + #include +-- +2.35.3 + diff --git a/cyrus-sasl-bdb.changes b/cyrus-sasl-bdb.changes index 34a4410..051ab5c 100644 --- a/cyrus-sasl-bdb.changes +++ b/cyrus-sasl-bdb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 08:26:51 UTC 2024 - Peter Varkoly + +- GCC 14: cyrus-sasl package fails (bsc#1221863) + Apply upstream patch: + 0001-Fix-time.h-check.patch + ------------------------------------------------------------------- Mon Feb 26 10:50:23 UTC 2024 - Dominique Leuenberger diff --git a/cyrus-sasl-bdb.spec b/cyrus-sasl-bdb.spec index f8ce2e1..4c99b6b 100644 --- a/cyrus-sasl-bdb.spec +++ b/cyrus-sasl-bdb.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-bdb # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: cyrus-sasl-bdb %define lname libsasl2-3 -Version: 2.1.28 +Version: 2.1.28 Release: 0 URL: https://github.com/cyrusimap/cyrus-sasl Summary: Implementation of Cyrus SASL API @@ -32,6 +32,7 @@ Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff +Patch8: 0001-Fix-time.h-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsasl2-3 BuildRequires: db-devel @@ -165,6 +166,7 @@ fi %patch -P 5 -p1 %patch -P 6 -p1 %patch -P 7 -p1 +%patch -P 8 -p1 %build find . -name "*.cvsignore" -exec rm -fv "{}" "+" diff --git a/cyrus-sasl-saslauthd-bdb.changes b/cyrus-sasl-saslauthd-bdb.changes index 34a4410..051ab5c 100644 --- a/cyrus-sasl-saslauthd-bdb.changes +++ b/cyrus-sasl-saslauthd-bdb.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 08:26:51 UTC 2024 - Peter Varkoly + +- GCC 14: cyrus-sasl package fails (bsc#1221863) + Apply upstream patch: + 0001-Fix-time.h-check.patch + ------------------------------------------------------------------- Mon Feb 26 10:50:23 UTC 2024 - Dominique Leuenberger diff --git a/cyrus-sasl-saslauthd-bdb.spec b/cyrus-sasl-saslauthd-bdb.spec index 02e9278..1872fb4 100644 --- a/cyrus-sasl-saslauthd-bdb.spec +++ b/cyrus-sasl-saslauthd-bdb.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-saslauthd-bdb # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: cyrus-sasl-saslauthd-bdb -Version: 2.1.28 +Version: 2.1.28 Release: 0 Summary: The SASL Authentication Server License: BSD-4-Clause @@ -37,6 +37,7 @@ Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff +Patch8: 0001-Fix-time.h-check.patch PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel @@ -79,6 +80,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %patch -P 5 -p1 %patch -P 6 -p1 %patch -P 7 -p1 +%patch -P 8 -p1 %build find . -name "*.cvsignore" -exec rm -fv "{}" "+" diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 34a4410..051ab5c 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 08:26:51 UTC 2024 - Peter Varkoly + +- GCC 14: cyrus-sasl package fails (bsc#1221863) + Apply upstream patch: + 0001-Fix-time.h-check.patch + ------------------------------------------------------------------- Mon Feb 26 10:50:23 UTC 2024 - Dominique Leuenberger diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 7627d11..ea73053 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl-saslauthd # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ %endif Name: cyrus-sasl-saslauthd -Version: 2.1.28 +Version: 2.1.28 Release: 0 Summary: The SASL Authentication Server License: BSD-4-Clause @@ -37,6 +37,7 @@ Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff +Patch8: 0001-Fix-time.h-check.patch PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gdbm-devel @@ -79,6 +80,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %patch -P 5 -p1 %patch -P 6 -p1 %patch -P 7 -p1 +%patch -P 8 -p1 %build find . -name "*.cvsignore" -exec rm -fv "{}" "+" diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index 34a4410..051ab5c 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 7 08:26:51 UTC 2024 - Peter Varkoly + +- GCC 14: cyrus-sasl package fails (bsc#1221863) + Apply upstream patch: + 0001-Fix-time.h-check.patch + ------------------------------------------------------------------- Mon Feb 26 10:50:23 UTC 2024 - Dominique Leuenberger diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec index 22d7492..c5125d9 100644 --- a/cyrus-sasl.spec +++ b/cyrus-sasl.spec @@ -1,7 +1,7 @@ # # spec file for package cyrus-sasl # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff +Patch8: 0001-Fix-time.h-check.patch BuildRequires: gdbm-devel BuildRequires: krb5-mini-devel BuildRequires: libtool @@ -173,6 +174,7 @@ fi %patch -P 5 -p1 %patch -P 6 -p1 %patch -P 7 -p1 +%patch -P 8 -p1 %build find . -name "*.cvsignore" -exec rm -fv "{}" "+"