[pkg-java] r18520 - in tags/axis/1.4-2/debian: . patches
Miguel Landaeta
nomadium at moszumanska.debian.org
Fri Oct 3 02:38:53 UTC 2014
Author: nomadium
Date: 2014-10-03 02:38:53 +0000 (Fri, 03 Oct 2014)
New Revision: 18520
Added:
tags/axis/1.4-2/debian/libaxis-java-doc.docs
tags/axis/1.4-2/debian/libaxis-java.install
Removed:
tags/axis/1.4-2/debian/axis.bnd
tags/axis/1.4-2/debian/jaxrpc.bnd
tags/axis/1.4-2/debian/libaxis-java-doc.doc-base
tags/axis/1.4-2/debian/libaxis-java.links
tags/axis/1.4-2/debian/libaxis-java.poms
tags/axis/1.4-2/debian/patches/02-gcj-4.4.patch
tags/axis/1.4-2/debian/patches/CVE-2014-3596.patch
tags/axis/1.4-2/debian/patches/javadoc.diff
tags/axis/1.4-2/debian/patches/series
tags/axis/1.4-2/debian/poms/
tags/axis/1.4-2/debian/saaj.bnd
tags/axis/1.4-2/debian/source/
tags/axis/1.4-2/debian/watch
Modified:
tags/axis/1.4-2/debian/changelog
tags/axis/1.4-2/debian/compat
tags/axis/1.4-2/debian/control
tags/axis/1.4-2/debian/copyright
tags/axis/1.4-2/debian/patches/01-libaxis-java-build.patch
tags/axis/1.4-2/debian/patches/axis-bz152255.patch
tags/axis/1.4-2/debian/rules
Log:
Retagging axis 1.4-2
Deleted: tags/axis/1.4-2/debian/axis.bnd
===================================================================
--- tags/axis/1.4-2/debian/axis.bnd 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/axis.bnd 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,6 +0,0 @@
-Bundle-Name: Apache Axis
-Bundle-SymbolicName: org.apache.axis
-Bundle-Version: 1.4
-Bundle-Vendor: Debian.org
-Import-Package: !com.sun.net.ssl.*, !sun.awt.image.codec, !sun.security.provider, *
--nouses: true
Modified: tags/axis/1.4-2/debian/changelog
===================================================================
--- tags/axis/1.4-2/debian/changelog 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/changelog 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,234 +1,3 @@
-axis (1.4-21) unstable; urgency=high
-
- * Team upload.
- * Fix CVE-2014-3596.
- - Replace 06-fix-CVE-2012-5784.patch with CVE-2014-3596.patch which fixes
- both CVE issues. Thanks to Raphael Hertzog for the report.
- - The getCN function in Apache Axis 1.4 and earlier does not properly
- verify that the server hostname matches a domain name in the subject's
- Common Name (CN) or subjectAltName field of the X.509 certificate,
- which allows man-in-the-middle attackers to spoof SSL servers via a
- certificate with a subject that specifies a common name in a field
- that is not the CN field. NOTE: this issue exists because of an
- incomplete fix for CVE-2012-5784.
- - (Closes: #762444)
- * Declare compliance with Debian Policy 3.9.6.
- * Use compat level 9 and require debhelper >=9.
- * Use canonical VCS fields.
-
- -- Markus Koschany <apo at gambaru.de> Thu, 25 Sep 2014 19:45:08 +0000
-
-axis (1.4-20) unstable; urgency=low
-
- * Updated the dependency on the Servlet API (2.5 -> 3.0)
- * Removed the obsolete dependency on the Activation Framework (libgnujaf-java)
- * Added the upstream changelog
- * debian/rules: Improved the clean target to allow rebuilds
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 15 May 2013 00:56:15 +0200
-
-axis (1.4-19) unstable; urgency=low
-
- * Team upload.
- * Upload to unstable.
-
- -- tony mancill <tmancill at debian.org> Mon, 13 May 2013 22:00:05 -0700
-
-axis (1.4-18) experimental; urgency=low
-
- * Team upload.
- * debian/watch: Fixed the URL
- * debian/control: Add Emmanuel Bourg to list of Uploaders.
-
- -- Emmanuel Bourg <ebourg at apache.org> Tue, 02 Apr 2013 17:02:15 +0200
-
-axis (1.4-17) experimental; urgency=low
-
- * Team upload.
-
- [ Jakub Adam ]
- * Use bnd to generate OSGi metadata.
- * Remove Michael Koch from Uploaders (Closes: #653992).
- - Thanks for your contribution to this package.
- * Bump Standards-Version to 3.9.4.
-
- [ tony mancill ]
- * Acknowledge NMU: Thank you to Alberto Fernández Martínez.
- - Fix CVE-2012-5784 (Closes: #692650)
- * Update d/copyright to add lintian warnings.
-
- -- tony mancill <tmancill at debian.org> Mon, 04 Feb 2013 22:14:27 -0800
-
-axis (1.4-16.2) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix CVE-2012-5784 (Closes: #692650)
- * Fix CN extraction from DN of X500 principal.
- * Fix wildcard validation on ssl connections
-
- -- Alberto Fernández Martínez <infjaf at gmail.com> Thu, 6 Dec 2012 14:28:00 +0100
-
-axis (1.4-16.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Fix CVE-2012-5784 (Closes: #692650)
-
- -- Alberto Fernández Martínez <infjaf at gmail.com> Wed, 5 Dec 2012 17:28:00 +0100
-
-axis (1.4-16) unstable; urgency=low
-
- * Add missing dependency on libcommons-httpclient-java
- * Update Export-Package OSGi attribute in manifest
- * Add Require-Bundle OSGi attributes
-
- -- Jakub Adam <jakub.adam at ktknet.cz> Mon, 31 Oct 2011 11:07:24 +0100
-
-axis (1.4-15) unstable; urgency=low
-
- * Add OSGi metadata to jar manifests
- * Bump to Standards-Version 3.9.2
- * Updated the DEP-5 copyright to r202
-
- -- Jakub Adam <jakub.adam at ktknet.cz> Thu, 27 Oct 2011 19:23:14 +0200
-
-axis (1.4-14) unstable; urgency=low
-
- * Team upload.
- * Drop package libaxis-java-gcj.
-
- -- Torsten Werner <twerner at debian.org> Thu, 08 Sep 2011 17:13:34 +0200
-
-axis (1.4-13) unstable; urgency=low
-
- [ tony mancill ]
- * libaxis-java-gcj: Remove incorrect libservlet2.4 depedency;
- the dependency on libaxis-java is sufficient.
- Thanks to Matthias Klose. (Closes: #597950)
-
- [ Damien Raude-Morvan ]
- * d/control: Bump Standards-Versions to 3.9.1 (no changes required).
- * d/control: Change short synopsis of packages.
- * Finaly upload to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 06 Mar 2011 19:08:04 +0100
-
-axis (1.4-12) unstable; urgency=low
-
- [ Niels Thykier ]
- * Bumped Standards-Versions to 3.9.0 - no changes required.
- * Replaced B-D on default-jdk-builddep with gcj-native-helper
- and default-jdk.
-
- [ Damien Raude-Morvan ]
- * Downgrade libaxis-java-gcj from Recommends to Suggest (Closes: #582151).
- * Remove Depends on JRE since Axis is a library.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 08 Jul 2010 00:06:06 +0200
-
-axis (1.4-11) unstable; urgency=low
-
- * Merge changes from Ubuntu:
- - debian/control, debian/rules: (Build-)Depend on libservlet2.5-java
- instead of libservlet2.4-java (LP: #534913)
- * Remove Stephan and Vladimír from Uploaders list.
-
- -- Torsten Werner <twerner at debian.org> Sun, 09 May 2010 02:53:34 +0200
-
-axis (1.4-10) unstable; urgency=low
-
- * Add symlinks for old JAR names to fix some FTBFS
- (Closes: #575041):
- - saaj.jar -> axis-saaj.jar
- - jaxrpc.jar -> axis-jaxrpc.jar
- * Javadoc:
- - Install Javadoc to /usr/share/doc/libaxis-java/api/
- - Register Javadoc with doc-base
- - d/patches/javadoc.diff and d/rules: Fix javadoc call
- to only use javadoc and no gjdoc (which fail with
- UnmappableCharacterException) and force 1.3 source format.
- * Fix short description of libaxis-java-doc to contains "documentation"
- * Rework d/copyright to use DEP5 format
-
- -- Damien Raude-Morvan <drazzib at debian.org> Thu, 25 Mar 2010 23:45:41 +0100
-
-axis (1.4-9) unstable; urgency=low
-
- * debian/rules: Fix FTBFS when doing arch build:
- - overrive install/libaxis-java for mh_installjar calls
- (instead of binary-post-install)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Mar 2010 23:46:28 +0100
-
-axis (1.4-8) unstable; urgency=low
-
- * Add Maven support:
- - debian/control: Build-Depends on maven-repo-helper
- - Add pom's files to debian/poms/
- - debian/rules: Use mh_installpoms and mh_installjar
- * Update Standards-Version: 3.8.4
- - debian/rules: Add recommended get-orig-source target
- * Bump to debhelper >= 7
- * Use 3.0 (quilt) source format:
- - debian/source/format: Set 3.0 (quilt)
- - debian/control: Remove quilt
- - debian/rules: Remove simpl-patchsys.mk
- - Refresh all debian/patches/*
- * Add DEP-3 headers to all patches
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sat, 20 Mar 2010 23:00:50 +0100
-
-axis (1.4-7) unstable; urgency=low
-
- * Change Build-Depends: ant1.7-optional because gij is failing with ant 1.8.
-
- -- Torsten Werner <twerner at debian.org> Sat, 27 Feb 2010 18:52:14 +0100
-
-axis (1.4-6ubuntu1) lucid; urgency=low
-
- * debian/control, debian/rules: (Build-)Depend on libservlet2.5-java instead
- of libservlet2.4-java (LP: #534913)
- * debian/rules: Drop extra JAVA_HOME entry, build with default-jdk
-
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Tue, 09 Mar 2010 09:39:09 +0100
-
-axis (1.4-6) unstable; urgency=low
-
- [ Matthias Klose ]
- * axis: Depend on default-jre-headless.
- * Build using java-gcj (axis is not 1.6 source compatible).
-
- [ Torsten Werner ]
- * Add patch for gcj-4.4: do not build function clearCache() which is not
- used anyway. (Closes: #531995)
- * Add myself to Uploaders.
- * Do no longer quote the full text of the Apache license.
- * Fix lintian warnings.
- * Move package to Section: java.
- * Update Standards-Version: 3.8.2 (no changes).
- * Add missing Depends: ${misc:Depends}.
-
- -- Torsten Werner <twerner at debian.org> Fri, 24 Jul 2009 18:38:59 +0200
-
-axis (1.4-5) unstable; urgency=low
-
- * Added missing packages to Depends of libaxis-java.
- Closes: #432582, #432582
- * Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev.
- Closes: #477846
- * Cleaned up debian/copyright.
- * Added watch file.
- * Added Homepage, Vcs-Svn and Vcs-Browser fields.
- * Updated Standards-Version to 3.7.3.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 26 Apr 2008 22:49:29 +0200
-
-axis (1.4-3) unstable; urgency=low
-
- * Added xmlParserAPIs.jar and xercesImpl.jar to classpath.
- Closes: #432538.
-
- -- Michael Koch <konqueror at gmx.de> Sat, 14 Jul 2007 21:10:45 +0200
-
axis (1.4-2) unstable; urgency=low
* Upload to unstable.
Modified: tags/axis/1.4-2/debian/compat
===================================================================
--- tags/axis/1.4-2/debian/compat 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/compat 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1 +1 @@
-9
+5
Modified: tags/axis/1.4-2/debian/control
===================================================================
--- tags/axis/1.4-2/debian/control 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/control 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,28 +1,18 @@
Source: axis
-Section: java
+Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>,
- Damien Raude-Morvan <drazzib at debian.org>,
- Jakub Adam <jakub.adam at ktknet.cz>,
- Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), cdbs, ant-optional, default-jdk, libwsdl4j-java,
- libcommons-logging-java, libcommons-httpclient-java, bnd,
- libcommons-discovery-java, libgnumail-java, libservlet3.0-java,
- maven-repo-helper
-Standards-Version: 3.9.6
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/axis
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/axis
-Homepage: http://ws.apache.org/axis/
+Uploaders: Stephan Michels <stephan at apache.org>, Vladimír Lapáček <vladimir.lapacek at gmail.com>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 5), cdbs, ant, ant-optional, java-gcj-compat-dev, libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.4-java
+Standards-Version: 3.7.2
Package: libaxis-java
Architecture: all
-Recommends: ant
+Section: libs
+Recommends: ant, libaxis-java-gcj
Suggests: libaxis-java-doc
-Depends: libwsdl4j-java, libcommons-logging-java, libcommons-discovery-java,
- libcommons-httpclient-java, libgnumail-java, libservlet3.0-java,
- ${misc:Depends}
-Description: SOAP implementation in Java
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libservlet2.4-java
+Description: A SOAP implementation in Java
Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
submission to W3C.
.
@@ -37,12 +27,21 @@
.
This project is a follow-on to the Apache SOAP project.
+Package: libaxis-java-gcj
+Architecture: any
+Section: libs
+Depends: libaxis-java (>= ${source:Version}), libservlet2.4-java-gcj, ${misc:Depends}, ${shlibs:Depends}
+Description: A SOAP implementation in Java (native code)
+ Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
+ submission to W3C.
+ .
+ This package contains the natively compiled code for use by gij.
+
Package: libaxis-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
Suggests: libaxis-java
-Description: SOAP implementation in Java (documentation)
+Description: A SOAP implementation in Java
Apache AXIS is an implementation of the SOAP ("Simple Object Access Protocol")
submission to W3C.
.
Modified: tags/axis/1.4-2/debian/copyright
===================================================================
--- tags/axis/1.4-2/debian/copyright 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/copyright 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,21 +1,216 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
-Upstream-Name: Apache Axis
-Upstream-Contact: http://ws.apache.org/axis/
-Source: http://www.apache.org/dist/ws/axis/1_4/
+This package was debianized by Vladimír Lapáček <vladimir.lapacek at gmail.com> on
+Wed, 6 Sep 2006 22:31:39 +0200.
-Files: *
-Copyright: 2006-2008, Apache Foundation
-License: Apache-2.0
+It was downloaded from http://ws.apache.org/axis/
-Files: debian/*
-Copyright: 2006, Vladimír Lapáček <vladimir.lapacek at gmail.com>
- 2006-2010, various Debian Contributors
- 2010, Damien Raude-Morvan <drazzib at debian.org>
-License: Apache-2.0
+Copyright Holder: Apache Software Foundation
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- .
- The full text of the license can be found in
- `/usr/share/common-licenses/Apache-2.0'.
+License:
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+
+The Debian packaging is (C) 2006, Vladimír Lapáček <vladimir.lapacek at gmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Deleted: tags/axis/1.4-2/debian/jaxrpc.bnd
===================================================================
--- tags/axis/1.4-2/debian/jaxrpc.bnd 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/jaxrpc.bnd 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,5 +0,0 @@
-Bundle-Name: JAX-RPC
-Bundle-SymbolicName: javax.xml.rpc
-Bundle-Version: 1.4
-Bundle-Vendor: Debian.org
-Import-Package: *
Deleted: tags/axis/1.4-2/debian/libaxis-java-doc.doc-base
===================================================================
--- tags/axis/1.4-2/debian/libaxis-java-doc.doc-base 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/libaxis-java-doc.doc-base 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,10 +0,0 @@
-Document: libaxis-java-doc
-Title: API Javadoc for Axis
-Author: Apache Axis
-Abstract: This is the API Javadoc provided by the Apache Axis library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libaxis-java/api/index.html
-Files: /usr/share/doc/libaxis-java/api/*
-
Added: tags/axis/1.4-2/debian/libaxis-java-doc.docs
===================================================================
--- tags/axis/1.4-2/debian/libaxis-java-doc.docs (rev 0)
+++ tags/axis/1.4-2/debian/libaxis-java-doc.docs 2014-10-03 02:38:53 UTC (rev 18520)
@@ -0,0 +1 @@
+build/javadocs
Added: tags/axis/1.4-2/debian/libaxis-java.install
===================================================================
--- tags/axis/1.4-2/debian/libaxis-java.install (rev 0)
+++ tags/axis/1.4-2/debian/libaxis-java.install 2014-10-03 02:38:53 UTC (rev 18520)
@@ -0,0 +1,4 @@
+build/lib/axis.jar usr/share/java
+build/lib/jaxrpc.jar usr/share/java
+build/lib/saaj.jar usr/share/java
+build/lib/axis-ant.jar usr/share/ant/lib
Deleted: tags/axis/1.4-2/debian/libaxis-java.links
===================================================================
--- tags/axis/1.4-2/debian/libaxis-java.links 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/libaxis-java.links 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,3 +0,0 @@
-/usr/share/java/axis-ant.jar /usr/share/ant/lib/axis-ant.jar
-/usr/share/java/axis-jaxrpc.jar /usr/share/java/jaxrpc.jar
-/usr/share/java/axis-saaj.jar /usr/share/java/saaj.jar
Deleted: tags/axis/1.4-2/debian/libaxis-java.poms
===================================================================
--- tags/axis/1.4-2/debian/libaxis-java.poms 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/libaxis-java.poms 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,5 +0,0 @@
-debian/poms/ant.xml
-debian/poms/axis.xml
-debian/poms/jaxrpc.xml
-debian/poms/saaj.xml
-
Modified: tags/axis/1.4-2/debian/patches/01-libaxis-java-build.patch
===================================================================
--- tags/axis/1.4-2/debian/patches/01-libaxis-java-build.patch 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/patches/01-libaxis-java-build.patch 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,9 +1,5 @@
-Description: build.xml: Don't copy jars during build
-Author: <vladimir.lapacek at gmail.com>
-Forwarded: not-needed
-Last-Update: 2010-03-20
---- a/build.xml
-+++ b/build.xml
+--- build.xml.orig 2006-09-07 20:35:59.000000000 +0000
++++ build.xml 2006-09-07 20:36:24.000000000 +0000
@@ -223,12 +223,12 @@
</section>
</manifest>
Deleted: tags/axis/1.4-2/debian/patches/02-gcj-4.4.patch
===================================================================
--- tags/axis/1.4-2/debian/patches/02-gcj-4.4.patch 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/patches/02-gcj-4.4.patch 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,22 +0,0 @@
-Description: Fix FTBFS with GCJ-4.4:
- "Cannot override the final method from ResourceBundle"
- Disable function clearCache() which is not used anyway.
-Bug-Debian: http://bugs.debian.org/531995
-Author: Torsten Werner <twerner at debian.org>
-Forwarded: no
-Last-Update: 2010-03-20
---- a/src/org/apache/axis/i18n/ProjectResourceBundle.java
-+++ b/src/org/apache/axis/i18n/ProjectResourceBundle.java
-@@ -360,10 +360,12 @@
- /**
- * Clears the internal cache
- */
-+ /*
- public static void clearCache()
- {
- bundleCache.clear();
- }
-+ */
-
- public String toString() {
- return resourceName;
Deleted: tags/axis/1.4-2/debian/patches/CVE-2014-3596.patch
===================================================================
--- tags/axis/1.4-2/debian/patches/CVE-2014-3596.patch 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/patches/CVE-2014-3596.patch 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,360 +0,0 @@
-From: David Jorm and Arun Neelicattu (Red Hat Product Security)
-Date: Thu, 25 Sep 2014 19:38:17 +0000
-Subject: CVE-2014-3596
-
-The getCN function in Apache Axis 1.4 and earlier does not properly
-verify that the server hostname matches a domain name in the subject's
-Common Name (CN) or subjectAltName field of the X.509 certificate,
-which allows man-in-the-middle attackers to spoof SSL servers via a
-certificate with a subject that specifies a common name in a field
-that is not the CN field. NOTE: this issue exists because of an
-incomplete fix for CVE-2012-5784.
-
-Forwarded: no
-Bug: https://bugs.debian.org/762444
----
- .../axis/components/net/JSSESocketFactory.java | 309 ++++++++++++++++++++-
- 1 file changed, 303 insertions(+), 6 deletions(-)
-
-diff --git a/src/org/apache/axis/components/net/JSSESocketFactory.java b/src/org/apache/axis/components/net/JSSESocketFactory.java
-index dd3f991..abffcdd 100644
---- a/src/org/apache/axis/components/net/JSSESocketFactory.java
-+++ b/src/org/apache/axis/components/net/JSSESocketFactory.java
-@@ -15,12 +15,6 @@
- */
- package org.apache.axis.components.net;
-
--import org.apache.axis.utils.Messages;
--import org.apache.axis.utils.XMLUtils;
--import org.apache.axis.utils.StringUtils;
--
--import javax.net.ssl.SSLSocket;
--import javax.net.ssl.SSLSocketFactory;
- import java.io.BufferedWriter;
- import java.io.IOException;
- import java.io.InputStream;
-@@ -28,7 +22,33 @@ import java.io.OutputStream;
- import java.io.OutputStreamWriter;
- import java.io.PrintWriter;
- import java.net.Socket;
-+import java.security.cert.Certificate;
-+import java.security.cert.CertificateParsingException;
-+import java.security.cert.X509Certificate;
-+import java.util.ArrayList;
-+import java.util.Arrays;
-+import java.util.Collection;
- import java.util.Hashtable;
-+import java.util.Iterator;
-+import java.util.LinkedList;
-+import java.util.List;
-+import java.util.Locale;
-+import java.util.regex.Pattern;
-+
-+import javax.naming.InvalidNameException;
-+import javax.naming.NamingException;
-+import javax.naming.directory.Attribute;
-+import javax.naming.directory.Attributes;
-+import javax.naming.ldap.LdapName;
-+import javax.naming.ldap.Rdn;
-+import javax.net.ssl.SSLException;
-+import javax.net.ssl.SSLSession;
-+import javax.net.ssl.SSLSocket;
-+import javax.net.ssl.SSLSocketFactory;
-+
-+import org.apache.axis.utils.Messages;
-+import org.apache.axis.utils.StringUtils;
-+import org.apache.axis.utils.XMLUtils;
-
-
- /**
-@@ -41,6 +61,10 @@ import java.util.Hashtable;
- */
- public class JSSESocketFactory extends DefaultSocketFactory implements SecureSocketFactory {
-
-+ // This is a a sorted list, if you insert new elements do it orderdered.
-+ private final static String[] BAD_COUNTRY_2LDS =
-+ {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
-+ "lg", "ne", "net", "or", "org"};
- /** Field sslFactory */
- protected SSLSocketFactory sslFactory = null;
-
-@@ -187,6 +211,279 @@ public class JSSESocketFactory extends DefaultSocketFactory implements SecureSoc
- if (log.isDebugEnabled()) {
- log.debug(Messages.getMessage("createdSSL00"));
- }
-+ verifyHostName(host, (SSLSocket) sslSocket);
- return sslSocket;
- }
-+ /**
-+ * Verifies that the given hostname in certicifate is the hostname we are trying to connect to.
-+ * This resolves CVE-2012-5784 and CVE-2014-3596
-+ * @param host
-+ * @param ssl
-+ * @throws IOException
-+ */
-+
-+ private static void verifyHostName(String host, SSLSocket ssl)
-+ throws IOException {
-+ if (host == null) {
-+ throw new IllegalArgumentException("host to verify was null");
-+ }
-+
-+ SSLSession session = ssl.getSession();
-+ if (session == null) {
-+ // In our experience this only happens under IBM 1.4.x when
-+ // spurious (unrelated) certificates show up in the server's chain.
-+ // Hopefully this will unearth the real problem:
-+ InputStream in = ssl.getInputStream();
-+ in.available();
-+ /*
-+ If you're looking at the 2 lines of code above because you're
-+ running into a problem, you probably have two options:
-+
-+ #1. Clean up the certificate chain that your server
-+ is presenting (e.g. edit "/etc/apache2/server.crt" or
-+ wherever it is your server's certificate chain is
-+ defined).
-+
-+ OR
-+
-+ #2. Upgrade to an IBM 1.5.x or greater JVM, or switch to a
-+ non-IBM JVM.
-+ */
-+
-+ // If ssl.getInputStream().available() didn't cause an exception,
-+ // maybe at least now the session is available?
-+ session = ssl.getSession();
-+ if (session == null) {
-+ // If it's still null, probably a startHandshake() will
-+ // unearth the real problem.
-+ ssl.startHandshake();
-+
-+ // Okay, if we still haven't managed to cause an exception,
-+ // might as well go for the NPE. Or maybe we're okay now?
-+ session = ssl.getSession();
-+ }
-+ }
-+
-+ Certificate[] certs = session.getPeerCertificates();
-+ verifyHostName(host.trim().toLowerCase(Locale.US), (X509Certificate) certs[0]);
-+ }
-+ /**
-+ * Extract the names from the certificate and tests host matches one of them
-+ * @param host
-+ * @param cert
-+ * @throws SSLException
-+ */
-+
-+ private static void verifyHostName(final String host, X509Certificate cert)
-+ throws SSLException {
-+ // I'm okay with being case-insensitive when comparing the host we used
-+ // to establish the socket to the hostname in the certificate.
-+ // Don't trim the CN, though.
-+
-+ String[] cns = getCNs(cert);
-+ String[] subjectAlts = getDNSSubjectAlts(cert);
-+ verifyHostName(host, cns, subjectAlts);
-+
-+ }
-+
-+ /**
-+ * Extract all alternative names from a certificate.
-+ * @param cert
-+ * @return
-+ */
-+ private static String[] getDNSSubjectAlts(X509Certificate cert) {
-+ LinkedList subjectAltList = new LinkedList();
-+ Collection c = null;
-+ try {
-+ c = cert.getSubjectAlternativeNames();
-+ } catch (CertificateParsingException cpe) {
-+ // Should probably log.debug() this?
-+ cpe.printStackTrace();
-+ }
-+ if (c != null) {
-+ Iterator it = c.iterator();
-+ while (it.hasNext()) {
-+ List list = (List) it.next();
-+ int type = ((Integer) list.get(0)).intValue();
-+ // If type is 2, then we've got a dNSName
-+ if (type == 2) {
-+ String s = (String) list.get(1);
-+ subjectAltList.add(s);
-+ }
-+ }
-+ }
-+ if (!subjectAltList.isEmpty()) {
-+ String[] subjectAlts = new String[subjectAltList.size()];
-+ subjectAltList.toArray(subjectAlts);
-+ return subjectAlts;
-+ } else {
-+ return new String[0];
-+ }
-+
-+ }
-+ /**
-+ * Verifies
-+ * @param host
-+ * @param cn
-+ * @param subjectAlts
-+ * @throws SSLException
-+ */
-+
-+ private static void verifyHostName(final String host, String[] cns, String[] subjectAlts)throws SSLException{
-+ StringBuffer cnTested = new StringBuffer();
-+
-+ for (int i = 0; i < subjectAlts.length; i++){
-+ String name = subjectAlts[i];
-+ if (name != null) {
-+ name = name.toLowerCase(Locale.US);
-+ if (verifyHostName(host, name)){
-+ return;
-+ }
-+ cnTested.append("/").append(name);
-+ }
-+ }
-+ for (int i = 0; i < cns.length; i++) {
-+ String cn = cns[i];
-+ if (cn != null) {
-+ cn = cn.toLowerCase(Locale.US);
-+ if (verifyHostName(host, cn)) {
-+ return;
-+ }
-+ cnTested.append("/").append(cn);
-+ }
-+ }
-+ throw new SSLException("hostname in certificate didn't match: <"
-+ + host + "> != <" + cnTested + ">");
-+ }
-+
-+ private static boolean verifyHostName(final String host, final String cn){
-+ if (doWildCard(cn) && !isIPAddress(host)) {
-+ return matchesWildCard(cn, host);
-+ }
-+ return host.equalsIgnoreCase(cn);
-+ }
-+ private static boolean doWildCard(String cn) {
-+ // Contains a wildcard
-+ // wildcard in the first block
-+ // not an ipaddress (ip addres must explicitily be equal)
-+ // not using 2nd level common tld : ex: not for *.co.uk
-+ String parts[] = cn.split("\\.");
-+ return parts.length >= 3 &&
-+ parts[0].endsWith("*") &&
-+ acceptableCountryWildcard(cn) &&
-+ !isIPAddress(cn);
-+ }
-+
-+ private static final Pattern IPV4_PATTERN =
-+ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
-+
-+ private static final Pattern IPV6_STD_PATTERN =
-+ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
-+
-+ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN =
-+ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
-+
-+
-+ private static boolean isIPAddress(final String hostname) {
-+ return hostname != null
-+ && (
-+ IPV4_PATTERN.matcher(hostname).matches()
-+ || IPV6_STD_PATTERN.matcher(hostname).matches()
-+ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
-+ );
-+
-+ }
-+
-+ private static boolean acceptableCountryWildcard(final String cn) {
-+ // The CN better have at least two dots if it wants wildcard action,
-+ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
-+ // The [*.co.uk] problem is an interesting one. Should we just
-+ // hope that CA's would never foolishly allow such a
-+ // certificate to happen?
-+
-+ String[] parts = cn.split("\\.");
-+ // Only checks for 3 levels, with country code of 2 letters.
-+ if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
-+ return true;
-+ }
-+ String countryCode = parts[parts.length - 2];
-+ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
-+ }
-+
-+ private static boolean matchesWildCard(final String cn,
-+ final String hostName) {
-+ String parts[] = cn.split("\\.");
-+ boolean match = false;
-+ String firstpart = parts[0];
-+ if (firstpart.length() > 1) {
-+ // server∗
-+ // e.g. server
-+ String prefix = firstpart.substring(0, firstpart.length() - 1);
-+ // skipwildcard part from cn
-+ String suffix = cn.substring(firstpart.length());
-+ // skip wildcard part from host
-+ String hostSuffix = hostName.substring(prefix.length());
-+ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
-+ } else {
-+ match = hostName.endsWith(cn.substring(1));
-+ }
-+ if (match) {
-+ // I f we ’ r e i n s t r i c t mode ,
-+ // [ ∗.foo.com] is not allowed to match [a.b.foo.com]
-+ match = countDots(hostName) == countDots(cn);
-+ }
-+ return match;
-+ }
-+
-+ private static int countDots(final String data) {
-+ int dots = 0;
-+ for (int i = 0; i < data.length(); i++) {
-+ if (data.charAt(i) == '.') {
-+ dots += 1;
-+ }
-+ }
-+ return dots;
-+ }
-+
-+
-+ private static String[] getCNs(X509Certificate cert) {
-+ // Note: toString() seems to do a better job than getName()
-+ //
-+ // For example, getName() gives me this:
-+ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
-+ //
-+ // whereas toString() gives me this:
-+ // EMAILADDRESS=juliusdavies at cucbc.com
-+ String subjectPrincipal = cert.getSubjectX500Principal().toString();
-+
-+ return getCNs(subjectPrincipal);
-+
-+ }
-+ private static String[] getCNs(String subjectPrincipal) {
-+ if (subjectPrincipal == null) {
-+ return null;
-+ }
-+ final List cns = new ArrayList();
-+ try {
-+ final LdapName subjectDN = new LdapName(subjectPrincipal);
-+ final List rdns = subjectDN.getRdns();
-+ for (int i = rdns.size() - 1; i >= 0; i--) {
-+ final Rdn rds = (Rdn) rdns.get(i);
-+ final Attributes attributes = rds.toAttributes();
-+ final Attribute cn = attributes.get("cn");
-+ if (cn != null) {
-+ try {
-+ final Object value = cn.get();
-+ if (value != null) {
-+ cns.add(value.toString());
-+ }
-+ }
-+ catch (NamingException ignore) {}
-+ }
-+ }
-+ }
-+ catch (InvalidNameException ignore) { }
-+ return cns.isEmpty() ? null : (String[]) cns.toArray(new String[ cns.size() ]);
-+ }
-+
- }
Modified: tags/axis/1.4-2/debian/patches/axis-bz152255.patch
===================================================================
--- tags/axis/1.4-2/debian/patches/axis-bz152255.patch 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/patches/axis-bz152255.patch 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,10 +1,6 @@
-Description: Fix build with Java 1.5
-Author: some Fedora packagers
-Forwarded: no
-Last-Update: 2010-03-20
---- a/src/org/apache/axis/SOAPPart.java
-+++ b/src/org/apache/axis/SOAPPart.java
-@@ -34,6 +34,7 @@
+--- axis-1_2/src/org/apache/axis/SOAPPart.java~ 2005-05-03 20:29:14.000000000 +0100
++++ axis-1_2/src/org/apache/axis/SOAPPart.java 2005-06-07 11:28:33.000000000 +0100
+@@ -33,6 +33,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
@@ -12,7 +8,7 @@
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
-@@ -46,6 +47,7 @@
+@@ -45,6 +46,7 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
@@ -20,7 +16,7 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-@@ -1280,5 +1282,102 @@
+@@ -1273,5 +1275,102 @@
public boolean isBodyStream() {
return (currentForm == SOAPPart.FORM_INPUTSTREAM || currentForm == SOAPPart.FORM_BODYINSTREAM);
}
@@ -123,8 +119,8 @@
+ }
}
---- a/src/org/apache/axis/message/NodeImpl.java
-+++ b/src/org/apache/axis/message/NodeImpl.java
+--- axis-1_2/src/org/apache/axis/message/NodeImpl.java~ 2005-05-03 20:28:58.000000000 +0100
++++ axis-1_2/src/org/apache/axis/message/NodeImpl.java 2005-06-07 12:22:15.000000000 +0100
@@ -30,6 +30,8 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -134,9 +130,9 @@
import org.xml.sax.Attributes;
import org.xml.sax.helpers.AttributesImpl;
-@@ -857,4 +859,74 @@
- }
- this._isDirty = false;
+@@ -834,4 +836,74 @@
+ ((NodeImpl) parent).setDirty(true);
+ }
}
+
+ /**
@@ -209,8 +205,8 @@
+ throw new RuntimeException("not implemented");
+ }
}
---- a/src/org/apache/axis/message/SOAPDocumentImpl.java
-+++ b/src/org/apache/axis/message/SOAPDocumentImpl.java
+--- axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java~ 2005-05-03 20:29:08.000000000 +0100
++++ axis-1_2/src/org/apache/axis/message/SOAPDocumentImpl.java 2005-06-07 12:31:30.000000000 +0100
@@ -25,6 +25,7 @@
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -227,7 +223,7 @@
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.soap.SOAPException;
-@@ -681,4 +683,113 @@
+@@ -680,4 +682,113 @@
public boolean hasAttributes() {
throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
}
@@ -341,8 +337,8 @@
+ throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "");
+ }
}
---- a/src/org/apache/axis/message/Text.java
-+++ b/src/org/apache/axis/message/Text.java
+--- axis-1_2/src/org/apache/axis/message/Text.java~ 2005-05-03 20:29:21.000000000 +0100
++++ axis-1_2/src/org/apache/axis/message/Text.java 2005-06-07 12:34:19.000000000 +0100
@@ -213,4 +213,19 @@
return ( textRep.getData() != null ? textRep.getData().hashCode() : 0 );
}
Deleted: tags/axis/1.4-2/debian/patches/javadoc.diff
===================================================================
--- tags/axis/1.4-2/debian/patches/javadoc.diff 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/patches/javadoc.diff 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,14 +0,0 @@
-Description: Ensure Javadoc call get correct source version (1.3)
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2010-03-25
-Forwarded: no
---- a/build.xml
-+++ b/build.xml
-@@ -369,6 +369,7 @@
- use="true"
- windowtitle="${Name} API"
- doctitle="${Name}"
-+ source="${source}"
- bottom="Copyright © ${year} Apache Web Services Project. All Rights Reserved."
- />
- </target>
Deleted: tags/axis/1.4-2/debian/patches/series
===================================================================
--- tags/axis/1.4-2/debian/patches/series 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/patches/series 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,5 +0,0 @@
-01-libaxis-java-build.patch
-02-gcj-4.4.patch
-axis-bz152255.patch
-javadoc.diff
-CVE-2014-3596.patch
Modified: tags/axis/1.4-2/debian/rules
===================================================================
--- tags/axis/1.4-2/debian/rules 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/rules 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,36 +1,26 @@
#!/usr/bin/make -f
+export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery commons-httpclient gnumail servlet-api-3.0 xmlParserAPIs xercesImpl
+include /usr/share/gcj/debian_defaults
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
+ with_gcj_native := yes
+endif
-DEB_ANT_BUILD_TARGET := compile javadocs
+JAVA_HOME := /usr/lib/jvm/java-gcj
+ANT_HOME := /usr/share/ant
-DEB_INSTALL_CHANGELOGS_ALL := changelog.html
+DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar wsdl4j commons-logging commons-discovery activation gnumail servlet-api
-common-post-build-indep::
- for BNDFILE in debian/*.bnd; do \
- JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \
- bnd wrap -properties $$BNDFILE -output $$JARPATH $$JARPATH; \
- done
+DEB_ANT_BUILD_TARGET := compile javadocs
+DEB_ANT_INSTALL_TARGET :=
-install/libaxis-java::
- mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION)
- mh_installjar -plibaxis-java -l debian/poms/axis.xml build/lib/axis.jar
- mh_installjar -plibaxis-java -l debian/poms/saaj.xml build/lib/saaj.jar
- mh_installjar -plibaxis-java -l debian/poms/jaxrpc.xml build/lib/jaxrpc.jar
- mh_installjar -plibaxis-java -l debian/poms/ant.xml build/lib/axis-ant.jar
-
-install/libaxis-java-doc::
- mv build/javadocs build/api
- dh_install -plibaxis-java-doc build/api/ /usr/share/doc/libaxis-java/
-
-clean::
- -rm -rf debian/tmp
- -rm -rf build/api
- mh_clean
-
-get-orig-source::
- uscan --force-download --rename
+ifeq ($(with_gcj_native),yes)
+install/libaxis-java-gcj:: install/libaxis-java
+ [ -d debian/libaxis-ava/usr/share/java ] || dh_install -plibaxis-java
+ dh_nativejava -plibaxis-java-gcj
+endif
Deleted: tags/axis/1.4-2/debian/saaj.bnd
===================================================================
--- tags/axis/1.4-2/debian/saaj.bnd 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/saaj.bnd 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,5 +0,0 @@
-Bundle-Name: SAAJ
-Bundle-SymbolicName: javax.xml.soap
-Bundle-Version: 1.4
-Bundle-Vendor: Debian.org
-Import-Package: *
Deleted: tags/axis/1.4-2/debian/watch
===================================================================
--- tags/axis/1.4-2/debian/watch 2014-10-03 01:57:18 UTC (rev 18519)
+++ tags/axis/1.4-2/debian/watch 2014-10-03 02:38:53 UTC (rev 18520)
@@ -1,3 +0,0 @@
-version=3
-opts=uversionmangle=s/_/./ \
-http://archive.apache.org/dist/ws/axis/1_4/ axis-src-(.*).tar.gz
More information about the pkg-java-commits
mailing list