Stop using 2020 as a future date in regress tests

6 files changed, 56 insertions, 4 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 261adc808..ae884c895 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-cfa01c635debb10e05f5ac34d269809c77c582dc
-cfa01c635debb10e05f5ac34d269809c77c582dc
+df3ad29af495185aa9b051028ae94b965a4b1659
+df3ad29af495185aa9b051028ae94b965a4b1659
 4213eec74e74de6310c27a40c3e9759a08a73996
 4213eec74e74de6310c27a40c3e9759a08a73996
 openssh_8.1p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index cf9fe8a24..73a037710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:8.1p1-4) UNRELEASED; urgency=medium
+
+  * Apply upstream patch to stop using 2020 as a future date in regress
+    tests.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 09 Jan 2020 11:40:46 +0000
+
 openssh (1:8.1p1-3) unstable; urgency=medium
 
   [ Colin Watson ]
diff --git a/debian/patches/regress-2020.patch b/debian/patches/regress-2020.patch
new file mode 100644
index 000000000..b46e0df31
--- /dev/null
+++ b/debian/patches/regress-2020.patch
@@ -0,0 +1,44 @@
+From df3ad29af495185aa9b051028ae94b965a4b1659 Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Fri, 3 Jan 2020 03:02:26 +0000
+Subject: upstream: what bozo decided to use 2020 as a future date in a regress
+
+test?
+
+OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a
+
+Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=ff31f15773ee173502eec4d7861ec56f26bba381
+Last-Update: 2020-01-09
+
+Patch-Name: regress-2020.patch
+---
+ regress/cert-hostkey.sh | 2 +-
+ regress/cert-userkey.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
+index 86ea62504..844adabcc 100644
+--- a/regress/cert-hostkey.sh
++++ b/regress/cert-hostkey.sh
+@@ -252,7 +252,7 @@ test_one() {
+ test_one "user-certificate"    failure "-n $HOSTS"
+ test_one "empty principals"    success "-h"
+ test_one "wrong principals"    failure "-h -n foo"
+-test_one "cert not yet valid"  failure "-h -V20200101:20300101"
++test_one "cert not yet valid"  failure "-h -V20300101:20320101"
+ test_one "cert expired"                failure "-h -V19800101:19900101"
+ test_one "cert valid interval" success "-h -V-1w:+2w"
+ test_one "cert has constraints"        failure "-h -Oforce-command=false"
+diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
+index 38c14a698..5cd02fc3f 100644
+--- a/regress/cert-userkey.sh
++++ b/regress/cert-userkey.sh
+@@ -338,7 +338,7 @@ test_one() {
+ test_one "correct principal"   success "-n ${USER}"
+ test_one "host-certificate"    failure "-n ${USER} -h"
+ test_one "wrong principals"    failure "-n foo"
+-test_one "cert not yet valid"  failure "-n ${USER} -V20200101:20300101"
++test_one "cert not yet valid"  failure "-n ${USER} -V20300101:20320101"
+ test_one "cert expired"                failure "-n ${USER} -V19800101:19900101"
+ test_one "cert valid interval" success "-n ${USER} -V-1w:+2w"
+ test_one "wrong source-address"        failure "-n ${USER} -Osource-address=10.0.0.0/8"
diff --git a/debian/patches/series b/debian/patches/series
index 8c1046a74..19a6569b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ debian-config.patch
 restore-authorized_keys2.patch
 conch-old-privkey-format.patch
 revert-ipqos-defaults.patch
+regress-2020.patch
diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
index 86ea62504..844adabcc 100644
--- a/regress/cert-hostkey.sh
+++ b/regress/cert-hostkey.sh
@@ -252,7 +252,7 @@ test_one() {
 test_one "user-certificate"     failure "-n $HOSTS"
 test_one "empty principals"     success "-h"
 test_one "wrong principals"     failure "-h -n foo"
-test_one "cert not yet valid"   failure "-h -V20200101:20300101"
+test_one "cert not yet valid"   failure "-h -V20300101:20320101"
 test_one "cert expired"         failure "-h -V19800101:19900101"
 test_one "cert valid interval"  success "-h -V-1w:+2w"
 test_one "cert has constraints" failure "-h -Oforce-command=false"
diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
index 38c14a698..5cd02fc3f 100644
--- a/regress/cert-userkey.sh
+++ b/regress/cert-userkey.sh
@@ -338,7 +338,7 @@ test_one() {
 test_one "correct principal"    success "-n ${USER}"
 test_one "host-certificate"     failure "-n ${USER} -h"
 test_one "wrong principals"     failure "-n foo"
-test_one "cert not yet valid"   failure "-n ${USER} -V20200101:20300101"
+test_one "cert not yet valid"   failure "-n ${USER} -V20300101:20320101"
 test_one "cert expired"         failure "-n ${USER} -V19800101:19900101"
 test_one "cert valid interval"  success "-n ${USER} -V-1w:+2w"
 test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8"