This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 74ef3a2c60cb72834aee7f172445a59eaab720c5 Author: Jan-Pascal van Best <[email protected]> Date: Thu Dec 24 13:10:58 2009 +0000 Working on patch set set OSGi metadata in the MANIFEST.MF files --- debian/changelog | 12 ++- debian/patches/00list | 1 + .../05_add-osgi-metadata-in-manifests.dpatch | 109 +++++++++++++++++++++ 3 files changed, 121 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 59202ae..4630035 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,17 @@ +lucene2 (2.9.1+ds1-3~pre1) experimental; urgency=low + + * Mention in this changelog that CVE-2007-2383 has been fixed + (Closes: #558355; Fix CVE-2007-2383) + * First try at providing OSGi metadata in the Manifest for the + core and analysis packages (needed for building Eclipse). Still + need to set symbolicname and requirepackage for most jars. + + -- Jan-Pascal van Best <[email protected]> Thu, 24 Dec 2009 14:10:17 +0100 + lucene2 (2.9.1+ds1-2) unstable; urgency=low * Removed (unused) embedded Prototype javascript library - (Closes: #555225, #555226) + (Closes: #555225, #555226; Fix CVE-2007-2383) * Added README.source containing information about how to create the Debian source from the upstream source tarball diff --git a/debian/patches/00list b/debian/patches/00list index b58a86f..32fc12f 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,5 @@ 01_remove_all_jarfiles.dpatch +05_add-osgi-metadata-in-manifests.dpatch 10_fix-javacc-locations.dpatch 11_fix-javacc-generated-files.dpatch 20_fix-java-compiler-version.dpatch diff --git a/debian/patches/05_add-osgi-metadata-in-manifests.dpatch b/debian/patches/05_add-osgi-metadata-in-manifests.dpatch new file mode 100755 index 0000000..42b788f --- /dev/null +++ b/debian/patches/05_add-osgi-metadata-in-manifests.dpatch @@ -0,0 +1,109 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_add-osgi-metadata-in-manifests.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad lucene2~/build.xml lucene2/build.xml +--- lucene2~/build.xml 2009-12-24 13:55:47.000000000 +0100 ++++ lucene2/build.xml 2009-12-24 13:55:48.000000000 +0100 +@@ -21,6 +21,16 @@ + + <property name="junit.includes" value="**/Test*.java"/> + ++ <property name="OSGI.symbolicname" value="org.apache.lucene" /> ++ <pathconvert property="OSGi.exportpackage" pathsep=","> ++ <dirset dir="src/java" excludes="org org/apache"/> ++ <mapper> ++ <chainedmapper> ++ <packagemapper from="${basedir}/src/java/*" to="*"/> ++ </chainedmapper> ++ </mapper> ++ </pathconvert> ++ + <import file="common-build.xml"/> + + <property name="build.demo.template" value="src/demo/demo-build.template"/> +diff -urNad lucene2~/common-build.xml lucene2/common-build.xml +--- lucene2~/common-build.xml 2009-12-24 13:55:47.000000000 +0100 ++++ lucene2/common-build.xml 2009-12-24 13:56:02.000000000 +0100 +@@ -313,6 +313,28 @@ + value="${javac.source}"/> + <attribute name="X-Compile-Target-JDK" + value="${javac.target}"/> ++ <attribute name="Bundle-ManifestVersion" ++ value="2"/> ++ <attribute name="Bundle-SymbolicName" ++ value="${OSGi.symbolicname}"/> ++ <attribute name="Require-Bundle" ++ value="${OSGi.requirebundle}"/> ++ <attribute name="Bundle-Name" ++ value="@{title}"/> ++ <attribute name="Bundle-Version" ++ value="${version}"/><!-- ++ <attribute name="Bundle-Version" ++ value="1.9.1.v20080530-1600"/>--> ++ <attribute name="Bundle-RequiredExecutionEnvironment" ++ value="J2SE-1.5"/> ++ <attribute name="Bundle-Vendor" ++ value="The Apache Software Foundation"/> ++ <attribute name="Bundle-Localization" ++ value="plugin"/> ++ <!--<attribute name="Export-Package" ++ value="org.apache.lucene,org.apache.lucene.analysis,org.apache.lucene.analysis.standard,org.apache.lucene.analysis.tokenattributes,org.apache.lucene.document,org.apache.lucene.index,org.apache.lucene.messages,org.apache.lucene.queryParser,org.apache.lucene.search,org.apache.lucene.search.function,org.apache.lucene.search.payloads,org.apache.lucene.search.spans,org.apache.lucene.store,org.apache.lucene.util,org.apache.lucene.util.cache"/>--> ++ <attribute name="Export-Package" ++ value="${OSGi.exportpackage}"/> + </manifest> + </sequential> + </macrodef> +diff -urNad lucene2~/contrib/analyzers/common/build.xml lucene2/contrib/analyzers/common/build.xml +--- lucene2~/contrib/analyzers/common/build.xml 2009-12-24 13:55:47.000000000 +0100 ++++ lucene2/contrib/analyzers/common/build.xml 2009-12-24 13:55:48.000000000 +0100 +@@ -31,7 +31,24 @@ + <property name="maven.dist.dir" location="../../../dist/maven" /> + + <import file="../../contrib-build.xml"/> +- ++ ++ <property name="OSGi.symbolicname" value="org.apache.lucene.analysis" /> ++ <property name="OSGi.requirebundle" ++ value='org.apache.lucene;bundle-version="${version}";visibility:=reexport' /> ++ <!-- ++ <property name="OSGi.exportpackage" ++ value="org.apache.lucene.analysis.shingle,org.apache.lucene.analysis.fr,org.apache.lucene.analysis.payloads,org.apache.lucene.analysis.cn,org.apache.lucene.analysis.reverse,org.apache.lucene.analysis.ar,org.apache.lucene.analysis.query,org.apache.lucene.analysis.fa,org.apache.lucene.analysis.el,org.apache.lucene.analysis.nl,org.apache.lucene.analysis.de,org.apache.lucene.analysis.cjk,org.apache.lucene.analysis.compound,org.apache.lucene.analysis.compound.hyphenation,org.apache.lucen [...] ++--> ++ <pathconvert property="OSGi.exportpackage" pathsep=","> ++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> ++ <!-- <map from="src/java" to=""/> --> ++ <mapper> ++ <chainedmapper> ++ <packagemapper from="${basedir}/src/java/*" to="*"/> ++ </chainedmapper> ++ </mapper> ++ </pathconvert> ++ + <path id="test.classpath"> + <path refid="classpath"/> + <pathelement location="../../../build/classes/test/"/> +diff -urNad lucene2~/contrib/contrib-build.xml lucene2/contrib/contrib-build.xml +--- lucene2~/contrib/contrib-build.xml 2009-12-24 13:55:47.000000000 +0100 ++++ lucene2/contrib/contrib-build.xml 2009-12-24 13:55:48.000000000 +0100 +@@ -24,7 +24,16 @@ + <property name="build.dir" location="../../build/contrib/${ant.project.name}"/> + <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/> + <property name="maven.dist.dir" location="../../dist/maven"/> +- ++ ++ <pathconvert property="OSGi.exportpackage" pathsep=","> ++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene"/> ++ <mapper> ++ <chainedmapper> ++ <packagemapper from="${basedir}/src/java/*" to="*"/> ++ </chainedmapper> ++ </mapper> ++ </pathconvert> ++ + <import file="../common-build.xml"/> + + <property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
