* [gentoo-commits] gentoo commit in src/patchsets/resin/3.0.28: mod_caucho-3.0.28-disable-sticky-sessions.patch mod_caucho-3.0.28-gentoo.patch mod_caucho-3.0.28-java.patch mod_caucho-3.0.28-ssl.patch resin-3.0.28-Makefile.in.patch resin-3.0.28-Resin.java.patch resin-3.0.28-build.xml.patch resin-3.0.28-wrapper.pl.patch
@ 2009-06-28 10:37 Krzysiek Pawlik (nelchael)
0 siblings, 0 replies; only message in thread
From: Krzysiek Pawlik (nelchael) @ 2009-06-28 10:37 UTC (permalink / raw
To: gentoo-commits
nelchael 09/06/28 10:37:57
Added: mod_caucho-3.0.28-disable-sticky-sessions.patch
mod_caucho-3.0.28-gentoo.patch
mod_caucho-3.0.28-java.patch
mod_caucho-3.0.28-ssl.patch
resin-3.0.28-Makefile.in.patch
resin-3.0.28-Resin.java.patch
resin-3.0.28-build.xml.patch
resin-3.0.28-wrapper.pl.patch
Log:
Add patches for Resin 3.0.28.
Revision Changes Path
1.1 src/patchsets/resin/3.0.28/mod_caucho-3.0.28-disable-sticky-sessions.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-disable-sticky-sessions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-disable-sticky-sessions.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.0.28-disable-sticky-sessions.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.0.28/modules/c/src/apache2/mod_caucho.c
--- resin-3.0.28.vanilla/modules/c/src/apache2/mod_caucho.c 2009-06-28 11:33:00.000000000 +0100
+++ resin-3.0.28/modules/c/src/apache2/mod_caucho.c 2009-06-28 11:34:53.000000000 +0100
@@ -391,6 +391,16 @@
}
/**
+ * Parse the CauchoDisableStickySessions configuration in the apache config file.
+ */
+static const char cse_disable_sticky_sessions(cmd_parms *cmd, void *pconfig, int on)
+{
+ config_t *config = pconfig;
+ config->disable_sticky_sessions = on;
+ return 0;
+}
+
+/**
* Parse the CauchoBackup configuration in the apache config file.
*/
static const char *
@@ -1215,6 +1225,9 @@
AP_INIT_TAKE1("CauchoConfigCacheDirectory", resin_config_cache_command,
NULL, RSRC_CONF|ACCESS_CONF,
"Configures the saved configuration file."),
+ AP_INIT_FLAG("CauchoDisableStickySessions", cse_disable_sticky_sessions,
+ NULL, RSRC_CONF,
+ "Disable sticky sessions."),
{NULL}
};
1.1 src/patchsets/resin/3.0.28/mod_caucho-3.0.28-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-gentoo.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.0.28-gentoo.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/modules/c/src/apache2/Makefile.in resin-3.0.28/modules/c/src/apache2/Makefile.in
--- resin-3.0.28.vanilla/modules/c/src/apache2/Makefile.in 2009-06-28 11:33:00.000000000 +0100
+++ resin-3.0.28/modules/c/src/apache2/Makefile.in 2009-06-28 11:35:26.000000000 +0100
@@ -36,11 +36,8 @@
$(CC) -c $(INCLUDES) $(CFLAGS) $<
install : mod_caucho.la
- $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
- - rm -f $(apache_libexec)/mod_caucho.la
- - rm -f $(apache_libexec)/mod_caucho.a
- sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
- -resin_home $(resin_home)
+ mkdir -p $(DESTDIR)$(apache_libexec)
+ $(LIBTOOL) --mode=install $(CP) mod_caucho.la $(DESTDIR)$(apache_libexec)
clean :
- rm -r *.o *.lo *.la *.so .libs
1.1 src/patchsets/resin/3.0.28/mod_caucho-3.0.28-java.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-java.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-java.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.0.28-java.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/configure.in resin-3.0.28/configure.in
--- resin-3.0.28.vanilla/configure.in 2009-06-28 11:33:00.000000000 +0100
+++ resin-3.0.28/configure.in 2009-06-28 11:35:42.000000000 +0100
@@ -430,54 +430,6 @@
fi
fi
#
-# --with-java-home
-#
-AC_ARG_WITH(java-home,
-[ --with-java-home=DIR java home
-], [
-JAVA_HOME=${withval}
-])
-
-if test -z "$JAVA_HOME"; then
- java=`which java 2>/dev/null`
- if test $? = "0"; then
- while test -h "$java"
- do
- head=`dirname $java`
- tail=`/bin/ls -l $java | awk '{ print $NF; }'`
- if test -f "$tail"; then
- java=$tail
- else
- java=$head/$tail
- fi
- done
-
- javabin=`dirname $java`
- JAVA_HOME=`cd $javabin/..; pwd`
-
- # we're in $JAVA_HOME/jre
- if test -f "$JAVA_HOME/lib/rt.jar"; then
- JAVA_HOME=`cd $JAVA_HOME/..; pwd`
- elif test -d "/usr/java"; then
- JAVA_HOME=/usr/java
- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
- fi
- elif test -d "/usr/java"; then
- JAVA_HOME=/usr/java
- elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
- JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
- fi
-fi
-
-echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
-
-if test ! -d "$JAVA_HOME"; then
- AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
-fi
-
-AC_SUBST(JAVA_HOME)
-#
# Resin home
#
resin_home=`pwd`
@@ -876,68 +828,6 @@
AC_SUBST(SSL_LIBS)
#
-# --with-jni-include
-#
-AC_ARG_WITH(jni-include,
-[ --with-jni-include="-Idir -Idir" jni include string
-], [
-JNI_INCLUDE=${withval}
-JNI="yes"
-])
-
-#
-# --enable-jni
-#
-AC_ARG_ENABLE(jni,
-[ --enable-jni Turn on jni],
-[case "${enableval}" in
- yes) JNI=true ;;
- no) JNI="" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
- esac],[JNI=""])
-
-if test -n "$JNI_INCLUDE"; then
- JNI=yes
-elif test -r "$JAVA_HOME/include/jni_md.h"; then
- JNI_INCLUDE="-I$JAVA_HOME/include"
- JNI=yes
- echo "checking for JNI in $JAVA_HOME/include ... found"
-elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
- JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
- JNI=yes
- echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
-elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
- # Darwin
- echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
- JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
- JNI=yes
-else
- JNI=""
- AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
-fi
-
-if test -r "$JAVA_HOME/include/jvmti.h"; then
- echo "Using JVMTI for class reloading"
-
- CFLAGS="$CFLAGS -DHAS_JVMTI"
-fi
-
-if test -r "$JAVA_HOME/include/jvmdi.h"; then
- echo "Using JVMDI for class reloading"
-
- CFLAGS="$CFLAGS -DHAS_JVMDI"
-fi
-
-if test -n "$JNI"; then
- plugins="$plugins $resin_plugin resin_os"
-else
- echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
-fi
-
-AC_SUBST(JNI)
-AC_SUBST(JNI_INCLUDE)
-
-#
# --enable-ssl
#
AC_ARG_ENABLE(ssl,
diff -Nru resin-3.0.28.vanilla/configure.in.orig resin-3.0.28/configure.in.orig
--- resin-3.0.28.vanilla/configure.in.orig 1970-01-01 01:00:00.000000000 +0100
+++ resin-3.0.28/configure.in.orig 2009-06-28 11:35:35.000000000 +0100
@@ -0,0 +1,1211 @@
+AC_INIT(modules/c/src/apache2/mod_caucho.c)
+AC_PREFIX_DEFAULT(`pwd`)
+AC_CONFIG_AUX_DIR(automake)
+
+dnl Get os info
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE(resin, 3.0.9)
+
+FULL_VERSION="Resin $VERSION -- `date`"
+AC_SUBST(FULL_VERSION)
+
+dnl Checks for programs.
+AC_PROG_CC
+AC_PROG_LD
+AC_PROG_EGREP
+
+dnl Checks for poll.h
+AC_CHECK_HEADER(sys/poll.h, [ CFLAGS="$CFLAGS -DPOLL" ])
+
+AC_PROG_LIBTOOL
+#
+# libtool stuff
+#
+if test -z "${LTFLAGS}"; then
+ LTFLAGS="--silent"
+fi
+
+LIBTOOL_SCRIPT="`pwd`/libtool"
+LIBTOOL="${LIBTOOL_SCRIPT} ${LTFLAGS}"
+libtoolversion=`${SHELL} ${LIBTOOL_SCRIPT} --version`
+case $libtoolversion in
+ *1.4*)
+ SH_LIBTOOL="${LIBTOOL_SCRIPT}"
+ SHLTCFLAGS="-prefer-pic"
+ LTCFLAGS="-prefer-non-pic -static"
+ ;;
+ *)
+ SH_LIBTOOL="${SHELL} ${LIBTOOL_SCRIPT} ${LTFLAGS}"
+ SHLTCFLAGS=""
+ LTCFLAGS=""
+ ;;
+esac
+
+AC_SUBST(LTFLAGS)
+AC_SUBST(LIBTOOL_SCRIPT)
+AC_SUBST(LIBTOOL)
+AC_SUBST(SH_LIBTOOL)
+AC_SUBST(LTCFLAGS)
+AC_SUBST(EGREP)
+
+INCLUDES=""
+plugins=common
+AC_SUBST(plugins)
+dnl should be unnecessary
+AC_SUBST(LD)
+
+#
+# --with-apache-src
+#
+AC_ARG_WITH(apache-src,
+[ --with-apache-src=DIR Apache src static compilation
+], [
+apache_src=${withval}
+
+if test -d "${apache_src}/modules"; then
+ a=b
+elif test -d "${apache_src}/src/modules"; then
+ apache_src=${apache_src}/src
+else
+ AC_MSG_ERROR([Can't find valid Apache source ${apache_src}])
+fi
+
+echo "using Apache source in ${apache_src}"
+
+mkdir ${apache_src}/modules/caucho 2> /dev/null
+cp modules/c/src/common/*.c ${apache_src}/modules/caucho
+cp modules/c/src/common/*.h ${apache_src}/modules/caucho
+cp modules/c/src/apache/*.c ${apache_src}/modules/caucho
+
+cat > ${apache_src}/modules/caucho/Makefile.tmpl <<'END'
+LIB=libcaucho.a
+OBJS=mod_caucho.o stream.o config.o registry.o memory.o
+
+OBJS_PIC=mod_caucho.lo stream.lo config.lo registry.lo memory.lo
+
+$(OBJS) $(OBJS_PIC): Makefile
+
+all: lib
+
+lib: $(LIB)
+
+libcaucho.a: $(OBJS)
+ rm -f $@
+ ar cr $@ $(OBJS)
+ $(RANLIB) $@
+
+libcaucho.o: $(OBJS)
+ $(LD) $(LDFLAGS) -r -o $@ $(OBJS)
+
+libcaucho.so: $(OBJS_PIC)
+ rm -f $@
+ $(LD_SHLIB) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(LIBS_SHLIB)
+
+.SUFFIXES: .o .lo
+
+.c.o:
+ $(CC) -c $(INCLUDES) $(CFLAGS) $<
+
+.c.lo:
+ $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $< && mv $*.o $*.lo
+
+# DO NOT REMOVE
+mod_caucho.o: cse.h
+mod_caucho.lo: cse.h
+stream.o: cse.h
+stream.lo: cse.h
+config.o: cse.h
+config.lo: cse.h
+registry.o: cse.h
+registry.lo: cse.h
+memory.o: cse.h
+memory.lo: cse.h
+
+END
+
+cat > ${apache_src}/modules/caucho/Makefile.libdir <<'END'
+# dummy
+END
+
+#grep caucho ${apache_src}/src/Configuration.tmpl >/dev/null 2>/dev/null
+#if test "$?" -ne 0; then
+# cat >> ${apache_src}/src/Configuration.tmpl <<'END'
+## mod_caucho incorporates Resin into Apache.
+#
+## AddModule modules/caucho/libcaucho.a
+#END
+#fi
+
+])
+#
+# --with-apache
+#
+AC_ARG_WITH(apache,
+[ --with-apache=DIR the Apache root directory
+], [
+apache_dir=${withval}
+
+if test "${apache_dir}" = "yes"; then
+ apache_dir=/usr/local/apache
+fi
+
+apache=1
+])
+
+#
+# --with-apxs
+#
+AC_ARG_WITH(apxs,
+[ --with-apxs=PATH the Apache configuration utility
+], [
+apxs=${withval}
+
+if test "${apxs}" = "yes"; then
+ apxs=apxs
+fi
+
+apache=1
+])
+
+#
+# --with-apache-eapi
+#
+AC_ARG_WITH(apache-eapi,
+[ --with-apache-eapi=DIR Apache eapi support
+], [
+apache_eapi=${withval}
+])
+
+#
+# --with-apache-include
+#
+AC_ARG_WITH(apache-include,
+[ --with-apache-include=DIR the Apache include directory
+], [
+apache_include=${withval}
+
+if test "${apache_include}" = "yes"; then
+ apache_include=
+fi
+
+apache=1
+])
+
+#
+# --with-apache-libexec
+#
+AC_ARG_WITH(apache-libexec,
+[ --with-apache-libexec=DIR the Apache module directory
+], [
+apache_libexec=${withval}
+
+if test "${apache_libexec}" = "yes"; then
+ apache_libexec=
+fi
+
+apache=1
+])
+
+#
+# --with-apache-conf
+#
+AC_ARG_WITH(apache-conf,
+[ --with-apache-conf=DIR the Apache configuration
+], [
+apache_conf=${withval}
+
+if test "${apache_conf}" = "yes"; then
+ apache_conf=
+fi
+
+apache=1
+])
+
+apache_cflags=
+
+#
+# --with-apache-cflags
+#
+AC_ARG_WITH(apache-cflags,
+[ --with-apache-cflags=flags flags for compiling mod_caucho
+], [
+apache_cflags=${withval}
+
+apache=1
+])
+
+#
+# check that apxs is okay
+#
+if test -n "${apxs}"; then
+ ${apxs} -q PREFIX >/dev/null 2>/dev/null
+ if test "$?" -ne 0; then
+ AC_MSG_ERROR(bad apxs ${apxs})
+ fi
+elif test -x "${apache_bin}/apxs"; then
+ apxs=${apache_bin}/apxs
+elif test -x "${apache_dir}/bin/apxs"; then
+ apxs=${apache_dir}/bin/apxs
+elif test -x "${apache_dir}/sbin/apxs"; then
+ apxs=${apache_dir}/sbin/apxs
+elif test -x "/sbin/apxs"; then
+ apxs=/sbin/apxs
+elif test -x "/usr/sbin/apxs"; then
+ apxs=/usr/sbin/apxs
+fi
+
+#
+# heuristics for finding the Apache include directory
+#
+if test -z "${apache_include}" -a -n "${apxs}"; then
+ apache_include=`${apxs} -q INCLUDEDIR`
+fi
+
+if test -z "${apache_include}" -a -r "${apache_dir}/include/httpd.h"; then
+ apache_include=${apache_dir}/include
+fi
+
+if test -n "${apache_include}"; then
+ APACHE_INC="-I${apache_include}"
+fi
+
+#
+# deal with stronghold
+#
+if test -z "${apache_include}" -a -r "${apache_dir}/src/include/httpd.h"; then
+ apache_include=${apache_dir}/src/include
+
+ APACHE_INC="-I${apache_dir}/src/include"
+ APACHE_INC="-I${apache_dir}/ssl/include $APACHE_INC"
+ APACHE_INC="-I${apache_dir}/src/os/unix $APACHE_INC"
+fi
+
+if test -n "$apache" -a ! -r ${apache_include}/httpd.h; then
+ AC_MSG_ERROR([Can't find Apache include directory ${apache_include}])
+fi
+
+#
+# heuristics for finding the Apache bin directory
+#
+if test -n "${apache_bin}"; then
+ a=b
+elif test -x "${apxs}"; then
+ apache_bin=`${apxs} -q SBINDIR`
+ apache_exe="${apache_bin}/`${apxs} -q TARGET`"
+elif test -n "${apache_dir}"; then
+ apache_bin="${apache_dir}/bin"
+fi
+
+if test -n "${apache_exe}"; then
+ a=b;
+elif test -z "${apache_bin}"; then
+ a=b;
+elif test -x "${apache_bin}/httpd"; then
+ apache_exe="${apache_bin}/httpd"
+elif test -x "${apache_bin}/apache"; then
+ apache_exe="${apache_bin}/apache"
+elif test -x "${apache_bin}/httpd2"; then
+ apache_exe="${apache_bin}/httpd2"
+elif test -x "${apache_bin}/apache2"; then
+ apache_exe="${apache_bin}/apache2"
+fi
+
+if test -n "${apache_exe}" -a ! -x "${apache_exe}"; then
+ AC_MSG_ERROR([Can't find Apache binary in directory ${apache_exe}])
+fi
+
+#
+# heuristics for finding the Apache module directory
+#
+if test -z "${apache_libexec}" -a -n "${apxs}"; then
+ apache_libexec=`${apxs} -q LIBEXECDIR`
+fi
+
+if test -z "${apache_libexec}" -a -d "${apache_dir}/libexec"; then
+ apache_libexec=${apache_dir}/libexec
+fi
+
+if test -z "${apache_libexec}" -a -d "${apache_dir}/modules"; then
+ apache_libexec=${apache_dir}/modules
+fi
+
+if test -n "$apache" -a ! -d "${apache_libexec}"; then
+ AC_MSG_ERROR([Can't find Apache module directory ${apache_libexec}])
+fi
+
+#
+# Heuristics for finding the Apache configuration directory
+#
+
+if test -z "${apache_conf}" -a -n "${apxs}"; then
+ apache_confdir=`${apxs} -q SYSCONFDIR`
+
+ if test -r "${apache_confdir}"/httpd.conf; then
+ apache_conf=${apache_confdir}/httpd.conf
+ elif test -r "${apache_confdir}"/apache.conf; then
+ apache_conf=${apache_confdir}/apache.conf
+ elif test -r "${apache_confdir}"/httpsd.conf; then
+ apache_conf=${apache_confdir}/httpsd.conf
+ fi
+fi
+
+if test -z "${apache_conf}" -a -r "${apache_dir}/conf/httpd.conf"; then
+ apache_conf=${apache_dir}/conf/httpd.conf
+fi
+
+if test -z "${apache_conf}" -a -r "${apache_dir}/etc/httpd.conf"; then
+ apache_conf=${apache_dir}/etc/httpd.conf
+fi
+
+if test -n "$apache" -a ! -r "${apache_conf}"; then
+ AC_MSG_ERROR([Can't find Apache module configuration ${apache_conf}])
+fi
+
+#
+# check for apr
+#
+if test -x "${apxs}"; then
+ apr_bin=`${apxs} -q APR_BINDIR 2> /dev/null`
+ if test -x "${apr_bin}/apr-config"; then
+ apr_inc=`"${apr_bin}/apr-config" --includes`
+ APACHE_INC="${APACHE_INC} ${apr_inc}"
+ elif test -x "${apr_bin}/apr-1-config"; then
+ apr_inc=`"${apr_bin}/apr-1-config" --includes`
+ APACHE_INC="${APACHE_INC} ${apr_inc}"
+ fi
+fi
+
+#
+# Apache CFLAGS
+#
+
+if test -z "$apache_cflags" -a -x "${apxs}"; then
+ if test -x "${apr_bin}/apr-config"; then
+ apache_cflags="$apache_cflags `${apr_bin}/apr-config --cppflags`"
+ apache_cflags="$apache_cflags `${apr_bin}/apr-config --cflags`"
+ elif test -x "${apr_bin}/apr-1-config"; then
+ apache_cflags="$apache_cflags `${apr_bin}/apr-1-config --cppflags`"
+ apache_cflags="$apache_cflags `${apr_bin}/apr-1-config --cflags`"
+ else
+ apache_cflags="`${apxs} -q CFLAGS`"
+ fi
+ fi
+
+if test -z "$apache_cflags" -a -x "${apache_exe}"; then
+ flags=`${apache_exe} -V | grep EAPI`
+ if test -n "$flags"; then
+ apache_cflags=-DEAPI
+ fi
+fi
+
+if test -z "$apache_dir" -a -x "${apxs}"; then
+ apache_dir=`${apxs} -q PREFIX`
+fi
+
+AC_SUBST(APACHE_INC)
+AC_SUBST(apache_libexec)
+AC_SUBST(apache_conf)
+AC_SUBST(apache_dir)
+AC_SUBST(apache_cflags)
+#
+# fill in compilation stuff
+#
+SO=so
+
+is_gcc=`${CC} -v 2>&1 | grep gcc`
+is_gnu_ld=`${LD} -v 2>&1 | grep GNU`
+
+#
+# Use apxs if it's available
+#
+if test -z "${LD_SHLIB}"; then
+ if test -n "${apxs}"; then
+ CFLAGS_SHLIB=`${apxs} -q CFLAGS_SHLIB`
+ LD_SHLIB=`${apxs} -q LD_SHLIB`
+ LDFLAGS_SHLIB=`${apxs} -q LDFLAGS_SHLIB`
+ LIBS_SHLIB=`${apxs} -q LIBS_SHLIB`
+
+ echo "Using shared library flags from ${apxs}"
+ fi
+fi
+#
+# --with-java-home
+#
+AC_ARG_WITH(java-home,
+[ --with-java-home=DIR java home
+], [
+JAVA_HOME=${withval}
+])
+
+if test -z "$JAVA_HOME"; then
+ java=`which java 2>/dev/null`
+ if test $? = "0"; then
+ while test -h "$java"
+ do
+ head=`dirname $java`
+ tail=`/bin/ls -l $java | awk '{ print $NF; }'`
+ if test -f "$tail"; then
+ java=$tail
+ else
+ java=$head/$tail
+ fi
+ done
+
+ javabin=`dirname $java`
+ JAVA_HOME=`cd $javabin/..; pwd`
+
+ # we're in $JAVA_HOME/jre
+ if test -f "$JAVA_HOME/lib/rt.jar"; then
+ JAVA_HOME=`cd $JAVA_HOME/..; pwd`
+ elif test -d "/usr/java"; then
+ JAVA_HOME=/usr/java
+ elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
+ JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
+ fi
+ elif test -d "/usr/java"; then
+ JAVA_HOME=/usr/java
+ elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
+ JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
+ fi
+fi
+
+echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
+
+if test ! -d "$JAVA_HOME"; then
+ AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
+fi
+
+AC_SUBST(JAVA_HOME)
+#
+# Resin home
+#
+resin_home=`pwd`
+AC_SUBST(resin_home)
+
+
+#
+# 64bit heuristics
+#
+echo -n "checking if Java is 64-bit... "
+
+tmpname="/tmp/java$$.out"
+
+$JAVA_HOME/bin/java -version 2> $tmpname
+grep "64-Bit" $tmpname 1> /dev/null
+if test "$?" = "0"; then
+ b64_jni=true
+fi
+grep "amd64-64" $tmpname 1> /dev/null
+if test "$?" = "0"; then
+ b64_jni=true
+fi
+
+$JAVA_HOME/bin/sparcv9/java -version 2> $tmpname
+grep "64-Bit" $tmpname 1> /dev/null
+
+if test "$?" = "0"; then
+ b64_jni=true
+fi
+
+#$JAVA_HOME/bin/java -d64 -version 2> $tmpname
+#grep "64-Bit" $tmpname 1> /dev/null
+
+#if test "$?" = "0"; then
+# b64_jni=true
+#fi
+
+if test -n "$b64_jni"; then
+ echo "yes"
+else
+ echo "no"
+fi
+
+rm -f $tmpname
+
+#
+# --enable-64bit
+#
+AC_ARG_ENABLE(64bit,
+[ --enable-64bit Enable 64 bit],
+[case "${enableval}" in
+ yes) b64=true ;;
+ no) b64=""; b64_jni="" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-64bit) ;;
+ esac],[])
+
+if test -n "${b64}"; then
+ b64_jni=true
+fi
+
+if test -n "${b64_jni}"; then
+ CFLAGS="$CFLAGS -DB64"
+fi
+
+#
+# Resin HardCore(tm) configuration
+#
+LINUX_SRC=
+smp=
+#
+# --with-linux-src
+#
+AC_ARG_WITH(linux-src,
+[ --with-linux-src=DIR Linux src dir
+], [
+LINUX_SRC=${withval}
+hardcore=1
+if test "${LINUX_SRC}" = "yes"; then
+ LINUX_SRC=
+fi
+])
+#
+# --with-hardcore
+#
+AC_ARG_WITH(hardcore,
+[ --with-hardcore=DIR Linux src dir
+], [
+LINUX_SRC=${withval}
+hardcore=1
+
+if test "${LINUX_SRC}" = "yes"; then
+ LINUX_SRC=
+fi
+])
+#
+# --with-hardcore-cflags
+#
+AC_ARG_WITH(hardcore-cflags,
+[ --with-hardcore-cflags=flags Linux src dir
+], [
+HARDCORE_CFLAGS=${withval}
+hardcore=1
+])
+#
+# --enable-linux-smp
+#
+AC_ARG_ENABLE(linux-smp,
+[ --enable-linux-smp Compile with smp],
+[case "${enableval}" in
+ yes) smp=1 ;;
+ no) smp="" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-linux-smp) ;;
+ esac],[smp=""])
+#
+# looking for proper hardcore stuff
+#
+#hardcore=""
+#
+if test -n "$hardcore"; then
+ kver=`uname -r`
+
+ if test -n "$LINUX_SRC"; then
+ zz=m
+ elif test -r "/usr/src/linux-$kver/include/linux/version.h"; then
+ LINUX_SRC="/usr/src/linux-$kver/include"
+ elif test -r "/usr/src/linux-2.4/include/linux/version.h"; then
+ LINUX_SRC="/usr/src/linux-2.4/include"
+ elif test -r "/usr/src/linux/include/linux/version.h"; then
+ LINUX_SRC="/usr/src/linux/include"
+ else
+ LINUX_SRC="/usr/src/linux-2.4/include"
+ fi
+
+ if test ! -r "$LINUX_SRC/linux/version.h"; then
+ AC_MSG_ERROR(HardCore can't find valid Linux source at \"${LINUX_SRC}\")
+ fi
+
+ cat /proc/version | grep SMP > /dev/null
+ if test -n "$smp"; then
+ zz=m
+ elif test ! $?; then
+ smp=1
+ HARDCORE_CFLAGS="$HARDCORE_CFLAGS -DSMP"
+ fi
+
+ plugins="$plugins hardcore"
+
+ echo "Using Linux src for Resin HardCore ... ${LINUX_SRC}"
+
+ if test -n "$smp"; then
+ echo "Resin HardCore(tm) using SMP"
+ fi
+fi
+
+AC_SUBST(LINUX_SRC)
+AC_SUBST(HARDCORE_CFLAGS)
+
+#
+# fill in based on known configurations
+#
+if test -z "${LD_SHLIB}"; then
+ LD_SHLIB=${LD}
+ CFLAGS_SHLIB="-fpic"
+ LDFLAGS_SHLIB="-shared"
+
+ case "$target_os" in
+ linux*)
+ LD_SHLIB=${CC}
+
+ if test -n "$b64"; then
+ CFLAGS="$CFLAGS -m64 -fPIC"
+ LDFLAGS_SHLIB="-shared -fPIC"
+ fi
+ if test -n "$b64_jni"; then
+ CFLAGS_JNI="$CFLAGS_JNI -m64 -fPIC"
+ LDFLAGS_SHLIB="-shared -fPIC"
+ fi
+ ;;
+
+ *solaris*)
+ if test -n "$is_gcc"; then
+ CFLAGS_SHLIB="-fPIC"
+
+ if test -n "$b64"; then
+ CFLAGS="$CFLAGS -m64"
+ fi
+ if test -n "$b64_jni"; then
+ CFLAGS_JNI="$CFLAGS_JNI -m64"
+ fi
+ else
+ CFLAGS_SHLIB="-KPIC"
+
+ if test -n "$b64"; then
+ CFLAGS="$CFLAGS -xarch=v9"
+ fi
+ if test -n "$b64_jni"; then
+ CFLAGS_JNI="$CFLAGS_JNI -xarch=v9"
+ fi
+ fi
+
+ if test -n "$is_gnu_ld"; then
+ LDFLAGS_SHLIB="-shared"
+ else
+ LDFLAGS_SHLIB="-G -fPIC"
+ fi
+ ;;
+
+ darwin*)
+ CFLAGS_SHLIB="-DSHARED_MODULE"
+ LD_SHLIB=${CC}
+ LDFLAGS_SHLIB="-bundle -undefined suppress -flat_namespace"
+ ;;
+
+ *aix*)
+ if test -z "$is_gcc"; then
+ CFLAGS_SHLIB="-bexpall"
+ else
+ CFLAGS_SHLIB="-fpic"
+ fi
+ LDFLAGS_SHLIB=""
+ ;;
+
+ *hpux*)
+ if test -z "$is_gcc"; then
+ CFLAGS_SHLIB="+z"
+ else
+ CFLAGS_SHLIB="-fpic"
+ fi
+ LDFLAGS_SHLIB="-b"
+ ;;
+ esac
+
+ case "$target_cpu" in
+ x86_64)
+ if test -z "$b64_jni"; then
+ CFLAGS_JNI="$CFLAGS_JNI -m32"
+ LDFLAGS_SHLIB="$LDFLAGS_SHLIB -melf_i386"
+ fi
+ ;;
+ esac
+fi
+
+if test -z "$apache"; then
+ a=b
+elif test -r "${apache_include}/apr_thread_mutex.h" -o -n "${apr_inc}"; then
+ echo "Using Apache 2.0 configuration ${apache_conf}"
+
+ plugins="$plugins apache2"
+elif test -n "${apache_include}/ap.h"; then
+ echo "Using Apache 1.3 configuration ${apache_conf}"
+
+ plugins="$plugins apache1"
+else
+ AC_MSG_ERROR([Can't find valid Apache directory ${apache_inc}])
+fi
+
+if test -n "$apache_cflags"; then
+ echo "Using Apache CFLAGS: $apache_cflags"
+fi
+
+#
+# Using Perl if it's available.
+#
+PERL=`which perl`
+if test -z "${LD_SHLIB}"; then
+ if test -z "${LD_SHLIB}" -a "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x"; then
+ PCC="`$PERL -V:cc | cut -d\' -f2`"
+ if test "${PCC}" = "${CC}"; then
+ CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`"
+ LDFLAGS_SHLIB="`$PERL -V:lddlflags | cut -d\' -f2`"
+ LD_SHLIB="`$PERL -V:ld | cut -d\' -f2`"
+
+ has_clflags=1
+
+ echo "Using shared library flags from Perl"
+ fi
+ fi
+fi
+
+#if test -z "${LD_SHLIB}"; then
+# AC_MSG_ERROR([Can't determine compilation flags.]);
+#fi
+
+#
+# OS which can handle the Resin launcher
+#
+resin_pro_plugin=
+if test -r "modules/c/src/resin/Makefile.in"; then
+ resin_pro_plugin="resin"
+fi
+
+resin_ssl_plugin=
+if test -r "modules/c/src/resinssl/Makefile.in"; then
+ resin_ssl_plugin="resinssl"
+fi
+
+resin_plugin=
+
+case "$target_cpu" in
+ i?86)
+ CPU=i386
+ resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
+ CFLAGS_JNI="$CFLAGS_JNI -D_FILE_OFFSET_BITS=64"
+ ;;
+
+ sparc*)
+ if test -n "${b64_jni}"; then
+ CPU=sparcv9
+ else
+ CPU=sparc
+ fi
+ resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
+ ;;
+
+ x86_64)
+ CPU=$target_cpu
+ resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
+ CFLAGS_JNI="$CFLAGS_JNI -D_FILE_OFFSET_BITS=64"
+ ;;
+
+ *)
+ CPU=$target_cpu
+ ;;
+esac
+
+case "$target_os" in
+ linux*)
+ jni_os=linux
+ PROXY_LIBS='-lpthread -lc'
+ ;;
+
+ *solaris*)
+ jni_os=solaris
+ CFLAGS="$CFLAGS -D__SOLARIS__"
+ PROXY_LIBS='-lnsl -lsocket -lthread'
+ ;;
+
+ *freebsd*5*)
+ PROXY_LIBS='-lpthread'
+ jni_os=freebsd
+
+ tmp=`ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libc_r`
+ tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libpthread`
+ tmp=$tmp `ldd $JAVA_HOME/bin/java | sed 's/.*=>//' | grep -c libthr`
+
+ case "$tmp" in
+ 100)
+ PROXY_LIBS='-lc_r';
+ ;;
+ 010)
+ PROXY_LIBS='-lpthread';
+ ;;
+ 001)
+ PROXY_LIBS='-lthr';
+ ;;
+ *)
+ PROXY_LIBS='-lpthread'
+ echo "Using -lpthread as default"
+ ;;
+ esac
+ ;;
+
+ *freebsd*)
+ PROXY_LIBS='-lc_r'
+ jni_os=freebsd
+ ;;
+
+ *darwin*)
+ LD=gcc
+ SO=jnilib
+ resin_plugin="$resin_pro_plugin $resin_ssl_plugin"
+ ;;
+
+ *hpux*)
+ if test -r "$JAVA_HOME/include/hpux/jni_md.h"; then
+ jni_os=hpux
+ else
+ jni_os=hp-ux
+ fi
+ ;;
+
+ *aix*)
+ jni_os=aix
+ ;;
+esac
+
+AC_SUBST(CPU)
+AC_SUBST(OS)
+AC_SUBST(SO)
+AC_SUBST(CFLAGS)
+AC_SUBST(CFLAGS_SHLIB)
+AC_SUBST(LD_SHLIB)
+AC_SUBST(LDFLAGS_SHLIB)
+AC_SUBST(LIBS_SHLIB)
+AC_SUBST(PROXY_LIBS)
+AC_SUBST(SSL_LIBS)
+
+#
+# --with-jni-include
+#
+AC_ARG_WITH(jni-include,
+[ --with-jni-include="-Idir -Idir" jni include string
+], [
+JNI_INCLUDE=${withval}
+JNI="yes"
+])
+
+#
+# --enable-jni
+#
+AC_ARG_ENABLE(jni,
+[ --enable-jni Turn on jni],
+[case "${enableval}" in
+ yes) JNI=true ;;
+ no) JNI="" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
+ esac],[JNI=""])
+
+if test -n "$JNI_INCLUDE"; then
+ JNI=yes
+elif test -r "$JAVA_HOME/include/jni_md.h"; then
+ JNI_INCLUDE="-I$JAVA_HOME/include"
+ JNI=yes
+ echo "checking for JNI in $JAVA_HOME/include ... found"
+elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
+ JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
+ JNI=yes
+ echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
+elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
+ # Darwin
+ echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
+ JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
+ JNI=yes
+else
+ JNI=""
+ AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
+fi
+
+if test -r "$JAVA_HOME/include/jvmti.h"; then
+ echo "Using JVMTI for class reloading"
+
+ CFLAGS="$CFLAGS -DHAS_JVMTI"
+fi
+
+if test -r "$JAVA_HOME/include/jvmdi.h"; then
+ echo "Using JVMDI for class reloading"
+
+ CFLAGS="$CFLAGS -DHAS_JVMDI"
+fi
+
+if test -n "$JNI"; then
+ plugins="$plugins $resin_plugin resin_os"
+else
+ echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
+fi
+
+AC_SUBST(JNI)
+AC_SUBST(JNI_INCLUDE)
+
+#
+# --enable-ssl
+#
+AC_ARG_ENABLE(ssl,
+[ --enable-ssl Turn on ssl],
+[case "${enableval}" in
+ yes) ENABLE_SSL=true ;;
+ no) ENABLE_SSL="false" ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-ssl) ;;
+ esac],[ENABLE_SSL=""])
+
+#
+# --with-openssl
+#
+AC_ARG_WITH(openssl,
+[ --with-openssl=DIR Openssl directory
+], [
+OPENSSL=${withval}
+OPENSSL_INCLUDE=${OPENSSL}/include
+OPENSSL_LIB=${OPENSSL}/lib
+])
+
+#
+# --with-openssl-include
+#
+AC_ARG_WITH(openssl-include,
+[ --with-openssl-include=DIR Openssl include directory
+], [
+OPENSSL_INCLUDE=${withval}
+
+if test ! -r "${OPENSSL_INCLUDE}/openssl/ssl23.h"; then
+ AC_MSG_ERROR([Can't find valid OpenSSL include ${OPENSSL_INCLUDE}])
+fi
+])
+
+#
+# --with-openssl-lib
+#
+AC_ARG_WITH(openssl-lib,
+[ --with-openssl-lib=DIR Openssl lib directory
+], [
+OPENSSL_LIB=${withval}
+
+if test ! -r "${OPENSSL_LIB}/libssl.a" -a \
+ ! -r "${OPENSSL_LIB}/libssl.dylib" -a \
+ ! -r "${OPENSSL_LIB}/libssl.so"; then
+ AC_MSG_ERROR([Can't find valid OpenSSL library ${OPENSSL_LIB}])
+fi
+])
+
+if test "${ENABLE_SSL}" = false; then
+ foo=bar
+elif test -n "${OPENSSL_INCLUDE}"; then
+ foo=bar
+elif test -r ${OPENSSL}/include/openssl/ssl23.h; then
+ OPENSSL_INCLUDE=${OPENSSL}/include
+elif test -r /usr/include/openssl/ssl23.h; then
+ OPENSSL_INCLUDE=/usr/include
+elif test -r /usr/local/include/openssl/ssl23.h; then
+ OPENSSL_INCLUDE=/usr/local/include
+elif test -r /usr/local/ssl/include/openssl/ssl23.h; then
+ OPENSSL_INCLUDE=/usr/local/ssl/include
+fi
+
+if test "${ENABLE_SSL}" = false; then
+ foo=bar
+
+elif test -n "${OPENSSL_LIB}"; then
+ foo=bar
+
+elif test -n "${b64_jni}" -a -r /lib64/libcrypto.so; then
+ OPENSSL_LIB=/lib64
+elif test -n "${b64_jni}" -a -r /usr/lib64/libcrypto.so; then
+ OPENSSL_LIB=/usr/lib64
+
+elif test -r /lib/libcrypto.so; then
+ OPENSSL_LIB=/lib
+elif test -r /lib/libcrypto.dylib; then
+ OPENSSL_LIB=/lib
+
+elif test -r /usr/lib/libcrypto.so; then
+ OPENSSL_LIB=/usr/lib
+elif test -r /usr/lib/libcrypto.dylib; then
+ OPENSSL_LIB=/usr/lib
+
+elif test -r /usr/local/ssl/lib/libcrypto.so; then
+ OPENSSL_LIB=/usr/local/ssl/lib
+elif test -r /usr/local/ssl/lib/libcrypto.dylib; then
+ OPENSSL_LIB=/usr/local/ssl/lib
+elif test -r ${OPENSSL}/lib/libcrypto.a; then
+ OPENSSL_LIB=${OPENSSL}/lib
+elif test -r /usr/local/ssl/lib/libcrypto.a; then
+ OPENSSL_LIB=/usr/local/ssl/lib
+elif test -r /usr/local/lib/libssl.a; then
+ OPENSSL_LIB=/usr/local/lib
+elif test -r /usr/lib/libssl.a; then
+ OPENSSL_LIB=/usr/lib
+fi
+
+if test -z "${OPENSSL_LIB}"; then
+ foo=bar
+elif test -r "${OPENSSL_LIB}/libssl.so"; then
+ SSL_LIBS="${SSL_LIBS} -lssl"
+elif test -r "${OPENSSL_LIB}/libssl.dylib"; then
+ SSL_LIBS="${SSL_LIBS} -lssl"
+elif test -r "${OPENSSL_LIB}/libssl3.so"; then
+ SSL_LIBS="${SSL_LIBS} -lssl3"
+elif test -r "${OPENSSL_LIB}/libssl3.dylib"; then
+ SSL_LIBS="${SSL_LIBS} -lssl3"
+elif test -r "${OPENSSL_LIB}/libssl.a"; then
+ SSL_LIBS="${SSL_LIBS} ${OPENSSL_LIB}/libssl.a"
+elif test -r "${OPENSSL_LIB}/libssl3.a"; then
+ SSL_LIBS="${SSL_LIBS} ${OPENSSL_LIB}/libssl3.a"
+else
+ # probably an error
+ SSL_LIBS="${SSL_LIBS} -lssl"
+fi
+
+if test -z "${OPENSSL_LIB}"; then
+ foo=bar
+elif test -r "${OPENSSL_LIB}/libcrypto.so"; then
+ SSL_LIBS="${SSL_LIBS} -lcrypto"
+elif test -r "${OPENSSL_LIB}/libcrypto.dylib"; then
+ SSL_LIBS="${SSL_LIBS} -lcrypto"
+elif test -r "${OPENSSL_LIB}/libcrypto.a"; then
+ SSL_LIBS="${SSL_LIBS} ${OPENSSL_LIB}/libcrypto.a"
+else
+ # probably an error
+ SSL_LIBS="${SSL_LIBS} -lcrypto"
+fi
+
+SSL_OBJ=ssl_stub.o
+
+if test "${ENABLE_SSL}" = false; then
+ echo "Openssl is not enabled"
+elif test -z "${OPENSSL_LIB}"; then
+ echo "Openssl library was not found"
+elif test ! -r "${OPENSSL_LIB}/libcrypto.so" -a \
+ ! -r "${OPENSSL_LIB}/libcrypto.dylib" -a \
+ ! -r "${OPENSSL_LIB}/libcrypto.a" ; then
+ AC_MSG_ERROR([Can't find valid OpenSSL library in ${OPENSSL_LIB}])
+elif test ! -r "${OPENSSL_INCLUDE}/openssl/ssl23.h"; then
+ AC_MSG_ERROR([Can't find valid OpenSSL include in ${OPENSSL_INCLUDE}])
+else
+ echo "Using openssl include in ... ${OPENSSL_INCLUDE}"
+ echo "Using openssl lib in ... ${OPENSSL_LIB}"
+ echo "Using openssl libraries in ... ${SSL_LIBS}"
+
+ if test -x "${apache_dir}/bin/httpd"; then
+ apache_ssl=`${apache_dir}/bin/httpd -l 2>&1 | grep ssl`
+ if test -n "$apache_ssl"; then
+ CFLAGS="$CFLAGS -DOPENSSL"
+ echo "Enabling ssl for mod_caucho"
+ fi
+ elif test -x "${apache_dir}/bin/httpd2"; then
+ apache_ssl=`${apache_dir}/bin/httpd2 -l 2>&1 | grep ssl`
+ if test -n "$apache_ssl"; then
+ CFLAGS="$CFLAGS -DOPENSSL"
+ echo "Enabling ssl for mod_caucho"
+ fi
+ fi
+
+ if test -r "${OPENSSL_INCLUDE}/openssl/engine.h"; then
+ CFLAGS_OPENSSL="$OPENSSL_CFLAGS -DSSL_ENGINE"
+ fi
+
+ if test -n "${OPENSSL_INCLUDE}"; then
+ INCLUDES="$INCLUDES -I${OPENSSL_INCLUDE}"
+ fi
+ SSL_OBJ=ssl.o
+ LDFLAGS_SHLIB="${LDFLAGS_SHLIB} -L${OPENSSL_LIB}"
+ # PROXY_LIBS="$PROXY_LIBS ${OPENSSL_LIB}/libssl.a ${OPENSSL_LIB}/libcrypto.a"
+fi
+
+if test -d /usr/kerberos/include; then
+ INCLUDES="$INCLUDES -I/usr/kerberos/include"
+fi
+
+#
+# test the open ssl
+#
+if test -n "${OPENSSL_LIB}"; then
+cat >conftest.$ac_ext <<_ACEOF
+#include <openssl/ssl.h>
+#include <openssl/rsa.h>
+#include <openssl/err.h>
+
+int main(int argc, char **argv)
+{
+ SSLeay_add_ssl_algorithms();
+ SSL_load_error_strings();
+
+#if OPENSSL_VERSION_NUMBER >= 0x00907000L
+ if (0)
+ ERR_print_errors_cb(0, 0);
+#endif
+
+ return 0;
+}
+_ACEOF
+
+${CC} -o conftest ${CFLAGS_OPENSSL} ${CFLAGS} ${INCLUDES} conftest.$ac_ext -L${OPENSSL_LIB} ${SSL_LIBS} ${PROXY_LIBS} 1>/dev/null 2>/dev/null
+
+if test "$?" != 0; then
+ ${CC} -o conftest ${CFLAGS_OPENSSL} ${CFLAGS} ${INCLUDES} conftest.$ac_ext -L${OPENSSL_LIB} ${SSL_LIBS} ${PROXY_LIBS}
+
+ AC_MSG_WARN(Can't compile SSL. Check compilation flags: ${CC} ${CFLAGS_OPENSSL} ${CFLAGS} ${INCLUDES} -L${OPENSSL_LIB} ${SSL_LIBS} ${PROXY_LIBS})
+
+ resin_ssl_plugin=""
+else
+ ./conftest
+
+ if test "$?" != 0; then
+ AC_MSG_WARN(Can't execute SSL. Check that load version in the library path: ${LD_LIBRARY_PATH} matches the expected version.)
+ fi
+fi
+
+rm -f conftest conftest.$ac_ext
+fi
+
+AC_SUBST(INCLUDES)
+AC_SUBST(CFLAGS_OPENSSL)
+AC_SUBST(CFLAGS_JNI)
+AC_SUBST(SSL_OBJ)
+
+PERL="perl"
+#
+# --with-perl
+#
+AC_ARG_WITH(perl,
+[ --with-perl=DIR Perl binary location
+], [
+PERL=${withval}
+])
+
+AC_SUBST(PERL)
+
+#
+# --enable-debug
+#
+AC_ARG_ENABLE(debug,
+[ --enable-debug Turn on debugging],
+[case "${enableval}" in
+ yes) debug=true ;;
+ no) debug=false ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+ esac],[debug=false])
+
+if test "$debug" = true; then
+ CFLAGS="$CFLAGS -DDEBUG -Wall"
+ HARDCORE_CFLAGS="$HARDCORE_CFLAGS -DDEBUG"
+fi
+
+AC_OUTPUT([
+Makefile
+bin/wrapper.pl
+modules/c/src/Makefile
+modules/c/src/common/Makefile
+modules/c/src/apache1/Makefile
+modules/c/src/apache2/Makefile
+modules/c/src/resin_os/Makefile
+contrib/init.resin
+], [])
+
+if test -n "${resin_pro_plugin}"; then
+ AC_OUTPUT([
+ modules/c/src/resin/Makefile
+ modules/c/src/resinssl/Makefile
+ ])
+fi
+
+chmod +x bin/wrapper.pl
1.1 src/patchsets/resin/3.0.28/mod_caucho-3.0.28-ssl.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-ssl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/mod_caucho-3.0.28-ssl.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.0.28-ssl.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.0.28/modules/c/src/apache2/mod_caucho.c
--- resin-3.0.28.vanilla/modules/c/src/apache2/mod_caucho.c 2009-06-28 11:33:00.000000000 +0100
+++ resin-3.0.28/modules/c/src/apache2/mod_caucho.c 2009-06-28 11:35:57.000000000 +0100
@@ -582,6 +582,16 @@
}
}
#endif
+ /* Add SSL Client certificate: (requires SSLOptions +StdEnvVars) */
+ {
+ int i;
+ char **env = (char **)ap_create_environment(r->pool, r->subprocess_env);
+ for (i = 0; env[i]; ++i) {
+ char *name = strsep(&(env[i]), "=");
+ if (strncmp(name, "SSL_CLIENT_CERT", 16) == 0)
+ cse_write_string(s, CSE_CLIENT_CERT, env[i]);
+ }
+ }
}
/**
1.1 src/patchsets/resin/3.0.28/resin-3.0.28-Makefile.in.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-Makefile.in.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-Makefile.in.patch?rev=1.1&content-type=text/plain
Index: resin-3.0.28-Makefile.in.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/Makefile.in resin-3.0.28/Makefile.in
--- resin-3.0.28.vanilla/Makefile.in 2009-06-28 11:33:01.000000000 +0100
+++ resin-3.0.28/Makefile.in 2009-06-28 11:33:13.000000000 +0100
@@ -1,6 +1,6 @@
PREFIX=@prefix@
-all :
+all :
(cd modules/c/src; $(MAKE))
clean :
@@ -8,20 +8,20 @@
install :
(cd modules/c/src; $(MAKE) install)
- if test $(PREFIX) != `pwd`; then \
- mkdir -p $(PREFIX)/lib; \
- mkdir -p $(PREFIX)/libexec; \
- cp -r libexec/* $(PREFIX)/libexec; \
- cp lib/*.jar $(PREFIX)/lib; \
- mkdir -p $(PREFIX)/bin; \
- cp bin/* $(PREFIX)/bin; \
- mkdir -p $(PREFIX)/webapps; \
- cp -r webapps/* $(PREFIX)/webapps; \
- mkdir -p $(PREFIX)/conf; \
- cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
- cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
- if test ! -r $(PREFIX)/conf/resin.conf; then \
- cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
- cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
+ if test $(DESTDIR)$(PREFIX) != `pwd`; then \
+ mkdir -p $(DESTDIR)$(PREFIX)/lib; \
+ mkdir -p $(DESTDIR)$(PREFIX)/libexec; \
+ cp -r libexec/* $(DESTDIR)$(PREFIX)/libexec; \
+ cp lib/*.jar $(DESTDIR)$(PREFIX)/lib; \
+ mkdir -p $(DESTDIR)$(PREFIX)/bin; \
+ cp bin/* $(DESTDIR)$(PREFIX)/bin; \
+ mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
+ cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
+ mkdir -p $(DESTDIR)$(PREFIX)/conf; \
+ cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
+ cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
+ if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
+ cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
+ cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
fi; \
fi
1.1 src/patchsets/resin/3.0.28/resin-3.0.28-Resin.java.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-Resin.java.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-Resin.java.patch?rev=1.1&content-type=text/plain
Index: resin-3.0.28-Resin.java.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.28/modules/resin/src/com/caucho/server/resin/Resin.java
--- resin-3.0.28.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java 2009-06-28 11:33:01.000000000 +0100
+++ resin-3.0.28/modules/resin/src/com/caucho/server/resin/Resin.java 2009-06-28 11:34:03.000000000 +0100
@@ -700,10 +700,10 @@
throw new ConfigException(L().l("The following system property must be set:\n -Djava.util.logging.manager=com.caucho.log.LogManagerImpl\nThe JDK 1.4 Logging manager must be set to Resin's log manager."));
}
- validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.4"});
+ validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.5"});
validatePackage("javax.servlet.jsp.jstl.core.Config", new String[] {"1.1"});
validatePackage("javax.management.MBeanServer", new String[] { "1.2", "1.5" });
- validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.4"});
+ validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.5"});
}
/**
1.1 src/patchsets/resin/3.0.28/resin-3.0.28-build.xml.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-build.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-build.xml.patch?rev=1.1&content-type=text/plain
Index: resin-3.0.28-build.xml.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/build.xml resin-3.0.28/build.xml
--- resin-3.0.28.vanilla/build.xml 2009-06-28 11:30:23.000000000 +0100
+++ resin-3.0.28/build.xml 2009-06-28 11:30:36.000000000 +0100
@@ -7,7 +7,6 @@
<property name="modules" location="${basedir}/modules"/>
<property name="src" location="${basedir}/src"/>
- <property name="ext" location="${basedir}/modules/ext"/>
<property name="doc" location="${basedir}/doc"/>
<property name="build" location="${install}/build"/>
@@ -17,14 +16,12 @@
<property name="javac.verbose" value="off"/>
- <property name="javac.debug" value="on"/>
+ <property name="javac.debug" value="off"/>
<property name="javac.optimize" value="off"/>
<property name="javac.deprecation" value="off"/>
<property name="javac.nowarn" value="on"/>
<property name="javac.memoryMaximumSize" value="256m"/>
- <property name="javac.source" value="1.4"/>
-
<property name="jar.compress" value="false"/>
<property name="jar.index" value="true"/>
<property name="jar.update" value="false"/>
@@ -66,7 +63,7 @@
</target>
<target name="compile"
- depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
+ depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
</target>
<target name="ejb" depends="init, jta">
@@ -80,7 +77,6 @@
<antcall target="module" inheritRefs="true">
<param name="module.name" value="ejb30"/>
<param name="module.jar" value="ejb-30.jar"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -98,11 +94,10 @@
</antcall>
</target>
- <target name="jaxrpc" depends="init,saaj,jsdk">
+ <target name="jaxrpc" depends="init,saaj">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="jaxrpc"/>
<param name="module.jar" value="jaxrpc.jar"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -116,7 +111,6 @@
<target name="resin-jdk15" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="resin-jdk15"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -148,7 +142,7 @@
</antcall>
</target>
- <target name="jstl" depends="init, jsdk">
+ <target name="jstl" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="jstl"/>
<param name="module.jar" value="jstl-11.jar"/>
@@ -187,7 +181,7 @@
</antcall>
</target>
- <target name="resin-dev" depends="init, ejb, ejb30, jca, jcr, jms, jmx, jsdk, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-jdk15">
+ <target name="resin-dev" depends="init, ejb, ejb30, jca, jcr, jms, jmx, jstl, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-jdk15">
<!-- filter to insert version -->
@@ -217,7 +211,6 @@
<antcall target="module" inheritRefs="true">
<param name="module.name" value="resin"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -242,14 +235,12 @@
<target name="webutil" depends="init, resin">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="webutil"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
<target name="quercus-dev" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="quercus"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -282,16 +273,15 @@
verbose="${javac.verbose}"
debug="${javac.debug}" optimize="${javac.optimize}"
deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
- source="${javac.source}"
excludes="**/.svn/**"
memoryMaximumSize="${javac.memoryMaximumSize}">
<classpath>
<dirset dir="${modules}">
<include name="*/classes"/>
</dirset>
- <fileset dir="${ext}">
- <include name="**/*.jar"/>
- </fileset>
+ <fileset dir="lib">
+ <include name="*.jar" />
+ </fileset>
</classpath>
</javac>
@@ -358,13 +348,6 @@
</copy>
</target>
- <target name="ext" depends="init, resin">
- <copy todir="${install}/lib" preservelastmodified="true">
- <fileset dir="${ext}">
- </fileset>
- </copy>
- </target>
-
<target name="webapps" depends="init, doc, quercus">
</target>
@@ -503,9 +486,6 @@
<dirset dir="${modules}">
<include name="*/classes"/>
</dirset>
- <fileset dir="${modules}/ext">
- <include name="**/*.jar"/>
- </fileset>
</classpath>
</java>
@@ -688,7 +668,6 @@
<include name="lib/jca-15.jar"/>
<include name="lib/jms-11.jar"/>
<include name="lib/jmx-12.jar"/>
- <include name="lib/jsdk-24.jar"/>
<include name="lib/jstl-11.jar"/>
<include name="lib/jta-101.jar"/>
<include name="lib/portlet-10.jar"/>
1.1 src/patchsets/resin/3.0.28/resin-3.0.28-wrapper.pl.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-wrapper.pl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.0.28/resin-3.0.28-wrapper.pl.patch?rev=1.1&content-type=text/plain
Index: resin-3.0.28-wrapper.pl.patch
===================================================================
diff -Nru resin-3.0.28.vanilla/bin/wrapper.pl resin-3.0.28/bin/wrapper.pl
--- resin-3.0.28.vanilla/bin/wrapper.pl 2009-06-28 11:33:00.000000000 +0100
+++ resin-3.0.28/bin/wrapper.pl 2009-06-28 11:34:28.000000000 +0100
@@ -447,9 +447,6 @@
$pid=`cat $pid_file`;
chop($pid);
- if ($cmd eq "stop") {
- print("Stopping ${name}\n");
- }
$signal = 15;
$count = 10;
while (kill($signal, $pid) && $count-- > 0) {
@@ -565,8 +562,6 @@
$SIG{CHLD} = 'IGNORE';
}
- print "\n\nResin wrapper.pl closing.\n\n";
-
close(S);
close(C); # closing the accepted socket should start orderly shutdown
# unlink needs to happen relatively soon so restart's pid won't
@@ -744,8 +739,6 @@
$date = `date`;
chop($date);
- print "Resin $name $cmd at $date\n";
-
# create a keepalive socket
# when the wrapper dies, the httpd class will detect that and
# close gracefully
diff -Nru resin-3.0.28.vanilla/bin/wrapper.pl.in resin-3.0.28/bin/wrapper.pl.in
--- resin-3.0.28.vanilla/bin/wrapper.pl.in 2009-06-28 11:33:00.000000000 +0100
+++ resin-3.0.28/bin/wrapper.pl.in 2009-06-28 11:34:28.000000000 +0100
@@ -447,9 +447,6 @@
$pid=`cat $pid_file`;
chop($pid);
- if ($cmd eq "stop") {
- print("Stopping ${name}\n");
- }
$signal = 15;
$count = 10;
while (kill($signal, $pid) && $count-- > 0) {
@@ -565,8 +562,6 @@
$SIG{CHLD} = 'IGNORE';
}
- print "\n\nResin wrapper.pl closing.\n\n";
-
close(S);
close(C); # closing the accepted socket should start orderly shutdown
# unlink needs to happen relatively soon so restart's pid won't
@@ -743,8 +738,6 @@
$date = `date`;
chop($date);
- print "Resin $name $cmd at $date\n";
-
# create a keepalive socket
# when the wrapper dies, the httpd class will detect that and
# close gracefully
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-28 10:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-28 10:37 [gentoo-commits] gentoo commit in src/patchsets/resin/3.0.28: mod_caucho-3.0.28-disable-sticky-sessions.patch mod_caucho-3.0.28-gentoo.patch mod_caucho-3.0.28-java.patch mod_caucho-3.0.28-ssl.patch resin-3.0.28-Makefile.in.patch resin-3.0.28-Resin.java.patch resin-3.0.28-build.xml.patch resin-3.0.28-wrapper.pl.patch Krzysiek Pawlik (nelchael)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox