diff options
author | 2007-11-10 12:47:38 +0000 | |
---|---|---|
committer | 2007-11-10 12:47:38 +0000 | |
commit | 88d619c03718373e22814d78fb5760524834864b (patch) | |
tree | 74fccd644db65c37963eafa0f9863797d6193a27 | |
parent | Stable on ppc wrt bug 198645 (diff) | |
download | historical-88d619c03718373e22814d78fb5760524834864b.tar.gz historical-88d619c03718373e22814d78fb5760524834864b.tar.bz2 historical-88d619c03718373e22814d78fb5760524834864b.zip |
Use tarball of patches.
Package-Manager: portage-2.1.3.19
-rw-r--r-- | www-apache/mod_caucho/ChangeLog | 11 | ||||
-rw-r--r-- | www-apache/mod_caucho/Manifest | 72 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/digest-mod_caucho-3.0.24 | 3 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/digest-mod_caucho-3.1.3 | 3 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.0.24-disable-sticky-sessions.patch | 30 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.0.24-gentoo.patch | 17 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.0.24-java.patch | 126 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.0.24-ssl.patch | 20 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.1.3-gentoo.patch | 17 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.1.3-java.patch | 131 | ||||
-rw-r--r-- | www-apache/mod_caucho/files/mod_caucho-3.1.3-ssl.patch | 20 | ||||
-rw-r--r-- | www-apache/mod_caucho/mod_caucho-3.0.24.ebuild | 12 | ||||
-rw-r--r-- | www-apache/mod_caucho/mod_caucho-3.1.3.ebuild | 22 |
13 files changed, 60 insertions, 424 deletions
diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog index 24bf915b5747..10648c0cb8ae 100644 --- a/www-apache/mod_caucho/ChangeLog +++ b/www-apache/mod_caucho/ChangeLog @@ -1,6 +1,15 @@ # 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.26 2007/11/10 11:21:02 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.27 2007/11/10 12:47:38 nelchael Exp $ + + 10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org> + -files/mod_caucho-3.0.24-disable-sticky-sessions.patch, + -files/mod_caucho-3.0.24-gentoo.patch, + -files/mod_caucho-3.0.24-java.patch, -files/mod_caucho-3.0.24-ssl.patch, + -files/mod_caucho-3.1.3-gentoo.patch, -files/mod_caucho-3.1.3-java.patch, + -files/mod_caucho-3.1.3-ssl.patch, mod_caucho-3.0.24.ebuild, + mod_caucho-3.1.3.ebuild: + Use tarball of patches. *mod_caucho-3.1.3 (10 Nov 2007) diff --git a/www-apache/mod_caucho/Manifest b/www-apache/mod_caucho/Manifest index 5d2e76bf19d1..9c79e6f272ec 100644 --- a/www-apache/mod_caucho/Manifest +++ b/www-apache/mod_caucho/Manifest @@ -17,53 +17,27 @@ AUX mod_caucho-3.0.22-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db MD5 c013ff79b1e3cf3cf3db58805e8e38dd files/mod_caucho-3.0.22-ssl.patch 707 RMD160 89025739f8bc910ec584c3c4d3ade5422e3db2e2 files/mod_caucho-3.0.22-ssl.patch 707 SHA256 f33096f6783a4d06e9d1ba6d77eba7bf32597a5adb1e6e2eb4617ec43f9d0d1e files/mod_caucho-3.0.22-ssl.patch 707 -AUX mod_caucho-3.0.24-disable-sticky-sessions.patch 1030 RMD160 7046a41960792b3efa622f612d211ddf6ffd705b SHA1 7faf81d727d2f3ade4d2383558818ec65bcb9667 SHA256 75e8b2ad9672e3041da1e9489d0f76b3ff789a42f6237a9e0d196ab1ecca838d -MD5 c834b541cc71fe34b9ee62d1dfa5fafd files/mod_caucho-3.0.24-disable-sticky-sessions.patch 1030 -RMD160 7046a41960792b3efa622f612d211ddf6ffd705b files/mod_caucho-3.0.24-disable-sticky-sessions.patch 1030 -SHA256 75e8b2ad9672e3041da1e9489d0f76b3ff789a42f6237a9e0d196ab1ecca838d files/mod_caucho-3.0.24-disable-sticky-sessions.patch 1030 -AUX mod_caucho-3.0.24-gentoo.patch 783 RMD160 4362f450b26e90361b16b3cd7295a78f6e859e79 SHA1 6f76e99964099ae99e25d3924cc846f2c318358a SHA256 c6412640f60bbfa5120b1b79115e4e5484d5a954b174239a8790ae3dab215435 -MD5 3f5a1c54cf61d9f4196f263067bd5966 files/mod_caucho-3.0.24-gentoo.patch 783 -RMD160 4362f450b26e90361b16b3cd7295a78f6e859e79 files/mod_caucho-3.0.24-gentoo.patch 783 -SHA256 c6412640f60bbfa5120b1b79115e4e5484d5a954b174239a8790ae3dab215435 files/mod_caucho-3.0.24-gentoo.patch 783 -AUX mod_caucho-3.0.24-java.patch 3087 RMD160 8bd1c58b70b12b1a6d30eaf3cf752a497125b4d2 SHA1 311e2dacb6c03c60714f1433ae9b13fd6e2e0d87 SHA256 2955e6ab32ab19fa25fbd0eccc371201d27b450e5521ba6ea36e2b86d79dc6be -MD5 e673d29a3c0fa2dcbe9cd3379d1a6073 files/mod_caucho-3.0.24-java.patch 3087 -RMD160 8bd1c58b70b12b1a6d30eaf3cf752a497125b4d2 files/mod_caucho-3.0.24-java.patch 3087 -SHA256 2955e6ab32ab19fa25fbd0eccc371201d27b450e5521ba6ea36e2b86d79dc6be files/mod_caucho-3.0.24-java.patch 3087 -AUX mod_caucho-3.0.24-ssl.patch 707 RMD160 30476dd9da2a56dd72bf2a7480f92d2323ab1df0 SHA1 8b0a247d41fa8e51136ffbc15b932c9d3e10958e SHA256 17e3de2a4bf95ac985297a62f791267f28817f1773bd3c9cc773144c09284ee3 -MD5 72dc4154957921f21e505a12223d6d9c files/mod_caucho-3.0.24-ssl.patch 707 -RMD160 30476dd9da2a56dd72bf2a7480f92d2323ab1df0 files/mod_caucho-3.0.24-ssl.patch 707 -SHA256 17e3de2a4bf95ac985297a62f791267f28817f1773bd3c9cc773144c09284ee3 files/mod_caucho-3.0.24-ssl.patch 707 -AUX mod_caucho-3.1.3-gentoo.patch 779 RMD160 da1c5cbaa2fe8205f39c389a602b9868ccd183f7 SHA1 c75fa342fca8ff0bb0227cfaf78d1c108ed2cf4c SHA256 07229349185774ac92d8e6c0ceb19e50432095b980a9c11f7a5d179be7cb8ff0 -MD5 63fbf2a8efb79ede6a357e730a6b7961 files/mod_caucho-3.1.3-gentoo.patch 779 -RMD160 da1c5cbaa2fe8205f39c389a602b9868ccd183f7 files/mod_caucho-3.1.3-gentoo.patch 779 -SHA256 07229349185774ac92d8e6c0ceb19e50432095b980a9c11f7a5d179be7cb8ff0 files/mod_caucho-3.1.3-gentoo.patch 779 -AUX mod_caucho-3.1.3-java.patch 3308 RMD160 ae6191db2160aab7cc2d3abcd2ea6026b174d41f SHA1 57c896eef906c91e1b775b9a3d41471253312554 SHA256 a09ce9cecebe9e77a3647d16c08475506d5c88623d6ad81058b17cd61c6745cb -MD5 5c9fbb2d6f8ee5b0c8f9994f11beb26d files/mod_caucho-3.1.3-java.patch 3308 -RMD160 ae6191db2160aab7cc2d3abcd2ea6026b174d41f files/mod_caucho-3.1.3-java.patch 3308 -SHA256 a09ce9cecebe9e77a3647d16c08475506d5c88623d6ad81058b17cd61c6745cb files/mod_caucho-3.1.3-java.patch 3308 -AUX mod_caucho-3.1.3-ssl.patch 703 RMD160 13de56d07eb59ef20e01f384cd4f8cf6d34ab46d SHA1 9d62db8233b749f7eda8faf352e6f51c42035717 SHA256 e998af4c44cc347b4056aaf3bb968d1a68c40b87d16bb002fbddcb65c4b5ae8f -MD5 6941747618d5e1f6a9f3b8903a9f0a6e files/mod_caucho-3.1.3-ssl.patch 703 -RMD160 13de56d07eb59ef20e01f384cd4f8cf6d34ab46d files/mod_caucho-3.1.3-ssl.patch 703 -SHA256 e998af4c44cc347b4056aaf3bb968d1a68c40b87d16bb002fbddcb65c4b5ae8f files/mod_caucho-3.1.3-ssl.patch 703 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a DIST resin-3.0.24-src.zip 10688883 RMD160 84aeee1482ac41d4e596c6800c7ab72c3a448d54 SHA1 76e40d628b662d1b64a8ae4772b7140b0eeaed54 SHA256 d7862e12245f5620dd198bdf10e3c5486fe6bd6262bdf0be3a7bb29280e70a1c DIST resin-3.1.3-src.zip 12366224 RMD160 573db137aca6da906f519333b27e67611d2b8a7a SHA1 3ceecbb8f480ad373ca1cf8dcec7401e1cedc577 SHA256 45825f9df5914f6f53633f5e6ce4905a4f9d788ba2b57eedba2a4bff9df78493 +DIST resin-gentoo-patches-3.0.24.tar.bz2 4788 RMD160 63f81074d7db75cc6fb30e2fe5be2413c1b46ff0 SHA1 386e94852599c24521665bdf8bb6405e1d936ab7 SHA256 9154fcb7fb51ac4367025a6f2ad72a01f525afc8373107f68e5f4ac5e05dcfe0 +DIST resin-gentoo-patches-3.1.3.tar.bz2 3516 RMD160 d71da2fc0f439d52d7023ca94cb18528d82f13dc SHA1 9cfd0514cb74ef88f659ad69a0337cab8e2a991e SHA256 49f649d93ee862461954e16b6b7cd73cb3eb8b60be152ebc821fcb222ed4fd63 EBUILD mod_caucho-3.0.22.ebuild 1232 RMD160 819c249556354c082a1803e14537f48fcc2e626f SHA1 6b659edf058704774b4e247c8fcdcfbe5d7ac0c2 SHA256 5362f6d41688ee770dd94028d908b84e91b66f4cb6cb556ec1bfaaa008c036c2 MD5 715fa2eec1930b917d746382c3a0a652 mod_caucho-3.0.22.ebuild 1232 RMD160 819c249556354c082a1803e14537f48fcc2e626f mod_caucho-3.0.22.ebuild 1232 SHA256 5362f6d41688ee770dd94028d908b84e91b66f4cb6cb556ec1bfaaa008c036c2 mod_caucho-3.0.22.ebuild 1232 -EBUILD mod_caucho-3.0.24.ebuild 1324 RMD160 68a2094e53838115bd550c4b01fd93d1eeb02639 SHA1 07f6dd95cbe78b8b4c5d8c3918e24bd0b12d96da SHA256 0bf0c92eae74c52e36e98d598dba9ddd75bb34dfc448b296693e980477266dc6 -MD5 da5abdfa37ac57467fedd4f60ded7777 mod_caucho-3.0.24.ebuild 1324 -RMD160 68a2094e53838115bd550c4b01fd93d1eeb02639 mod_caucho-3.0.24.ebuild 1324 -SHA256 0bf0c92eae74c52e36e98d598dba9ddd75bb34dfc448b296693e980477266dc6 mod_caucho-3.0.24.ebuild 1324 -EBUILD mod_caucho-3.1.3.ebuild 1288 RMD160 60daf572c671ee2dc3102f15ff70fb1bb240a119 SHA1 b2abb47aa4e045b5b0baeec00b9837e1f4d1c48d SHA256 9f3ef3c854615cf7389b4e14a617cfd0e5751758a85f4708d9bf40d125d066b8 -MD5 b1bb86fc03930950512b2b55cdbdac22 mod_caucho-3.1.3.ebuild 1288 -RMD160 60daf572c671ee2dc3102f15ff70fb1bb240a119 mod_caucho-3.1.3.ebuild 1288 -SHA256 9f3ef3c854615cf7389b4e14a617cfd0e5751758a85f4708d9bf40d125d066b8 mod_caucho-3.1.3.ebuild 1288 -MISC ChangeLog 5794 RMD160 2df87669988d58e97298bb0207e2da8e43647435 SHA1 624494baa89cb6b78af4e74779325ccd31e79b58 SHA256 24c05f2e8376f0f3374a1552bcd81c4d27262c01013adec2659383ca54d8b006 -MD5 b8dbd3ad614c3b563ff6763b7570103c ChangeLog 5794 -RMD160 2df87669988d58e97298bb0207e2da8e43647435 ChangeLog 5794 -SHA256 24c05f2e8376f0f3374a1552bcd81c4d27262c01013adec2659383ca54d8b006 ChangeLog 5794 +EBUILD mod_caucho-3.0.24.ebuild 1272 RMD160 c1868215374bf9278a46326b0b0f6eef314a042f SHA1 180c50d484e41c8ec4efafc92c6c8134827c2cdb SHA256 6309d1e03943cfc30b64c04df668d7966907ef838c1a2eda34af24061e05e29b +MD5 0840ffbc4d2112d03ec2ac11d0bcfd32 mod_caucho-3.0.24.ebuild 1272 +RMD160 c1868215374bf9278a46326b0b0f6eef314a042f mod_caucho-3.0.24.ebuild 1272 +SHA256 6309d1e03943cfc30b64c04df668d7966907ef838c1a2eda34af24061e05e29b mod_caucho-3.0.24.ebuild 1272 +EBUILD mod_caucho-3.1.3.ebuild 1301 RMD160 54af97d2d71bf1040aa4e151c7b74025ec305565 SHA1 892c29e7e73de4fe2ef18a3e6a14eff6113b2e79 SHA256 19e15dc93bc0ae769c94163b72cc89e4db19f6ce7949ae41d06f2e98ef9b0dfd +MD5 6d44b2aade5eb182ad52cc2b5223e622 mod_caucho-3.1.3.ebuild 1301 +RMD160 54af97d2d71bf1040aa4e151c7b74025ec305565 mod_caucho-3.1.3.ebuild 1301 +SHA256 19e15dc93bc0ae769c94163b72cc89e4db19f6ce7949ae41d06f2e98ef9b0dfd mod_caucho-3.1.3.ebuild 1301 +MISC ChangeLog 6214 RMD160 a946b5c5d55d09dd9d97fb2cd9a6e8fd4e733081 SHA1 487c076a0b9f4b9e55b366f94b603004c0dd6173 SHA256 8a0e423dd1528fb5271f786ae3bc2ba38381da1d5db4f38ca27d6555c006b845 +MD5 b591e0c02d1da652f625c4333fe89af3 ChangeLog 6214 +RMD160 a946b5c5d55d09dd9d97fb2cd9a6e8fd4e733081 ChangeLog 6214 +SHA256 8a0e423dd1528fb5271f786ae3bc2ba38381da1d5db4f38ca27d6555c006b845 ChangeLog 6214 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957 MD5 2beccfb509fa2c8b2489d1278d021b4e metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 metadata.xml 245 @@ -71,16 +45,16 @@ SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957 metadata MD5 1df6f758925c19f33df250705d01755e files/digest-mod_caucho-3.0.22 253 RMD160 bd3fd0cce1c7cccefb0440cd6520d7d58f3625eb files/digest-mod_caucho-3.0.22 253 SHA256 22df3f8469cc556d0c7f3e0238eb0a7bfc0ebf2f64fdf30fee739e286e1505cb files/digest-mod_caucho-3.0.22 253 -MD5 e9267b2668be4aafeb97bbdb3d97930a files/digest-mod_caucho-3.0.24 247 -RMD160 27adb862f5bc22f97bffe8099abba0203c28ed3a files/digest-mod_caucho-3.0.24 247 -SHA256 3d3943077944fee34766254183d9d3ca344c46606c081648d595799b948661ec files/digest-mod_caucho-3.0.24 247 -MD5 a8a78ace89324ba9bda96ccea165115b files/digest-mod_caucho-3.1.3 244 -RMD160 ee63e107ad02eb9aa793f6e535b8e501b9c09765 files/digest-mod_caucho-3.1.3 244 -SHA256 cd4eaac7ed898104dd107d4ee34e0d265612045dd29201c2dfb981775674ee63 files/digest-mod_caucho-3.1.3 244 +MD5 c7c462602ca5c349a59a723fa638c5d4 files/digest-mod_caucho-3.0.24 527 +RMD160 c4beef8a6695578fcadd59dd4d6e25ea70ad3855 files/digest-mod_caucho-3.0.24 527 +SHA256 a6b9a039e60fc1fed41bd34a877a66d164e3a9cfb7fc0d9aff22a5141bc41c51 files/digest-mod_caucho-3.0.24 527 +MD5 3452e171ffd7205098076d1bcf888f8e files/digest-mod_caucho-3.1.3 521 +RMD160 0f39c9014e42b6ad80acb510396ee332e044584a files/digest-mod_caucho-3.1.3 521 +SHA256 90cf2b90e8bc281d1cb1ee06bdff72ef566f58114144fa9fbb27df9bb16df39f files/digest-mod_caucho-3.1.3 521 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHNZQngo/w9rxVVVERApW/AJ4ua+O4AUjvhpkv0AeMMhF8BNESvwCfW2Vt -YrdHt+Lf45B7yHisnGTjBUA= -=TPnC +iD8DBQFHNahygo/w9rxVVVERAhP6AKC18xvqb9AKhVpc1IY0K3ySeJEgiwCglIvB +fdSxVLHvzYcoZuPRGMCQ+DM= +=sHTO -----END PGP SIGNATURE----- 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]); -+ } -+ } - } - - /** diff --git a/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild index 7aaa3ce9e69a..04d0a8a737d8 100644 --- a/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild +++ b/www-apache/mod_caucho/mod_caucho-3.0.24.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.0.24.ebuild,v 1.7 2007/11/10 11:21:02 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v 1.8 2007/11/10 12:47:38 nelchael Exp $ inherit eutils apache-module autotools @@ -8,7 +8,8 @@ KEYWORDS="~amd64 ppc ~ppc64 x86" DESCRIPTION="mod_caucho connects Resin and Apache2." HOMEPAGE="http://www.caucho.com/" -SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip" +SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip + mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" IUSE="" @@ -28,10 +29,9 @@ src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-ssl.patch" - epatch "${FILESDIR}/${P}-java.patch" - epatch "${FILESDIR}/${P}-disable-sticky-sessions.patch" + for i in "${WORKDIR}"/${PV}/mod_caucho-*; do + epatch "${i}" + done eautoreconf chmod 755 ./configure } diff --git a/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild b/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild index b047423c8afe..b6427ee6998c 100644 --- a/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild +++ b/www-apache/mod_caucho/mod_caucho-3.1.3.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.3.ebuild,v 1.1 2007/11/10 11:21:02 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.1.3.ebuild,v 1.2 2007/11/10 12:47:38 nelchael Exp $ inherit eutils apache-module autotools @@ -8,7 +8,8 @@ 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.zip" +SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip + mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" IUSE="" @@ -28,27 +29,34 @@ DEPEND="${DEPEND} app-arch/unzip" src_unpack() { + unpack ${A} + cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.patch" - epatch "${FILESDIR}/${P}-ssl.patch" - epatch "${FILESDIR}/${P}-java.patch" + for i in "${WORKDIR}"/${PV}/mod_caucho-*; do + epatch "${i}" + done + eautoreconf chmod 755 ./configure + } src_compile() { - econf --with-apxs=${APXS2} || die "econf failed" + 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: ${APACHE2_MOD_CONF}.conf not found." + || die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found." + } |