* [gentoo-commits] gentoo commit in src/patchsets/resin/3.1.4: mod_caucho-3.1.4-gentoo.patch mod_caucho-3.1.4-java.patch mod_caucho-3.1.4-ssl.patch resin-3.1.4-Makefile.in.patch resin-3.1.4-build.xml.patch
@ 2008-06-10 21:18 Krzysiek Pawlik (nelchael)
0 siblings, 0 replies; only message in thread
From: Krzysiek Pawlik (nelchael) @ 2008-06-10 21:18 UTC (permalink / raw
To: gentoo-commits
nelchael 08/06/10 21:18:02
Added: mod_caucho-3.1.4-gentoo.patch
mod_caucho-3.1.4-java.patch
mod_caucho-3.1.4-ssl.patch
resin-3.1.4-Makefile.in.patch
resin-3.1.4-build.xml.patch
Log:
Add patches for resin.
Revision Changes Path
1.1 src/patchsets/resin/3.1.4/mod_caucho-3.1.4-gentoo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/mod_caucho-3.1.4-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/mod_caucho-3.1.4-gentoo.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.1.4-gentoo.patch
===================================================================
diff -Nru resin-3.1.1.vanilla/modules/c/src/apache2/Makefile.in resin-3.1.1/modules/c/src/apache2/Makefile.in
--- resin-3.1.1.vanilla/modules/c/src/apache2/Makefile.in 2006-12-26 02:44:02.000000000 +0100
+++ resin-3.1.1/modules/c/src/apache2/Makefile.in 2006-12-26 02:46:14.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.1.4/mod_caucho-3.1.4-java.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/mod_caucho-3.1.4-java.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/mod_caucho-3.1.4-java.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.1.4-java.patch
===================================================================
diff -Nru resin-3.1.2.vanilla/configure.in resin-3.1.2/configure.in
--- resin-3.1.2.vanilla/configure.in 2007-08-17 10:14:28.000000000 +0200
+++ resin-3.1.2/configure.in 2007-08-17 10:14:59.000000000 +0200
@@ -442,54 +442,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`
@@ -814,72 +766,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
-elif test -r "$JAVA_HOME/include/jni.h"; then
- JNI_INCLUDE="-I$JAVA_HOME/include"
- JNI=yes
- echo "checking for JNI in $JAVA_HOME/include ... found"
-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,
1.1 src/patchsets/resin/3.1.4/mod_caucho-3.1.4-ssl.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/mod_caucho-3.1.4-ssl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/mod_caucho-3.1.4-ssl.patch?rev=1.1&content-type=text/plain
Index: mod_caucho-3.1.4-ssl.patch
===================================================================
diff -Nru resin-3.1.1.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.1.1/modules/c/src/apache2/mod_caucho.c
--- resin-3.1.1.vanilla/modules/c/src/apache2/mod_caucho.c 2007-04-13 15:41:18.000000000 +0200
+++ resin-3.1.1/modules/c/src/apache2/mod_caucho.c 2007-04-13 16:00:24.000000000 +0200
@@ -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.1.4/resin-3.1.4-Makefile.in.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/resin-3.1.4-Makefile.in.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/resin-3.1.4-Makefile.in.patch?rev=1.1&content-type=text/plain
Index: resin-3.1.4-Makefile.in.patch
===================================================================
diff -Nru resin-3.1.4.vanilla/Makefile.in resin-3.1.3/Makefile.in
--- resin-3.1.4.vanilla/Makefile.in 2007-11-09 14:59:07.000000000 +0100
+++ resin-3.1.4/Makefile.in 2007-11-09 15:00:28.000000000 +0100
@@ -9,20 +9,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.1.4/resin-3.1.4-build.xml.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/resin-3.1.4-build.xml.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/3.1.4/resin-3.1.4-build.xml.patch?rev=1.1&content-type=text/plain
Index: resin-3.1.4-build.xml.patch
===================================================================
diff -Nru resin-3.1.4.vanilla/build.xml resin-3.1.4/build.xml
--- resin-3.1.4.vanilla/build.xml 2007-12-14 17:02:33.000000000 +0100
+++ resin-3.1.4/build.xml 2007-12-14 17:03:03.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="512m"/>
- <property name="javac.source" value="1.5"/>
-
<property name="jar.compress" value="false"/>
<!--
<property name="jar.index" value="true"/>
@@ -83,14 +80,13 @@
</target>
<target name="compile"
- depends="init, hessian, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webbeans, webutil, deploy, conf, ext">
+ depends="init, hessian, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jstl, jsf, jta, portlet, script, resin-util, quercus, resin, ecmascript, webbeans, webutil, deploy, conf">
</target>
<target name="ant" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="ant"/>
<param name="module.jar" value="resin-ant.jar"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -98,7 +94,6 @@
<antcall target="module" inheritRefs="true">
<param name="module.name" value="ejb"/>
<param name="module.jar" value="ejb-15.jar"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -106,11 +101,10 @@
<antcall target="module" inheritRefs="true">
<param name="module.name" value="jpa"/>
<param name="module.jar" value="jpa-15.jar"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
- <target name="hessian" depends="init, jsdk">
+ <target name="hessian" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="hessian"/>
<param name="module.jar" value="hessian.jar"/>
@@ -132,11 +126,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-15.jar"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -175,7 +168,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"/>
@@ -267,13 +260,12 @@
</copy>
</target>
- <target name="resin-dev" depends="init, ejb, hessian, jca, jcr, jms, jsdk, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util, webbeans, version">
+ <target name="resin-dev" depends="init, ejb, hessian, jca, jcr, jms, jstl, jsf, jta, j2ee-deploy, j2ee-management, saaj, jaxrpc, portlet, script, resin-util, webbeans, version">
<!-- build module -->
<antcall target="module" inheritRefs="true">
<param name="module.name" value="resin"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -298,14 +290,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>
@@ -314,7 +304,6 @@
<target name="ecmascript" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="ecmascript"/>
- <param name="javac.source" value="1.5"/>
</antcall>
</target>
@@ -347,16 +336,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>
@@ -450,13 +438,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>
@@ -559,9 +540,6 @@
<dirset dir="${modules}">
<include name="*/classes"/>
</dirset>
- <fileset dir="${modules}/ext">
- <include name="**/*.jar"/>
- </fileset>
</classpath>
</java>
@@ -695,7 +673,6 @@
<include name="lib/j2ee-management-10.jar"/>
<include name="lib/jca-15.jar"/>
<include name="lib/jms-11.jar"/>
- <include name="lib/jsdk-15.jar"/>
<include name="lib/jsf-12.jar"/>
<include name="lib/jstl-11.jar"/>
<include name="lib/jta-101.jar"/>
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-10 21:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-10 21:18 [gentoo-commits] gentoo commit in src/patchsets/resin/3.1.4: mod_caucho-3.1.4-gentoo.patch mod_caucho-3.1.4-java.patch mod_caucho-3.1.4-ssl.patch resin-3.1.4-Makefile.in.patch resin-3.1.4-build.xml.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