[pkg-java] r18328 - in trunk/libapache-poi-java/debian: . patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Aug 28 21:03:59 UTC 2014
Author: ebourg-guest
Date: 2014-08-28 21:03:59 +0000 (Thu, 28 Aug 2014)
New Revision: 18328
Modified:
trunk/libapache-poi-java/debian/ant.properties
trunk/libapache-poi-java/debian/changelog
trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch
trunk/libapache-poi-java/debian/patches/04_jar_names.patch
trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch
Log:
New upstream release (3.10.1)
Fixes CVE-2014-3529 and CVE-2014-3574
Refreshed the patches
Modified: trunk/libapache-poi-java/debian/ant.properties
===================================================================
--- trunk/libapache-poi-java/debian/ant.properties 2014-08-27 07:57:28 UTC (rev 18327)
+++ trunk/libapache-poi-java/debian/ant.properties 2014-08-28 21:03:59 UTC (rev 18328)
@@ -8,4 +8,5 @@
main.junit.jar=/usr/share/java/junit4.jar
ooxml.xsds.tmp.dir=ooxml-xsds
ooxml.dom4j.jar=/usr/share/java/dom4j.jar
-ooxml.xmlbeans.jar=/usr/share/java/xmlbeans.jar
+ooxml.xmlbeans23.jar=/usr/share/java/xmlbeans.jar
+ooxml.xmlbeans26.jar=/usr/share/java/xmlbeans.jar
Modified: trunk/libapache-poi-java/debian/changelog
===================================================================
--- trunk/libapache-poi-java/debian/changelog 2014-08-27 07:57:28 UTC (rev 18327)
+++ trunk/libapache-poi-java/debian/changelog 2014-08-28 21:03:59 UTC (rev 18328)
@@ -1,3 +1,10 @@
+libapache-poi-java (3.10.1-1) unstable; urgency=medium
+
+ * New upstream release (Fixes CVE-2014-3529 and CVE-2014-3574)
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 28 Aug 2014 22:43:52 +0200
+
libapache-poi-java (3.10-2) unstable; urgency=medium
* Fixed a test failure with Java 8
Modified: trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch 2014-08-27 07:57:28 UTC (rev 18327)
+++ trunk/libapache-poi-java/debian/patches/01_disable-code-coverage.patch 2014-08-28 21:03:59 UTC (rev 18328)
@@ -3,7 +3,7 @@
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -719,9 +719,9 @@
+@@ -727,9 +727,9 @@
</taskdef>
</target>
@@ -15,7 +15,7 @@
<target name="testcoveragereport" depends="jacocotask" description="create test-report" xmlns:jacoco="antlib:org.jacoco.ant" if="coverage.enabled">
<delete dir="${coverage.dir}"/>
-@@ -793,8 +793,7 @@
+@@ -801,8 +801,7 @@
</target>
<target name="test-main" unless="main.test.notRequired"
@@ -25,7 +25,7 @@
<junit fork="yes" forkmode="once" printsummary="yes" haltonfailure="${halt.on.test.failure}"
failureproperty="main.test.failed" showoutput="true">
<classpath refid="test.classpath"/>
-@@ -813,7 +812,6 @@
+@@ -821,7 +820,6 @@
</fileset>
</batchtest>
</junit>
@@ -33,7 +33,7 @@
<delete file="${main.testokfile}"/>
<antcall target="-test-main-write-testfile"/>
</target>
-@@ -834,9 +832,8 @@
+@@ -842,9 +840,8 @@
</uptodate>
</target>
@@ -45,7 +45,7 @@
<junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
failureproperty="scratchpad.test.failed">
<classpath refid="test.scratchpad.classpath"/>
-@@ -858,7 +855,6 @@
+@@ -866,7 +863,6 @@
</fileset>
</batchtest>
</junit>
@@ -53,7 +53,7 @@
<delete file="${scratchpad.testokfile}"/>
<antcall target="-test-scratchpad-write-testfile"/>
</target>
-@@ -874,11 +870,10 @@
+@@ -882,11 +878,10 @@
</uptodate>
</target>
@@ -66,7 +66,7 @@
<junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
failureproperty="ooxml.test.failed">
<classpath refid="@{classpath}"/>
-@@ -895,11 +890,10 @@
+@@ -903,11 +898,10 @@
</fileset>
</batchtest>
</junit>
@@ -79,7 +79,7 @@
<ooxml-test-runner classpath="test.ooxml.classpath" type="ooxml"/>
<delete file="${ooxml.testokfile}"/>
<antcall target="-test-ooxml-write-testfile"/>
-@@ -934,7 +928,7 @@
+@@ -942,7 +936,7 @@
</java>
</target>
@@ -88,7 +88,7 @@
<delete file="${ooxml.testokfile}"/>
<echo message="Running ooxml tests against 'poi-ooxml-schemas'"/>
<ooxml-test-runner classpath="ooxml-lite.classpath" type="ooxml-lite"/>
-@@ -951,9 +945,8 @@
+@@ -959,9 +953,8 @@
<echo file="${excelant.testokfile}" append="false" message="testok"/>
</target>
@@ -100,7 +100,7 @@
<junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="${halt.on.test.failure}"
failureproperty="excelant.test.failed">
<classpath refid="test.excelant.classpath"/>
-@@ -968,7 +961,6 @@
+@@ -976,7 +969,6 @@
</fileset>
</batchtest>
</junit>
Modified: trunk/libapache-poi-java/debian/patches/04_jar_names.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2014-08-27 07:57:28 UTC (rev 18327)
+++ trunk/libapache-poi-java/debian/patches/04_jar_names.patch 2014-08-28 21:03:59 UTC (rev 18328)
@@ -4,7 +4,7 @@
Last-Update:2013-07-10
--- a/build.xml
+++ b/build.xml
-@@ -1144,32 +1144,32 @@
+@@ -1152,32 +1152,32 @@
<attribute name="Implementation-Vendor-Id" value="org.apache.poi"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
</manifest>
Modified: trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch
===================================================================
--- trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2014-08-27 07:57:28 UTC (rev 18327)
+++ trunk/libapache-poi-java/debian/patches/05_use-local-ooxml-xsds.patch 2014-08-28 21:03:59 UTC (rev 18328)
@@ -3,7 +3,7 @@
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -466,7 +466,7 @@
+@@ -474,7 +474,7 @@
</or>
</condition>
</target>
@@ -12,7 +12,7 @@
depends="check-jars,fetch-jars,check-compiled-ooxml-xsds"
description="Unpacks the OOXML xsd files, and compiles them into XmlBeans">
<property name="ooxml.xsds.tmp.dir" location="build/ooxml-xsds"/>
-@@ -483,7 +483,6 @@
+@@ -491,7 +491,6 @@
<equals arg1="${sun.arch.data.model}" arg2="64" />
</condition>
@@ -20,7 +20,7 @@
<!--
schema="build/ooxml-xsds/"
schema="build/ooxml-xsds/sml-workbook.xsd"
-@@ -508,7 +507,7 @@
+@@ -516,7 +515,7 @@
/>
</target>
More information about the pkg-java-commits
mailing list