[Nickle] nickle: Branch 'master' - 3 commits

Keith Packard keithp at keithp.com
Tue Nov 14 02:31:45 PST 2017


 builtin-date.c   |    2 --
 configure.ac     |    4 ++--
 debian/changelog |    7 +++++++
 test/datetest.5c |    8 +++++---
 4 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit bbdfc46d5f640db769ade04a3b94b9306f7ab472
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 14 02:31:00 2017 -0800

    Update to version 2.81
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 9beda96..c4be8bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl for licensing information.
 
 AC_PREREQ([2.69])
 
-AC_INIT([nickle],[2.80],[http://nickle.org],[nickle])
-RELEASE_DATE="2017-11-13"
+AC_INIT([nickle],[2.81],[http://nickle.org],[nickle])
+RELEASE_DATE="2017-11-14"
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR(.)
diff --git a/debian/changelog b/debian/changelog
index 841a5d7..aa009ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nickle (2.81-1) unstable; urgency=low
+
+  * Don't attempt to test Y2038 bug fix yet. It's not fixed on 32-bit
+    machines.
+
+ -- Keith Packard <keithp at keithp.com>  Tue, 14 Nov 2017 02:29:18 -0800
+
 nickle (2.80-2) unstable; urgency=low
 
   * Update standard version to 4.1.1
commit c97d95c71805bd1b0e9b21228f7786cef51def25
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 14 02:26:04 2017 -0800

    test: Can't test for Y2038 fix because 32 bit machines
    
    glibc on all 32-bit machines fails the Y2038 test. Change that to use
    the maximum possible 32-bit value instead (sigh)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/datetest.5c b/test/datetest.5c
index b516c86..38947b0 100644
--- a/test/datetest.5c
+++ b/test/datetest.5c
@@ -56,7 +56,9 @@ test_utc_seconds(0,
 		     .zone = "GMT"
 			 });
 
-/* Make sure 2038 problem isn't present */
-test_utc_seconds(2**31,
-		 (date_t) {sec = 8, min = 14, hour = 3, mday = 19, mon = 1, year = 2038,
+/* Try the largest possible time for 32-bit systems. Update
+ * this test when glibc has been fixed for Y2038
+ */
+test_utc_seconds(2**31-1,
+		 (date_t) {sec = 7, min = 14, hour = 3, mday = 19, mon = 1, year = 2038,
 			 wday = 2, yday = 18, isdst = false, zone = "GMT"});
commit 49591a84a6bb23ff64a49578cf7ce0ff7a6715e3
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Nov 14 02:25:42 2017 -0800

    Remove unused variable in builtin-date.c
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/builtin-date.c b/builtin-date.c
index 5d5e1f4..cc8cdd5 100644
--- a/builtin-date.c
+++ b/builtin-date.c
@@ -83,8 +83,6 @@ to_date(struct tm *tm)
 static void
 from_date(Value date, struct tm *tm)
 {
-    BoxPtr	box = date->structs.values;
-
     tm->tm_sec = value_int(date, "sec", "invalid sec", 0);
     tm->tm_min = value_int(date, "min", "invalid min", 0);
     tm->tm_hour = value_int(date, "hour", "invalid hour", 0);


More information about the Nickle mailing list