Control: tags 897747 + pending Dear maintainer,
I've prepared an NMU for faketime (versioned as 0.9.7-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- tobi
diff -Nru faketime-0.9.7/debian/changelog faketime-0.9.7/debian/changelog
--- faketime-0.9.7/debian/changelog 2018-02-19 23:07:10.000000000 +0100
+++ faketime-0.9.7/debian/changelog 2018-09-29 16:31:57.000000000 +0200
@@ -1,3 +1,11 @@
+faketime (0.9.7-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherry-Pick fixes for the FTBFS with gcc-8 from upstream git
+ repository. (Closes: #897747)
+
+ -- Tobias Frost <t...@debian.org> Sat, 29 Sep 2018 16:31:57 +0200
+
faketime (0.9.7-2) unstable; urgency=medium
* git: convert branch naming to DEP-14
diff -Nru faketime-0.9.7/debian/patches/0004-FTBFS-891551.patch faketime-0.9.7/debian/patches/0004-FTBFS-891551.patch
--- faketime-0.9.7/debian/patches/0004-FTBFS-891551.patch 2018-02-19 23:07:10.000000000 +0100
+++ faketime-0.9.7/debian/patches/0004-FTBFS-891551.patch 2018-09-29 16:31:49.000000000 +0200
@@ -1,42 +1,11 @@
-From 0d964363a4352b7ee358f523c3416d07378d4583 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazz...@bootlin.com>
-Date: Thu, 17 May 2018 22:55:22 +0200
-Subject: [PATCH 1/4] libfaketime.c: fix strncpy() issues raised by gcc 8.x
-
-gcc 8.x introduced stricter checking on strncpy(), and causes the
-following build failures:
-
-libfaketime.c: In function 'fake_clock_gettime.part.4':
-libfaketime.c:2134:7: error: 'strncpy' specified bound 256 equals destination size [-Werror=stringop-truncation]
- strncpy(user_faked_time, tmp_env, BUFFERLEN);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-libfaketime.c:2134:7: error: 'strncpy' specified bound 256 equals destination size [-Werror=stringop-truncation]
- strncpy(user_faked_time, tmp_env, BUFFERLEN);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-libfaketime.c: In function 'ftpl_init':
-libfaketime.c:1884:12: error: 'strncpy' specified bound 1024 equals destination size [-Werror=stringop-truncation]
- (void) strncpy(ft_spawn_target, getenv("FAKETIME_SPAWN_TARGET"), 1024);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-libfaketime.c:1945:5: error: 'strncpy' specified bound 8192 equals destination size [-Werror=stringop-truncation]
- strncpy(user_faked_time_fmt, tmp_env, BUFSIZ);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-libfaketime.c: In function 'ftpl_init':
-libfaketime.c:1884:12: error: 'strncpy' specified bound 1024 equals destination size [-Werror=stringop-truncation]
- (void) strncpy(ft_spawn_target, getenv("FAKETIME_SPAWN_TARGET"), 1024);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-libfaketime.c:1945:5: error: 'strncpy' specified bound 8192 equals destination size [-Werror=stringop-truncation]
- strncpy(user_faked_time_fmt, tmp_env, BUFSIZ);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This commit fixes that by making sure we keep one final byte for the
-nul terminator, as suggested by
-https://github.com/wolfcw/libfaketime/issues/150.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazz...@bootlin.com>
+Description: Fix FTBFS with gcc-8
+ Patch is taken from upstream, but needed tweaking (removal of code not yet in Debian)
+Origin: https://github.com/wolfcw/libfaketime/commit/9a2c84d68cca3750d28912010450844004510e81
+Bug-Debian: bugs.debian.org/897747
+Applied-Upstream: yes, see Origin
+Last-Update: 2018-09-29
---
- src/libfaketime.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/libfaketime.c
+++ b/src/libfaketime.c
@@ -1836,7 +1836,8 @@
signature.asc
Description: PGP signature
