Your message dated Fri, 15 Apr 2016 16:52:40 +0000
with message-id <[email protected]>
and subject line Bug#820684: fixed in fop 1:2.1-3
has caused the Debian Bug report #820684,
regarding fop: please make the build reproducible
(username,hostname,timestamps,locale)
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
820684: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820684
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: fop
Version: 1:2.1-2
Severity: wishlist
Tags: patch upstream
User: [email protected]
Usertags: username hostname timestamps locale
X-Debbugs-Cc: [email protected]
Dear Maintainer,
While working on the “reproducible builds” effort [1], we have noticed
that 'fop' could not be built reproducibly.
The attached patch fixes the encoding of documentation files, strips the
timestamp from the fop-ttfreader man page, and removes hostname,
username and OS info from MANIFEST files.
Once applied, fop can be built reproducibly in our current experimental
framework.
Regards,
Alexis Bienvenüe.
[1]: https://wiki.debian.org/ReproducibleBuilds
diff -Nru fop-2.1/debian/changelog fop-2.1/debian/changelog
--- fop-2.1/debian/changelog 2016-02-15 08:56:48.000000000 +0100
+++ fop-2.1/debian/changelog 2016-04-11 13:51:45.000000000 +0200
@@ -1,3 +1,11 @@
+fop (1:2.1-2.0~reproducible1) unstable; urgency=medium
+
+ * Use d/changelog date for pod2man
+ * Strip user/host from MANIFEST
+ * Fix javadoc encoding
+
+ -- Alexis Bienvenüe <[email protected]> Mon, 11 Apr 2016 11:48:50 +0200
+
fop (1:2.1-2) unstable; urgency=medium
[ Sylvestre Ledru ]
diff -Nru fop-2.1/debian/patches/javadoc_encoding.patch fop-2.1/debian/patches/javadoc_encoding.patch
--- fop-2.1/debian/patches/javadoc_encoding.patch 1970-01-01 01:00:00.000000000 +0100
+++ fop-2.1/debian/patches/javadoc_encoding.patch 2016-04-11 12:18:12.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Set javadoc output encoding to UTF-8
+ Set javadoc output encoding to UTF-8, to make the build reproducible.
+Author: Alexis Bienvenüe <[email protected]>
+
+Index: fop-2.1/build.xml
+===================================================================
+--- fop-2.1.orig/build.xml
++++ fop-2.1/build.xml
+@@ -963,6 +963,7 @@ NOTE:
+ windowtitle="${Name} ${version} API"
+ doctitle="Apache Formatting Objects Processor (FOP)"
+ bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved."
++ encoding="UTF-8" docencoding="UTF-8" charset="UTF-8"
+ overview="${src.dir}/java/org/apache/fop/overview.html"
+ maxmemory="256M">
+ <header><![CDATA[${name} ${version}]]></header>
diff -Nru fop-2.1/debian/patches/series fop-2.1/debian/patches/series
--- fop-2.1/debian/patches/series 2016-02-15 08:56:48.000000000 +0100
+++ fop-2.1/debian/patches/series 2016-04-11 12:07:35.000000000 +0200
@@ -2,3 +2,5 @@
fixbuildxml.patch
replace-sRGB-profile.patch
hyph_stacksize.patch
+strip_user_host_from_manifest.patch
+javadoc_encoding.patch
diff -Nru fop-2.1/debian/patches/strip_user_host_from_manifest.patch fop-2.1/debian/patches/strip_user_host_from_manifest.patch
--- fop-2.1/debian/patches/strip_user_host_from_manifest.patch 1970-01-01 01:00:00.000000000 +0100
+++ fop-2.1/debian/patches/strip_user_host_from_manifest.patch 2016-04-11 11:25:09.000000000 +0200
@@ -0,0 +1,81 @@
+Description: Strip user and host from MANIFEST
+ Strip user, host and os variables from MANIFEST.MF, to make the build
+ reproducible.
+Author: Alexis Bienvenüe <[email protected]>
+
+--- fop-2.1.orig/build.xml
++++ fop-2.1/build.xml
+@@ -461,7 +461,7 @@ list of possible build targets.
+ <attribute name="Implementation-Title" value="${Name}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/>
+ </manifest>
+ </jar>
+ </target>
+@@ -483,7 +483,7 @@ list of possible build targets.
+ <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}" manifest="${basedir}/fop.mf">
+ <manifest>
+ <attribute name="Main-Class" value="org.apache.fop.cli.Main"/>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/>
+ <section name="org/apache/fop/">
+ <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/>
+ <attribute name="Specification-Version" value="1.1"/>
+@@ -508,7 +508,7 @@ list of possible build targets.
+ </tstamp>
+ <jar jarfile="${build.dir}/fop-sandbox.jar" basedir="${build.sandbox-classes.dir}">
+ <manifest>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/>
+ </manifest>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ </jar>
+@@ -638,7 +638,7 @@ list of possible build targets.
+ <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
+ <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/>
+ </manifest>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ </jar>
+@@ -673,7 +673,7 @@ list of possible build targets.
+ <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
+ <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/>
+ </manifest>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ </jar>
+@@ -1044,7 +1044,7 @@ NOTE:
+ <target name="jar-javadocs" depends="javadocs" description="Generates a jar file containing the Javadocs">
+ <jar jarfile="${build.dir}/${name}-${version}-javadoc.jar">
+ <manifest>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version}, Target Java ${javac.target})"/>
+ </manifest>
+ <fileset dir="${build.javadocs.dir}"/>
+ <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+@@ -1348,7 +1348,7 @@ NOTE:
+ </antcall>
+ <jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
+ <manifest>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
++ <attribute name="Build-Id" value="${ts} (Java ${java.runtime.version})"/>
+ </manifest>
+ <fileset dir="${build.dir}">
+ <patternset>
+--- fop-2.1.orig/examples/plan/build.xml
++++ fop-2.1/examples/plan/build.xml
+@@ -133,7 +133,7 @@
+ <attribute name="Implementation-Title" value="${Name}"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
+- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}])"/>
++ <attribute name="Build-Id" value="${ts}"/>
+ </manifest>
+ </jar>
+ </target>
diff -Nru fop-2.1/debian/rules fop-2.1/debian/rules
--- fop-2.1/debian/rules 2016-02-15 08:56:48.000000000 +0100
+++ fop-2.1/debian/rules 2016-04-11 11:28:53.000000000 +0200
@@ -37,7 +37,6 @@
pod2man --section=1 \
--release="Fop-TTFReader " \
- --date="`date`" \
debian/fop-ttfreader.pod > build/fop-ttfreader.1
install/fop-doc::
--- End Message ---
--- Begin Message ---
Source: fop
Source-Version: 1:2.1-3
We believe that the bug you reported is fixed in the latest version of
fop, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mathieu Malaterre <[email protected]> (supplier of updated fop package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Fri, 15 Apr 2016 16:33:18 +0200
Source: fop
Binary: fop libfop-java fop-doc
Architecture: source
Version: 1:2.1-3
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers
<[email protected]>
Changed-By: Mathieu Malaterre <[email protected]>
Description:
fop - XML formatter driven by XSL Formatting Objects (XSL-FO.) - app
fop-doc - XML formatter driven by XSL Formatting Objects (doc) - doc
libfop-java - XML formatter driven by XSL Formatting Objects (XSL-FO.) - libs
Closes: 817264 820684
Changes:
fop (1:2.1-3) unstable; urgency=medium
.
[ Alexis Bienvenüe ]
* Use d/changelog date for pod2man
* Strip user/host from MANIFEST
+ debian/patches/strip_user_host_from_manifest.patch
* Fix javadoc encoding. Closes: #820684
+ debian/patches/javadoc_encoding.patch
.
[ Mathieu Malaterre ]
* Update offo to release 2.2. Closes: #817264
* Bump Std-Vers to 3.9.8, no changes needed
Checksums-Sha1:
aa367826d8540f7248fd5c7de8e2ac9b5bb307a9 2437 fop_2.1-3.dsc
66c2e066d0691588c170354eb207b1889b82f172 870068 fop_2.1-3.debian.tar.xz
Checksums-Sha256:
6102203301c69762b9f719c33414bfb31fc53dc6940c11c93e638e5dc3241055 2437
fop_2.1-3.dsc
f09de3b25238eeceb5819ce2d7db9b02e1afa08badf61215803069179b86fe64 870068
fop_2.1-3.debian.tar.xz
Files:
908d6ec8a589418b288952749d224bcd 2437 text optional fop_2.1-3.dsc
b4359c8f216538f1e8ab704e3b50c2e8 870068 text optional fop_2.1-3.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBAgAGBQJXEPvqAAoJEAFx4YKK4JNFzNUP/2zegCD6lWUIADrY5OYfOABS
9AQWYBsd37OhofftBdiuXtYg+G1uHtmByni3JgqEOIKEDcSutb47wWSocM4FqbTd
/kkGVw05on7XIxIFWbYRNZHLbYOuLg1peNORemjY7dqTrbGw5RnNm1K+gm3T501L
xOCav/RMnYkh49xAHxVjDcUAOwGybt4kgp+OmyMzmIxEo6FTntAA7ZXa6RhguF+H
RTSCjMKEhfnrjUDuBoDWS8/Uy2rffogDwHhthf029gFqHTml6tVhAaD4TcQxTtdd
EVfeltFz5OM0DYbpEGhkz32o7geqZ3WwaPMz3rRsMMIRPLg3Gi0ozTKnor+gLfVC
RT11JEHQUxCAOfMdkKVMR2vTKzeV2FGrcCvPQYaBXUvjadLhI7IZw7jS7sMsAtqq
MjhQgxxLeAuO5mePVqDfPmFttL0ahjn+PHuSqtSYg30AsessKZlgy8Xx0mdbrtpq
xUbeOeqSV+SzHTLfFYQSVRtnMttSR5fhl0w1GPgol9bMTLxWtToE+swOthJKz2Vf
sTjei4rdzK0NPIhOL+Pc2rcdDs7PBViN7oaW/xU4ZAdg8sB2XZs4BE+fv1jDmGlK
/0oB+1XpvKG/wSStrTEyiW9QEHgF3PepTb1P2gn7fltnaaji3bsuiEDz9aMl19VA
6Tl47qOkrIG61tJoKcuX
=ddsd
-----END PGP SIGNATURE-----
--- End Message ---
