diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2007-05-15 16:37:41 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2007-05-15 16:37:41 +0000 |
| commit | 873d869150db50a2806274716bc26d02278be617 (patch) | |
| tree | 1f3e17c130752bde4cd6f77a23bb2f3eda783a6e /www-apache/mod_caucho | |
| parent | Version bumps. (diff) | |
| download | historical-873d869150db50a2806274716bc26d02278be617.tar.gz historical-873d869150db50a2806274716bc26d02278be617.tar.bz2 historical-873d869150db50a2806274716bc26d02278be617.zip | |
Version bumps.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'www-apache/mod_caucho')
13 files changed, 288 insertions, 41 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/Manifest b/www-apache/mod_caucho/Manifest index e8e5d003faa1..17991826455e 100644 --- a/www-apache/mod_caucho/Manifest +++ b/www-apache/mod_caucho/Manifest @@ -17,32 +17,49 @@ 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.1.0-gentoo.patch 779 RMD160 2bd24d536c97b07b5366b5c450be9e0e878c1d44 SHA1 775eaa939ff0c8cf0ed4c43a1866631acf94aad4 SHA256 667c97c8fa9c34102303a7096cc271f422e83cc4fc1fd09a1630368babdd9c34 -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-java.patch 3085 RMD160 178506b5c0f363c3f9e03a2c0ff6db8a8327df19 SHA1 710f0d5b5b7ec17620d04749fa172d80e9e03b90 SHA256 4665a94cbd8b48903cd1bb332698ace19107f63fa39800d2c1b15e49dde889f0 -MD5 00ec6a7ceac63802f4c9db7d0c78b853 files/mod_caucho-3.1.0-java.patch 3085 -RMD160 178506b5c0f363c3f9e03a2c0ff6db8a8327df19 files/mod_caucho-3.1.0-java.patch 3085 -SHA256 4665a94cbd8b48903cd1bb332698ace19107f63fa39800d2c1b15e49dde889f0 files/mod_caucho-3.1.0-java.patch 3085 -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 +AUX mod_caucho-3.0.23-gentoo.patch 783 RMD160 4362f450b26e90361b16b3cd7295a78f6e859e79 SHA1 6f76e99964099ae99e25d3924cc846f2c318358a SHA256 c6412640f60bbfa5120b1b79115e4e5484d5a954b174239a8790ae3dab215435 +MD5 3f5a1c54cf61d9f4196f263067bd5966 files/mod_caucho-3.0.23-gentoo.patch 783 +RMD160 4362f450b26e90361b16b3cd7295a78f6e859e79 files/mod_caucho-3.0.23-gentoo.patch 783 +SHA256 c6412640f60bbfa5120b1b79115e4e5484d5a954b174239a8790ae3dab215435 files/mod_caucho-3.0.23-gentoo.patch 783 +AUX mod_caucho-3.0.23-java.patch 3087 RMD160 8bd1c58b70b12b1a6d30eaf3cf752a497125b4d2 SHA1 311e2dacb6c03c60714f1433ae9b13fd6e2e0d87 SHA256 2955e6ab32ab19fa25fbd0eccc371201d27b450e5521ba6ea36e2b86d79dc6be +MD5 e673d29a3c0fa2dcbe9cd3379d1a6073 files/mod_caucho-3.0.23-java.patch 3087 +RMD160 8bd1c58b70b12b1a6d30eaf3cf752a497125b4d2 files/mod_caucho-3.0.23-java.patch 3087 +SHA256 2955e6ab32ab19fa25fbd0eccc371201d27b450e5521ba6ea36e2b86d79dc6be files/mod_caucho-3.0.23-java.patch 3087 +AUX mod_caucho-3.0.23-ssl.patch 707 RMD160 30476dd9da2a56dd72bf2a7480f92d2323ab1df0 SHA1 8b0a247d41fa8e51136ffbc15b932c9d3e10958e SHA256 17e3de2a4bf95ac985297a62f791267f28817f1773bd3c9cc773144c09284ee3 +MD5 72dc4154957921f21e505a12223d6d9c files/mod_caucho-3.0.23-ssl.patch 707 +RMD160 30476dd9da2a56dd72bf2a7480f92d2323ab1df0 files/mod_caucho-3.0.23-ssl.patch 707 +SHA256 17e3de2a4bf95ac985297a62f791267f28817f1773bd3c9cc773144c09284ee3 files/mod_caucho-3.0.23-ssl.patch 707 +AUX mod_caucho-3.1.1-gentoo.patch 779 RMD160 da1c5cbaa2fe8205f39c389a602b9868ccd183f7 SHA1 c75fa342fca8ff0bb0227cfaf78d1c108ed2cf4c SHA256 07229349185774ac92d8e6c0ceb19e50432095b980a9c11f7a5d179be7cb8ff0 +MD5 63fbf2a8efb79ede6a357e730a6b7961 files/mod_caucho-3.1.1-gentoo.patch 779 +RMD160 da1c5cbaa2fe8205f39c389a602b9868ccd183f7 files/mod_caucho-3.1.1-gentoo.patch 779 +SHA256 07229349185774ac92d8e6c0ceb19e50432095b980a9c11f7a5d179be7cb8ff0 files/mod_caucho-3.1.1-gentoo.patch 779 +AUX mod_caucho-3.1.1-java.patch 3085 RMD160 4ce02117392b15a06d2240a309c52b84235755ef SHA1 4c486fc14a2c56439f382d4e94f9f0c8f1ff377f SHA256 e41f493ede7f3fcd59bf682548587c064e461be7689bfd72ccbf6cf0acab6e3d +MD5 ae1e659329ae6cdf85652b76a3b99146 files/mod_caucho-3.1.1-java.patch 3085 +RMD160 4ce02117392b15a06d2240a309c52b84235755ef files/mod_caucho-3.1.1-java.patch 3085 +SHA256 e41f493ede7f3fcd59bf682548587c064e461be7689bfd72ccbf6cf0acab6e3d files/mod_caucho-3.1.1-java.patch 3085 +AUX mod_caucho-3.1.1-ssl.patch 703 RMD160 13de56d07eb59ef20e01f384cd4f8cf6d34ab46d SHA1 9d62db8233b749f7eda8faf352e6f51c42035717 SHA256 e998af4c44cc347b4056aaf3bb968d1a68c40b87d16bb002fbddcb65c4b5ae8f +MD5 6941747618d5e1f6a9f3b8903a9f0a6e files/mod_caucho-3.1.1-ssl.patch 703 +RMD160 13de56d07eb59ef20e01f384cd4f8cf6d34ab46d files/mod_caucho-3.1.1-ssl.patch 703 +SHA256 e998af4c44cc347b4056aaf3bb968d1a68c40b87d16bb002fbddcb65c4b5ae8f files/mod_caucho-3.1.1-ssl.patch 703 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 +DIST resin-3.0.23-src.tar.gz 5470406 RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef SHA1 9b767c79c20003b76637095bed7150e784fea3ce SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d +DIST resin-3.1.1-src.tar.gz 7351646 RMD160 8b09954308408ef1312d2257bd607efb3b9dd1ce SHA1 0bd1b2fb048867fc2156898c749863ed3302512d SHA256 f37740327cda3b24c668ddcf61a28da825d258e3ba70a95073da02dafbe21424 EBUILD mod_caucho-3.0.22.ebuild 1246 RMD160 bad458fdde146b79dab8517b907584804fe6bd8e SHA1 a074174d81ccc99c55e868e6de02cbc34e70514c SHA256 36e2597015ccdd9627cb1ae1aed83bdbe718965c5d92513128d1581204f36dbd MD5 079233ffa74ed3f3c7f97ff7da53edc3 mod_caucho-3.0.22.ebuild 1246 RMD160 bad458fdde146b79dab8517b907584804fe6bd8e mod_caucho-3.0.22.ebuild 1246 SHA256 36e2597015ccdd9627cb1ae1aed83bdbe718965c5d92513128d1581204f36dbd mod_caucho-3.0.22.ebuild 1246 -EBUILD mod_caucho-3.1.0.ebuild 1269 RMD160 f2d84d1e1dac207ad30f47f68ddd33dc2f5cc24f SHA1 d389260539d40a65ecbcf4b3d48c9ee551dc4d5d SHA256 39044075938a48f2148fbf8034822d79e1ebe09669483c0acc5a2f8e8ff34b1d -MD5 96ebf6721b2a947585ff9f5cb4ad08d8 mod_caucho-3.1.0.ebuild 1269 -RMD160 f2d84d1e1dac207ad30f47f68ddd33dc2f5cc24f mod_caucho-3.1.0.ebuild 1269 -SHA256 39044075938a48f2148fbf8034822d79e1ebe09669483c0acc5a2f8e8ff34b1d mod_caucho-3.1.0.ebuild 1269 -MISC ChangeLog 2874 RMD160 1e04a8de1652f51fcbc4dd31a8ffe16880636b46 SHA1 7e0a3ee6d1c795b6c3a24c07d5584f7cc3df8140 SHA256 2041350d695bd51ddccab94f22042f1d4d706c3c59ad9169e1cd41bf120f9013 -MD5 f42298449f3044778351f9a7bd22c968 ChangeLog 2874 -RMD160 1e04a8de1652f51fcbc4dd31a8ffe16880636b46 ChangeLog 2874 -SHA256 2041350d695bd51ddccab94f22042f1d4d706c3c59ad9169e1cd41bf120f9013 ChangeLog 2874 +EBUILD mod_caucho-3.0.23.ebuild 1248 RMD160 55da78214beb9840d3c3d1e5fa245bbffcefbf25 SHA1 c5edce4c30fca806bf99b170884e82bf04f71a5b SHA256 b1a99ded7611fb5cd42e5814d71aaa1ed59101ccfa3a3c92cae68643c64d2c85 +MD5 1ca271d1f06b12f8de65ca88f5d3112c mod_caucho-3.0.23.ebuild 1248 +RMD160 55da78214beb9840d3c3d1e5fa245bbffcefbf25 mod_caucho-3.0.23.ebuild 1248 +SHA256 b1a99ded7611fb5cd42e5814d71aaa1ed59101ccfa3a3c92cae68643c64d2c85 mod_caucho-3.0.23.ebuild 1248 +EBUILD mod_caucho-3.1.1.ebuild 1269 RMD160 f83714e8601619010309a0e54382df5b5188a990 SHA1 f79dbd16cb2410f425571f88d9d29d93bf22db38 SHA256 300b8b7d89615b4cc9c7b75f1416cadf4273bd0406a0bc767ff5e691415b688f +MD5 cc16952f43ed4b52635dece6cbd4440e mod_caucho-3.1.1.ebuild 1269 +RMD160 f83714e8601619010309a0e54382df5b5188a990 mod_caucho-3.1.1.ebuild 1269 +SHA256 300b8b7d89615b4cc9c7b75f1416cadf4273bd0406a0bc767ff5e691415b688f mod_caucho-3.1.1.ebuild 1269 +MISC ChangeLog 3434 RMD160 afa95638259bd052c85ec5c5fc09749bea98e605 SHA1 06fb45b24c1a752b7c44f84f375440da38573a97 SHA256 0e7356668c237b53f9c9712a24138c120846eaec40791535cd30dfed0a7344a0 +MD5 af72b1b8227a594f0f279583e331d4ae ChangeLog 3434 +RMD160 afa95638259bd052c85ec5c5fc09749bea98e605 ChangeLog 3434 +SHA256 0e7356668c237b53f9c9712a24138c120846eaec40791535cd30dfed0a7344a0 ChangeLog 3434 MISC metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 SHA1 e75506fde1ffe1aab92c624c3299957c9819fafe SHA256 2934a1d824233ffc25ba694782ed7386f899e39e3020cc5fa82f5a0e371b1957 MD5 2beccfb509fa2c8b2489d1278d021b4e metadata.xml 245 RMD160 ab2afa1527b94d2776eb4cff88ab06b86f4da8d4 metadata.xml 245 @@ -50,13 +67,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 486b2f59227ff5e961aee6f6a7482362 files/digest-mod_caucho-3.1.0 250 -RMD160 29b90fa098e07020808bc9bb0156c404b6e012b3 files/digest-mod_caucho-3.1.0 250 -SHA256 8af0d2e1d33ccff5b8ef7c6cfc0097f92c557d9179a3c1145ea103f7c40a1171 files/digest-mod_caucho-3.1.0 250 +MD5 a4e0893dd1c60cd73ce6f28a4ccc8ae6 files/digest-mod_caucho-3.0.23 253 +RMD160 43ab80dd8eff83f564cb02b725ab6c287f7edb60 files/digest-mod_caucho-3.0.23 253 +SHA256 325bcbc92c222e3a387af37a3313ebcd4be2d8fba1f97b936e487580741db7b3 files/digest-mod_caucho-3.0.23 253 +MD5 7c0a009cc263c0f8e753ffebd4d4dd90 files/digest-mod_caucho-3.1.1 250 +RMD160 343df1f7d1981283f5e2f3b0564949bc5ab9d505 files/digest-mod_caucho-3.1.1 250 +SHA256 13233a3d52b314e7f3392c9012a48c289b7f61c2378b80257f92a19265fdc32a files/digest-mod_caucho-3.1.1 250 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGIUI+go/w9rxVVVERAjM3AJ98Tp5RuSUCZ6MgSdIzf92acLq7PACfWcWP -rELpP9RwEmGsgqbHI/LnH6I= -=dFuQ +iD8DBQFGSeIjgo/w9rxVVVERAk0JAJ4l85JukjShjRRMRa2jm3H75whI1QCgrYuq +2tlDjzM6OlLHMKxGiBruWQM= +=pyCt -----END PGP SIGNATURE----- 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 |