Control: tags 1068782 + pending
Control: tags 1071322 + patch
Control: tags 1071322 + pending
Hi Jeremy,
I've prepared an NMU for libesmtp (versioned as 1.1.0-3.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
I see it as intermediate solution to get the packages back into
testing. Whenever upstream wakes up, make sense to re-evaluate the
patches and drop them in favour of upstreams.
Regards,
Salvatore
diff -Nru libesmtp-1.1.0/debian/changelog libesmtp-1.1.0/debian/changelog
--- libesmtp-1.1.0/debian/changelog 2023-08-19 12:04:32.000000000 +0200
+++ libesmtp-1.1.0/debian/changelog 2024-09-16 21:36:36.000000000 +0200
@@ -1,3 +1,16 @@
+libesmtp (1.1.0-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Michael Hudson-Doyle ]
+ * d/patches/time64: cast time_t values to long long before passing to
+ *printf functions (code storing time_t values in void* variables will
+ still break in 2038). (Closes: #1068782)
+ * d/patches/default-source: define _DEFAULT_SOURCE to get access to
+ prototype of strlcpy. (Closes: #1071322)
+
+ -- Salvatore Bonaccorso <car...@debian.org> Mon, 16 Sep 2024 21:36:36 +0200
+
libesmtp (1.1.0-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru libesmtp-1.1.0/debian/patches/default-source libesmtp-1.1.0/debian/patches/default-source
--- libesmtp-1.1.0/debian/patches/default-source 1970-01-01 01:00:00.000000000 +0100
+++ libesmtp-1.1.0/debian/patches/default-source 2024-09-16 21:36:36.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/meson.build
++++ b/meson.build
+@@ -30,6 +30,7 @@
+ ################################################################################
+ cflags = [
+ '-D_POSIX_C_SOURCE=200809L',
++ '-D_DEFAULT_SOURCE',
+ ]
+
+ cflags_warnings = [
diff -Nru libesmtp-1.1.0/debian/patches/series libesmtp-1.1.0/debian/patches/series
--- libesmtp-1.1.0/debian/patches/series 2023-08-19 12:04:32.000000000 +0200
+++ libesmtp-1.1.0/debian/patches/series 2024-09-16 21:36:36.000000000 +0200
@@ -1 +1,3 @@
meson-build-soname
+time64
+default-source
diff -Nru libesmtp-1.1.0/debian/patches/time64 libesmtp-1.1.0/debian/patches/time64
--- libesmtp-1.1.0/debian/patches/time64 1970-01-01 01:00:00.000000000 +0100
+++ libesmtp-1.1.0/debian/patches/time64 2024-09-16 21:36:36.000000000 +0200
@@ -0,0 +1,16 @@
+--- a/headers.c
++++ b/headers.c
+@@ -170,11 +170,11 @@
+ {
+ #ifdef HAVE_GETTIMEOFDAY
+ if (gettimeofday (&tv, NULL) != -1) /* This shouldn't fail ... */
+- snprintf (buf, sizeof buf, "%ld.%ld.%d@%s", tv.tv_sec, tv.tv_usec,
++ snprintf (buf, sizeof buf, "%lld.%lld.%d@%s", (long long)tv.tv_sec, (long long)tv.tv_usec,
+ getpid (), message->session->localhost);
+ else /* ... but if it does fall back to using time() */
+ #endif
+- snprintf (buf, sizeof buf, "%ld.%d@%s", time (NULL),
++ snprintf (buf, sizeof buf, "%lld.%d@%s", (long long)time (NULL),
+ getpid (), message->session->localhost);
+ message_id = buf;
+ }
