Sync from SUSE:SLFO:Main libheimdal revision 2dff78f856f9b21b9663f24381ba54cc

This commit is contained in:
Adrian Schröter 2024-10-03 17:29:15 +02:00
parent 0516860784
commit b773211579
3 changed files with 30 additions and 1 deletions

23
1229.patch Normal file
View File

@ -0,0 +1,23 @@
From 2b372170c894ed9aa3fe2fca976f3541ea7041d9 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Sat, 10 Feb 2024 09:33:48 +0100
Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72
Fixes https://github.com/heimdal/heimdal/issues/1201
---
cf/largefile.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cf/largefile.m4 b/cf/largefile.m4
index 5c54897be4..cdbbc55431 100644
--- a/cf/largefile.m4
+++ b/cf/largefile.m4
@@ -10,7 +10,7 @@ dnl with generated code, such as lex
if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
fi
-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then
+if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then
CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
fi
])

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 22 08:01:11 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 1229.patch: Fix build with autoconf-2.72.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 6 13:26:58 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org> Thu Apr 6 13:26:58 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -1,7 +1,7 @@
# #
# spec file for package libheimdal # spec file for package libheimdal
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,7 @@ Patch0: heimdal-patched.diff
Patch1: reproducible.patch Patch1: reproducible.patch
# PATCH-FIX-UPSTREAM https://www.openwall.com/lists/oss-security/2023/02/08/1 # PATCH-FIX-UPSTREAM https://www.openwall.com/lists/oss-security/2023/02/08/1
Patch2: heimdal-CVE-2022-45142.patch Patch2: heimdal-CVE-2022-45142.patch
Patch3: https://patch-diff.githubusercontent.com/raw/heimdal/heimdal/pull/1229.patch
BuildRequires: automake >= 1.11 BuildRequires: automake >= 1.11
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel >= 4.8 BuildRequires: db-devel >= 4.8