Control: tags -1 + patch pending
thanks
I've prepared an NMU for faketime (versioned as 0.9.5-2.1) and uploaded
it to DELAYED/3. Please feel free to tell me if I should delay it
longer.
--
Jakub Wilk
diffstat for faketime-0.9.5 faketime-0.9.5
changelog | 7 ++
patches/series | 1
patches/use-CLOCK_MONOTONIC_RAW-only-if-defined.patch | 45 ++++++++++++++++++
3 files changed, 53 insertions(+)
No differences were encountered between the control files
diff -Nru faketime-0.9.5/debian/changelog faketime-0.9.5/debian/changelog
--- faketime-0.9.5/debian/changelog 2014-04-02 15:45:49.000000000 +0200
+++ faketime-0.9.5/debian/changelog 2014-06-06 22:50:42.000000000 +0200
@@ -1,3 +1,10 @@
+faketime (0.9.5-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use CLOCK_MONOTONIC_RAW only when it's defined (closes: #737571).
+
+ -- Jakub Wilk <jw...@debian.org> Fri, 06 Jun 2014 22:50:41 +0200
+
faketime (0.9.5-2) unstable; urgency=medium
* avoid accidentally truncating LD_PRELOAD. Thanks, Antonio Terceiro
diff -Nru faketime-0.9.5/debian/patches/series faketime-0.9.5/debian/patches/series
--- faketime-0.9.5/debian/patches/series 2014-04-02 15:51:00.000000000 +0200
+++ faketime-0.9.5/debian/patches/series 2014-06-06 22:34:20.000000000 +0200
@@ -1,3 +1,4 @@
fix-infinite-recursion-on-real_clock_gettime.patch
avoid-spurious-lrt.patch
fix-handling-of-LD_PRELOAD.diff
+use-CLOCK_MONOTONIC_RAW-only-if-defined.patch
diff -Nru faketime-0.9.5/debian/patches/use-CLOCK_MONOTONIC_RAW-only-if-defined.patch faketime-0.9.5/debian/patches/use-CLOCK_MONOTONIC_RAW-only-if-defined.patch
--- faketime-0.9.5/debian/patches/use-CLOCK_MONOTONIC_RAW-only-if-defined.patch 1970-01-01 01:00:00.000000000 +0100
+++ faketime-0.9.5/debian/patches/use-CLOCK_MONOTONIC_RAW-only-if-defined.patch 2014-06-06 22:49:56.000000000 +0200
@@ -0,0 +1,45 @@
+Description: use CLOCK_MONOTONIC_RAW only when it's defined
+ CLOCK_MONOTONIC_RAW is not universally available (in fact, it's
+ Linux-specific), so use it only if it's actually defined.
+Author: Jakub Wilk <jw...@debian.org>
+Bug-Debian: https://bugs.debian.org/737571
+Forwarded: no
+Last-Update: 2014-06-06
+
+--- a/src/libfaketime.c
++++ b/src/libfaketime.c
+@@ -299,8 +299,10 @@
+ #else
+ DONT_FAKE_TIME((*real_clock_gettime)(CLOCK_REALTIME, &systime->real));
+ DONT_FAKE_TIME((*real_clock_gettime)(CLOCK_MONOTONIC, &systime->mon));
++#if defined(CLOCK_MONOTONIC_RAW)
+ DONT_FAKE_TIME((*real_clock_gettime)(CLOCK_MONOTONIC_RAW, &systime->mon_raw));
+ #endif
++#endif
+ }
+
+ static void next_time(struct timespec *tp, struct timespec *ticklen)
+@@ -1598,9 +1600,11 @@
+ case CLOCK_MONOTONIC:
+ timespecsub(tp, &ftpl_starttime.mon, &tmp_ts);
+ break;
++#if defined(CLOCK_MONOTONIC_RAW)
+ case CLOCK_MONOTONIC_RAW:
+ timespecsub(tp, &ftpl_starttime.mon_raw, &tmp_ts);
+ break;
++#endif
+ default:
+ printf("Invalid clock_id for clock_gettime: %d", clk_id);
+ exit(EXIT_FAILURE);
+@@ -1725,9 +1729,11 @@
+ case CLOCK_MONOTONIC:
+ timespecsub(tp, &ftpl_starttime.mon, &tdiff);
+ break;
++#if defined(CLOCK_MONOTONIC_RAW)
+ case CLOCK_MONOTONIC_RAW:
+ timespecsub(tp, &ftpl_starttime.mon_raw, &tdiff);
+ break;
++#endif
+ default:
+ printf("Invalid clock_id for clock_gettime: %d", clk_id);
+ exit(EXIT_FAILURE);
