From patchwork Thu Dec 10 21:31:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25689 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D988527BC03; Thu, 10 Dec 2020 21:32:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AF6C027BC04 for ; Thu, 10 Dec 2020 21:32:11 +0000 (GMT) Received: from localhost ([::1]:43790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knTXm-00070O-Po for patchwork@mira.cbaines.net; Thu, 10 Dec 2020 16:32:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knTXe-000706-3m for guix-patches@gnu.org; Thu, 10 Dec 2020 16:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knTXd-0002hs-RY for guix-patches@gnu.org; Thu, 10 Dec 2020 16:32:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knTXd-0003of-MZ for guix-patches@gnu.org; Thu, 10 Dec 2020 16:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Dec 2020 21:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33041 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?utf-8?b?R8OhYm9y?= Boskovits Received: via spool by 33041-submit@debbugs.gnu.org id=B33041.160763591314656 (code B ref 33041); Thu, 10 Dec 2020 21:32:01 +0000 Received: (at 33041) by debbugs.gnu.org; 10 Dec 2020 21:31:53 +0000 Received: from localhost ([127.0.0.1]:39484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knTXR-0003oF-HM for submit@debbugs.gnu.org; Thu, 10 Dec 2020 16:31:53 -0500 Received: from mout02.posteo.de ([185.67.36.66]:53793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knTXL-0003ny-KV for 33041@debbugs.gnu.org; Thu, 10 Dec 2020 16:31:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 3E5E92400FC for <33041@debbugs.gnu.org>; Thu, 10 Dec 2020 22:31:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607635897; bh=YGw/HXPOVcOx0zE3RgfUUtLPwdoyk4PHOEpgfJssE6Q=; h=From:To:Cc:Subject:Date:From; b=cXqP0IvZRcq6m7pvzM75ao4kpx84HS/CgS6uXU991Xd9xNDM06ECVMpdcVGGqvYPE NAhiwfPJzDxpZrPOBLmb5GN7SdN2I1hwnO0rofcWOTib3QPYq0gt8oRRhzO4Eikgzm c1kOEkSATDjc1JvFI7aRuBDQILjWL3fjtCBkyqKCnuonfMjb9Ja3aCnOG5qsWXffng goy5ymOCaCBPvrHwWpduF4ZyQIEIbt0htqrgzR6Mdz7V4cDIRCkRDnoHh9F6XKm2ZP I5Qg2nGVtK/RkiwzEnooqUbRZjGrmSRDbxEaybi05XzxVB9gHsvv8+zAlG4AiT7Ouz xgxfjXW6ag8hQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4CsRtv3h7Gz6tmL; Thu, 10 Dec 2020 22:31:35 +0100 (CET) From: Kei Kebreau References: <87h7wiiejl.fsf@elephly.net> Date: Thu, 10 Dec 2020 16:31:33 -0500 In-Reply-To: (" =?utf-8?b?R8OhYm9y?= Boskovits"'s message of "Thu, 14 May 2020 20:22:02 +0200") Message-ID: <87o8j1xs96.fsf@posteo.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 33041@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi all, I came across this bug and had some time to attempt to make the suggested changes. Please find the updated patch attached and let me know if it still works as intended. Best, Kei Gábor Boskovits writes: > Ok, I will look into it. > > Ricardo Wurmus ezt írta (időpont: 2020. máj. 14., Csü 19:59): > > Hi Gábor, > > looks like we dropped this issue. Would you like to rebase it, include > Danny’s suggestions, and push it? I’d very much like to close bug #30927. > > -- > Ricardo From e3bc8635e8730e33c2e4f9658dacb6f2f669d8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Sun, 14 Oct 2018 21:06:55 +0200 Subject: [PATCH] gnu: icedtea-6: Make javadoc reproducible. * gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch: New file. * gnu/packages/java.scm[icedtea-6](native-inputs): Add patch to langtools-src. (phases)[unpack]: Adjust unpacking of patched source. * gnu/local.mk[dist_patch_DATA]: Register it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 9 +++++-- .../icedtea-6-javadoc-reproducibility.patch | 25 +++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9284e487fe..9a1b98eb16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1169,6 +1169,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-extend-hotspot-aarch64-support.patch \ + %D%/packages/patches/icedtea-6-javadoc-reproducibility.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch \ %D%/packages/patches/icu4c-CVE-2020-10531.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e298fd9537..deaa9e1fcd 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -892,7 +892,10 @@ machine."))) (string-append part "-src")) part)) '("jdk" "hotspot" "corba" - "langtools" "jaxp" "jaxws"))) + "jaxp" "jaxws"))) + (with-directory-excursion "openjdk" + (invoke "tar" "xvf" (assoc-ref inputs "langtools-src")) + (rename-file "hg-checkout" "langtools")) (substitute* "patches/freetypeversion.patch" (("REQUIRED_FREETYPE_VERSION = 2.2.1") "REQUIRED_FREETYPE_VERSION = 2.10.1")) @@ -1136,7 +1139,9 @@ machine."))) (changeset "jdk6-b41"))) (sha256 (base32 - "1x52wd67fynbbd9ild6fb4wvba3f5hhwk03qdjfazd0a1qr37z3d")))) + "1x52wd67fynbbd9ild6fb4wvba3f5hhwk03qdjfazd0a1qr37z3d")) + (patches + (search-patches "icedtea-6-javadoc-reproducibility.patch")))) ("jaxp-src" ,(origin (method hg-fetch) diff --git a/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch b/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch new file mode 100644 index 0000000000..dd472a9c66 --- /dev/null +++ b/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User Gábor Boskovits +# Date 1539456874 -7200 +# Sat Oct 13 20:54:34 2018 +0200 +# Node ID 6e5f716a659247888c104f66c58bf40fb959c8a4 +# Parent 06656286f572cbf716397b9d983f8dee7d94f913 +Make javadoc respect SOURCE_DATE_EPOCH. + +diff -r 06656286f572 src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java +--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Mon Aug 22 10:53:55 2016 -0700 ++++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java Wed Dec 09 21:40:00 2020 -0500 +@@ -396,6 +396,12 @@ + */ + public String today() { + Calendar calendar = new GregorianCalendar(TimeZone.getDefault()); +- return calendar.getTime().toString(); ++ Date date=calendar.getTime(); ++ String epoch=System.getenv("SOURCE_DATE_EPOCH"); ++ if(epoch != null) { ++ long unixtime=Long.parseLong(epoch); ++ date=new Date(unixtime*1000L); ++ } ++ return date.toString(); + } + } -- 2.29.2