commit: a252cace3c34490668017794a229f6ddf6a3f7d8 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> AuthorDate: Tue Jul 2 05:50:20 2019 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Tue Jul 2 05:50:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a252cace
app-crypt/p11-kit: fix date handling Closes: https://bugs.gentoo.org/show_bug.cgi?id=688460 Thanks: Alexey Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 RepoMan-Options: --force .../p11-kit/files/p11-kit-0.23.12-mktime.patch | 26 ++++++++++++++++++++++ ...it-0.23.12.ebuild => p11-kit-0.23.12-r1.ebuild} | 4 ++++ ....23.16.1.ebuild => p11-kit-0.23.16.1-r1.ebuild} | 4 ++++ 3 files changed, 34 insertions(+) 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 new file mode 100644 index 00000000000..7cc0baada97 --- /dev/null +++ b/app-crypt/p11-kit/files/p11-kit-0.23.12-mktime.patch @@ -0,0 +1,26 @@ +From 3d009fda4cb39157d6876e7d16cbc57f7b59bc86 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <[email protected]> +Date: Mon, 1 Jul 2019 13:38:25 +0300 +Subject: [PATCH] trust: do not allow daylight to invalidate date validation + +Issue: 235 +Signed-off-by: Alon Bar-Lev <[email protected]> +--- + trust/builder.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/trust/builder.c b/trust/builder.c +index d819dc8..2fc0c40 100644 +--- a/trust/builder.c ++++ b/trust/builder.c +@@ -261,6 +261,7 @@ type_date (p11_builder *builder, + return false; + + memcpy (&two, &tm, sizeof (tm)); ++ two.tm_isdst = -1; // do not perform tz fixup + if (mktime (&two) < 0) + return false; + +-- +2.21.0 + 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 similarity index 97% rename from app-crypt/p11-kit/p11-kit-0.23.12.ebuild rename to app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild index 1e38188fa1a..acd2250428b 100644 --- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild +++ b/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild @@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${P}-mktime.patch" +) + pkg_setup() { # disable unsafe tests, bug#502088 export FAKED_MODE=1 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 similarity index 97% rename from app-crypt/p11-kit/p11-kit-0.23.16.1.ebuild rename to app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild index ec7c6c32971..6b1c88e6912 100644 --- 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 @@ -21,6 +21,10 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/${PN}-0.23.12-mktime.patch" +) + pkg_setup() { # disable unsafe tests, bug#502088 export FAKED_MODE=1
