diff --git a/db-4.8.30.patch b/db-4.8.30.patch index 9359920..6591dea 100644 --- a/db-4.8.30.patch +++ b/db-4.8.30.patch @@ -1,7 +1,7 @@ -Index: dist/configure.ac +Index: db-4.8.30/dist/configure.ac =================================================================== ---- dist/configure.ac.orig -+++ dist/configure.ac +--- db-4.8.30.orig/dist/configure.ac ++++ db-4.8.30/dist/configure.ac @@ -852,20 +852,20 @@ LTLIBOBJS=`echo "$LIB@&t@OBJS" | AC_SUBST(LTLIBOBJS) diff --git a/libdb-4_8-sequence.patch b/libdb-4_8-sequence.patch new file mode 100644 index 0000000..e2358c5 --- /dev/null +++ b/libdb-4_8-sequence.patch @@ -0,0 +1,15 @@ +Index: db-4.8.30/dist/aclocal/sequence.m4 +=================================================================== +--- db-4.8.30.orig/dist/aclocal/sequence.m4 ++++ db-4.8.30/dist/aclocal/sequence.m4 +@@ -43,7 +43,9 @@ AC_DEFUN(AM_SEQUENCE_CONFIGURE, [ + # test, which won't test for the appropriate printf format strings. + if test "$db_cv_build_sequence" = "yes"; then + AC_TRY_RUN([ +- main() { ++ #include ++ #include ++ int main() { + $db_cv_seq_type l; + unsigned $db_cv_seq_type u; + char buf@<:@100@:>@; diff --git a/libdb-4_8.changes b/libdb-4_8.changes index a94d2ce..17f4a91 100644 --- a/libdb-4_8.changes +++ b/libdb-4_8.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 26 14:15:24 UTC 2024 - Dominique Leuenberger + +- Add libdb-4_8-sequence.patch: Fix code to detect/enable 64-bit + integral type support for sequences. The m4 macros were not + complying with GCC 14's strictness. +- Rebase db-4.8.30.patch and libdb-fix-atomic.patch to also apply + using -p1 and use the autosetup macro. + ------------------------------------------------------------------- Wed Aug 7 09:15:21 UTC 2024 - Pedro Monreal diff --git a/libdb-4_8.spec b/libdb-4_8.spec index b7a32f2..9df9ef5 100644 --- a/libdb-4_8.spec +++ b/libdb-4_8.spec @@ -36,6 +36,7 @@ Patch1: libdb-fix-atomic.patch Patch2: 0001-OPD-deadlock-RH-BZ-1349779.patch # PATCH-FIX-UPSTREAM bsc#1174414 CVE-2019-2708 libdb: data store execution leads to partial DoS Patch3: libdb-4_8-CVE-2019-2708.patch +Patch4: libdb-4_8-sequence.patch BuildRequires: autoconf BuildRequires: fdupes BuildRequires: gcc-c++ @@ -93,11 +94,7 @@ database support for applications. This package contains the header files and libraries. %prep -%setup -q -n %{generic_name}-%{version} -%patch -P 0 -%patch -P 1 -%patch -P 2 -p1 -%patch -P 3 -p1 +%autosetup -p1 -n %{generic_name}-%{version} %build cd dist @@ -126,6 +123,7 @@ cd ../build_nptl %else %{_target_cpu}-suse-linux %endif + # Make sure O_DIRECT is really disabled (build host could have old kernel) perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h # Remove libtool predep_objects and postdep_objects wonkiness diff --git a/libdb-fix-atomic.patch b/libdb-fix-atomic.patch index f906fa6..55bcc80 100644 --- a/libdb-fix-atomic.patch +++ b/libdb-fix-atomic.patch @@ -1,8 +1,10 @@ Fix use of reserved identifier __atomic_compare_exchange by renaming ---- dbinc/atomic.h.orig 2018-03-13 09:44:13.197929296 +0100 -+++ dbinc/atomic.h 2018-03-13 09:45:09.582831244 +0100 -@@ -144,7 +144,7 @@ +Index: db-4.8.30/dbinc/atomic.h +=================================================================== +--- db-4.8.30.orig/dbinc/atomic.h ++++ db-4.8.30/dbinc/atomic.h +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ @@ -11,7 +13,7 @@ Fix use of reserved identifier __atomic_compare_exchange by renaming static inline int __atomic_inc(db_atomic_t *p) { int temp; -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html * which configure could be changed to use. */ diff --git a/libdb_java-4_8.spec b/libdb_java-4_8.spec index 3a2b8bc..1796ccb 100644 --- a/libdb_java-4_8.spec +++ b/libdb_java-4_8.spec @@ -36,6 +36,7 @@ Patch2: libdb-fix-atomic.patch Patch3: reproducible.patch # PATCH-FIX-UPSTREAM bsc#1174414 CVE-2019-2708 libdb: data store execution leads to partial DoS Patch4: libdb-4_8-CVE-2019-2708.patch +Patch5: libdb-4_8-sequence.patch BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: java-sdk >= 1.8 @@ -64,14 +65,15 @@ These are the development files. %prep %setup -q -n %{generic_name}-%{version} -%patch -P 0 +%patch -P 0 -p1 %patch -P 1 -p1 -%patch -P 2 +%patch -P 2 -p1 # the Leap build happens with an old jar version that does not know the --date option, so we need to test for that if jar --help|grep -q -- --date=TIMESTAMP ; then %patch -P 3 -p1 fi %patch -P 4 -p1 +%patch -P 5 -p1 %build cd dist