This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository libapache-mod-jk.
commit 99fcc46dc8763dee26fde39bb5e9c658bfec6642 Author: Michael Koch <[email protected]> Date: Sun Jul 26 10:54:06 2009 +0000 libapache-mod-jk (1:1.2.28-1) unstable; urgency=low * New upstream release. - Removed debian/patches/05_bug_451494.dpatch. Applied upstream. - Removed debian/patches/06_CVE-2008-5519.dpatch. Applied upstream. * Updated Build-Depends to debhelper (>= 5) as 4 is deprecated. * Link /usr/share/common-licenses/Apache-2.0 in debian/copgyright. * Updated Standards-Version to 3.8.2. -- Michael Koch <[email protected]> Sat, 25 Jul 2009 23:08:41 +0200 libapache-mod-jk (1:1.2.26-2.1) unstable; urgency=high * Non-maintainer upload by the security-team. * CVE-2008-5519: Fix information disclosure vulnerability when clients abort connection before sending POST body (closes: #523054). -- Stefan Fritsch <[email protected]> Sat, 30 May 2009 15:49:20 +0200 --- debian/changelog | 19 +++ debian/compat | 2 +- debian/control | 4 +- debian/copyright | 187 ++------------------- debian/patches/00list | 1 - .../03_jk-runtime-status_default_location.dpatch | 10 +- debian/patches/05_bug_451494.dpatch | 24 --- 7 files changed, 40 insertions(+), 207 deletions(-) diff --git a/debian/changelog b/debian/changelog index e82bb9e..4e56231 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +libapache-mod-jk (1:1.2.28-1) unstable; urgency=low + + * New upstream release. + - Removed debian/patches/05_bug_451494.dpatch. Applied upstream. + - Removed debian/patches/06_CVE-2008-5519.dpatch. Applied upstream. + * Updated Build-Depends to debhelper (>= 5) as 4 is deprecated. + * Link /usr/share/common-licenses/Apache-2.0 in debian/copgyright. + * Updated Standards-Version to 3.8.2. + + -- Michael Koch <[email protected]> Sat, 25 Jul 2009 23:08:41 +0200 + +libapache-mod-jk (1:1.2.26-2.1) unstable; urgency=high + + * Non-maintainer upload by the security-team. + * CVE-2008-5519: Fix information disclosure vulnerability when clients + abort connection before sending POST body (closes: #523054). + + -- Stefan Fritsch <[email protected]> Sat, 30 May 2009 15:49:20 +0200 + libapache-mod-jk (1:1.2.26-2) unstable; urgency=low * Apply patch to fix JkOptions handling for virtual hosts. Thanks to diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 7fc4a83..e16abd0 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,9 @@ Section: web Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Stefan Gybas <[email protected]>, Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]> -Build-Depends: debhelper (>= 4.2.30), dpatch, apache2-threaded-dev, libtool +Build-Depends: debhelper (>= 5), dpatch, apache2-threaded-dev, libtool Build-Depends-Indep: xsltproc, lynx -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Homepage: http://tomcat.apache.org/ Package: libapache2-mod-jk diff --git a/debian/copyright b/debian/copyright index 9efa241..b52a6a2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,185 +1,24 @@ This package was debianized by Stefan Gybas <[email protected]> on 11-Nov-2003. The source archive was downloaded from -http://www.apache.de/dist/jakarta/tomcat-connectors/jk/. +http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/. Authors: The Apache Jakarta team -Copyright: (c) 2003-2008 Apache Foundation +Copyright: (c) 2003-2009 Apache Foundation License: + 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 - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ + http://www.apache.org/licenses/LICENSE-2.0 - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + 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. - 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. +On Debian system the full text of the Apache License, Version 2.0, can be +found in /usr/share/common-licenses/Apache-2.0. diff --git a/debian/patches/00list b/debian/patches/00list index eae964f..03dd388 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,4 +1,3 @@ 02_style_xsl 03_jk-runtime-status_default_location.dpatch 04_no-worker-error.dpatch -05_bug_451494.dpatch diff --git a/debian/patches/03_jk-runtime-status_default_location.dpatch b/debian/patches/03_jk-runtime-status_default_location.dpatch index 0f57165..2e84f0c 100644 --- a/debian/patches/03_jk-runtime-status_default_location.dpatch +++ b/debian/patches/03_jk-runtime-status_default_location.dpatch @@ -8,14 +8,14 @@ --- ./native/apache-2.0/mod_jk.c~ 2006-07-08 07:57:31.000000000 +0000 +++ ./native/apache-2.0/mod_jk.c 2006-10-09 08:19:21.000000000 +0000 -@@ -109,8 +109,8 @@ - #include "jk_worker.h" +@@ -104,8 +104,8 @@ #include "jk_shm.h" + #include "jk_url.h" -#define JK_LOG_DEF_FILE ("logs/mod_jk.log") -#define JK_SHM_DEF_FILE ("logs/jk-runtime-status") +#define JK_LOG_DEF_FILE ("/var/log/apache2/mod_jk.log") +#define JK_SHM_DEF_FILE ("/var/log/apache2/jk-runtime-status") - #define JK_ENV_HTTPS ("HTTPS") - #define JK_ENV_CERTS ("SSL_CLIENT_CERT") - #define JK_ENV_CIPHER ("SSL_CIPHER") + #define JK_ENV_REMOTE_ADDR ("JK_REMOTE_ADDR") + #define JK_ENV_REMOTE_HOST ("JK_REMOTE_HOST") + #define JK_ENV_REMOTE_USER ("JK_REMOTE_USER") diff --git a/debian/patches/05_bug_451494.dpatch b/debian/patches/05_bug_451494.dpatch deleted file mode 100755 index 1faa731..0000000 --- a/debian/patches/05_bug_451494.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## test.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixing overrides of JkOptions for virtual hosts. - -@DPATCH@ -diff -urNad libapache-mod-jk-1.2.26~/native/apache-2.0/mod_jk.c libapache-mod-jk-1.2.26/native/apache-2.0/mod_jk.c ---- libapache-mod-jk-1.2.26~/native/apache-2.0/mod_jk.c 2008-04-02 22:07:03.000000000 +0200 -+++ libapache-mod-jk-1.2.26/native/apache-2.0/mod_jk.c 2008-04-02 22:13:43.000000000 +0200 -@@ -2526,7 +2526,12 @@ - if (!overrides->key_size_indicator) - overrides->key_size_indicator = base->key_size_indicator; - -- overrides->options |= (base->options & ~base->exclude_options); -+/* Don't simply accumulate bits in the JK_OPT_FWDURIMASK region, */ -+/* because those are multi-bit values. */ -+ if (overrides->options & JK_OPT_FWDURIMASK) -+ overrides->options |= (base->options & ~base->exclude_options) & ~JK_OPT_FWDURIMASK; -+ else -+ overrides->options |= (base->options & ~base->exclude_options); - - if (base->envvars) { - if (overrides->envvars && overrides->envvars_has_own) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libapache-mod-jk.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
