[csw-devel] SF.net SVN: gar:[19442] csw/mgar/pkg/mod_jk/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Sun Oct 14 15:50:31 CEST 2012
Revision: 19442
http://gar.svn.sourceforge.net/gar/?rev=19442&view=rev
Author: wilbury
Date: 2012-10-14 13:50:30 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
mod_jk/trunk: Correct build variables, rework patches.
Modified Paths:
--------------
csw/mgar/pkg/mod_jk/trunk/Makefile
csw/mgar/pkg/mod_jk/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch
Removed Paths:
-------------
csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend
csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec
csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall
csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove
csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.prototype
csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.space
csw/mgar/pkg/mod_jk/trunk/files/install.diff
csw/mgar/pkg/mod_jk/trunk/files/logging.diff
Modified: csw/mgar/pkg/mod_jk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,6 +1,6 @@
NAME = tomcat-connectors
VERSION = 1.2.37
-CATEGORIES = server
+CATEGORIES = lib
GARTYPE = v2
DESCRIPTION = AJP connector module for Apache 2
@@ -24,7 +24,17 @@
MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/
DISTFILES = $(NAME)-$(VERSION)-src.tar.gz
DISTFILES += httpd-jk.conf.CSW
+PACKAGING_PLATFORMS = solaris10-i386
+WORKSRC = $(WORKDIR)/$(DISTNAME)-src/native
+PATCHDIR = $(WORKDIR)/$(DISTNAME)-src
+# Apache paths
+AP2_ROOT = $(prefix)/apache2
+AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec
+AP2_APXS = $(AP2_ROOT)/sbin/apxs
+AP2_MODS = 1
+AP2_MODFILES += mod_jk.so
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-src.tar.gz
@@ -33,14 +43,8 @@
AUXCONFIG += uriworkermap.properties
DISTFILES += $(AUXCONFIG)
-WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)-src/native
+PATCHFILES += 0001-Use-correct-paths-for-install-and-logging.patch
-# Make apxs install to the temp dir
-PATCHFILES += install.diff
-
-# Fix bad embedded paths in mod_jk.c
-PATCHFILES += logging.diff
-
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
CONFIGURE_ARGS += --enable-jni
@@ -54,11 +58,17 @@
include gar/category.mk
+post-extract-modulated:
+ echo $(WORKDIR)
+ echo $(WORKSRC)
+ @$(MAKECOOKIE)
+
pre-install:
install -d $(DESTDIR)$(prefix)/apache2/libexec
install -d $(DESTDIR)$(prefix)/apache2/etc/extra
install -d $(DESTDIR)$(datadir)/ap2modjk
install -d $(DESTDIR)$(docdir)/ap2modjk
+ @$(MAKECOOKIE)
post-install:
ginstall -m 0644 \
Modified: csw/mgar/pkg/mod_jk/trunk/checksums
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/checksums 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/checksums 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,13 +1 @@
-1815c09dc59d4a769e20c0f2361c4656 CSWap2modjk.depend
-da3c0df06571efa952998e637ca10cde CSWap2modjk.gspec
-f4781a01cc678a752a800198918e5687 CSWap2modjk.postinstall
-5eb4612d15fdf4fd8498d97c79ed8e4b CSWap2modjk.preremove
-a0994b400fb225bffa325b5cd53a08a2 CSWap2modjk.prototype
-0dd379f20ceb32fc77bb3a9bf045097f CSWap2modjk.space
-43136ccdd67533557a2e4953249f755f httpd-jk.conf.CSW
-25c3855d2af69021dfc63e9d4b1ed78a install.diff
-7c6ff5425f542ec5eb80954f8a470519 logging.diff
-e6504ce44628ca18deaa503cbc77f545 tomcat-connectors-1.2.30-src.tar.gz
-594aca8f50b11134fd3396e348bd2f12 uriworkermap.properties
-7824a6e972faae3d9ec7b06a47b70105 workers.properties
-b69613899d749ba2a40d1acbbbe13ba9 workers.properties.minimal
+64c3803477b47c5b7ef7f0e4a416e45e tomcat-connectors-1.2.37-src.tar.gz
Added: csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch (rev 0)
+++ csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch 2012-10-14 13:50:30 UTC (rev 19442)
@@ -0,0 +1,55 @@
+From be896c015d432de308f998a80b0eb94863f872ac Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 14 Oct 2012 15:20:23 +0200
+Subject: [PATCH] Use correct paths for install and logging.
+
+---
+ native/apache-2.0/Makefile.apxs.in | 2 +-
+ native/apache-2.0/Makefile.in | 2 +-
+ native/apache-2.0/mod_jk.c | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/native/apache-2.0/Makefile.apxs.in b/native/apache-2.0/Makefile.apxs.in
+index a313654..b9c44df 100644
+--- a/native/apache-2.0/Makefile.apxs.in
++++ b/native/apache-2.0/Makefile.apxs.in
+@@ -32,7 +32,7 @@ mod_jk.la:
+ $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS}
+
+ install: mod_jk.la
+- $(APXS) -i mod_jk.la
++ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(APACHE_DIR)/libexec -i mod_jk.la
+
+ clean:
+ rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
+diff --git a/native/apache-2.0/Makefile.in b/native/apache-2.0/Makefile.in
+index 35c778e..0da5997 100644
+--- a/native/apache-2.0/Makefile.in
++++ b/native/apache-2.0/Makefile.in
+@@ -83,7 +83,7 @@ mod_jk.so: mod_jk.la
+ install_dynamic:
+ @echo ""
+ @echo "Installing files to Apache Modules Directory..."
+- $(APXS) -i mod_jk.la
++ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(APACHE_DIR)/libexec -i mod_jk.la
+ @echo ""
+ @echo "Please be sure to arrange ${APACHE_DIR}/conf/httpd.conf..."
+ @echo ""
+diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c
+index 3a31fe2..e8b17d4 100644
+--- a/native/apache-2.0/mod_jk.c
++++ b/native/apache-2.0/mod_jk.c
+@@ -98,8 +98,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/mod_jk.log")
++#define JK_SHM_DEF_FILE ("var/log/jk-runtime-status")
+ #define JK_ENV_REMOTE_ADDR ("JK_REMOTE_ADDR")
+ #define JK_ENV_REMOTE_PORT ("JK_REMOTE_PORT")
+ #define JK_ENV_REMOTE_HOST ("JK_REMOTE_HOST")
+--
+1.7.12
+
Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1 +0,0 @@
-P CSWap2prefork ap2_prefork - Apache 2.2 prefork MPM
Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,4 +0,0 @@
-%var bitname ap2_mod_jk
-%var pkgname CSWap2modjk
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/../LICENSE
Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_EXTRADIR=$AP2_CONFDIR/extra
-AP2_CONFIG=$AP2_CONFDIR/httpd.conf
-
-# Enable the jk module
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-chroot $PKG_INSTALL_ROOT \
- $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n jk mod_jk.so
-
-# Configure mod_jk in httpd.conf
-if [ -n "`egrep 'IfModule (mod_jk|jk_module)' $AP2_CONFIG`" ]
-then
- echo "Existing mod_jk configuration detected"
-elif [ -n "`egrep '#Include etc/extra/httpd-jk.conf' $AP2_CONFIG`" ]; then
- echo "Re-enabling existing config"
- perl -i -plne 's,^#(Include etc/extra/httpd-jk.conf),$1,' $AP2_CONFIG
-else
- echo "Adding Include for extra/http-jk.conf to httpd.conf"
- cat << END >> $AP2_CONFIG
-
-Include etc/extra/httpd-jk.conf
-END
-fi
-
-# Copy templates
-for file in $AP2_EXTRADIR/httpd-jk.conf
-do
- if [ ! -f $file ]; then
- echo "Creating $file"
- cp $file.CSW $file
- else
- echo "Preserving existing $file"
- fi
-done
-
-# Finito
-cat << END
-
-NOTICE: mod_jk is enabled in httpd.conf, but the server was not restarted.
-Please examine your mod_jk configuration and restart apache.
-
-NOTICE: mod_proxy_ajp, included with Apache 2.1 and later, replaces the
-functionality of mod_jk. Please consider migrating your configuration from
-mod_jk to mod_proxy_ajp. A configuration sample is provided in
-httpd-jk.conf.
-
-END
-
-exit 0
Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_EXTRADIR=$AP2_CONFDIR/extra
-AP2_CONFIG=$AP2_CONFDIR/httpd.conf
-
-# Disable the jk module
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-chroot $PKG_INSTALL_ROOT \
- $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n jk mod_jk.so
-
-echo "Disabling extra/httpd-jk.conf in httpd.conf"
-perl -i -plne 's,(?<!#)(Include etc/extra/httpd-jk.conf),#$1,' $AP2_CONFIG
-
-cat << END
-
-NOTICE: mod_jk is disabled in httpd.conf, but the server was not restarted.
-Please check your configuration and restart apache.
-
-END
-
-exit 0
Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.prototype
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.prototype 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.prototype 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,19 +0,0 @@
-d none /opt/csw/apache2 0755 root bin
-d none /opt/csw/apache2/etc 0755 root bin
-d none /opt/csw/apache2/etc/extra 0755 root bin
-f none /opt/csw/apache2/etc/extra/httpd-jk.conf.CSW 0644 root bin
-d none /opt/csw/apache2/libexec 0755 root bin
-f none /opt/csw/apache2/libexec/mod_jk.so 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/ap2modjk 0755 root bin
-f none /opt/csw/share/ap2modjk/workers.properties.minimal 0644 root bin
-f none /opt/csw/share/ap2modjk/workers.properties 0644 root bin
-f none /opt/csw/share/ap2modjk/uriworkermap.properties 0644 root bin
-d none /opt/csw/share/doc 0755 root bin
-d none /opt/csw/share/doc/ap2modjk 0755 root bin
-f none /opt/csw/share/doc/ap2modjk/STATUS.txt 0644 root bin
-f none /opt/csw/share/doc/ap2modjk/README 0644 root bin
-f none /opt/csw/share/doc/ap2modjk/NOTICE 0644 root bin
-f none /opt/csw/share/doc/ap2modjk/NEWS 0644 root bin
-f none /opt/csw/share/doc/ap2modjk/LICENSE 0644 root bin
-f none /opt/csw/share/doc/ap2modjk/CHANGES 0644 root bin
Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.space
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.space 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.space 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1 +0,0 @@
-$BASEDIR 4
Deleted: csw/mgar/pkg/mod_jk/trunk/files/install.diff
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/install.diff 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/install.diff 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,22 +0,0 @@
---- native/apache-2.0/Makefile.apxs.in 2006-05-14 06:47:47.000000000 -0400
-+++ native/apache-2.0/Makefile.apxs.in 2006-12-14 23:43:49.342079000 -0500
-@@ -21,7 +21,7 @@
- $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" "${JAVA_INCL}" "${APXSLDFLAGS}" mod_jk.c ${APACHE_OBJECTS}
-
- install: mod_jk.la
-- $(APXS) -i mod_jk.la
-+ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(APACHE_DIR)/libexec -i mod_jk.la
-
- clean:
- rm -f *.o *.lo *.a *.la *.so *.so.* *.slo
---- native/apache-2.0/Makefile.in 2006-05-14 06:47:47.000000000 -0400
-+++ native/apache-2.0/Makefile.in 2006-12-14 23:43:17.201187000 -0500
-@@ -71,7 +71,7 @@
- install_dynamic:
- @echo ""
- @echo "Installing files to Apache Modules Directory..."
-- $(APXS) -i mod_jk.la
-+ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(APACHE_DIR)/libexec -i mod_jk.la
- @echo ""
- @echo "Please be sure to arrange ${APACHE_DIR}/conf/httpd.conf..."
- @echo ""
Deleted: csw/mgar/pkg/mod_jk/trunk/files/logging.diff
===================================================================
--- csw/mgar/pkg/mod_jk/trunk/files/logging.diff 2012-10-14 08:33:53 UTC (rev 19441)
+++ csw/mgar/pkg/mod_jk/trunk/files/logging.diff 2012-10-14 13:50:30 UTC (rev 19442)
@@ -1,13 +0,0 @@
---- native/apache-2.0/mod_jk.c.orig 2006-12-03 08:57:46.000000000 -0500
-+++ native/apache-2.0/mod_jk.c 2007-02-20 16:09:04.521210000 -0500
-@@ -109,8 +109,8 @@
- #include "jk_worker.h"
- #include "jk_shm.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/mod_jk.log")
-+#define JK_SHM_DEF_FILE ("var/log/jk-runtime-status")
- #define JK_ENV_HTTPS ("HTTPS")
- #define JK_ENV_CERTS ("SSL_CLIENT_CERT")
- #define JK_ENV_CIPHER ("SSL_CIPHER")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list