[lucene2] 77/104: Disable calling svnversion during package build; Backport upstream fix (svn 834011): fix bug that causes false positive
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Mar 23 16:27:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository lucene2.
commit f0c2e575bbf76d95f514ecabcac6eb53cc63b6b4
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date: Sat Jan 23 14:04:19 2010 +0000
Disable calling svnversion during package build; Backport upstream fix (svn 834011): fix bug that causes false positive
---
debian/changelog | 8 ++++
debian/patches/00list | 4 +-
...ldd-failure-in-TestTimeLimitingCollector.dpatch | 34 +++++++++++++++
debian/patches/82_disable-svnversion-calls.dpatch | 49 ++++++++++++++++++++++
4 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0e5f4fb..6e8e68c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lucene2 (2.9.1+ds1-4) unstable; urgency=low
+
+ * Disable calling svnversion during package build
+ * Backport upstream fix (svn 834011): fix bug that causes false positive
+ failure in the test (Closes: #562308)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 22 Jan 2010 12:49:57 +0100
+
lucene2 (2.9.1+ds1-3) unstable; urgency=low
* Mention in this changelog that CVE-2007-2383 has been fixed
diff --git a/debian/patches/00list b/debian/patches/00list
index 32fc12f..fff9e1c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,6 +2,7 @@
05_add-osgi-metadata-in-manifests.dpatch
10_fix-javacc-locations.dpatch
11_fix-javacc-generated-files.dpatch
+12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
20_fix-java-compiler-version.dpatch
30_fix-contrib-ant-libs.dpatch
31_fix-contrib-ant-test-wrong-encoding.dpatch
@@ -13,4 +14,5 @@
61_lucli-script.dpatch
70_fix-contrib-regex-libs.dpatch
80_prevent-downloading-data-files.dpatch
-81_disable-test-tag-backcompat-tests.dpatch
+#81_disable-test-tag-backcompat-tests.dpatch
+82_disable-svnversion-calls.dpatch
diff --git a/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch b/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
new file mode 100755
index 0000000..8f9f564
--- /dev/null
+++ b/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix bug that causes false positive failure in the test
+## DP: Apache Lucene svn revision 834011
+
+ at DPATCH@
+diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java lucene2/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
+--- lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java 2009-10-23 17:21:47.000000000 +0200
++++ lucene2/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java 2010-01-22 12:49:03.000000000 +0100
+@@ -80,7 +80,8 @@
+ searcher = new IndexSearcher(directory);
+
+ String qtxt = "one";
+- for (int i = 0; i < docText.length; i++) {
++ // start from 1, so that the 0th doc never matches
++ for (int i = 1; i < docText.length; i++) {
+ qtxt += ' ' + docText[i]; // large query so that search will be longer
+ }
+ QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
+diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java lucene2/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
+--- lucene2~/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java 2009-10-23 17:21:47.000000000 +0200
++++ lucene2/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java 2010-01-22 12:44:21.000000000 +0100
+@@ -82,7 +82,8 @@
+ searcher = new IndexSearcher(directory);
+
+ String qtxt = "one";
+- for (int i = 0; i < docText.length; i++) {
++ // start from 1, so that the 0th doc never matches
++ for (int i = 1; i < docText.length; i++) {
+ qtxt += ' ' + docText[i]; // large query so that search will be longer
+ }
+ QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
diff --git a/debian/patches/82_disable-svnversion-calls.dpatch b/debian/patches/82_disable-svnversion-calls.dpatch
new file mode 100755
index 0000000..303b481
--- /dev/null
+++ b/debian/patches/82_disable-svnversion-calls.dpatch
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 82_disable-svnversion-calls.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove the calls to svnversion. svnversion is used to include the
+## DP: svn revision of the lucene source in the Manifest files, but calling
+## DP: svnversion may require network access which isn't available in buildds
+
+ at DPATCH@
+diff -urNad lucene2~/common-build.xml lucene2/common-build.xml
+--- lucene2~/common-build.xml 2010-01-22 09:36:40.000000000 +0100
++++ lucene2/common-build.xml 2010-01-22 09:37:27.000000000 +0100
+@@ -99,15 +99,6 @@
+
+ <property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
+
+- <!--
+- we attempt to exec svnversion to get details build information
+- for jar manifests. this property can be set at runtime to an
+- explicit path as needed, or ant will just try to find it in the
+- default PATH. (this is useful for Hudson)
+- -->
+- <property name="svnversion.exe" value="svnversion" />
+- <property name="svn.exe" value="svn" />
+-
+ <condition property="build-1-5-contrib">
+ <equals arg1="1.5" arg2="${ant.java.version}" />
+ </condition>
+@@ -307,7 +298,7 @@
+ <attribute name="Implementation-Title" value="org.apache.lucene"/>
+ <!-- impl version can be any string -->
+ <attribute name="Implementation-Version"
+- value="${version} ${svnversion} - ${DSTAMP} ${TSTAMP}"/>
++ value="${version} - ${DSTAMP} ${TSTAMP}"/>
+ <attribute name="Implementation-Vendor"
+ value="The Apache Software Foundation"/>
+ <attribute name="X-Compile-Source-JDK"
+@@ -347,11 +338,6 @@
+ <element name="manifest-attributes" optional="yes"/>
+ <element name="metainf-includes" optional="yes"/>
+ <sequential>
+- <!-- If possible, include the svnversion -->
+- <exec dir="." executable="${svnversion.exe}"
+- outputproperty="svnversion" failifexecutionfails="false">
+- <arg line="."/>
+- </exec>
+
+ <build-manifest/>
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git
More information about the pkg-java-commits
mailing list