mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 06:18:07 -05:00
gnu: p11-kit: Update to 0.23.17.
* gnu/packages/patches/p11-kit-jks-timestamps.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/tls.scm (p11-kit): Update to 0.23.17. [source](patches): Remove.
This commit is contained in:
parent
25c4a04fde
commit
aa0e28bc73
3 changed files with 2 additions and 46 deletions
|
@ -1176,7 +1176,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/osip-CVE-2017-7853.patch \
|
%D%/packages/patches/osip-CVE-2017-7853.patch \
|
||||||
%D%/packages/patches/ots-no-include-missing-file.patch \
|
%D%/packages/patches/ots-no-include-missing-file.patch \
|
||||||
%D%/packages/patches/owncloud-disable-updatecheck.patch \
|
%D%/packages/patches/owncloud-disable-updatecheck.patch \
|
||||||
%D%/packages/patches/p11-kit-jks-timestamps.patch \
|
|
||||||
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
||||||
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
||||||
%D%/packages/patches/p7zip-remove-unused-code.patch \
|
%D%/packages/patches/p7zip-remove-unused-code.patch \
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
|
@ -122,16 +122,15 @@ (define-public asn1c
|
||||||
(define-public p11-kit
|
(define-public p11-kit
|
||||||
(package
|
(package
|
||||||
(name "p11-kit")
|
(name "p11-kit")
|
||||||
(version "0.23.15")
|
(version "0.23.17")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://github.com/p11-glue/p11-kit/releases/"
|
(uri (string-append "https://github.com/p11-glue/p11-kit/releases/"
|
||||||
"download/" version "/p11-kit-" version ".tar.gz"))
|
"download/" version "/p11-kit-" version ".tar.gz"))
|
||||||
(patches (search-patches "p11-kit-jks-timestamps.patch"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"166pwj00cffv4qq4dvx0k53zka0b0r1fa0whc49007vsqyh3khgp"))))
|
"07kwdlw07jk9833k43kkhv0q9gkll3vmd25wwp68cpy0crfv4isl"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
Loading…
Reference in a new issue