~ubuntu-branches/ubuntu/maverick/tomcat6/maverick

« back to all changes in this revision

Viewing changes to debian/patches/jsp-api-OSGi.patch

  • Committer: Bazaar Package Importer
  • Author(s): Torsten Werner
  • Date: 2010-06-28 21:41:31 UTC
  • mfrom: (2.2.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100628214131-3wktukpb3lgdf83h
Tags: 6.0.26-5
* Convert patches to dep3 format.
* Backport security fix from trunk to fix CVE-2010-1157. (Closes: #587447)
* Set urgency to medium due to the security fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Description: Adds OSGi metadata needed by eclipse.
2
 
 
3
 
--- a/res/META-INF/jsp-api.jar.manifest
4
 
+++ b/res/META-INF/jsp-api.jar.manifest
5
 
@@ -1,6 +1,18 @@
6
 
 Manifest-version: 1.0
7
 
 X-Compile-Source-JDK: @source.jdk@
8
 
 X-Compile-Target-JDK: @target.jdk@
9
 
+Import-Package: javax.servlet; version=2.5,javax.servlet.http; version
10
 
+ =2.5,javax.servlet.resources; version=2.5
11
 
+Bundle-ManifestVersion: 2
12
 
+Export-Package: javax.servlet.jsp; version=2.1,javax.servlet.jsp.el; v
13
 
+ ersion=2.1,javax.servlet.jsp.resources; version=2.1,javax.servlet.jsp
14
 
+ .tagext; version=2.1
15
 
+Bundle-Version: 2.0.1.v200806031605
16
 
+Bundle-SymbolicName: javax.servlet.jsp
17
 
+Bundle-Name: Java Server Pages API Bundle
18
 
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
19
 
+Bundle-Localization: plugin
20
 
+Bundle-Vendor: Apache Software Foundation
21
 
 
22
 
 Name: javax/servlet/jsp/
23
 
 Specification-Title: Java API for JavaServer Pages