Version bumps.

(Portage version: 2.1.2.7)

12 files changed, 240 insertions, 13 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 4da7ea019bb9..519d68b9a9cc 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for www-apache/mod_caucho
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.16 2007/04/14 21:05:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.17 2007/05/15 16:37:41 nelchael Exp $
+
+*mod_caucho-3.1.1 (15 May 2007)
+*mod_caucho-3.0.23 (15 May 2007)
+
+  15 May 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mod_caucho-3.0.23-gentoo.patch,
+  +files/mod_caucho-3.0.23-java.patch, +files/mod_caucho-3.0.23-ssl.patch,
+  -files/mod_caucho-3.1.0-gentoo.patch, -files/mod_caucho-3.1.0-java.patch,
+  -files/mod_caucho-3.1.0-ssl.patch, +files/mod_caucho-3.1.1-gentoo.patch,
+  +files/mod_caucho-3.1.1-java.patch, +files/mod_caucho-3.1.1-ssl.patch,
+  +mod_caucho-3.0.23.ebuild, -mod_caucho-3.1.0.ebuild,
+  +mod_caucho-3.1.1.ebuild:
+  Version bumps.
 
   14 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/mod_caucho-3.0.22-java.patch, +files/mod_caucho-3.1.0-java.patch,
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.0.23 b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.23
new file mode 100644
index 000000000000..bae42a23b37b
--- /dev/null
+++ b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.23
@@ -0,0 +1,3 @@
+MD5 f18ed18598f4bfbba18ec5dc9427cb68 resin-3.0.23-src.tar.gz 5470406
+RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef resin-3.0.23-src.tar.gz 5470406
+SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d resin-3.0.23-src.tar.gz 5470406
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.1.0 b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.0
deleted file mode 100644
index 82f68ed4827c..000000000000
--- a/www-apache/mod_caucho/files/digest-mod_caucho-3.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bee26233a9bf67935c75fbb8136e9001 resin-3.1.0-src.tar.gz 5708227
-RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 resin-3.1.0-src.tar.gz 5708227
-SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440 resin-3.1.0-src.tar.gz 5708227
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.1.1 b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.1
new file mode 100644
index 000000000000..1ed7597677ec
--- /dev/null
+++ b/www-apache/mod_caucho/files/digest-mod_caucho-3.1.1
@@ -0,0 +1,3 @@
+MD5 860fbaf78013c0bc5bde742e45a13e21 resin-3.1.1-src.tar.gz 7351646
+RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce resin-3.1.1-src.tar.gz 7351646
+SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424 resin-3.1.1-src.tar.gz 7351646
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.23-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.23-gentoo.patch
new file mode 100644
index 000000000000..71920c0feb95
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.0.23-gentoo.patch
@@ -0,0 +1,17 @@
+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.23-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.23-java.patch
new file mode 100644
index 000000000000..f5ac7e24d801
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.0.23-java.patch
@@ -0,0 +1,126 @@
+--- 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.1.0-ssl.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.23-ssl.patch
index fc6a0b5ac878..343e3b864446 100644
--- a/www-apache/mod_caucho/files/mod_caucho-3.1.0-ssl.patch
+++ b/www-apache/mod_caucho/files/mod_caucho-3.0.23-ssl.patch
@@ -1,6 +1,6 @@
-diff -Nru resin-3.0.22.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.0.22/modules/c/src/apache2/mod_caucho.c
---- resin-3.0.22.vanilla/modules/c/src/apache2/mod_caucho.c	2007-04-13 15:41:18.000000000 +0200
-+++ resin-3.0.22/modules/c/src/apache2/mod_caucho.c	2007-04-13 16:00:24.000000000 +0200
+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 @@
      }
    }
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.0-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.1-gentoo.patch
index 788c466a9f52..c2160d8a9654 100644
--- a/www-apache/mod_caucho/files/mod_caucho-3.1.0-gentoo.patch
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.1-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Nru resin-3.1.0.vanilla/modules/c/src/apache2/Makefile.in resin-3.1.0/modules/c/src/apache2/Makefile.in
---- resin-3.1.0.vanilla/modules/c/src/apache2/Makefile.in	2006-12-26 02:44:02.000000000 +0100
-+++ resin-3.1.0/modules/c/src/apache2/Makefile.in	2006-12-26 02:46:14.000000000 +0100
+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) $<
  
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.1-java.patch
index a2e185157008..accfaae4edea 100644
--- a/www-apache/mod_caucho/files/mod_caucho-3.1.0-java.patch
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.1-java.patch
@@ -1,5 +1,5 @@
---- resin-3.1.0.vanilla/configure.in	2007-04-14 22:59:47.000000000 +0200
-+++ resin-3.1.0/configure.in	2007-04-14 23:00:30.000000000 +0200
+--- resin-3.1.1.vanilla/configure.in	2007-04-14 22:59:47.000000000 +0200
++++ resin-3.1.1/configure.in	2007-04-14 23:00:30.000000000 +0200
 @@ -434,54 +434,6 @@
    fi
  fi
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.1-ssl.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.1-ssl.patch
new file mode 100644
index 000000000000..1cfcdc397b8a
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.1-ssl.patch
@@ -0,0 +1,20 @@
+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]);
++    }
++  }
+ }
+ 
+ /**
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.23.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.23.ebuild
new file mode 100644
index 000000000000..b5d2c916ca45
--- /dev/null
+++ b/www-apache/mod_caucho/mod_caucho-3.0.23.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.23.ebuild,v 1.1 2007/05/15 16:37:41 nelchael Exp $
+
+inherit eutils apache-module autotools
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DESCRIPTION="mod_caucho connects Resin and Apache2."
+HOMEPAGE="http://www.caucho.com/"
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/resin-${PV}"
+
+# See apache-module.eclass for more information.
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="CAUCHO"
+
+need_apache2
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-ssl.patch"
+	epatch "${FILESDIR}/${P}-java.patch"
+	eautoreconf
+	chmod 755 ./configure
+}
+
+src_compile() {
+	econf --with-apxs=${APXS2} || die "econf failed"
+
+	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
+}
+
+src_install() {
+	cd "${S}/modules/c/src/apache2"
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	insinto "${APACHE2_MODULES_CONFDIR}"
+	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
+	|| die "internal ebuild error: '${FILESDIR}/${APACHE2_MOD_CONF}.conf' not found."
+}
diff --git a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.1.ebuild
index ac6f842ac1d1..2f015b24cef5 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.6 2007/04/14 21:05:31 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.1.ebuild,v 1.1 2007/05/15 16:37:41 nelchael Exp $
 
 inherit eutils apache-module autotools