Merge ~skia/ubuntu/+source/htpdate:skia/merge_2.0.0-5_1.3.7-2ubuntu1 into ubuntu/+source/htpdate:debian/sid

[Skia]

Local build on amd64 passed and is working fine
PPA: https://launchpad.net/~skia/+archive/ubuntu/merge-htpdate-lp2132112/+packages
autopkgtest:
  - htpdate: resolute/htpdate/2.0.0-5ubuntu1~skiappa1 [amd64]
    + ✅ htpdate on resolute for amd64 @ 21.11.25 13:38:49 Log️ 🗒️
  - htpdate: resolute/htpdate/2.0.0-5ubuntu1~skiappa1 [arm64]
    + ✅ htpdate on resolute for arm64 @ 21.11.25 13:40:52 Log️ 🗒️
  - htpdate: resolute/htpdate/2.0.0-5ubuntu1~skiappa1 [armhf]
    + ✅ htpdate on resolute for armhf @ 21.11.25 13:42:18 Log️ 🗒️
  - htpdate: resolute/htpdate/2.0.0-5ubuntu1~skiappa1 [ppc64el]
    + ✅ htpdate on resolute for ppc64el @ 21.11.25 13:41:03 Log️ 🗒️
  - htpdate: resolute/htpdate/2.0.0-5ubuntu1~skiappa1 [s390x]
    + ✅ htpdate on resolute for s390x @ 21.11.25 13:39:27 Log️ 🗒️

Next merge will hopefully be a sync, when 2.0.1 reaches Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1121116

[Nick Rosbrook (enr0n)]

LGTM. Thanks!

review: Approve

Unmerged commits

f5edb57... by Skia on 2025-11-21

update-maintainer

c350c78... by Skia on 2025-11-21

reconstruct-changelog

f2c162d... by Skia on 2025-11-21

merge-changelogs

a8f864a... by Adrien Nader on 2024-09-18

  * Use fabs when checking computed offset is reasonable
    (LP: #2071779)

diff --git a/debian/changelog b/debian/changelog
index 34790dd..22dffe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+htpdate (2.0.0-5ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2132112).
+    Remaining change (patch trivially refreshed):
+    - Use fabs when checking computed offset is reasonable
+      (LP #2071779)
+
+ -- Florent 'Skia' Jacquet <[e-mail]>  Fri, 21 Nov 2025 11:05:54 +0100
+
 htpdate (2.0.0-5) unstable; urgency=medium
 
   * debian/patches/0003-fix-ppc64el-stack-corruption.patch: added.
@@ -34,6 +43,25 @@ htpdate (2.0.0-1) unstable; urgency=medium
 
  -- Thiago Andrade Marques <[e-mail]>  Tue, 19 Aug 2025 12:34:32 -0300
 
+htpdate (1.3.7-2ubuntu1) oracular; urgency=medium
+
+  * Use fabs when checking computed offset is reasonable
+    (LP: #2071779)
+
+ -- Adrien Nader <[e-mail]>  Wed, 18 Sep 2024 11:24:11 +0200
+
+htpdate (1.3.7-2build2) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <[e-mail]>  Mon, 01 Apr 2024 16:53:33 +1100
+
+htpdate (1.3.7-2build1) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <[e-mail]>  Mon, 04 Mar 2024 18:12:36 +0000
+
 htpdate (1.3.7-2) unstable; urgency=medium
 
   * debian/control: added libssl-dev to Build-Depends field.
diff --git a/debian/control b/debian/control
index 83a7866..e82dbe2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: htpdate
 Section: net
 Priority: optional
-Maintainer: Thiago Andrade Marques <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Thiago Andrade Marques <[e-mail]>
 Build-Depends: debhelper-compat (= 13), libssl-dev
 Standards-Version: 4.7.2
 Homepage: https://github.com/twekkel/htpdate
diff --git a/debian/patches/htpdate.c-use-fabs-when-checking-offset-is-reasonabl.patch b/debian/patches/htpdate.c-use-fabs-when-checking-offset-is-reasonabl.patch
new file mode 100644
index 0000000..d86dd84
--- /dev/null
+++ b/debian/patches/htpdate.c-use-fabs-when-checking-offset-is-reasonabl.patch
@@ -0,0 +1,36 @@
+From 37b79f8b9f9ee218a77f3310894193ad522f9934 Mon Sep 17 00:00:00 2001
+From: Adrien Nader <[e-mail]>
+Date: Wed, 18 Sep 2024 11:09:46 +0200
+Subject: [PATCH] htpdate.c: use fabs when checking offset is reasonable.
+
+The current code does the following:
+
+  (offset < timelimit && offset > -timelimit)
+
+For reasons that I can't explain, on Ubuntu during automated tests on
+ppc64el, when offset is negative (-0.125), the second clause is false. I
+haven't been able to obtain the same behavior in a reproducer (different
+machines?) but using fabs() instead of the double comparison reliably
+fixes the issue. It is also in-line with recent use of fabs in the
+codebase.
+
+Forwarded: https://github.com/twekkel/htpdate/pull/40
+Applied-Upstream: https://github.com/twekkel/htpdate/commit/d3e39078aafd42bf9fd42097553da37b11f8fac8
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/htpdate/+bug/2071779
+Bug: https://github.com/twekkel/htpdate/pull/40
+
+---
+ htpdate.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/htpdate.c
++++ b/htpdate.c
+@@ -946,7 +946,7 @@
+             }
+ 
+             /* Only include valid responses in timedelta[] */
+-            if ((timelimit == NO_TIME_LIMIT && offset != ERR_TIMESTAMP) || (offset < timelimit && offset > -timelimit)) {
++            if ((timelimit == NO_TIME_LIMIT && offset != ERR_TIMESTAMP) || (fabs(offset) < timelimit)) {
+                 timedelta[validtimes] = offset;
+                 validtimes++;
+             }
diff --git a/debian/patches/series b/debian/patches/series
index ee9882a..25c1d57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Hardening-Makefile.patch
 0002-Build-https-enabled-variant.patch
 0003-fix-ppc64el-stack-corruption.patch
+htpdate.c-use-fabs-when-checking-offset-is-reasonabl.patch