Author: pabloduboue-guest
Date: 2009-12-14 09:24:06 +0000 (Mon, 14 Dec 2009)
New Revision: 11287
Added:
trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch
Modified:
trunk/jetty/debian/changelog
trunk/jetty/debian/jetty.install
trunk/jetty/debian/patches/series
Log:
* New upstream release.
* Added OSGi bundle metadata (by upstream). (Closes: #558187)
* Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877)
Modified: trunk/jetty/debian/changelog
===================================================================
--- trunk/jetty/debian/changelog 2009-12-14 08:52:36 UTC (rev 11286)
+++ trunk/jetty/debian/changelog 2009-12-14 09:24:06 UTC (rev 11287)
@@ -1,14 +1,11 @@
-jetty (6.1.21-2) UNRELEASED; urgency=low
+jetty (6.1.22-1) UNRELEASED; urgency=low
- * Imported two patches from Fedora and created one ourselves:
- - Fixed problems where jetty could be tricked into writing binary
- data to log-files.
- - Fixed some javascript injections in the examples.
- (Fixes: CVE-2009-3579)
- * Corrected path to jetty web-apps. (Closes: #554877)
+ * New upstream release.
+ * Added OSGi bundle metadata (by upstream). (Closes: #558187)
+ * Corrected path to jetty web-apps (by Niels Thykier). (Closes: #554877)
- -- Niels Thykier <ni...@thykier.net> Fri, 27 Nov 2009 20:54:58 +0100
-
+ -- Pablo Duboue <pablo.dub...@gmail.com> Sun, 13 Dec 2009 1:55:00 -0400
+
jetty (6.1.21-1) unstable; urgency=medium
* New upstream release.
Modified: trunk/jetty/debian/jetty.install
===================================================================
--- trunk/jetty/debian/jetty.install 2009-12-14 08:52:36 UTC (rev 11286)
+++ trunk/jetty/debian/jetty.install 2009-12-14 09:24:06 UTC (rev 11287)
@@ -8,5 +8,5 @@
README.txt usr/share/doc/jetty
LICENSES/cla-* usr/share/doc/jetty/LICENSES
LICENSES/ccla-* usr/share/doc/jetty/LICENSES
-LICENSES/NOTICE.txt usr/share/doc/jetty/LICENSES
+NOTICE.txt usr/share/doc/jetty/LICENSES
debian/README.Debian usr/share/doc/jetty
Added: trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch
===================================================================
--- trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch
(rev 0)
+++ trunk/jetty/debian/patches/01_add_manifests_with_osgi_bundles_info.patch
2009-12-14 09:24:06 UTC (rev 11287)
@@ -0,0 +1,125 @@
+Description: Adds MANIFEST.MF with OSGi Bundle information (needed for Eclipse)
+Origin: Upstream.
+
+diff -Naur ./modules-old/jetty/src/main/resources/META-INF/MANIFEST.MF
./modules/jetty/src/main/resources/META-INF/MANIFEST.MF
+--- ./modules-old/jetty/src/main/resources/META-INF/MANIFEST.MF
1970-01-01 00:00:00.000000000 +0000
++++ ./modules/jetty/src/main/resources/META-INF/MANIFEST.MF 2009-12-09
23:54:58.000000000 +0000
+@@ -0,0 +1,71 @@
++Manifest-Version: 1.0
++implementation-version: 6.1.22
++mode: development
++package: org.mortbay
++url: http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty
++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0, http://www
++ .eclipse.org/org/documents/epl-v10.php
++Import-Package: javax.net.ssl,javax.security.cert,javax.servlet;versio
++ n="2.5",javax.servlet.http;version="2.5",javax.servlet.jsp;resolution
++ :=optional,javax.servlet.resources;resolution:=optional;version="2.5"
++ ,javax.xml.parsers,org.apache.jasper.servlet;resolution:=optional,org
++ .mortbay.component;version="6.1",org.mortbay.jetty.handler.management
++ ;resolution:=optional,org.mortbay.log;version="6.1",org.mortbay.servl
++ et;version="6.1",org.mortbay.thread;version="6.1",org.mortbay.util;ve
++ rsion="6.1",org.mortbay.util.ajax;version="6.1",org.xml.sax,org.xml.s
++ ax.helpers
++Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bnd-LastModified: 1259702329236
++Export-Package: org.mortbay.jetty.bio;uses:="org.mortbay.log,org.mortb
++ ay.thread,org.mortbay.io.bio,org.mortbay.io,org.mortbay.jetty";versio
++ n="6.1.22",org.mortbay.servlet.jetty;uses:="javax.servlet.http,javax.
++ servlet,org.mortbay.servlet,org.mortbay.io,org.mortbay.jetty";version
++ ="6.1.22",org.mortbay.jetty.nio;uses:="org.mortbay.log,org.mortbay.th
++ read,org.mortbay.io,org.mortbay.jetty,org.mortbay.util.ajax,org.mortb
++ ay.io.nio";version="6.1.22",org.mortbay.resource;uses:="org.mortbay.l
++ og,org.mortbay.util";version="6.1.22",org.mortbay.io.nio;uses:="org.m
++ ortbay.log,org.mortbay.component,org.mortbay.thread,org.mortbay.io,or
++ g.mortbay.jetty";version="6.1.22",org.mortbay.jetty.security;uses:="o
++ rg.mortbay.util,org.mortbay.component,javax.servlet.http,org.mortbay.
++ jetty.bio,javax.security.cert,org.mortbay.resource,org.mortbay.log,ja
++ vax.servlet,org.mortbay.io.bio,org.mortbay.jetty.servlet,org.mortbay.
++ io,org.mortbay.jetty.handler,org.mortbay.jetty.webapp,org.mortbay.jet
++ ty,javax.net.ssl";version="6.1.22",org.mortbay.jetty.deployer;uses:="
++ org.mortbay.util,org.mortbay.component,org.mortbay.resource,org.mortb
++ ay.log,org.mortbay.xml,org.mortbay.jetty.handler,org.mortbay.jetty,or
++ g.mortbay.jetty.webapp";version="6.1.22",org.mortbay.xml;uses:="org.m
++ ortbay.util,org.mortbay.component,org.xml.sax,org.mortbay.resource,or
++ g.mortbay.log,javax.xml.parsers,org.xml.sax.helpers";version="6.1.22"
++ ,org.mortbay.io.bio;uses:="org.mortbay.log,org.mortbay.io";version="6
++ .1.22",org.mortbay.jetty.servlet;uses:="org.mortbay.util,javax.servle
++ t.http,org.mortbay.component,org.mortbay.jetty.nio,org.mortbay.resour
++ ce,org.mortbay.io.nio,org.mortbay.jetty.security,org.mortbay.log,java
++ x.servlet,org.mortbay.io,org.mortbay.jetty.handler,org.mortbay.jetty"
++ ;version="6.1.22",org.mortbay.io;uses:="org.mortbay.log,org.mortbay.u
++ til";version="6.1.22",org.mortbay.jetty.handler;uses:="org.mortbay.ut
++ il,org.mortbay.component,javax.servlet.http,org.mortbay.resource,org.
++ mortbay.log,javax.servlet,org.mortbay.jetty.servlet,org.mortbay.io,or
++ g.mortbay.jetty.webapp,org.mortbay.jetty";version="6.1.22",org.mortba
++ y.jetty;uses:="org.mortbay.util,org.mortbay.component,javax.servlet.h
++ ttp,org.mortbay.jetty.bio,org.mortbay.thread,org.mortbay.resource,org
++ .mortbay.io.nio,org.mortbay.jetty.security,org.mortbay.log,javax.serv
++ let,org.mortbay.jetty.servlet,org.mortbay.jetty.handler,org.mortbay.i
++ o,org.mortbay.jetty.webapp,org.mortbay.util.ajax";version="6.1.22",or
++ g.mortbay.jetty.webapp;uses:="org.mortbay.util,javax.servlet.http,org
++ .mortbay.resource,org.mortbay.jetty.security,org.mortbay.jetty.deploy
++ er,org.mortbay.log,javax.servlet,org.mortbay.xml,org.mortbay.jetty.se
++ rvlet,org.mortbay.jetty.handler,org.mortbay.jetty";version="6.1.22"
++Bundle-Version: 6.1.22
++Ignore-Package: org.mortbay.jetty.bio,org.mortbay.servlet.jetty,org.mo
++ rtbay.jetty.nio,org.mortbay.resource,org.mortbay.io.nio,org.mortbay.j
++ etty.security,org.mortbay.jetty.deployer,org.mortbay.xml,org.mortbay.
++ io.bio,org.mortbay.jetty.servlet,org.mortbay.jetty.handler,org.mortba
++ y.io,org.mortbay.jetty,org.mortbay.jetty.webapp
++Bundle-Name: Jetty Server
++Bundle-Description: Jetty server core
++Bundle-DocURL: http://jetty.mortbay.org
++Bundle-ManifestVersion: 2
++Bundle-Vendor: Mort Bay Consulting
++Bundle-SymbolicName: org.mortbay.jetty.server
++Tool: Bnd-0.0.238
++
+diff -Naur ./modules-old/start/src/main/resources/META-INF/MANIFEST.MF
./modules/start/src/main/resources/META-INF/MANIFEST.MF
+--- ./modules-old/start/src/main/resources/META-INF/MANIFEST.MF
1970-01-01 00:00:00.000000000 +0000
++++ ./modules/start/src/main/resources/META-INF/MANIFEST.MF 2009-12-09
23:54:58.000000000 +0000
+@@ -0,0 +1,7 @@
++Manifest-Version: 1.0
++Main-Class: org.mortbay.start.Main
++implementation-version: 6.1.22
++mode: development
++package: org.mortbay
++url: http://www.eclipse.org/jetty/jetty-parent/project/modules/start
++
+diff -Naur ./modules-old/util/src/main/resources/META-INF/MANIFEST.MF
./modules/util/src/main/resources/META-INF/MANIFEST.MF
+--- ./modules-old/util/src/main/resources/META-INF/MANIFEST.MF 1970-01-01
00:00:00.000000000 +0000
++++ ./modules/util/src/main/resources/META-INF/MANIFEST.MF 2009-12-09
23:54:58.000000000 +0000
+@@ -0,0 +1,32 @@
++Manifest-Version: 1.0
++implementation-version: 6.1.22
++mode: development
++package: org.mortbay
++url: http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty-u
++ til
++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0, http://www
++ .eclipse.org/org/documents/epl-v10.php
++Import-Package: javax.servlet,javax.servlet.http,org.slf4j;resolution:
++ =optional;version="1.3"
++Bundle-RequiredExecutionEnvironment: J2SE-1.4
++Bnd-LastModified: 1259702316270
++Export-Package: org.mortbay.util;uses:="org.mortbay.log,org.mortbay.th
++ read";version="6.1.22",org.mortbay.log;uses:="org.mortbay.util,org.sl
++ f4j";version="6.1.22",org.mortbay.component;uses:="org.mortbay.log,or
++ g.mortbay.util";version="6.1.22",org.mortbay.thread;uses:="org.mortba
++ y.log,org.mortbay.component";version="6.1.22",org.mortbay.servlet;use
++ s:="org.mortbay.log,org.mortbay.util,javax.servlet.http,javax.servlet
++ ,org.mortbay.util.ajax";version="6.1.22",org.mortbay.util.ajax;uses:=
++ "org.mortbay.log,org.mortbay.util,javax.servlet.http,javax.servlet";v
++ ersion="6.1.22"
++Bundle-Version: 6.1.22
++Ignore-Package: org.mortbay.log,org.mortbay.util,org.mortbay.component
++ ,org.mortbay.thread,org.mortbay.servlet,org.mortbay.util.ajax
++Bundle-Name: Jetty Utilities
++Bundle-Description: Utility classes for Jetty
++Bundle-DocURL: http://jetty.mortbay.org
++Bundle-ManifestVersion: 2
++Bundle-Vendor: Mort Bay Consulting
++Bundle-SymbolicName: org.mortbay.jetty.util
++Tool: Bnd-0.0.238
++
Modified: trunk/jetty/debian/patches/series
===================================================================
--- trunk/jetty/debian/patches/series 2009-12-14 08:52:36 UTC (rev 11286)
+++ trunk/jetty/debian/patches/series 2009-12-14 09:24:06 UTC (rev 11287)
@@ -1,3 +1 @@
-01_CVE_2009_3579.patch
-02_log_exploit.patch
-03_jsnoop-vul.patch
+01_add_manifests_with_osgi_bundles_info.patch
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
