Merge ~ahasenack/ubuntu/+source/backuppc-rsync:noble-backuppc-rsync-fix-gettimeofday-detection into ubuntu/+source/backuppc-rsync:ubuntu/devel

[Andreas Hasenack]

This fixes the gettimeofday() configure test, which was failing due to an implicit-function-declaration warning/error, and not because of the arguments.

The TL;DR for the bug is this comment: https://bugs.launchpad.net/ubuntu/+source/backuppc-rsync/+bug/2061966/comments/2

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/backuppc-rsync-ftbfs

Upstream seems dead, but I'll forward a patch to their github tracker and debian so at least others can find it.

It doesn't look like this package should be in main... :(

[Andreas Hasenack (ahasenack)]

The key thing to check is this output from configure:

checking if gettimeofday takes tz argument... yes

It was "no" before.

[Bryce Harrington (bryce)]

gotta love autopkgtest. sounds like the debugging was convoluted but makes sense

Thanks for forwarding the fix upstream and to debian, hopefully one way or another that lets this get back in sync.

LGTM, +1.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: ahasenack, bryce
Uploaders: ahasenack, bryce
MP auto-approved

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks!

Uploaded:
Uploading backuppc-rsync_3.1.3.0-3ubuntu1.dsc
Uploading backuppc-rsync_3.1.3.0-3ubuntu1.debian.tar.xz
Uploading backuppc-rsync_3.1.3.0-3ubuntu1_source.buildinfo
Uploading backuppc-rsync_3.1.3.0-3ubuntu1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 9dc3780..55c8c6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+backuppc-rsync (3.1.3.0-3ubuntu1) noble; urgency=medium
+
+  * d/p/fix-gettimeofday-detection.patch: fix configure check for
+    gettimeofday() (LP: #2061966)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 17 Apr 2024 19:25:18 -0300
+
 backuppc-rsync (3.1.3.0-3build2) noble; urgency=high
 
   * No change rebuild for 64-bit time_t and frame pointers.
diff --git a/debian/patches/fix-gettimeofday-detection.patch b/debian/patches/fix-gettimeofday-detection.patch
new file mode 100644
index 0000000..5259167
--- /dev/null
+++ b/debian/patches/fix-gettimeofday-detection.patch
@@ -0,0 +1,16 @@
+Description: fix detection of gettimeofday() arguments
+Author: Andreas Hasenack <[e-mail]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066438
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/backuppc-rsync/+bug/2061966
+Forwarded: https://github.com/backuppc/rsync-bpc/pull/41
+Last-Update: 2024-04-17
+--- a/configure.ac
++++ b/configure.ac
+@@ -852,6 +852,7 @@ fi
+ 
+ AC_CACHE_CHECK([if gettimeofday takes tz argument],rsync_cv_HAVE_GETTIMEOFDAY_TZ,[
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>
++#include <stdlib.h>
+ #include <unistd.h>]], [[struct timeval tv; exit(gettimeofday(&tv, NULL));]])],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes],[rsync_cv_HAVE_GETTIMEOFDAY_TZ=no])])
+ if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" != x"no"; then
+     AC_DEFINE(HAVE_GETTIMEOFDAY_TZ, 1, [Define to 1 if gettimeofday() takes a time-zone arg])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8c0b49f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-gettimeofday-detection.patch