| 1 |
commit: a252cace3c34490668017794a229f6ddf6a3f7d8 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 2 05:50:20 2019 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 2 05:50:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a252cace |
| 7 |
|
| 8 |
app-crypt/p11-kit: fix date handling |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/show_bug.cgi?id=688460 |
| 11 |
Thanks: Alexey |
| 12 |
Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
| 14 |
RepoMan-Options: --force |
| 15 |
|
| 16 |
.../p11-kit/files/p11-kit-0.23.12-mktime.patch | 26 ++++++++++++++++++++++ |
| 17 |
...it-0.23.12.ebuild => p11-kit-0.23.12-r1.ebuild} | 4 ++++ |
| 18 |
....23.16.1.ebuild => p11-kit-0.23.16.1-r1.ebuild} | 4 ++++ |
| 19 |
3 files changed, 34 insertions(+) |
| 20 |
|
| 21 |
diff --git a/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..7cc0baada97 |
| 24 |
--- /dev/null |
| 25 |
+++ b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch |
| 26 |
@@ -0,0 +1,26 @@ |
| 27 |
+From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 29 |
+Date: Mon, 1 Jul 2019 13:38:25 +0300 |
| 30 |
+Subject: [PATCH] trust: do not allow daylight to invalidate date validation |
| 31 |
+ |
| 32 |
+Issue: 235 |
| 33 |
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com> |
| 34 |
+--- |
| 35 |
+ trust/builder.c | 1 + |
| 36 |
+ 1 file changed, 1 insertion(+) |
| 37 |
+ |
| 38 |
+diff --git a/trust/builder.c b/trust/builder.c |
| 39 |
+index d819dc8..2fc0c40 100644 |
| 40 |
+--- a/trust/builder.c |
| 41 |
++++ b/trust/builder.c |
| 42 |
+@@ -261,6 +261,7 @@ type_date (p11_builder *builder, |
| 43 |
+ return false; |
| 44 |
+ |
| 45 |
+ memcpy (&two, &tm, sizeof (tm)); |
| 46 |
++ two.tm_isdst = -1; // do not perform tz fixup |
| 47 |
+ if (mktime (&two) < 0) |
| 48 |
+ return false; |
| 49 |
+ |
| 50 |
+-- |
| 51 |
+2.21.0 |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild |
| 55 |
similarity index 97% |
| 56 |
rename from app-crypt/p11-kit/p11-kit-0.23.12.ebuild |
| 57 |
rename to app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild |
| 58 |
index 1e38188fa1a..acd2250428b 100644 |
| 59 |
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild |
| 60 |
+++ b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild |
| 61 |
@@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) |
| 62 |
DEPEND="${RDEPEND}" |
| 63 |
BDEPEND="virtual/pkgconfig" |
| 64 |
|
| 65 |
+PATCHES=( |
| 66 |
+ "${FILESDIR}/${P}-mktime.patch" |
| 67 |
+) |
| 68 |
+ |
| 69 |
pkg_setup() { |
| 70 |
# disable unsafe tests, bug#502088 |
| 71 |
export FAKED_MODE=1 |
| 72 |
|
| 73 |
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild |
| 74 |
similarity index 97% |
| 75 |
rename from app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild |
| 76 |
rename to app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild |
| 77 |
index ec7c6c32971..6b1c88e6912 100644 |
| 78 |
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild |
| 79 |
+++ b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild |
| 80 |
@@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) |
| 81 |
DEPEND="${RDEPEND}" |
| 82 |
BDEPEND="virtual/pkgconfig" |
| 83 |
|
| 84 |
+PATCHES=( |
| 85 |
+ "${FILESDIR}/${PN}-0.23.12-mktime.patch" |
| 86 |
+) |
| 87 |
+ |
| 88 |
pkg_setup() { |
| 89 |
# disable unsafe tests, bug#502088 |
| 90 |
export FAKED_MODE=1 |
Archives