[gentoo-commits] gentoo-x86 commit in www-apache/mod_caucho/files: mod_caucho-3.1.3-gentoo.patch digest-mod_caucho-3.1.3 mod_caucho-3.1.3-java.patch mod_caucho-3.1.3-ssl.patch digest-mod_caucho-3.1.2 mod_caucho-3.1.2-java.patch mod_caucho-3.1.2-ssl.patch mod_caucho-3.1.2-gentoo.patch

[Krzysiek Pawlik (nelchael)]

nelchael    07/11/10 11:21:03

  Added:                mod_caucho-3.1.3-gentoo.patch
                        digest-mod_caucho-3.1.3 mod_caucho-3.1.3-java.patch
                        mod_caucho-3.1.3-ssl.patch
  Removed:              digest-mod_caucho-3.1.2 mod_caucho-3.1.2-java.patch
                        mod_caucho-3.1.2-ssl.patch
                        mod_caucho-3.1.2-gentoo.patch
  Log:
  Version bump for Resin 3.1.3
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch?rev=1.1&content-type=text/plain

Index: mod_caucho-3.1.3-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                  www-apache/mod_caucho/files/digest-mod_caucho-3.1.3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/digest-mod_caucho-3.1.3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/digest-mod_caucho-3.1.3?rev=1.1&content-type=text/plain

Index: digest-mod_caucho-3.1.3
===================================================================
MD5 9b786d3fc037f43f9c11b48d486a0893 resin-3.1.3-src.zip 12366224
RMD160 573db137aca6da906f519333b27e67611d2b8a7a resin-3.1.3-src.zip 12366224
SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493 resin-3.1.3-src.zip 12366224



1.1                  www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch?rev=1.1&content-type=text/plain

Index: mod_caucho-3.1.3-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                  www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch?rev=1.1&content-type=text/plain

Index: mod_caucho-3.1.3-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]);
+    }
+  }
 }
 
 /**



-- 
gentoo-commits@g.o mailing list