From 5e75cc845a738b7d139a248d2207641d5f5cf6e4 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 26 Aug 2024 12:12:29 +0200 Subject: Merging debian version 1.6.3-3. Signed-off-by: Daniel Baumann --- debian/changelog | 8 +++++++- debian/patches/fix_db53_detechtion.patch | 11 +++++++++++ debian/patches/series | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix_db53_detechtion.patch diff --git a/debian/changelog b/debian/changelog index 4581d7d..e68533c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apr-util (1.6.3-3) unstable; urgency=medium + + * Fix db 5.3 detection with gcc 14. Closes: #1074812 + + -- Stefan Fritsch Sun, 04 Aug 2024 12:02:26 +0200 + apr-util (1.6.3-2~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-updates, remaining changes: @@ -16,7 +22,7 @@ apr-util (1.6.3-2) unstable; urgency=medium * Bump libapr1-dev Build-Dep to 1.7.2-3.2. Hopefully closes: #1066821 * Add more 64-bit time_t patches from Simon McVittie. Thanks. - Closes: #1066821 + Closes: #1067035 -- Stefan Fritsch Mon, 18 Mar 2024 20:21:56 +0100 diff --git a/debian/patches/fix_db53_detechtion.patch b/debian/patches/fix_db53_detechtion.patch new file mode 100644 index 0000000..ce176a4 --- /dev/null +++ b/debian/patches/fix_db53_detechtion.patch @@ -0,0 +1,11 @@ +--- apr-util.orig/build/dbm.m4 ++++ apr-util/build/dbm.m4 +@@ -235,7 +235,7 @@ AC_DEFUN([APU_TRY_BERKELEY_DB], + #include + #include + #include <$apu_try_berkeley_db_header> +-main () ++int main (void) + { + int major, minor, patch; + diff --git a/debian/patches/series b/debian/patches/series index 35fd85d..2ab879b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ avoid_db_by-default.patch test_verbose fix_doxygen_inputdir doxygen_no_ful_path_names.patch +fix_db53_detechtion.patch -- cgit v1.2.3