OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 14-Jan-2003 17:40:07
Branch: HEAD Handle: 2003011416400502
Added files:
openpkg-re/vcheck vc.tomcat4-adapter
openpkg-src/tomcat4-adapter
tomcat4-adapter.conf tomcat4-adapter.patch
tomcat4-adapter.spec
Modified files:
openpkg-web news.txt
Log:
Created package
Summary:
Revision Changes Path
1.1 +10 -0 openpkg-re/vcheck/vc.tomcat4-adapter
1.1 +39 -0 openpkg-src/tomcat4-adapter/tomcat4-adapter.conf
1.1 +101 -0 openpkg-src/tomcat4-adapter/tomcat4-adapter.patch
1.1 +97 -0 openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
1.2760 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.tomcat4-adapter
============================================================================
$ cvs diff -u -r0 -r1.1 vc.tomcat4-adapter
--- /dev/null 2003-01-14 17:40:05.000000000 +0100
+++ vc.tomcat4-adapter 2003-01-14 17:40:05.000000000 +0100
@@ -0,0 +1,10 @@
+config = {
+}
+
+prog tomcat4 = {
+ version = 4.1.18
+ url = http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/
+ regex = (?<!\w)v(\d+\.\d+\.\d+)/
+ url =
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v__NEWVER__/src/
+ regex = jakarta-tomcat-connectors-(__VER__)-src\.tar\.gz
+}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.conf
============================================================================
$ cvs diff -u -r0 -r1.1 tomcat4-adapter.conf
--- /dev/null 2003-01-14 17:40:07.000000000 +0100
+++ tomcat4-adapter.conf 2003-01-14 17:40:07.000000000 +0100
@@ -0,0 +1,39 @@
+##
+## tomcat-adapter.conf -- Apache Configuration Snippet for Tomcat Adapter
+##
+
+# load DSO
+LoadModule webapp_module @l_prefix@/libexec/tomcat4-adapter/mod_webapp.so
+
+#
+# how to reach Tomcat 4
+#
+# currently only the 'warp' provider is available
+# and the optional parameter points to Tomcat's listen port
+#
+# name provider optional-parameter
+WebAppConnection conn warp localhost:8080
+
+#
+# map URIs to Tomcat applications
+#
+# name is the name of the application in webapps/
+# this can also be a .war-filename
+# conn is the name of the previously declared connection
+# uri-path is the URI prefix to serv by the application
+#
+# you can (should) add this to a VirtualHost environment
+#
+# name connection uri-path
+#WebAppDeploy examples conn /examples
+
+#
+# Status query over all connections and applications
+#
+# be careful not to expose this information in a hostile environment
+#
+# you can (should) add this to a VirtualHost environment
+#
+# uri-path
+#WebAppInfo /webapp-info
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.patch
============================================================================
$ cvs diff -u -r0 -r1.1 tomcat4-adapter.patch
--- /dev/null 2003-01-14 17:40:07.000000000 +0100
+++ tomcat4-adapter.patch 2003-01-14 17:40:07.000000000 +0100
@@ -0,0 +1,101 @@
+--- webapp/configure.in.dist Tue Jan 14 15:35:38 2003
++++ webapp/configure.in Tue Jan 14 16:58:25 2003
+@@ -149,82 +149,9 @@
+ if test "${APXS_VERSION}" = "1.3" ; then
+
+ dnl ----------------------------------------------------------------------
+- dnl APXS version 1.3, meaning Apache 1.3. We _require_ APR sources
+- dnl ----------------------------------------------------------------------
+- WA_HEADER([Apache 1.3 module compilation (APR checks)])
+-
+- dnl ----------------------------------------------------------------------
+- dnl Check where the APR sources are and issue "configure"
+- dnl ----------------------------------------------------------------------
+- WA_APR([APR_DIR])
+- tempret="0"
+- tempval="--enable-static --disable-shared --disable-threads"
+- tempval="${tempval} --libdir=${TGT_DIR}/objects"
+- WA_EXEC(
+- [tempret],
+- [./configure ${tempval}],
+- [apr],
+- [${APR_DIR}])
+- AC_MSG_CHECKING([for proper command execution])
+- if test "${tempret}" = "0" ; then
+- AC_MSG_RESULT([ok (${tempret})])
+- else
+- WA_ERROR([command returned with ${tempret}])
+- fi
+- unset tempret
+- unset tempval
+-
+- dnl ----------------------------------------------------------------------
+- dnl Retrieve APR variables
+- dnl ----------------------------------------------------------------------
+- WA_APR_GET([CC],[${APR_DIR}],[CC])
+- WA_APR_GET([CPP],[${APR_DIR}],[CPP])
+- WA_APR_GET([SHELL],[${APR_DIR}],[SHELL])
+-
+- WA_APR_GET([CFLAGS],[${APR_DIR}],[CFLAGS])
+- WA_APR_GET([CPPFLAGS],[${APR_DIR}],[CPPFLAGS])
+- WA_APR_GET([LDFLAGS],[${APR_DIR}],[LDFLAGS])
+-
+- WA_APR_GET([LDFLAGS],[${APR_DIR}],[LIBS])
+- WA_APR_GET([CPPFLAGS],[${APR_DIR}],[EXTRA_INCLUDES])
+-
+- WA_APR_LIB([APR_LIB],[${APR_DIR}])
+- WA_APR_LIBNAME([APR_LIBNAME],[${APR_DIR}])
+-
+- AC_MSG_CHECKING([for apr headers])
+- WA_APPEND([INCLUDES],[-I${APR_DIR}/include])
+- AC_MSG_RESULT([-I${APR_DIR}/include])
+-
+- AC_MSG_CHECKING([for apr libtool])
+- LIBTOOL="${SHELL} ${APR_DIR}/libtool --silent"
+- AC_MSG_RESULT([${LIBTOOL}])
+-
+- dnl ----------------------------------------------------------------------
+- dnl Done with APR, let's see what APXS says
+- dnl ----------------------------------------------------------------------
+- WA_HEADER([Apache 1.3 module compilation (APXS checks)])
+-
+- dnl ----------------------------------------------------------------------
+- dnl Do a check on the C compiler to see if apxs reports the same one
+- dnl ----------------------------------------------------------------------
+- WA_APXS_GET([tempval],[${APXS}],[CC])
+- AC_MSG_CHECKING([for compiler coherency])
+- if test "${tempval}" != "${CC}" ; then
+- AC_MSG_RESULT([error])
+- AC_MSG_RESULT([compiler discovered by apr: ${CC}])
+- AC_MSG_RESULT([compiler used by apache apxs: ${tempval}])
+- AC_MSG_ERROR([the apache apxs and apr compilers must be the same])
+- exit 1
+- fi
+- AC_MSG_RESULT([ok (${CC})])
+- unset tempval
+-
+- dnl ----------------------------------------------------------------------
+ dnl Apache 1.3 configuration complete
+ dnl ----------------------------------------------------------------------
+ MODULE="apache-1.3"
+- WA_APPEND([EXTRA_BUILD],[apr-build])
+- WA_APPEND([EXTRA_CLEAN],[apr-clean])
+
+ WA_APXS_GET([tempval],[${APXS}],[INCLUDEDIR])
+ WA_PATH_DIR([tempdir],[${tempval}],[apache 1.3 headers])
+@@ -236,6 +163,15 @@
+ WA_APXS_GET([EXTRA_LDFLAGS],[${APXS}],[LIBS_SHLIB])
+ WA_APXS_GET([EXTRA_LDFLAGS],[${APXS}],[LDFLAGS_SHLIB])
+
++ WA_APXS_GET([CC],[${APXS}],[CC])
++
++ WA_APPEND([CFLAGS],"-I$prefix/include/apr")
++ WA_APPEND([LDFLAGS],"-I$prefix/lib")
++
++ APR_LIB=apr
++ CPP=$prefix/bin/cc -E
++ SHELL=/bin/sh
++ LIBTOOL=$prefix/bin/libtool
+ else
+
+ dnl ----------------------------------------------------------------------
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tomcat4-adapter/tomcat4-adapter.spec
============================================================================
$ cvs diff -u -r0 -r1.1 tomcat4-adapter.spec
--- /dev/null 2003-01-14 17:40:07.000000000 +0100
+++ tomcat4-adapter.spec 2003-01-14 17:40:07.000000000 +0100
@@ -0,0 +1,97 @@
+##
+## tomcat-adapter4.spec -- OpenPKG RPM Specification
+## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH
+## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/>
+## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: tomcat4-adapter
+Summary: Apache Jakarta Tomcat Webserver Adapter
+URL: http://jakarta.apache.org/
+Vendor: Apache Software Foundation
+Packager: The OpenPKG Project
+Distribution: OpenPKG [EVAL]
+Group: Web
+License: Apache Software License 1.1
+Version: 4.1.18
+Release: 20030114
+
+# list of sources
+Source0:
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/src/jakarta-tomcat-connectors-%{version}-src.tar.gz
+Source1: tomcat4-adapter.conf
+Patch0: tomcat4-adapter.patch
+
+# build information
+Prefix: %{l_prefix}
+BuildRoot: %{l_buildroot}
+BuildPreReq: OpenPKG, openpkg >= 20020206, apr, autoconf, libtool, gcc
+PreReq: OpenPKG, openpkg >= 20020206
+AutoReq: no
+AutoReqProv: no
+
+%description
+ Apache Jakarta Tomcat Webserver Adapter %{version} is a glue code
+ between the Apache webserver and Tomcat.
+
+%prep
+ %setup -q -n jakarta-tomcat-connectors-%{version}-src
+ %patch0 -p0
+
+%build
+ # create installation tree
+ cd webapp
+
+ ./support/buildconf.sh
+ ./configure \
+ --prefix=%{l_prefix} \
+ --disable-java \
+ --without-ant \
+ --with-apr=%{l_prefix}
+ %{l_make} %{l_mflags -O}
+
+%install
+ rm -rf $RPM_BUILD_ROOT
+
+ # create installation tree
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat4-adapter \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter \
+ $RPM_BUILD_ROOT%{l_prefix}/var/tomcat4-adapter
+
+ # install config
+ %{l_shtool} install -c -m 644 \
+ -e 's;@l_prefix@;%{l_prefix};g' \
+ %{SOURCE tomcat4-adapter.conf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat4-adapter/
+
+ # install DSO
+ %{l_shtool} install -c -m 755 \
+ webapp/build/mod_webapp.so \
+ $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat4-adapter
+
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2759 -r1.2760 news.txt
--- openpkg-web/news.txt 14 Jan 2003 16:01:47 -0000 1.2759
+++ openpkg-web/news.txt 14 Jan 2003 16:40:06 -0000 1.2760
@@ -1,3 +1,4 @@
+14-Jan-2003: New package: P<tomcat4-adapter-4.1.18-20030114>
14-Jan-2003: Upgraded package: P<patch-2.5.8-20030114>
14-Jan-2003: Upgraded package: P<cvs-1.11.4-20030114>
14-Jan-2003: Upgraded package: P<tar-1.13.25-20030114>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
