GNU bug report logs - #33041
[PATCH] gnu: icedtea-6: Make javadoc reproducible.

Previous Next

Package: guix-patches;

Reported by: Gábor Boskovits <boskovits <at> gmail.com>

Date: Sun, 14 Oct 2018 19:08:02 UTC

Severity: normal

Tags: moreinfo, patch

Done: Vagrant Cascadian <vagrant <at> reproducible-builds.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 33041 in the body.
You can then email your comments to 33041 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#33041; Package guix-patches. (Sun, 14 Oct 2018 19:08:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Gábor Boskovits <boskovits <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sun, 14 Oct 2018 19:08:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Gábor Boskovits <boskovits <at> gmail.com>
Subject: [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Sun, 14 Oct 2018 21:06:55 +0200

* 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                         | 10 ++++---
 .../icedtea-6-javadoc-reproducibility.patch   | 26 +++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c3bc35a80..6e332b041 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -807,6 +807,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/icecat-use-system-graphite2.patch	\
   %D%/packages/patches/icecat-use-system-harfbuzz.patch		\
   %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch  \
+  %D%/packages/patches/icedtea-6-javadoc-reproducibility.patch	\
   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch			\
   %D%/packages/patches/ilmbase-fix-tests.patch			\
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d2f4c9d05..ab9e3fd3a 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -734,10 +734,12 @@ machine.")))
                                        (string-append part "-src"))
                             part))
                          '("jdk" "corba"
-                           "langtools" "jaxp" "jaxws")))
+                           "jaxp" "jaxws")))
              (with-directory-excursion "openjdk"
                (invoke "tar" "xvf" (assoc-ref inputs "hotspot-src"))
-               (rename-file "hg-checkout" "hotspot"))
+               (rename-file "hg-checkout" "hotspot")
+               (invoke "tar" "xvf" (assoc-ref inputs "langtools-src"))
+               (rename-file "hg-checkout" "langtools"))
              (substitute* "Makefile.in"
                (("echo \"ERROR: No up-to-date OpenJDK zip available\"; exit -1;")
                 "echo \"trust me\";")
@@ -976,7 +978,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 000000000..d4c8a97f3
--- /dev/null
+++ b/gnu/packages/patches/icedtea-6-javadoc-reproducibility.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User Gábor Boskovits <boskovits <at> gmail.com>
+# 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 -r 6e5f716a6592 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	Sat Oct 13 20:54:34 2018 +0200
+@@ -396,6 +396,13 @@
+      */
+     public String today() {
+         Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
+-        return calendar.getTime().toString();
++	Date date=calendar.getTime();
++	Map<String,String> env = System.getenv();
++	if(env.containsKey("SOURCE_DATE_EPOCH")) {
++	    String epoch=env.get("SOURCE_DATE_EPOCH");
++	    long unixtime=Long.parseLong(epoch);
++	    date=new Date(unixtime*1000L);
++	}
++        return date.toString();
+     }
+ }
-- 
2.18.0
Information forwarded to guix-patches <at> gnu.org:
bug#33041; Package guix-patches. (Wed, 17 Oct 2018 07:59:01 GMT) Full text and rfc822 format available.

Message #8 received at 33041 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Gábor Boskovits <boskovits <at> gmail.com>
Cc: 33041 <at> debbugs.gnu.org
Subject: Re: [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Wed, 17 Oct 2018 09:58:11 +0200

[Message part 1 (text/plain, inline)]
Hi Gabor,

On Sun, 14 Oct 2018 21:06:55 +0200
Gábor Boskovits <boskovits <at> gmail.com> wrote:

> +diff -r 06656286f572 -r 6e5f716a6592 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	Sat Oct 13 20:54:34 2018 +0200
> +@@ -396,6 +396,13 @@
> +      */
> +     public String today() {
> +         Calendar calendar = new GregorianCalendar(TimeZone.getDefault());
> +-        return calendar.getTime().toString();
> ++	Date date=calendar.getTime();
> ++	Map<String,String> env = System.getenv();
> ++	if(env.containsKey("SOURCE_DATE_EPOCH")) {
> ++	    String epoch=env.get("SOURCE_DATE_EPOCH");
> ++	    long unixtime=Long.parseLong(epoch);
> ++	    date=new Date(unixtime*1000L);
> ++	}
> ++        return date.toString();
> +     }
> + }

Indentation is off.

Also, why not System.getenv("SOURCE_DATE_EPOCH") and check for null?  Not that important, though.

Otherwise LGTM!

[Message part 2 (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#33041; Package guix-patches. (Thu, 14 May 2020 18:00:02 GMT) Full text and rfc822 format available.

Message #11 received at 33041 <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: 33041 <at> debbugs.gnu.org
Cc: Gábor Boskovits <boskovits <at> gmail.com>
Subject: [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Thu, 14 May 2020 19:58:54 +0200

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
Information forwarded to guix-patches <at> gnu.org:
bug#33041; Package guix-patches. (Thu, 14 May 2020 18:23:01 GMT) Full text and rfc822 format available.

Message #14 received at 33041 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: Ricardo Wurmus <rekado <at> elephly.net>
Cc: 33041 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Thu, 14 May 2020 20:22:02 +0200

[Message part 1 (text/plain, inline)]
Ok, I will look into it.

Ricardo Wurmus <rekado <at> elephly.net> 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
>

[Message part 2 (text/html, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#33041; Package guix-patches. (Thu, 10 Dec 2020 21:32:01 GMT) Full text and rfc822 format available.

Message #17 received at 33041 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: Gábor Boskovits <boskovits <at> gmail.com>
Cc: Ricardo Wurmus <rekado <at> elephly.net>, 33041 <at> debbugs.gnu.org
Subject: Re: [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Thu, 10 Dec 2020 16:31:33 -0500

[Message part 1 (text/plain, inline)]
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


[0001-gnu-icedtea-6-Make-javadoc-reproducible.patch (text/x-patch, attachment)]
[Message part 3 (text/plain, inline)]

Gábor Boskovits <boskovits <at> gmail.com> writes:

> Ok, I will look into it.
>
> Ricardo Wurmus <rekado <at> elephly.net> 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

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#33041; Package guix-patches. (Wed, 14 Jul 2021 13:35:02 GMT) Full text and rfc822 format available.

Message #20 received at 33041 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: Ricardo Wurmus <rekado <at> elephly.net>,
 Gábor Boskovits <boskovits <at> gmail.com>, 33041 <at> debbugs.gnu.org
Subject: Re: bug#33041: [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Wed, 14 Jul 2021 09:34:40 -0400

Hi,

Kei Kebreau <kkebreau <at> posteo.net> 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 = 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 <boskovits <at> gmail.com>
> +# 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();
> +     }
> + }

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/share/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicyHelper.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/POAPackage/WrongPolicyHelper.html
116c116
<  Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
>  Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/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</div>
---
>  Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.html
102c102
<  Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
>  Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/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</div>
---
>  Wednesday, July 14, 2021 12:14:11 AM GMT</div>
diff -r /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc/share/doc/icedtea/api/org/omg/PortableServer/THREAD_POLICY_ID.html /gnu/store/394r3dq5q2kmxddwcbh4wwnxmlp0b2rs-icedtea-1.13.13-doc-check/share/doc/icedtea/api/org/omg/PortableServer/THREAD_POLICY_ID.html
102c102
<  Wednesday, July 14, 2021 12:30:23 AM GMT</div>
---
>  Wednesday, July 14, 2021 12:14:11 AM GMT</div>
--8<---------------cut here---------------end--------------->8---

Could you retest it to validate it's working as expected?

Thank you,

Maxim
Added tag(s) moreinfo. Request was from Maxim Cournoyer <maxim.cournoyer <at> gmail.com> to control <at> debbugs.gnu.org. (Wed, 14 Jul 2021 13:35:02 GMT) Full text and rfc822 format available.
Reply sent to Vagrant Cascadian <vagrant <at> reproducible-builds.org>:
You have taken responsibility. (Thu, 07 Mar 2024 22:26:01 GMT) Full text and rfc822 format available.
Notification sent to Gábor Boskovits <boskovits <at> gmail.com>:
bug acknowledged by developer. (Thu, 07 Mar 2024 22:26:01 GMT) Full text and rfc822 format available.

Message #27 received at 33041-done <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> reproducible-builds.org>
To: 33041-done <at> debbugs.gnu.org
Cc: Gábor Boskovits <boskovits <at> gmail.com>
Subject: Re: [bug#33041] [PATCH] gnu: icedtea-6: Make javadoc reproducible.
Date: Thu, 07 Mar 2024 14:24:15 -0800

[Message part 1 (text/plain, inline)]
On 2018-10-14, Gábor Boskovits wrote:
> * 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.

icedtea-6 was removed in 96ccb89bef04405cc615df492e1219c75ef4f11a.

Marking as done.

FWIW, icedtea <at> 3 appears to be reproducible, although icedtea <at> 2 appears
not to be...

live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 05 Apr 2024 11:24:22 GMT) Full text and rfc822 format available.
This bug report was last modified 21 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.