Hello community, here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory checked in at 2018-11-06 15:24:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old) and /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-fop" Tue Nov 6 15:24:07 2018 rev:36 rq:645613 version:2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes 2018-09-03 10:33:25.396409750 +0200 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new/xmlgraphics-fop.changes 2018-11-06 15:24:10.768631083 +0100 @@ -1,0 +2,7 @@ +Mon Oct 29 06:31:21 UTC 2018 - [email protected] + +- Add reproducible-build-manifest.patch: Remove custom "Build-Id" + from manifests. It contains date and other information making the + build unreproducible (boo#1110024). + +------------------------------------------------------------------- New: ---- reproducible-build-manifest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-fop.spec ++++++ --- /var/tmp/diff_new_pack.ijEag6/_old 2018-11-06 15:24:12.560628490 +0100 +++ /var/tmp/diff_new_pack.ijEag6/_new 2018-11-06 15:24:12.564628484 +0100 @@ -40,6 +40,8 @@ Patch2: hyphenation-more-stack.patch Patch3: fix-javadoc-java8.patch Patch4: java8-compatibility.patch +# PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024 +Patch5: reproducible-build-manifest.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-commons-io >= 2.4 BuildRequires: apache-commons-logging @@ -89,6 +91,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: ++++++ reproducible-build-manifest.patch ++++++ Remove custom "Build-Id" field from manifest. It contains: * Timestamp: Makes the build unreproducible. * Architecture: Makes the build arch-dependent whereas we want it as noarch.: * OS and Java version: Too detailed information, triggers too many publication for no real advantage. -- diff -up fop-2.1/build.xml.orig fop-2.1/build.xml --- fop-2.1/build.xml.orig 2018-10-29 07:26:58.205413821 +0100 +++ fop-2.1/build.xml 2018-10-29 07:55:33.117484917 +0100 @@ -460,7 +460,6 @@ 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}])"/> </manifest> </jar> </target> @@ -482,7 +481,6 @@ list of possible build targets. <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}"> <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}])"/> <section name="org/apache/fop/"> <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/> <attribute name="Specification-Version" value="1.1"/> @@ -506,9 +504,7 @@ list of possible build targets. <format property="ts" pattern="yyyyMMdd-HHmmss-z"/> </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}])"/> - </manifest> + <manifest/> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> </jar> </target> @@ -637,7 +633,6 @@ 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}])"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> </jar> @@ -672,7 +667,6 @@ 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}])"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> </jar> @@ -1042,9 +1036,7 @@ NOTE: </target> <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}])"/> - </manifest> + <manifest/> <fileset dir="${build.javadocs.dir}"/> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> </jar> @@ -1346,9 +1338,7 @@ NOTE: <param name="pwd" value="${pwd}"/> </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}])"/> - </manifest> + <manifest/> <fileset dir="${build.dir}"> <patternset> <include name="${name}-${version}.jar*"/> diff -up fop-2.1/examples/plan/build.xml.orig fop-2.1/examples/plan/build.xml --- fop-2.1/examples/plan/build.xml.orig 2018-10-29 07:48:15.749466784 +0100 +++ fop-2.1/examples/plan/build.xml 2018-10-29 07:48:22.709467073 +0100 @@ -133,7 +133,6 @@ <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}])"/> </manifest> </jar> </target>
