Fix FTBFS with tzdata uninstalled

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 8580730f26a937b0a40ef75311fc1fe23d02fcb4..5da7f669f1e12cc7317e6393e0eec05a0c635d09 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openafs (1.6.18.3-3) UNRELEASED; urgency=medium
 
   * Drop openafs-dbg in favor of automatically generated dbgsym packages.
   * Mark openafs-doc Multi-Arch: foreign.
+  * debian/patches/tests-util-ktime-t.c-Specify-EST-offset-in-TZ.patch:
+    Fix FTBFS with tzdata uninstalled.  (Closes: #839481)
 
  -- Anders Kaseorg <andersk@mit.edu>  Thu, 15 Sep 2016 03:23:49 -0400
 

diff --git a/debian/patches/series b/debian/patches/series
index 58bc02e5f914486cdee155a66d25e99baf15a6ef..95b29a5631d236ed9d3dba32a4087409818ab651 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0003-Add-dummy-exit-command-for-afsd-to-do-nothing.patch
+tests-util-ktime-t.c-Specify-EST-offset-in-TZ.patch

diff --git a/debian/patches/tests-util-ktime-t.c-Specify-EST-offset-in-TZ.patch b/debian/patches/tests-util-ktime-t.c-Specify-EST-offset-in-TZ.patch
new file mode 100644 (file)
index 0000000..f3f08c1
--- /dev/null
+++ b/debian/patches/tests-util-ktime-t.c-Specify-EST-offset-in-TZ.patch
@@ -0,0 +1,33 @@
+From 5751945cf57432538df65ce89ba96f7b9086fca4 Mon Sep 17 00:00:00 2001
+From: Anders Kaseorg <andersk@mit.edu>
+Date: Sun, 9 Oct 2016 06:39:12 -0400
+Subject: tests/util/ktime-t.c: Specify EST offset in TZ
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes test failures observed on new Debian build servers that no
+longer install tzdata by default.  As the tests expect, EST is defined
+as UTC−05:00 with no daylight saving time.
+
+Change-Id: Ida8cb33687b5d87761cb0422e446afd99246d47a
+---
+ tests/util/ktime-t.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/util/ktime-t.c b/tests/util/ktime-t.c
+index fefbcb3..1992598 100644
+--- a/tests/util/ktime-t.c
++++ b/tests/util/ktime-t.c
+@@ -74,7 +74,7 @@ main(void)
+ 
+     /* should do timezone and daylight savings time correction so this program
+      * work in other than EST */
+-    putenv("TZ=EST");
++    putenv("TZ=EST+5");
+ 
+     errors = 0;
+     for (tt = testTimes; tt->time; tt++) {
+-- 
+2.10.1
+