aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-01-28 20:36:21 +0100
committerMarius Bakke <mbakke@fastmail.com>2019-01-31 20:57:21 +0100
commit39855bfef12c8ab66a29cc7d096c719187c71b56 (patch)
tree0fce6b3d549356263102790e76bc1ebc312b2946 /gnu/packages/patches
parent7c56237b4ca1067e0204617c8b89d28a457d805f (diff)
downloadguix-39855bfef12c8ab66a29cc7d096c719187c71b56.tar
guix-39855bfef12c8ab66a29cc7d096c719187c71b56.tar.gz
gnu: p11-kit: Update to 0.23.15.
* gnu/packages/patches/p11-kit-jks-timestamps.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/tls.scm (p11-kit): Update to 0.23.15. [source](patches): New field.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/p11-kit-jks-timestamps.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/gnu/packages/patches/p11-kit-jks-timestamps.patch b/gnu/packages/patches/p11-kit-jks-timestamps.patch
new file mode 100644
index 0000000000..8cb8ed8684
--- /dev/null
+++ b/gnu/packages/patches/p11-kit-jks-timestamps.patch
@@ -0,0 +1,42 @@
+Fix test failures induced by setting the SOURCE_DATE_EPOCH variable.
+
+Taken from upstream: <https://github.com/p11-glue/p11-kit/pull/213>.
+
+From 2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@redhat.com>
+Date: Mon, 28 Jan 2019 13:03:15 +0100
+Subject: [PATCH] extract-jks: Prefer _p11_extract_jks_timestamp to
+ SOURCE_DATE_EPOCH
+
+Give _p11_extract_jks_timestamp precedence over SOURCE_DATE_EPOCH so
+that the test results are not affected by the envvar settings.
+---
+ trust/extract-jks.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/trust/extract-jks.c b/trust/extract-jks.c
+index ad8dc35..a6f855f 100644
+--- a/trust/extract-jks.c
++++ b/trust/extract-jks.c
+@@ -250,7 +250,9 @@ prepare_jks_buffer (p11_enumerate *ex,
+ * when this was this certificate was added to the keystore, however
+ * we don't have that information. Java uses time in milliseconds
+ */
+- {
++ if (_p11_extract_jks_timestamp)
++ now = _p11_extract_jks_timestamp;
++ else {
+ char *source_date_epoch;
+ source_date_epoch = secure_getenv ("SOURCE_DATE_EPOCH");
+ if (source_date_epoch) {
+@@ -276,9 +278,7 @@ prepare_jks_buffer (p11_enumerate *ex,
+ return false;
+ }
+ now = epoch;
+- } else if (_p11_extract_jks_timestamp)
+- now = _p11_extract_jks_timestamp;
+- else
++ } else
+ now = time (NULL);
+ }
+