summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:12:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:12:29 +0000
commitfe2f50df8ad8484adb78ac65906d68d3f76da460 (patch)
tree17a9981c63a6a1b5637cb1a117d4df1292021953
parentAdding debian version 1.6.3-2. (diff)
downloadapr-util-fe2f50df8ad8484adb78ac65906d68d3f76da460.tar.xz
apr-util-fe2f50df8ad8484adb78ac65906d68d3f76da460.zip
Adding debian version 1.6.3-3.debian/1.6.3-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/patches/fix_db53_detechtion.patch11
-rw-r--r--debian/patches/series1
3 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ff3117e..d9eee48 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 <sf@debian.org> Sun, 04 Aug 2024 12:02:26 +0200
+
apr-util (1.6.3-2) unstable; urgency=medium
* Incorporate NMU. Thanks to all the 64-bit time_t transition
@@ -5,7 +11,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 <sf@debian.org> 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 <stdlib.h>
+ #include <stdio.h>
+ #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