Update to 1.2.37. Update README and drop MAINTAINER. okay dcoppa@
This commit is contained in:
kurt
parent
be091a93af
commit
8e267a77b4
@ -1,17 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.24 2012/03/29 13:39:00 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.25 2012/12/13 15:19:19 kurt Exp $
|
||||
|
||||
COMMENT= Apache-Tomcat AJP Connector
|
||||
|
||||
V= 1.2.28
|
||||
REVISION= 4
|
||||
V= 1.2.37
|
||||
DISTNAME= tomcat-connectors-${V}-src
|
||||
PKGNAME= mod_jk-${V}
|
||||
CATEGORIES= www
|
||||
|
||||
HOMEPAGE= http://tomcat.apache.org/connectors-doc/index.html
|
||||
|
||||
MAINTAINER= Kurt Miller <kurt@openbsd.org>
|
||||
|
||||
MODULES+= apache-module
|
||||
|
||||
# Apache Software License 2.0
|
||||
@ -20,9 +17,8 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/source/jk-$V/}
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/}
|
||||
|
||||
SEPARATE_BUILD= Yes
|
||||
NO_REGRESS= Yes
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
MD5 (tomcat-connectors-1.2.28-src.tar.gz) = 2zmQqV0KmodOeY8wXJGTHA==
|
||||
RMD160 (tomcat-connectors-1.2.28-src.tar.gz) = T4/FoWYUu0fJft6LlcQUONMrEBA=
|
||||
SHA1 (tomcat-connectors-1.2.28-src.tar.gz) = DgIuJC2I9NQsu/pCiD0C4UrRaSk=
|
||||
SHA256 (tomcat-connectors-1.2.28-src.tar.gz) = iY/dztMgdUEhtTsyktHSCjG+vGcz1a65I2cUP4lB/m8=
|
||||
SIZE (tomcat-connectors-1.2.28-src.tar.gz) = 1541956
|
||||
SHA256 (tomcat-connectors-1.2.37-src.tar.gz) = OKkmI93Si4W79Uz3f0yGfMvrr7cSMxMUcWI2keTnUfk=
|
||||
SIZE (tomcat-connectors-1.2.37-src.tar.gz) = 1528647
|
||||
|
||||
@ -1,28 +1,28 @@
|
||||
$OpenBSD: patch-conf_workers_properties_minimal,v 1.2 2008/02/11 02:18:28 kurt Exp $
|
||||
--- conf/workers.properties.minimal.orig Sun Sep 2 15:32:11 2007
|
||||
+++ conf/workers.properties.minimal Fri Dec 21 17:50:23 2007
|
||||
$OpenBSD: patch-conf_workers_properties_minimal,v 1.3 2012/12/13 15:19:19 kurt Exp $
|
||||
--- conf/workers.properties.minimal.orig Tue Nov 27 10:12:19 2012
|
||||
+++ conf/workers.properties.minimal Tue Nov 27 10:13:01 2012
|
||||
@@ -21,22 +21,15 @@
|
||||
# The workers that jk should create and work with
|
||||
#
|
||||
|
||||
-worker.list=wlb,jkstatus
|
||||
+worker.list=ajp13w,jkstatus
|
||||
-worker.list=lb,jk-status
|
||||
+worker.list=ajp13w,jk-status
|
||||
|
||||
#
|
||||
# Defining a worker named ajp13w and of type ajp13
|
||||
# Defining a worker named node1 and of type ajp13
|
||||
# Note that the name and the type do not have to match.
|
||||
#
|
||||
worker.ajp13w.type=ajp13
|
||||
-worker.ajp13w.host=localhost
|
||||
+worker.ajp13w.host=127.0.0.1
|
||||
worker.ajp13w.port=8009
|
||||
worker.node1.type=ajp13
|
||||
-worker.node1.host=localhost
|
||||
+worker.node1.host=127.0.0.1
|
||||
worker.node1.port=8009
|
||||
-
|
||||
-#
|
||||
-# Defining a load balancer
|
||||
-#
|
||||
-
|
||||
-worker.wlb.type=lb
|
||||
-worker.wlb.balance_workers=ajp13w
|
||||
-worker.lb.type=lb
|
||||
-worker.lb.balance_workers=node1
|
||||
|
||||
#
|
||||
# Define status worker
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-native_apache-1_3_Makefile_in,v 1.3 2008/02/11 02:18:28 kurt Exp $
|
||||
--- native/apache-1.3/Makefile.in.orig Sun Sep 2 15:32:11 2007
|
||||
+++ native/apache-1.3/Makefile.in Fri Dec 21 17:50:23 2007
|
||||
@@ -40,7 +40,7 @@ BUILD_DIR = ${JK_DIR}/../build/jk/apache13
|
||||
APACHE_FILES = Makefile.tmpl Makefile.libdir libjk.module
|
||||
|
||||
JK=../common/
|
||||
-JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common
|
||||
+JK_INCL=-DUSE_APACHE_MD5 -I ${top_srcdir}/common -I ${top_builddir}/common
|
||||
JAVA_INCL=-I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS}
|
||||
JAVA_LIB=-L ${JAVA_HOME}/jre/lib/${ARCH} -L ${JAVA_HOME}/lib/${ARCH}/native_threads
|
||||
APACHE_CFLAGS=@apache_include@ @APXSCFLAGS@ @APXSCPPFLAGS@ -I${top_srcdir}/common
|
||||
@@ -100,13 +100,13 @@ mod_jk.a: mod_jk.lo $(APACHE_OBJECTS)
|
||||
${MOD_LINK} -o $@ $^
|
||||
|
||||
mod_jk.so: mod_jk.la
|
||||
- ../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
|
||||
+ ${top_srcdir}/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
|
||||
|
||||
#
|
||||
# Common part.
|
||||
#
|
||||
mod_jk.lo: mod_jk.c
|
||||
- ${SH_COMPILE} -c mod_jk.c -o $@
|
||||
+ ${SH_COMPILE} -c ${srcdir}/mod_jk.c -o $@
|
||||
|
||||
.c.lo:
|
||||
${SH_COMPILE} -c $< -o $@
|
||||
27
www/mod_jk/patches/patch-native_apache-1_3_mod_jk_c
Normal file
27
www/mod_jk/patches/patch-native_apache-1_3_mod_jk_c
Normal file
@ -0,0 +1,27 @@
|
||||
$OpenBSD: patch-native_apache-1_3_mod_jk_c,v 1.1 2012/12/13 15:19:19 kurt Exp $
|
||||
--- native/apache-1.3/mod_jk.c.orig Wed Mar 28 04:17:59 2012
|
||||
+++ native/apache-1.3/mod_jk.c Tue Nov 27 11:23:13 2012
|
||||
@@ -701,6 +701,7 @@ static int init_ws_service(apache_private_data_t * pri
|
||||
const char *route = NULL;
|
||||
rule_extension_t *e;
|
||||
jk_request_conf_t *rconf;
|
||||
+ in_port_t remote_port;
|
||||
|
||||
/* Copy in function pointers (which are really methods) */
|
||||
s->start_response = ws_start_response;
|
||||
@@ -731,8 +732,13 @@ static int init_ws_service(apache_private_data_t * pri
|
||||
}
|
||||
else {
|
||||
s->remote_addr = r->connection->remote_ip;
|
||||
- s->remote_port = ap_psprintf(r->pool, "%d",
|
||||
- ntohs(r->connection->remote_addr.sin_port));
|
||||
+ if (r->connection->remote_addr.ss_family == AF_INET)
|
||||
+ remote_port = ((struct sockaddr_in *)(&r->connection->remote_addr))->sin_port;
|
||||
+ else if (r->connection->remote_addr.ss_family == AF_INET6)
|
||||
+ remote_port = ((struct sockaddr_in6 *)(&r->connection->remote_addr))->sin6_port;
|
||||
+ else
|
||||
+ remote_port = 0;
|
||||
+ s->remote_port = ap_psprintf(r->pool, "%d", ntohs(remote_port));
|
||||
}
|
||||
s->remote_addr = get_env_string(r, s->remote_addr,
|
||||
conf->remote_addr_indicator, 1);
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-native_common_Makefile_in,v 1.2 2008/02/11 02:18:28 kurt Exp $
|
||||
--- native/common/Makefile.in.orig Sun Sep 2 15:32:11 2007
|
||||
+++ native/common/Makefile.in Fri Dec 21 17:50:23 2007
|
||||
@@ -32,7 +32,7 @@ OEXT=.lo
|
||||
include list.mk
|
||||
|
||||
JAVA_INCL=-I @JAVA_HOME@/include -I @JAVA_HOME@/include/@OS@
|
||||
-CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
|
||||
+CFLAGS=@apache_include@ -I ${top_builddir}/common @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS} ${JAVA_INCL}
|
||||
|
||||
include @top_srcdir@/scripts/build/rules.mk
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-native_configure,v 1.1 2009/06/12 18:14:26 kurt Exp $
|
||||
--- native/configure.orig Fri Jun 12 13:59:35 2009
|
||||
+++ native/configure Fri Jun 12 14:01:40 2009
|
||||
@@ -24993,7 +24993,7 @@ fi
|
||||
$OpenBSD: patch-native_configure,v 1.2 2012/12/13 15:19:19 kurt Exp $
|
||||
--- native/configure.orig Tue Nov 27 10:17:55 2012
|
||||
+++ native/configure Tue Nov 27 10:18:50 2012
|
||||
@@ -24046,7 +24046,7 @@ fi
|
||||
jk_val_changed=0
|
||||
for i in $APXSLDFLAGS; do
|
||||
case $i in
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: README,v 1.2 2011/06/02 13:41:41 ajacoutot Exp $
|
||||
$OpenBSD: README,v 1.3 2012/12/13 15:19:19 kurt Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${FULLPKGNAME} on OpenBSD
|
||||
@ -11,7 +11,7 @@ Apache, chroot(2) and mod_jk:
|
||||
|
||||
Apache on OpenBSD is chrooted by default into /var/www. When restarting
|
||||
Apache (i.e. apachectl restart) mod_jk will not be reloaded because mod_jk.so
|
||||
resides outsite of /var/www. All Apache DSO modules have this problem.
|
||||
resides outside of /var/www. All Apache DSO modules have this problem.
|
||||
|
||||
mod_jk AJP13 Basic Setup:
|
||||
|
||||
@ -20,8 +20,7 @@ server (local or remote) where Tomcat serves both the static and dynamic
|
||||
content for the default installed Tomcat contexts. If this is your first time
|
||||
using mod_jk, start here and get this working first. This section assumes
|
||||
that you have installed Tomcat and can access the examples context directly
|
||||
(i.e. http://your.tomcat.host:8080/examples/ for Tomcat 4 or
|
||||
http://your.tomcat.host:8080/jsp-examples/ for Tomcat 5).
|
||||
(i.e. http://your.tomcat.host:8080/examples/).
|
||||
|
||||
Sample configuration files will be installed to /var/www/conf if you don't
|
||||
already have them.
|
||||
@ -30,7 +29,7 @@ already have them.
|
||||
privileges (using sudo).
|
||||
|
||||
2) If Tomcat is installed on another machine, edit the sample
|
||||
/var/www/conf/workers.properies file and change the `worker.ajp13w.host'
|
||||
/var/www/conf/workers.properties file and change the `worker.ajp13w.host'
|
||||
line to the hostname or IP address of the location of Tomcat.
|
||||
|
||||
3) Edit /var/www/conf/httpd.conf and add the following line at the end of
|
||||
@ -40,8 +39,7 @@ the file to include the sample mod_jk.conf file:
|
||||
|
||||
4) Stop and start Apache using apachectl(1)
|
||||
|
||||
5) Test mod_jk by accessing the url http://your.apache.host/examples/ for
|
||||
Tomcat 4 & 6 or http://your.apache.host/jsp-examples/ for Tomcat 5.
|
||||
5) Test mod_jk by accessing the url http://your.apache.host/examples/.
|
||||
|
||||
On-line documentation is here:
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user