Add patch for SSL connections for 3.1.0

Package-Manager: portage-2.1.2.3

4 files changed, 42 insertions, 13 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index aaebf235de3e..37169bed772b 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2007/04/13 14:45:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.14 2007/04/13 14:55:36 nelchael Exp $
+
+  13 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/mod_caucho-3.1.0-ssl.patch, mod_caucho-3.1.0.ebuild:
+  Add patch for SSL connections for 3.1.0
 
   13 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   +files/mod_caucho-3.0.22-ssl.patch, mod_caucho-3.0.22.ebuild:
diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest
index 2204826b0888..ecff4bfce666 100644
--- a/www-apache/mod_caucho/Manifest
+++ b/www-apache/mod_caucho/Manifest
@@ -17,20 +17,24 @@ AUX mod_caucho-3.1.0-gentoo.patch 779 RMD160 2bd24d536c97b07b5366b5c450be9e0e878
 MD5 b2b19809a96fd5e41d11294c9d0c144b files/mod_caucho-3.1.0-gentoo.patch 779
 RMD160 2bd24d536c97b07b5366b5c450be9e0e878c1d44 files/mod_caucho-3.1.0-gentoo.patch 779
 SHA256 667c97c8fa9c34102303a7096cc271f422e83cc4fc1fd09a1630368babdd9c34 files/mod_caucho-3.1.0-gentoo.patch 779
+AUX mod_caucho-3.1.0-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 SHA1 1acf6ab1a4f945609903986966dc7d29eb655bfe SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e
+MD5 c013ff79b1e3cf3cf3db58805e8e38dd files/mod_caucho-3.1.0-ssl.patch 707
+RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 files/mod_caucho-3.1.0-ssl.patch 707
+SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e files/mod_caucho-3.1.0-ssl.patch 707
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.1.0-src.tar.gz 5708227 RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 SHA1 2f3f7c5d6003424f2f1afc27f38f9f36cc312466 SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440
 EBUILD mod_caucho-3.0.22.ebuild 1273 RMD160 53efea17e4aa3380fb8d133c2584102e1edc62a7 SHA1 0387ca77e97a65ddceb45bb31e80f9b3b2e1c4d5 SHA256 96d98e4ca0094e9a9c4254e703c43a2d807c0042835949e23736322ae71fc36c
 MD5 0315bc60e74408e38834b01fbd8243d4 mod_caucho-3.0.22.ebuild 1273
 RMD160 53efea17e4aa3380fb8d133c2584102e1edc62a7 mod_caucho-3.0.22.ebuild 1273
 SHA256 96d98e4ca0094e9a9c4254e703c43a2d807c0042835949e23736322ae71fc36c mod_caucho-3.0.22.ebuild 1273
-EBUILD mod_caucho-3.1.0.ebuild 1259 RMD160 7a7a443e9ddecc616f615d11601eeb2175d850bf SHA1 ad041d7ff93e54eae93be1ca1fb4bf36df8292a5 SHA256 345f3b5f0e172dc5a7969202d3cdcd0eb6bc3fbe6af51b0175d6b4221535091d
-MD5 292b3d6b9708268b83765051d2768bfd mod_caucho-3.1.0.ebuild 1259
-RMD160 7a7a443e9ddecc616f615d11601eeb2175d850bf mod_caucho-3.1.0.ebuild 1259
-SHA256 345f3b5f0e172dc5a7969202d3cdcd0eb6bc3fbe6af51b0175d6b4221535091d mod_caucho-3.1.0.ebuild 1259
-MISC ChangeLog 2337 RMD160 1fa6277f5aea192d58f9ecdb77acbb10306121e0 SHA1 a74815a8c033bcc4a29b210d5e37456c01a4956b SHA256 bf40ce58da46d2317c8bead3aaa8aa6023b15d9dc2bb507e5e67db45e15df010
-MD5 fb80081290dc3ea508b990e1a7326cc5 ChangeLog 2337
-RMD160 1fa6277f5aea192d58f9ecdb77acbb10306121e0 ChangeLog 2337
-SHA256 bf40ce58da46d2317c8bead3aaa8aa6023b15d9dc2bb507e5e67db45e15df010 ChangeLog 2337
+EBUILD mod_caucho-3.1.0.ebuild 1296 RMD160 355a5b42d3927f414e0beda42538e77136fee951 SHA1 3b096b717621b6dbd01049d2a8997fb957fc0e88 SHA256 e6c7105a6e65c2910a6a38f097cc159377fbc5fd28a6a0879a936bb81fb23196
+MD5 1d80004dd5699bf84dc2852258076750 mod_caucho-3.1.0.ebuild 1296
+RMD160 355a5b42d3927f414e0beda42538e77136fee951 mod_caucho-3.1.0.ebuild 1296
+SHA256 e6c7105a6e65c2910a6a38f097cc159377fbc5fd28a6a0879a936bb81fb23196 mod_caucho-3.1.0.ebuild 1296
+MISC ChangeLog 2495 RMD160 31ad27ebbd5a8233fd2bdbf30c386d477159bec9 SHA1 f22355dd1f5ace79c9b8cf20eddd60af9b0e7957 SHA256 d0f98755d0fcc4561b610798e4cdbc4752989ae6a4e6bd966ba493f6a13252d5
+MD5 19ecde0f7454c75c4e5056246a1a5a2f ChangeLog 2495
+RMD160 31ad27ebbd5a8233fd2bdbf30c386d477159bec9 ChangeLog 2495
+SHA256 d0f98755d0fcc4561b610798e4cdbc4752989ae6a4e6bd966ba493f6a13252d5 ChangeLog 2495
 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957
 MD5 2beccfb509fa2c8b2489d1278d021b4e metadata.xml 245
 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 metadata.xml 245
@@ -44,7 +48,7 @@ SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGH5eugo/w9rxVVVERAiatAJ4/Lx0yqxB+mfnYZOjE/HuQdPxVLgCgkgJp
-TMUJlIjvFwhOg54Nk61x4i4=
-=ieBl
+iD8DBQFGH5oJgo/w9rxVVVERAhl1AJ4hQJxC3Sp3T887LkQVYLzIZKpLagCfexwW
+5rjyWlsMPH1WlTEdTlaDARY=
+=hG1j
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.1.0-ssl.patch b/www-apache/mod_caucho/files/mod_caucho-3.1.0-ssl.patch
new file mode 100644
index 000000000000..fc6a0b5ac878
--- /dev/null
+++ b/www-apache/mod_caucho/files/mod_caucho-3.1.0-ssl.patch
@@ -0,0 +1,20 @@
+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
+@@ -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.1.0.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
index 4cad20b69947..e3522e7ec910 100644
--- a/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.1.0.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.3 2007/01/26 10:20:42 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.0.ebuild,v 1.4 2007/04/13 14:55:36 nelchael Exp $
 
 inherit eutils apache-module autotools
 
@@ -29,6 +29,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-ssl.patch"
 	eautoreconf
 	chmod 755 ./configure
 }