Commit 77d2f6186c3ae49abeda0c83afa7ff6d61b7b47d - libapache-mod-jk

+0

-7

~~debian/README.source~~ less more

0		libapache-mod-jk for Debian
1		===========================
2
3		Steps to retrieve the upstream sources of this package.
4
5		1. svn export -r 1680946 https://svn.apache.org/repos/asf/tomcat/jk/trunk/
6		2. Change JK_VERISRELEASE to 1 in native/common/jk_version.h

+17

-0

debian/changelog less more

	0	libapache-mod-jk (1:1.2.41-1) unstable; urgency=medium
	1
	2	* Team upload.
	3	* Imported Upstream version 1.2.41.
	4	* Drop README.source. We use regular upstream releases again.
	5	* Update get-orig-source target. Use --verbose and --download-current-version
	6	flags.
	7	* Drop disable-libtool-check.patch. Not required for normal releases.
	8	* Vcs-Browser: Use https.
	9	* Remove autoconf and automake from Build-Depends again.
	10	* Run wrap-and-sort -sa.
	11	* Add clean file and ensure libapache-mod-jk can be built twice in a row.
	12	* debian/rules: Remove override for dh_auto_clean.
	13	* Update debian/copyright for new release.
	14
	15	-- Markus Koschany <apo@debian.org> Fri, 30 Oct 2015 22:33:34 +0100
	16
0	17	libapache-mod-jk (1:1.2.40+svn150520-1) unstable; urgency=high
1	18
2	19	* Team upload.

+96

-0

debian/clean less more

	0	conf/jk.conf
	1	build/docs/images/add.gif
	2	build/docs/images/code.gif
	3	build/docs/images/design.gif
	4	build/docs/images/docs.gif
	5	build/docs/images/fix.gif
	6	build/docs/images/jakarta-logo.gif
	7	build/docs/images/printer.gif
	8	build/docs/images/tomcat.gif
	9	build/docs/images/update.gif
	10	build/docs/images/void.gif
	11	native/apache-2.0/mod_jk.a
	12	native/apache-2.0/mod_jk.o
	13	native/apache-2.0/mod_jk.so
	14	native/common/.libs/*
	15	native/apache-2.0/.libs/*
	16	native/common/*.o
	17	build/docs/ajp/ajpv13a.html
	18	build/docs/ajp/ajpv13ext.html
	19	build/docs/ajp/project.html
	20	build/docs/build.html
	21	build/docs/changelog
	22	build/docs/common_howto/loadbalancers.html
	23	build/docs/common_howto/project.html
	24	build/docs/common_howto/proxy.html
	25	build/docs/common_howto/quick.html
	26	build/docs/common_howto/timeouts.html
	27	build/docs/common_howto/workers.html
	28	build/docs/empty.html
	29	build/docs/index.html
	30	build/docs/miscellaneous/changelog.html
	31	build/docs/miscellaneous/doccontrib.html
	32	build/docs/miscellaneous/faq.html
	33	build/docs/miscellaneous/jkstatustasks.html
	34	build/docs/miscellaneous/project.html
	35	build/docs/miscellaneous/reporttools.html
	36	build/docs/news/20041100.html
	37	build/docs/news/20050101.html
	38	build/docs/news/20060101.html
	39	build/docs/news/20070301.html
	40	build/docs/news/20081001.html
	41	build/docs/news/20090301.html
	42	build/docs/news/20100101.html
	43	build/docs/news/20110701.html
	44	build/docs/news/20120301.html
	45	build/docs/news/20140201.html
	46	build/docs/news/20150101.html
	47	build/docs/news/project.html
	48	build/docs/project.html
	49	build/docs/reference/apache.html
	50	build/docs/reference/iis.html
	51	build/docs/reference/project.html
	52	build/docs/reference/status.html
	53	build/docs/reference/uriworkermap.html
	54	build/docs/reference/workers.html
	55	build/docs/style.css
	56	build/docs/webserver_howto/apache.html
	57	build/docs/webserver_howto/iis.html
	58	build/docs/webserver_howto/nes.html
	59	build/docs/webserver_howto/project.html
	60	native/Makefile
	61	native/apache-1.3/Makefile
	62	native/apache-1.3/Makefile.apxs
	63	native/apache-2.0/Makefile
	64	native/apache-2.0/Makefile.apxs
	65	native/apache-2.0/mod_jk.la
	66	native/apache-2.0/mod_jk.lo
	67	native/common/Makefile
	68	native/common/config.h
	69	native/common/jk_ajp12_worker.lo
	70	native/common/jk_ajp13.lo
	71	native/common/jk_ajp13_worker.lo
	72	native/common/jk_ajp14.lo
	73	native/common/jk_ajp14_worker.lo
	74	native/common/jk_ajp_common.lo
	75	native/common/jk_connect.lo
	76	native/common/jk_context.lo
	77	native/common/jk_lb_worker.lo
	78	native/common/jk_map.lo
	79	native/common/jk_md5.lo
	80	native/common/jk_msg_buff.lo
	81	native/common/jk_pool.lo
	82	native/common/jk_shm.lo
	83	native/common/jk_sockbuf.lo
	84	native/common/jk_status.lo
	85	native/common/jk_types.h
	86	native/common/jk_uri_worker_map.lo
	87	native/common/jk_url.lo
	88	native/common/jk_util.lo
	89	native/common/jk_worker.lo
	90	native/common/list.mk
	91	native/common/stamp-h1
	92	native/config.log
	93	native/config.nice
	94	native/config.status
	95	native/libtool

+22

-14

debian/control less more

1	1	Section: httpd
2	2	Priority: optional
3	3	Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
4		Uploaders: Damien Raude-Morvan <drazzib@debian.org>
5		Build-Depends: apache2-dev,
6		autoconf,
7		automake,
8		autotools-dev,
9		debhelper (>= 9),
10		dh-apache2,
11		libtool
12		Build-Depends-Indep: lynx, xsltproc
	4	Uploaders:
	5	Damien Raude-Morvan <drazzib@debian.org>
	6	Build-Depends:
	7	apache2-dev,
	8	autotools-dev,
	9	debhelper (>= 9),
	10	dh-apache2,
	11	libtool
	12	Build-Depends-Indep:
	13	lynx,
	14	xsltproc
13	15	Standards-Version: 3.9.6
14	16	Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libapache-mod-jk
15		Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-mod-jk
	17	Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libapache-mod-jk
16	18	Homepage: http://tomcat.apache.org
17	19
18	20	Package: libapache2-mod-jk
19	21	Architecture: any
20		Depends: ${misc:Depends}, ${shlibs:Depends}
21		Suggests: libapache-mod-jk-doc, tomcat8
	22	Depends:
	23	${misc:Depends},
	24	${shlibs:Depends}
	25	Suggests:
	26	libapache-mod-jk-doc,
	27	tomcat8
22	28	Description: Apache 2 connector for the Tomcat Java servlet engine
23	29	Apache Tomcat is the reference implementation for the Java Servlet and
24	30	JavaServer Pages (JSP) specification from the Apache Jakarta project.

30	36	Package: libapache-mod-jk-doc
31	37	Architecture: all
32	38	Section: doc
33		Depends: ${misc:Depends}
34		Suggests: libapache2-mod-jk
	39	Depends:
	40	${misc:Depends}
	41	Suggests:
	42	libapache2-mod-jk
35	43	Description: Documentation of libapache2-mod-jk package
36	44	Documentation and examples of the Apache jk connector for the Tomcat
37	45	Java servlet engine.

+45

-1

debian/copyright less more

10	10	Copyright: 1997-2004, University of Cambridge
11	11	License: BSD-3-clause
12	12
	13	Files: native/scripts/build/unix/ltmain.sh
	14	native/scripts/build/unix/missing
	15	native/scripts/build/unix/compile
	16	native/aclocal.m4
	17	Copyright: 1996-2013 Free Software Foundation, Inc.
	18	License: GPL-2+
	19
	20	Files: native/scripts/build/unix/config.guess
	21	native/scripts/build/unix/config.sub
	22	Copyright: 1992-2014 Free Software Foundation, Inc.
	23	License: GPL-3+
	24
	25	Files: native/scripts/build/unix/install-sh
	26	Copyright: 1994, X Consortium
	27	License: MIT
	28	Permission is hereby granted, free of charge, to any person obtaining a copy
	29	of this software and associated documentation files (the "Software"), to
	30	deal in the Software without restriction, including without limitation the
	31	rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
	32	sell copies of the Software, and to permit persons to whom the Software is
	33	furnished to do so, subject to the following conditions:
	34	.
	35	The above copyright notice and this permission notice shall be included in
	36	all copies or substantial portions of the Software.
	37	.
	38	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	39	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	40	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	41	X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	42	AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
	43	TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	44	.
	45	Except as contained in this notice, the name of the X Consortium shall not
	46	be used in advertising or otherwise to promote the sale, use or other deal-
	47	ings in this Software without prior written authorization from the X Consor-
	48	tium.
	49
	50
13	51	Files: debian/*
14	52	Copyright: 2003, Stefan Gybas <sgybas@debian.org>
15	53	2009, Michael Koch <konqueror@gmx.de>
16	54	2011, Damien Raude-Morvan <drazzib@debian.org>
17		2015, Markus Koschany <apo@gambaru.de>
	55	2015, Markus Koschany <apo@debian.org>
18	56	License: Apache-2.0
19	57
20	58	License: Apache-2.0

48	86	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
49	87	POSSIBILITY OF SUCH DAMAGE.
50	88
	89	License: GPL-2+
	90	On Debian systems, the full text of the GNU General Public license 2
	91	can be found in the file '/usr/share/common-licenses/GPL-2
51	92
	93	License: GPL-3+
	94	On Debian systems, the full text of the GNU General Public license 3
	95	can be found in the file '/usr/share/common-licenses/GPL-3

+2

-2

debian/libapache2-mod-jk.NEWS less more

29	29	the archive.
30	30
31	31	Its recommended to switch to this package. Due to building packages
32		for Apache 1.3 and 2 the documentation is now packaged separately
33		(libapache-mod-jk-doc).
	32	for Apache 1.3 and 2 the documentation is now packaged separately
	33	(libapache-mod-jk-doc).
34	34
35	35	-- Wolfgang Baer <WBaer@gmx.de> Thu, 23 Jun 2005 22:42:54 +0200

+1

-1

debian/libapache2-mod-jk.README.Debian less more

12	12	a remote tomcat you have to modify the workers.properties file.
13	13
14	14	By default, no webapp is mounted so you'll have to edit jk.conf
15		to enable, at least, a JkMount directive for you webapp.
	15	to enable, at least, a JkMount directive for you webapp.
16	16
17	17	Please pay attention to global scope vs VirtualHost when setting JkMount
18	18	(see #460398) as, by default, no mounts will be inherited from the

+4

-4

debian/libapache2-mod-jk.install less more

0		conf/jk.conf /etc/apache2/mods-available/
1		debian/jk.load /etc/apache2/mods-available/
2		debian/workers.properties /etc/libapache2-mod-jk/
3		native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/
	0	conf/jk.conf /etc/apache2/mods-available/
	1	debian/jk.load /etc/apache2/mods-available/
	2	debian/workers.properties /etc/libapache2-mod-jk/
	3	native/apache-2.0/mod_jk.so /usr/lib/apache2/modules/

+0

-54

~~debian/patches/disable-libtool-check.patch~~ less more

0		From: Markus Koschany <apo@gambaru.de>
1		Date: Thu, 21 May 2015 17:10:30 +0200
2		Subject: disable libtool check
3
4		Disable libtool check for SVN builds. This patch can be removed with the next
5		official release.
6
7		Forwarded: not-needed
8		---
9		native/scripts/build/unix/buildcheck.sh \| 32 ++++++++++++++++----------------
10		1 file changed, 16 insertions(+), 16 deletions(-)
11
12		diff --git a/native/scripts/build/unix/buildcheck.sh b/native/scripts/build/unix/buildcheck.sh
13		index db119a7..9b67052 100755
14		--- a/native/scripts/build/unix/buildcheck.sh
15		+++ b/native/scripts/build/unix/buildcheck.sh
16		@@ -35,21 +35,21 @@ else
17		echo "buildconf: autoconf version $ac_version (ok)"
18		fi
19
20		-ac_version=`${LIBTOOL:-libtool} --version 2>/dev/null\|sed -e 's/^[^0-9]//;s/[a-z] $//;s/(.//;q'`
21		-if test -z "$ac_version"; then
22		-echo "buildconf: libtool not found."
23		-echo " You need libtool version 1.4 or newer installed"
24		-echo " to build mod_jk from SVN."
25		-exit 1
26		-fi
27		-IFS=.; set $ac_version; IFS=' '
28		-if test "$1" = "1" -a "$2" -lt "4" \|\| test "$1" -lt "1"; then
29		-echo "buildconf: libtool version $ac_version found."
30		-echo " You need libtool version 1.4 or newer installed"
31		-echo " to build mod_jk from SVN."
32		-exit 1
33		-else
34		-echo "buildconf: libtool version $ac_version (ok)"
35		-fi
36		+#ac_version=`${LIBTOOL:-libtool} --version 2>/dev/null\|sed -e 's/^[^0-9]//;s/[a-z] $//;s/(.//;q'`
37		+#if test -z "$ac_version"; then
38		+#echo "buildconf: libtool not found."
39		+#echo " You need libtool version 1.4 or newer installed"
40		+#echo " to build mod_jk from SVN."
41		+#exit 1
42		+#fi
43		+#IFS=.; set $ac_version; IFS=' '
44		+#if test "$1" = "1" -a "$2" -lt "4" \|\| test "$1" -lt "1"; then
45		+#echo "buildconf: libtool version $ac_version found."
46		+#echo " You need libtool version 1.4 or newer installed"
47		+#echo " to build mod_jk from SVN."
48		+#exit 1
49		+#else
50		+#echo "buildconf: libtool version $ac_version (ok)"
51		+#fi
52
53		exit 0

+0

-1

debian/patches/series less more

0	0	0001-disable-logo.patch
1	1	0002-debianize-log-directory.patch
2	2	0003-upgrade-info-to-error-message.patch
3		disable-libtool-check.patch
4	3	fix-privacy-breach.patch

+1

-46

debian/rules less more

6	6	dh $@ --with autotools_dev,apache2 --sourcedirectory=native
7	7
8	8	override_dh_auto_configure:
9		# Run buildconf.sh before configure step. Only needed for building SVN
10		# snapshots
11		cd native && ./buildconf.sh
12	9	dh_auto_configure -- --with-apxs=/usr/bin/apxs2
13		#sed -i -e 's/^LIBTOOL = .*$$/LIBTOOL = \/bin\/sh ..\/libtool/' native/common/Makefile
14	10
15	11	override_dh_auto_build:
16	12	dh_auto_build
17	13	cp conf/httpd-jk.conf conf/jk.conf
18
19		override_dh_auto_clean:
20		rm -f conf/jk.conf
21		# ac_config_files
22		rm -f Makefile apache-1.3/Makefile apache-1.3/Makefile.apxs \
23		apache-2.0/Makefile apache-2.0/Makefile.apxs common/Makefile \
24		common/list.mk common/jk_types.h jni/Makefile
25		# MAINTAINERCLEANFILES
26		rm -f native/config.status
27		rm -f native/config.log
28		rm -f native/config.cache
29		rm -f native/common/*.o
30		rm -f native/common/*.lo
31		rm -f native/apache-2.0/mod_jk.a
32		rm -f native/apache-2.0/mod_jk.so*
33		rm -f native/apache-2.0/mod_jk.o
34		rm -f native/apache-2.0/mod_jk.lo
35		rm -f native/apache-2.0/mod_jk.la
36		rm -rf build/docs/
37		rm -rf native/apache-2.0/.libs native/common/.libs
38		rm -f native/Makefile
39		rm -f native/Makefile.in
40		rm -f native/aclocal.m4
41		rm -f native/apache-1.3/Makefile
42		rm -f native/apache-1.3/Makefile.apxs
43		rm -f native/apache-2.0/Makefile
44		rm -f native/apache-2.0/Makefile.apxs
45		rm -f native/common/Makefile
46		rm -f native/common/config.h
47		rm -f native/common/config.h.in
48		rm -f native/common/jk_types.h
49		rm -f native/common/list.mk
50		rm -f native/common/stamp-h1
51		rm -f native/config.nice
52		rm -f native/configure
53		rm -f native/libtool
54		rm -f native/scripts/build/unix/compile
55		rm -f native/scripts/build/unix/install-sh
56		rm -f native/scripts/build/unix/ltmain.sh
57		rm -f native/scripts/build/unix/missing
58
59	14
60	15	override_dh_auto_install:
61	16	ifneq (,$(filter libapache-mod-jk-doc, $(shell dh_listpackages)))

73	28	override_dh_auto_test:
74	29
75	30	get-orig-source:
76		uscan --force-download --rename
	31	uscan --verbose --download-current-version --force-download