Use tarball of patches.

(Portage version: 2.1.3.19)

9 files changed, 6 insertions, 361 deletions

diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.0.24 b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.24
index 42192b685b09..0b7053910d75 100644
--- a/www-apache/mod_caucho/files/digest-mod_caucho-3.0.24
+++ b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.24
@@ -1,3 +1,6 @@
 MD5 9310288218c7cb4c97f68a966600fede resin-3.0.24-src.zip 10688883
 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 resin-3.0.24-src.zip 10688883
 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c resin-3.0.24-src.zip 10688883
+MD5 aa067e589a4fefbd8db05f20a81e5e98 resin-gentoo-patches-3.0.24.tar.bz2 4788
+RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 resin-gentoo-patches-3.0.24.tar.bz2 4788
+SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0 resin-gentoo-patches-3.0.24.tar.bz2 4788
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.1.3 b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.3
index 7fba46d3cf54..f034967b0e7e 100644
--- a/www-apache/mod_caucho/files/digest-mod_caucho-3.1.3
+++ b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.3
@@ -1,3 +1,6 @@
 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
+MD5 a16352098c112615d1465055bf38b94d resin-gentoo-patches-3.1.3.tar.bz2 3516
+RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc resin-gentoo-patches-3.1.3.tar.bz2 3516
+SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63 resin-gentoo-patches-3.1.3.tar.bz2 3516
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.24-disable-sticky-sessions.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.24-disable-sticky-sessions.patch
deleted file mode 100644
index 1e49f750218a..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.24-disable-sticky-sessions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nru resin-3.0.23.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.0.23/modules/c/src/apache2/mod_caucho.c
---- resin-3.0.23.vanilla/modules/c/src/apache2/mod_caucho.c	2006-11-01 19:09:04.000000000 +0100
-+++ resin-3.0.23/modules/c/src/apache2/mod_caucho.c	2007-05-22 11:02:20.000000000 +0200
-@@ -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}
- };
- 
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.24-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.24-gentoo.patch
deleted file mode 100644
index 71920c0feb95..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.24-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru resin-3.0.23.vanilla/modules/c/src/apache2/Makefile.in resin-3.0.23/modules/c/src/apache2/Makefile.in
---- resin-3.0.23.vanilla/modules/c/src/apache2/Makefile.in	2006-08-14 22:44:04.000000000 +0200
-+++ resin-3.0.23/modules/c/src/apache2/Makefile.in	2006-08-14 23:24:00.000000000 +0200
-@@ -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
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.24-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.24-java.patch
deleted file mode 100644
index f5ac7e24d801..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.24-java.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- resin-3.0.23.vanilla/configure.in	2007-04-14 22:51:15.000000000 +0200
-+++ resin-3.0.23/configure.in	2007-04-14 22:54:46.000000000 +0200
-@@ -427,54 +427,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`
-@@ -870,68 +822,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 --git a/www-apache/mod_caucho/files/mod_caucho-3.0.24-ssl.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.24-ssl.patch
deleted file mode 100644
index 343e3b864446..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.24-ssl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nru resin-3.0.23.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.0.23/modules/c/src/apache2/mod_caucho.c
---- resin-3.0.23.vanilla/modules/c/src/apache2/mod_caucho.c	2007-04-13 15:41:18.000000000 +0200
-+++ resin-3.0.23/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]);
-+    }
-+  }
- }
- 
- /**
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch
deleted file mode 100644
index c2160d8a9654..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch
deleted file mode 100644
index 37fa05011260..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-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,
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch
deleted file mode 100644
index 1cfcdc397b8a..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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]);
-+    }
-+  }
- }
- 
- /**