--- libapache-mod-jk-1.2.28.orig/debian/workers.properties +++ libapache-mod-jk-1.2.28/debian/workers.properties @@ -0,0 +1,100 @@ +# workers.properties - +# +# This file is a simplified version of the workers.properties supplied +# with the upstream sources. The jni inprocess worker (not build in the +# debian package) section and the ajp12 (deprecated) section are removed. +# +# As a general note, the characters $( and ) are used internally to define +# macros. Do not use them in your own configuration!!! +# +# Whenever you see a set of lines such as: +# x=value +# y=$(x)\something +# +# the final value for y will be value\something +# +# Normaly all you will need to do is un-comment and modify the first three +# properties, i.e. workers.tomcat_home, workers.java_home and ps. +# Most of the configuration is derived from these. +# +# When you are done updating workers.tomcat_home, workers.java_home and ps +# you should have 3 workers configured: +# +# - An ajp13 worker that connects to localhost:8009 +# - A load balancer worker +# +# + +# OPTIONS ( very important for jni mode ) + +# +# workers.tomcat_home should point to the location where you +# installed tomcat. This is where you have your conf, webapps and lib +# directories. +# +workers.tomcat_home=/usr/share/tomcat5 + +# +# workers.java_home should point to your Java installation. Normally +# you should have a bin and lib directories beneath it. +# +workers.java_home=/usr/lib/jvm/java-gcj + +# +# You should configure your environment slash... ps=\ on NT and / on UNIX +# and maybe something different elsewhere. +# +ps=/ + +# +#------ ADVANCED MODE ------------------------------------------------ +#--------------------------------------------------------------------- +# + +# +#------ worker list ------------------------------------------ +#--------------------------------------------------------------------- +# +# +# The workers that your plugins should create and work with +# +worker.list=ajp13_worker + +# +#------ ajp13_worker WORKER DEFINITION ------------------------------ +#--------------------------------------------------------------------- +# + +# +# Defining a worker named ajp13_worker and of type ajp13 +# Note that the name and the type do not have to match. +# +worker.ajp13_worker.port=8009 +worker.ajp13_worker.host=localhost +worker.ajp13_worker.type=ajp13 +# +# Specifies the load balance factor when used with +# a load balancing worker. +# Note: +# ----> lbfactor must be > 0 +# ----> Low lbfactor means less work done by the worker. +worker.ajp13_worker.lbfactor=1 + +# +# Specify the size of the open connection cache. +#worker.ajp13_worker.cachesize + +# +#------ DEFAULT LOAD BALANCER WORKER DEFINITION ---------------------- +#--------------------------------------------------------------------- +# + +# +# The loadbalancer (type lb) workers perform wighted round-robin +# load balancing with sticky sessions. +# Note: +# ----> If a worker dies, the load balancer will check its state +# once in a while. Until then all work is redirected to peer +# workers. +worker.loadbalancer.type=lb +worker.loadbalancer.balance_workers=ajp13_worker --- libapache-mod-jk-1.2.28.orig/debian/500mod_jk.info +++ libapache-mod-jk-1.2.28/debian/500mod_jk.info @@ -0,0 +1,20 @@ +LoadModule: jk_module /usr/lib/apache/1.3/mod_jk.so +Directives: + JkMountCopy + JkMount + JkAutoMount + JkWorkersFile + JkLogFile + JkLogLevel + JkLogStampFormat + JkAutoAlias + JkRequestLogFormat + JkExtractSSL + JkHTTPSIndicator + JkCERTSIndicator + JkCIPHERIndicator + JkSESSIONIndicator + JkKEYSIZEIndicator + JkOptions + JkEnvVar +Description: Tomcat connector for Java servlets and web applications --- libapache-mod-jk-1.2.28.orig/debian/rules +++ libapache-mod-jk-1.2.28/debian/rules @@ -0,0 +1,120 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +build: patch build-stamp +build-stamp: + dh_testdir + + cp -a native native-apache2 + + touch build-stamp + + +build-apache20: + dh_testdir +# -$(MAKE) -C native clean + cd native-apache2 && ./configure --with-apxs=/usr/bin/apxs2 + sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native-apache2/common/Makefile + $(MAKE) -C native-apache2 + + +build-doc: + cd xdocs && install -d ../build/docs/ && cp -R * ../build/docs/ + cd build/docs && for i in `find . -name '*.xml'`; do xsltproc style.xsl $$i > `dirname $$i`/`basename $$i .xml`.html; done + cd build/docs && find . -name '*.xml' -exec rm -f {} \; + cd build/docs && rm -f style.xsl BUILDING + cd build/docs/miscellaneous && lynx -dump -nolist changelog.html > ../changelog + + +## -------- CLEAN TARGETS +clean: clean-patched unpatch +clean-patched: + dh_testdir + dh_testroot + rm -f build-stamp + rm -f native/common/portable.h native/common/stamp-h1 + rm -rf build + rm -f native/apache-2.0/Makefile native/apache-2.0/Makefile.apxs + rm -f native/common/Makefile native/common/list.mk + rm -f native/common/jk_types.h + rm -f native/jni/Makefile native/Makefile native/libtool + rm -f native/config.status native/config.log + rm -f native/apache-2.0/mod_jk.o + rm -f native/apache-2.0/mod_jk.la native/apache-2.0/mod_jk.lo + rm -f native/apache-2.0/mod_jk.a native/apache-2.0/mod_jk.so* + rm -f native/common/*.lo native/common/*.o + rm -rf native/apache-2.0/.libs native/common/.libs + rm -rf native-apache2 + dh_clean + + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -a + dh_installdirs -a + cp native-apache2/apache-2.0/mod_jk.so debian/libapache2-mod-jk/usr/lib/apache2/modules/mod_jk.so + dh_install -a + + +patch: patch-stamp +patch-stamp: + dpatch apply-all + touch patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +# Build architecture-independent files here. +binary-indep: build-doc install-indep + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i + dh_installexamples -i + dh_installdocs -i + dh_compress -i -Xchangelog.html + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build build-apache20 install-arch + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a + dh_installdocs -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch --- libapache-mod-jk-1.2.28.orig/debian/README.source +++ libapache-mod-jk-1.2.28/debian/README.source @@ -0,0 +1,6 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/dpatch/README.source.gz for a detailed explanation. + --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.install +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.install @@ -0,0 +1,3 @@ +debian/workers.properties /etc/libapache2-mod-jk/ +debian/jk.load /etc/apache2/mods-available/ + --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk.docs +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk.docs @@ -0,0 +1 @@ +debian/httpd_example_apache.conf --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk.postinst +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk.postinst @@ -0,0 +1,28 @@ +#!/bin/sh -e + +#DEBHELPER# + +case "$1" in + configure) + + # Only activate mod_jk if this is not an upgrade + if [ -z "$2" ]; then + for i in apache apache-perl apache-ssl; do + if [ -r /etc/$i/modules.conf ]; then + /usr/sbin/modules-config $i enable mod_jk + fi + done + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 + --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk.README.Debian +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk.README.Debian @@ -0,0 +1,16 @@ +libapache-mod-jk for Debian +---------------------------------- + +Packages for Apache 1.3 and Apache 2 are provided. The documentation +can be found in the libapache-mod-jk-doc package. + +To enable the Apache - Tomcat connector you have to edit your +httpd.conf to include the necessary commands. An example configuration +is provided with the package - see httpd_example_apache.conf + +One default worker named ajp13_worker, which connects to the localhost on +port 8009, is configured. If you need more workers or want to connect to +a remote tomcat you have to modify the workers.properties file. + + + -- Wolfgang Baer Thu, 23 Jun 2005 22:42:54 +0200 --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk-doc.examples +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk-doc.examples @@ -0,0 +1,3 @@ +tools/reports/README.txt +tools/reports/tomcat_reports.pl +tools/reports/tomcat_trend.pl --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk.dirs +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk.dirs @@ -0,0 +1,2 @@ +usr/lib/apache/1.3/ +etc/libapache-mod-jk/ --- libapache-mod-jk-1.2.28.orig/debian/httpd_example_apache.conf +++ libapache-mod-jk-1.2.28/debian/httpd_example_apache.conf @@ -0,0 +1,39 @@ +# Sample mod_jk configuration +# for Apache 1.3 +# +# for all commands/options available see the manual +# provided in libapache-mod-jk-doc package. + +# The location where mod_jk will find the workers definitions +JkWorkersFile /etc/libapache-mod-jk/workers.properties + +# The location where mod_jk is going to place its log file +JkLogFile /var/log/apache/mod_jk.log + +# The log level: +# - info log will contain standard mod_jk activity (default). +# - warn log will contain non fatal error reports. +# - error log will contain also error reports. +# - debug log will contain all information on mod_jk activity +# - trace log will contain all tracing information on mod_jk activity +JkLogLevel info + + +# Assign specific URLs to Tomcat. In general the structure of a +# JkMount directive is: JkMount [URL prefix] [Worker name] + +# send all requests ending in .jsp to ajp13_worker +JkMount /*.jsp ajp13_worker +# send all requests ending /servlet to ajp13_worker +JkMount /*/servlet/ ajp13_worker + +# JkUnmount directive acts as an opposite to JkMount and blocks access +# to a particular URL. The purpose is to be able to filter out the +# particular content types from mounted context. + +# do not send requests ending with .gif to ajp13_worker +#JkUnMount /servlet/*.gif ajp13_worker + + +# JkMount / JkUnMount directives can also be used inside +# sections of your httpd.conf file. --- libapache-mod-jk-1.2.28.orig/debian/httpd_example_apache2.conf +++ libapache-mod-jk-1.2.28/debian/httpd_example_apache2.conf @@ -0,0 +1,39 @@ +# Sample mod_jk configuration +# for Apache 2 +# +# for all commands/options available see the manual +# provided in libapache-mod-jk-doc package. + +# The location where mod_jk will find the workers definitions +JkWorkersFile /etc/libapache2-mod-jk/workers.properties + +# The location where mod_jk is going to place its log file +JkLogFile /var/log/apache2/mod_jk.log + +# The log level: +# - info log will contain standard mod_jk activity (default). +# - warn log will contain non fatal error reports. +# - error log will contain also error reports. +# - debug log will contain all information on mod_jk activity +# - trace log will contain all tracing information on mod_jk activity +JkLogLevel info + + +# Assign specific URLs to Tomcat. In general the structure of a +# JkMount directive is: JkMount [URL prefix] [Worker name] + +# send all requests ending in .jsp to ajp13_worker +JkMount /*.jsp ajp13_worker +# send all requests ending /servlet to ajp13_worker +JkMount /*/servlet/ ajp13_worker + +# JkUnmount directive acts as an opposite to JkMount and blocks access +# to a particular URL. The purpose is to be able to filter out the +# particular content types from mounted context. + +# do not send requests ending with .gif to ajp13_worker +#JkUnMount /servlet/*.gif ajp13_worker + + +# JkMount / JkUnMount directives can also be used inside +# sections of your httpd.conf file. --- libapache-mod-jk-1.2.28.orig/debian/control +++ libapache-mod-jk-1.2.28/debian/control @@ -0,0 +1,39 @@ +Source: libapache-mod-jk +Section: web +Priority: optional +Maintainer: Debian Java Maintainers +Uploaders: Stefan Gybas , Arnaud Vandyck , Michael Koch +Build-Depends: debhelper (>= 5), dpatch, apache2-threaded-dev, libtool +Build-Depends-Indep: xsltproc, lynx +Standards-Version: 3.8.3 +Homepage: http://tomcat.apache.org/ + +Package: libapache2-mod-jk +Architecture: any +Section: web +Priority: optional +Depends: ${shlibs:Depends}, apache2.2-common, apache2 +Suggests: tomcat6, libapache-mod-jk-doc +Conflicts: libapache2-mod-jk2 +Replaces: libapache2-mod-jk2 +Description: Apache 2 connector for the Tomcat Java servlet engine + Apache Tomcat is the reference implementation for the Java Servlet and + JavaServer Pages (JSP) specification from the Apache Jakarta project. + . + This package contains an Apache 2 module (mod_jk) to forward requests + from Apache to Tomcat using the AJP 1.3 or 1.4 protocol. It can either + talk to Tomcat on the local machine or to a remote engine using TCP. + +Package: libapache-mod-jk-doc +Architecture: all +Section: doc +Priority: optional +Suggests: libapache2-mod-jk +Conflicts: libapache-mod-jk (<= 1.2.5-2) +Replaces: libapache-mod-jk (<= 1.2.5-2) +Description: Documentation of libapache2-mod-jk package + Documentation and examples of the Apache jk connector for the Tomcat + Java servlet engine. + . + For uptodate documentation about Tomcat connectors please take a look + at the home page at http://tomcat.apache.org/connectors-doc/. --- libapache-mod-jk-1.2.28.orig/debian/compat +++ libapache-mod-jk-1.2.28/debian/compat @@ -0,0 +1 @@ +5 --- libapache-mod-jk-1.2.28.orig/debian/changelog +++ libapache-mod-jk-1.2.28/debian/changelog @@ -0,0 +1,189 @@ +libapache-mod-jk (1:1.2.28-2) unstable; urgency=low + + * Added debian/patches/05_config_update.dpatch which updates + config.{guess|sub} in native/scripts/build/unix/ (Closes: #540392). + * debian/control: Let libapache2-mod-jk suggest tomcat6 instead of + tomcat5.5. + * Added debian/README.source. + * Updated Standards-Version to 3.8.3. + + -- Michael Koch Thu, 20 Aug 2009 20:04:39 +0200 + +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 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 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 + Toshihiro Sasajima for the patch, Closes: #451494 + * Fixed debian/copyright to mention copyright and license properly. + * debian/libapache-mod-jk-doc.doc-base: Moved to section + System/Administration. + * Remove unused lintian override for libapache-mod-jk-doc. + + -- Michael Koch Wed, 02 Apr 2008 23:09:41 +0200 + +libapache-mod-jk (1:1.2.26-1) unstable; urgency=low + + * New upstream release. + * Updated Standards-Version to 3.7.3. + * Fixed URL in Homepage field. + * Fixed typo in debian/libapache2-mod-jk.NEWS. + + -- Michael Koch Thu, 27 Dec 2007 13:04:55 -0100 + +libapache-mod-jk (1:1.2.25-2) unstable; urgency=low + + * debian/workers.properties: Renamed worker.loadbalancer.balanced_workers to + worker.loadbalancer.balance_workers. Closes: #448062. + + -- Michael Koch Thu, 25 Oct 2007 21:18:33 +0200 + +libapache-mod-jk (1:1.2.25-1) unstable; urgency=low + + * New upstream release. + * Don't suggest tomcat5 anymore. + * Use Homepage: field in debian/control + + -- Michael Koch Sat, 15 Sep 2007 09:07:30 +0200 + +libapache-mod-jk (1:1.2.23-4) unstable; urgency=low + + * libapache2-mod-jk: Removed Suggests on tomcat4. + * libapache-mod-jk-doc: Removed Suggests on libapache-mod-jk. + + -- Michael Koch Thu, 5 Jul 2007 13:44:24 +0200 + +libapache-mod-jk (1:1.2.23-3) unstable; urgency=low + + * Don't build libapache-mod-jk binary package anymore. Closes: #429125. + * Removed Wolfgang from Uploaders. + + -- Michael Koch Sun, 24 Jun 2007 18:34:33 -0100 + +libapache-mod-jk (1:1.2.23-2) unstable; urgency=low + + * Point workers.tomcat_home to /usr/share/tomcat5 and + workers.java_home to /usr/lib/jvm/java-gcj. + * Generate changelog from changelog.html correctly. + + -- Michael Koch Sat, 09 Jun 2007 16:06:13 -0100 + +libapache-mod-jk (1:1.2.23-1) unstable; urgency=high + + * New upstream release. + - Forward unparsed URI to tomcat. Closes: #425836. + CVE-2007-1860 + + -- Michael Koch Sat, 2 Jun 2007 23:14:13 +0200 + +libapache-mod-jk (1:1.2.22-1) unstable; urgency=low + + * New upstream release + - works when no JkWorkersFile option set (Closes: #419448). + * Added debian/patches/04_no-worker-error.dpatch to make the message + "Could not find worker" an error and more visible (Closes: #418887). + + -- Michael Koch Tue, 17 Apr 2007 08:12:38 +0200 + +libapache-mod-jk (1:1.2.21-1) unstable; urgency=low + + * New upstream release + + -- Michael Koch Thu, 12 Apr 2007 07:21:37 +0000 + +libapache-mod-jk (1:1.2.18-3) unstable; urgency=medium + + * debian/rules: copy source tree for native part to compile seperately for + Apache 2.0 (Closes: #396224, #406636). + * Added tomcat5.5 to Depends on tomcat4 | tomcat5 | tomcat5.5. + * Updated Standards-Version to 3.7.2. + * Added myself to Uploaders. + + -- Michael Koch Sat, 17 Feb 2007 17:10:27 +0100 + +libapache-mod-jk (1:1.2.18-2) unstable; urgency=low + + * debian/control (Depends): updated to apache2.2-common (closes: + #391651), thanks to Philippe Marzouk. + * debian/patches/03_jk-runtime-status_default_location.dpatch: + added. This change the default location of JkShmFile variable (closes: + #362004), thanks to Adrian Bridgett. + + -- Arnaud Vandyck Mon, 9 Oct 2006 15:41:47 +0200 + +libapache-mod-jk (1:1.2.18-1) unstable; urgency=low + + * New upstream + * debian/watch: added + * Added myself to uploaders + * debian/rules: modified to revert changes in upstream structure (jk + directory does not exist anymore) + + -- Arnaud Vandyck Wed, 2 Aug 2006 11:11:03 +0200 + +libapache-mod-jk (1:1.2.14.1-2) unstable; urgency=low + + * Fixed binary arch only build by splitting + arch and indep install targets + + -- Wolfgang Baer Mon, 03 Oct 2005 13:25:14 +0200 + +libapache-mod-jk (1:1.2.14.1-1) unstable; urgency=low + + * New upstream release (closes: #307331) + * Removed cdbs dependency - building only with debhelper + * Build Apache2 package (closes: #296345) + + debian/control: package libapache2-mod-jk added + + debian/control: added apache2-threaded-dev build dependency + * Split documentation in own package so it does not ship twice + + debian/control: package libapache-mod-jk-doc added + + debian/control: xsltproc dependency for building + + debian/control: added conflicts/replaces with old libapache-mod-jk + * Updated workers.properties + * Added example httpd.conf files for Apache 1.3 and 2 + * Added tomcat5 as alternative to tomcat4 to suggests + * Only provide example conf files (for Apache1.3/2) which have to be + installed and modified for a specific setup by the user (closes: #321203) + * Added conflicts/replaces with libapache2-mod-jk2 and added NEWS.Debian + * Registered documentation with doc-base + * Added lintian override for changelog html file used in the manual + * Updated copyright to new upstream Apache License Version 2.0 + * Updated Standards-Version to 3.6.2 - no changes + + -- Wolfgang Baer Tue, 6 Sep 2005 14:43:49 +0200 + +libapache-mod-jk (1:1.2.5-2) unstable; urgency=low + + * Added libtool build dependency (closes: #229395) + + -- Stefan Gybas Fri, 30 Jan 2004 17:22:12 +0100 + +libapache-mod-jk (1:1.2.5-1) unstable; urgency=low + + * New upstream release (libapache-mod-jk was previously built by the tomcat + source package) + * Updated download location in copyright file + * Mention in the long description that this module can talk to a remote + Tomcat server so it can go into main + * Updated to the new module handling in Apache 1.3.29 and support Apache, + Apache-Perl and Apache-SSL + + -- Stefan Gybas Sat, 10 Jan 2004 17:18:52 +0100 + --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk-doc.doc-base +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk-doc.doc-base @@ -0,0 +1,10 @@ +Document: libapache-mod-jk-doc +Title: The Apache Jakarta Tomcat Connector +Author: The Apache Jakarta team +Abstract: This manual contains general documentation and configuration + information of the Apache Tomcat connector for Apache 1.3 and 2.0 +Section: System/Administration + +Format: HTML +Index: /usr/share/doc/libapache-mod-jk-doc/index.html +Files: /usr/share/doc/libapache-mod-jk-doc/*.html --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.dirs +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.dirs @@ -0,0 +1,3 @@ +usr/lib/apache2/modules/ +etc/libapache2-mod-jk/ +etc/apache2/mods-available/ --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.docs +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.docs @@ -0,0 +1 @@ +debian/httpd_example_apache2.conf --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.prerm +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.prerm @@ -0,0 +1,22 @@ +#!/bin/sh -e + +#DEBHELPER# + +case "$1" in + upgrade|failed-upgrade) + # Nothing to do here + ;; + + deconfigure|remove) + # Disable jk if this is not an upgrade + a2dismod jk || true + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 + --- libapache-mod-jk-1.2.28.orig/debian/watch +++ libapache-mod-jk-1.2.28/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-(.*)/tomcat-connectors-(.*)-src\.tar\.gz debian uupdate --- libapache-mod-jk-1.2.28.orig/debian/jk.load +++ libapache-mod-jk-1.2.28/debian/jk.load @@ -0,0 +1 @@ +LoadModule jk_module /usr/lib/apache2/modules/mod_jk.so --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk.prerm +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk.prerm @@ -0,0 +1,26 @@ +#!/bin/sh -e + +#DEBHELPER# + +case "$1" in + upgrade|failed-upgrade) + # Nothing to do here + ;; + + deconfigure|remove) + # Disable mod_jk if this is not an upgrade + for i in apache apache-perl apache-ssl; do + if [ -r /etc/$i/modules.conf ]; then + /usr/sbin/modules-config $i disable mod_jk quiet + fi + done + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 + --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk-doc.docs +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk-doc.docs @@ -0,0 +1 @@ +build/docs/* --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.NEWS +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.NEWS @@ -0,0 +1,11 @@ +libapache2-mod-jk (1:1.2.14.1-1) unstable; urgency=low + + This package replaces the previously libapache2-mod-jk2 package + which is now unsupported upstream and therefore removed from + the archive. + + Its recommended to switch to this package. Due to building packages + for Apache 1.3 and 2 the documentation is now packaged separately + (libapache-mod-jk-doc). + + -- Wolfgang Baer Thu, 23 Jun 2005 22:42:54 +0200 --- libapache-mod-jk-1.2.28.orig/debian/libapache-mod-jk.install +++ libapache-mod-jk-1.2.28/debian/libapache-mod-jk.install @@ -0,0 +1,3 @@ +debian/500mod_jk.info /usr/lib/apache/1.3/ +debian/workers.properties /etc/libapache-mod-jk/ + --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.postinst +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.postinst @@ -0,0 +1,24 @@ +#!/bin/sh -e + +#DEBHELPER# + +case "$1" in + configure) + + # Only activate jk if this is not an upgrade + if [ -z "$2" ]; then + a2enmod jk || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "$0 called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 + --- libapache-mod-jk-1.2.28.orig/debian/libapache2-mod-jk.README.Debian +++ libapache-mod-jk-1.2.28/debian/libapache2-mod-jk.README.Debian @@ -0,0 +1,16 @@ +libapache2-mod-jk for Debian +---------------------------------- + +Packages for Apache 1.3 and Apache 2 are provided. The documentation +can be found in the libapache-mod-jk-doc package. + +To enable the Apache - Tomcat connector you have to edit your +httpd.conf to include the necessary commands. An example configuration +is provided with the package - see httpd_example_apache2.conf + +One default worker named ajp13_worker, which connects to the localhost on +port 8009, is configured. If you need more workers or want to connect to +a remote tomcat you have to modify the workers.properties file. + + + -- Wolfgang Baer Thu, 23 Jun 2005 22:42:54 +0200 --- libapache-mod-jk-1.2.28.orig/debian/copyright +++ libapache-mod-jk-1.2.28/debian/copyright @@ -0,0 +1,24 @@ +This package was debianized by Stefan Gybas on +11-Nov-2003. The source archive was downloaded from +http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/. + +Authors: The Apache Jakarta team + +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 + + 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. + +On Debian system the full text of the Apache License, Version 2.0, can be +found in /usr/share/common-licenses/Apache-2.0. --- libapache-mod-jk-1.2.28.orig/debian/patches/04_no-worker-error.dpatch +++ libapache-mod-jk-1.2.28/debian/patches/04_no-worker-error.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_no-worker-error.dpatch by Michael Koch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: commented some errors in the stylesheet + +@DPATCH@ + +--- ./native/apache-2.0/mod_jk.c~ 2007-04-17 08:04:47.000000000 +0200 ++++ ./native/apache-2.0/mod_jk.c 2007-04-17 08:05:12.000000000 +0200 +@@ -2259,7 +2259,7 @@ + } + } + else { +- jk_log(xconf->log, JK_LOG_INFO, "Could not find a worker" ++ jk_log(xconf->log, JK_LOG_ERROR, "Could not find a worker" + " for worker name=%s", + worker_name); + JK_TRACE_EXIT(xconf->log); --- libapache-mod-jk-1.2.28.orig/debian/patches/05_config_update.dpatch +++ libapache-mod-jk-1.2.28/debian/patches/05_config_update.dpatch @@ -0,0 +1,848 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_config_update.dpatch by Michael Koch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: update config.{guess|sub} for newer archs like kfreebsd-*. + +@DPATCH@ + +--- libapache-mod-jk-1.2.28.orig/native/scripts/build/unix/config.sub ++++ libapache-mod-jk-1.2.28/native/scripts/build/unix/config.sub +@@ -1,9 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. + +-timestamp='2005-12-11' ++timestamp='2009-06-11' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -71,8 +72,8 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -121,6 +122,7 @@ + case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` +@@ -151,6 +153,9 @@ + os= + basic_machine=$1 + ;; ++ -bluegene*) ++ os=-cnk ++ ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 +@@ -240,20 +245,24 @@ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ +- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ +- | fr30 | frv \ ++ | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ +- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +- | mips64vr | mips64vrel \ ++ | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ +@@ -266,26 +275,26 @@ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ ++ | moxie \ + | mt \ + | msp430 \ ++ | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ +- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ +- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ +- | sparcv8 | sparcv9 | sparcv9b \ +- | strongarm \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ +- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ +- | z8k) +- basic_machine=$basic_machine-unknown +- ;; +- m32c) ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) +@@ -317,25 +326,28 @@ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ +- | avr-* \ ++ | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ +- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ +- | m32r-* | m32rle-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +- | mips64vr-* | mips64vrel-* \ ++ | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ +@@ -350,28 +362,31 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ +- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ +- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ +- | xstormy16-* | xtensa-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | xstormy16-* | xtensa*-* \ + | ymp-* \ +- | z8k-*) ++ | z8k-* | z80-*) + ;; +- m32c-*) ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. +@@ -435,6 +450,10 @@ + basic_machine=m68k-apollo + os=-bsd + ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; + aux) + basic_machine=m68k-apple + os=-aux +@@ -443,10 +462,26 @@ + basic_machine=ns32k-sequent + os=-dynix + ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; + convex-c1) + basic_machine=c1-convex + os=-bsd +@@ -475,8 +510,8 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16c) +- basic_machine=cr16c-unknown ++ cr16) ++ basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) +@@ -514,6 +549,10 @@ + basic_machine=m88k-motorola + os=-sysv3 + ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp +@@ -668,6 +707,14 @@ + basic_machine=m68k-isi + os=-sysv + ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + m88k-omron*) + basic_machine=m88k-omron + ;; +@@ -683,6 +730,10 @@ + basic_machine=i386-pc + os=-mingw32 + ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; + miniframe) + basic_machine=m68000-convergent + ;; +@@ -809,6 +860,14 @@ + basic_machine=i860-intel + os=-osf + ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; + pbd) + basic_machine=sparc-tti + ;; +@@ -818,6 +877,12 @@ + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; +@@ -904,6 +969,10 @@ + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; + sei) + basic_machine=mips-sei + os=-seiux +@@ -915,6 +984,9 @@ + basic_machine=sh-hitachi + os=-hms + ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; + sh64) + basic_machine=sh64-unknown + ;; +@@ -1004,6 +1076,10 @@ + basic_machine=tic6x-unknown + os=-coff + ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; + tx39) + basic_machine=mipstx39-unknown + ;; +@@ -1079,6 +1155,10 @@ + basic_machine=z8k-unknown + os=-sim + ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; + none) + basic_machine=none-none + os=-none +@@ -1117,10 +1197,10 @@ + we32k) + basic_machine=we32k-att + ;; +- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; +- sparc | sparcv8 | sparcv9 | sparcv9b) ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) +@@ -1187,18 +1267,20 @@ + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ ++ | -kopensolaris* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ ++ | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -chorusos* | -chorusrdb* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ +@@ -1208,7 +1290,7 @@ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ +- | -skyos* | -haiku* | -rdos*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) +@@ -1338,6 +1420,9 @@ + -zvmoe) + os=-zvmoe + ;; ++ -dicos*) ++ os=-dicos ++ ;; + -none) + ;; + *) +@@ -1360,6 +1445,12 @@ + # system, and we'll never get to this point. + + case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; + *-acorn) + os=-riscix1.2 + ;; +@@ -1369,9 +1460,9 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff +- ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 +@@ -1397,6 +1488,9 @@ + m68*-cisco) + os=-aout + ;; ++ mep-*) ++ os=-elf ++ ;; + mips*-cisco) + os=-elf + ;; +@@ -1526,7 +1620,7 @@ + -sunos*) + vendor=sun + ;; +- -aix*) ++ -cnk*|-aix*) + vendor=ibm + ;; + -beos*) +--- libapache-mod-jk-1.2.28.orig/native/scripts/build/unix/config.guess ++++ libapache-mod-jk-1.2.28/native/scripts/build/unix/config.guess +@@ -1,9 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. + +-timestamp='2005-12-13' ++timestamp='2009-06-10' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -55,8 +56,8 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +-Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -106,7 +107,7 @@ + trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; + trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; + : ${TMPDIR=/tmp} ; +- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +@@ -160,6 +161,7 @@ + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched +@@ -168,7 +170,7 @@ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -206,8 +208,11 @@ + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; + macppc:MirBSD:*:*) +- echo powerppc-unknown-mirbsd${UNAME_RELEASE} ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} +@@ -319,14 +324,30 @@ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize +@@ -527,7 +548,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[45]) ++ *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -635,7 +656,7 @@ + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -764,12 +785,19 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; +- i*:MINGW*:*) ++ *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) +@@ -779,12 +807,24 @@ + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- x86:Interix*:[345]*) +- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' +- exit ;; ++ *:Interix*:[3456]*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ EM64T | authenticamd | genuineintel) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -815,6 +855,16 @@ + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +@@ -835,42 +885,27 @@ + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips +- #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips64 +- #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^CPU/{ ++ s: ::g ++ p ++ }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +@@ -892,10 +927,13 @@ + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null ++ objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -925,6 +963,9 @@ + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent +@@ -940,17 +981,6 @@ + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- coff-i386) +- echo "${UNAME_MACHINE}-pc-linux-gnucoff" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build +@@ -967,7 +997,7 @@ + LIBC=gnulibc1 + # endif + #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) ++ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout +@@ -977,7 +1007,11 @@ + LIBC=dietlibc + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`" ++ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' ++ /^LIBC/{ ++ s: ::g ++ p ++ }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit +@@ -1012,7 +1046,7 @@ + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1056,8 +1090,11 @@ + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 +@@ -1095,6 +1132,16 @@ + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; +@@ -1107,7 +1154,7 @@ + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1170,6 +1217,9 @@ + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1179,6 +1229,15 @@ + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; +@@ -1269,6 +1328,9 @@ + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; + esac + + #echo '(No uname command or uname output not recognized.)' 1>&2 +@@ -1429,9 +1491,9 @@ + the operating system you are using. It is advised that you + download the most up to date version of the config scripts from + +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + and +- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + + If the version you run ($0) is already up to date, please + send the following data and any information you think might be --- libapache-mod-jk-1.2.28.orig/debian/patches/01_stylesheet.dpatch +++ libapache-mod-jk-1.2.28/debian/patches/01_stylesheet.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_stylesheet.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: alters variable name so they don't redefine existing ones + +@DPATCH@ + +--- ./jk/xdocs/style.xsl 2005-06-25 15:34:30.000000000 +0200 ++++ ./jk/xdocs/style.xsl 2005-06-25 18:07:57.000000000 +0200 +@@ -77,19 +77,19 @@ + {$alt} + + +- ++ + + + + + +- ++ + + + + PROJECT LOGO + +- {$alt} ++ {$alt2} + + + --- libapache-mod-jk-1.2.28.orig/debian/patches/02_style_xsl.dpatch +++ libapache-mod-jk-1.2.28/debian/patches/02_style_xsl.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_style_xsl.dpatch by Arnaud Vandyck +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: commented some errors in the stylesheet + +@DPATCH@ + +--- ./xdocs/style.xsl~ 2006-06-28 23:56:49.000000000 +0000 ++++ ./xdocs/style.xsl 2006-08-02 12:59:51.000000000 +0000 +@@ -77,15 +77,15 @@ + {$alt} + + +- ++ + + + +- ++ + + APACHE LOGO + --- libapache-mod-jk-1.2.28.orig/debian/patches/03_jk-runtime-status_default_location.dpatch +++ libapache-mod-jk-1.2.28/debian/patches/03_jk-runtime-status_default_location.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_jk-runtime-statuts_default_location.dpatch by Arnaud Vandyck +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: commented some errors in the stylesheet + +@DPATCH@ + +--- ./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 +@@ -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_REMOTE_ADDR ("JK_REMOTE_ADDR") + #define JK_ENV_REMOTE_HOST ("JK_REMOTE_HOST") + #define JK_ENV_REMOTE_USER ("JK_REMOTE_USER") --- libapache-mod-jk-1.2.28.orig/debian/patches/00list +++ libapache-mod-jk-1.2.28/debian/patches/00list @@ -0,0 +1,4 @@ +02_style_xsl +03_jk-runtime-status_default_location.dpatch +04_no-worker-error.dpatch +05_config_update