From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2Mn/AxDo7mANOQAAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 15:35:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +Mk5Ow/o7mDcFgAAbx9fmQ (envelope-from ) for ; Wed, 14 Jul 2021 13:35:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 64BBE16C83 for ; Wed, 14 Jul 2021 15:35:11 +0200 (CEST) Received: from localhost ([::1]:39480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3f2c-0008Gl-EV for larch@yhetil.org; Wed, 14 Jul 2021 09:35:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3f2U-0008GH-FN for guix-patches@gnu.org; Wed, 14 Jul 2021 09:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60120) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3f2U-0008Ay-7u for guix-patches@gnu.org; Wed, 14 Jul 2021 09:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3f2U-0001Iq-6B for guix-patches@gnu.org; Wed, 14 Jul 2021 09:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Jul 2021 13:35:02 +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: Kei Kebreau Cc: Ricardo Wurmus , =?UTF-8?Q?G=C3=A1bor?= Boskovits , 33041@debbugs.gnu.org Received: via spool by 33041-submit@debbugs.gnu.org id=B33041.16262696904971 (code B ref 33041); Wed, 14 Jul 2021 13:35:02 +0000 Received: (at 33041) by debbugs.gnu.org; 14 Jul 2021 13:34:50 +0000 Received: from localhost ([127.0.0.1]:43430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3f2I-0001I5-74 for submit@debbugs.gnu.org; Wed, 14 Jul 2021 09:34:50 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:42844) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3f2F-0001Hb-Vf for 33041@debbugs.gnu.org; Wed, 14 Jul 2021 09:34:48 -0400 Received: by mail-qk1-f177.google.com with SMTP id e14so1524201qkl.9 for <33041@debbugs.gnu.org>; Wed, 14 Jul 2021 06:34:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=mSn5SVA+FnGmX7jLw6Cz7Vre/US5Tf2avtsbm8dO+mQ=; b=ugWfoyWCXVfCxRZoIcreRMYrhpHgEL+brikw2TvqVbh0gmng0kF4JVbwjb/6VnK/l1 NeOlmcMzJnKxw+ARoDHHe4fuHUlRITh4m3mSnZ3SL2EU1oKnOugK65rU71u07N62JYBh Cwm5m9fcCIeHxlYv5Hcv6hz97z8HBu/Lb6rHR6llv5DTU7n0j2BVevAnxAynmzrd9mgO Fio6X1Yov9tuGaeDNeZ3OlCPwO0xVgL2DgULR7G6aC0zWG1NuqR1p4WXRDkrkAnsEOOG hfmSSmzEv/baJ9wYsXuNkrEC6GDbd+dtC+u/8YDqXv1+FEdnPqblFVsmcnUXhK3vBIcF qvFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=mSn5SVA+FnGmX7jLw6Cz7Vre/US5Tf2avtsbm8dO+mQ=; b=JKO8Z2LO++q7HqfEtiOJcZP0TCwVuVO2h7CtAJjXKRfnawUnmI8c2AaWKOkwWIiiAX 6OeixO8anlcNZI/ZsBI4lnxbhl28vjsCzGLlUy7vwD8R9nhUBfa++EA7seZ2po/m5y0x RS9WN9WDKVUdiP6O7tjYHYxegapIEHQmzjI6kssMi1VnmUxp8wLZ/LBxYFPMXx9oG58P 40SnMzWSR6L51V/jtUODhPJm61VhpgtnWMWkkjqOGNn5YtvSyr1bl/6LxKyuyQSKS7qi iO+DICHEp0STCrFzhvUbYzHxt4ipTPqsgVaM3QLsV6WBDOdSw01SEm/OODuTWldSL/AO EQ/A== X-Gm-Message-State: AOAM533LSToz/a5gkoKH0aPGXPL1ZP2CO0M2XyvCuALuK96ZCicsirm4 GinFoMhdrh1DcpuqfEP+apAdLeNAWWqr4QR1 X-Google-Smtp-Source: ABdhPJzN2ICicaYfIPKPZ4IHZNmSIlhoKtJPffy91CSQcpRbbvfCJEBSDS1WjWiRxpHyxmSsOmSlbQ== X-Received: by 2002:a37:dcc2:: with SMTP id v185mr9950095qki.167.1626269682384; Wed, 14 Jul 2021 06:34:42 -0700 (PDT) Received: from hurd (dsl-159-138.b2b2c.ca. [66.158.159.138]) by smtp.gmail.com with ESMTPSA id j27sm1007213qkl.76.2021.07.14.06.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 06:34:41 -0700 (PDT) From: Maxim Cournoyer References: <87h7wiiejl.fsf@elephly.net> <87o8j1xs96.fsf@posteo.net> Date: Wed, 14 Jul 2021 09:34:40 -0400 In-Reply-To: <87o8j1xs96.fsf@posteo.net> (Kei Kebreau's message of "Thu, 10 Dec 2020 16:31:33 -0500") Message-ID: <871r81ow7j.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626269711; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=mSn5SVA+FnGmX7jLw6Cz7Vre/US5Tf2avtsbm8dO+mQ=; b=II2F2rJV5exDX5Uv3vLErxxXyfL5zEHrA6L2PVrKLzna8+dVeoXxtFaZuixxHYNLldZprl pZrEz+Qf4HcX43JRDYRedlNaTCcrVV1suRUd2lNQJt0qFqwNSISiTqGDe2hzSgz5FdAlPe tE0f3owzAiRlpIdDO715fr+r+n95elMukpe9h0T2ybSE8pGSRbE1uyLXb76tr12vI+Qvph 2RnuR+zRu3oi8NUstJvdOcVaXU3RJMLPzSmUfEa15CKj/el6I2qgO0BEbIUbDALbSW359P od9FYsa4tjSglrZU428QdiCIKwr/MwBCQK/rcc2oXdlph6jYMihdsu0gVS4/3w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626269711; a=rsa-sha256; cv=none; b=lUxEoQLhJ0kqT6b1rcUzWYgUWVRLhoC3MM3YECroLsHexlIFquqnH/fo6k3mItlDIa9yP1 HGT68eQTdCdWZ7sSA2yU+ZOYWw6cPuLUGeGAB50SWDdlU7mQTPsbguGG5FxIuVdxAEI5W9 TsH5FiFGI74etE2+/yE3II1bz3BibCX8VQ1PMTquQH3GNFRlgfsQ/eyIGzaB2cHc/PHYFq 8UOg8zKOK1WDNZQ28/ndfUWNH0IN4X89wPsLE2yq4ZcO0tYRmpwnGEAYSXSobxwuWG/VDX zV7jJfdaULcDjSUuX0JrGKrmzcfM8XAiNuL0/Fcn55w40ielH1f0o77ptORMpQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=ugWfoyWC; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=ugWfoyWC; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 64BBE16C83 X-Spam-Score: -1.30 X-Migadu-Scanner: scn1.migadu.com X-TUID: Y4Gqe6jfENMT Hi, Kei Kebreau writes: > 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. [...] > 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 =3D 2.2.1") > "REQUIRED_FREETYPE_VERSION =3D 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=C3=A1bor 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/htm= l/markup/HtmlDocWriter.java > +--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDo= cWriter.java Mon Aug 22 10:53:55 2016 -0700 > ++++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDo= cWriter.java Wed Dec 09 21:40:00 2020 -0500 > +@@ -396,6 +396,12 @@ > + */ > + public String today() { > + Calendar calendar =3D new GregorianCalendar(TimeZone.getDefault= ()); > +- return calendar.getTime().toString(); > ++ Date date=3Dcalendar.getTime(); > ++ String epoch=3DSystem.getenv("SOURCE_DATE_EPOCH"); > ++ if(epoch !=3D null) { > ++ long unixtime=3DLong.parseLong(epoch); > ++ date=3Dnew Date(unixtime*1000L); > ++ } > ++ return date.toString(); > + } > + } I tried this patch but it didn't work for me: --8<---------------cut here---------------start------------->8--- diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/sha= re/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicyHelper.html= /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/shar= e/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicyHelper.html 116c116 < Wednesday, July 14, 2021 12:30:23 AM GMT --- > Wednesday, July 14, 2021 12:14:11 AM GMT diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/sha= re/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicy.html /gnu/= store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/= icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicy.html 129c129 < Wednesday, July 14, 2021 12:30:23 AM GMT --- > Wednesday, July 14, 2021 12:14:11 AM GMT diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/sha= re/doc/icedtea/api/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.html= /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/shar= e/doc/icedtea/api/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.html 102c102 < Wednesday, July 14, 2021 12:30:23 AM GMT --- > Wednesday, July 14, 2021 12:14:11 AM GMT diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/sha= re/doc/icedtea/api/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.html = /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share= /doc/icedtea/api/org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.html 102c102 < Wednesday, July 14, 2021 12:30:23 AM GMT --- > Wednesday, July 14, 2021 12:14:11 AM GMT diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/sha= re/doc/icedtea/api/org/omg/PortableServer/THREAD_POLICY_ID.html /gnu/store/= 394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedte= a/api/org/omg/PortableServer/THREAD_POLICY_ID.html 102c102 < Wednesday, July 14, 2021 12:30:23 AM GMT --- > Wednesday, July 14, 2021 12:14:11 AM GMT --8<---------------cut here---------------end--------------->8--- Could you retest it to validate it's working as expected? Thank you, Maxim