diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache24/MESSAGE | 11 | ||||
| -rw-r--r-- | www/apache24/Makefile | 5 | ||||
| -rw-r--r-- | www/apache24/PLIST | 31 | ||||
| -rw-r--r-- | www/apache24/distinfo | 8 | ||||
| -rw-r--r-- | www/apache24/options.mk | 29 |
5 files changed, 54 insertions, 30 deletions
diff --git a/www/apache24/MESSAGE b/www/apache24/MESSAGE new file mode 100644 index 00000000000..de839c10fb7 --- /dev/null +++ b/www/apache24/MESSAGE @@ -0,0 +1,11 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2012/08/26 12:37:34 ryoon Exp $ + +After apache-2.4.3, --enable-mpms-shared='event prefork worker' is +passed to configure script, then three multi-process model is built +and you can select the model in configuraton file. + +The mod_cgi.so module conflicts with non-prefork multi-process model, +and mod_cgi.so module is not built anymore. +You can use mod_cgid.so module instead. +=========================================================================== diff --git a/www/apache24/Makefile b/www/apache24/Makefile index ab740fd29a6..fbcd2390d75 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2012/07/11 19:09:18 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2012/08/26 12:37:34 ryoon Exp $ -DISTNAME= httpd-2.4.2 +DISTNAME= httpd-2.4.3 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ http://archive.apache.org/dist/httpd/ \ diff --git a/www/apache24/PLIST b/www/apache24/PLIST index d928bb39945..43b76389435 100644 --- a/www/apache24/PLIST +++ b/www/apache24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2012/08/20 14:14:16 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.8 2012/08/26 12:37:34 ryoon Exp $ bin/ab bin/apxs bin/dbmmanage @@ -94,8 +94,7 @@ lib/httpd/mod_autoindex.so lib/httpd/mod_buffer.so lib/httpd/mod_cache.so lib/httpd/mod_cache_disk.so -${PLIST.prefork}lib/httpd/mod_cgi.so -${PLIST.worker}lib/httpd/mod_cgid.so +lib/httpd/mod_cgid.so lib/httpd/mod_charset_lite.so lib/httpd/mod_data.so lib/httpd/mod_dav.so @@ -129,9 +128,9 @@ lib/httpd/mod_logio.so ${PLIST.lua}lib/httpd/mod_lua.so lib/httpd/mod_mime.so lib/httpd/mod_mime_magic.so -${PLIST.mpm-shared}lib/httpd/mod_mpm_event.so -${PLIST.mpm-shared}lib/httpd/mod_mpm_prefork.so -${PLIST.mpm-shared}lib/httpd/mod_mpm_worker.so +lib/httpd/mod_mpm_event.so +lib/httpd/mod_mpm_prefork.so +lib/httpd/mod_mpm_worker.so lib/httpd/mod_negotiation.so lib/httpd/mod_proxy.so lib/httpd/mod_proxy_ajp.so @@ -176,13 +175,13 @@ libexec/cgi-bin/test-cgi man/man1/ab.1 man/man1/apxs.1 man/man1/dbmmanage.1 -man/man8/fcgistarter.8 man/man1/htdbm.1 man/man1/htdigest.1 man/man1/htpasswd.1 man/man1/httxt2dbm.1 man/man1/logresolve.1 man/man8/apachectl.8 +man/man8/fcgistarter.8 man/man8/htcacheclean.8 man/man8/httpd.8 man/man8/rotatelogs.8 @@ -533,6 +532,8 @@ share/httpd/manual/developer/hooks.html.en share/httpd/manual/developer/index.html share/httpd/manual/developer/index.html.en share/httpd/manual/developer/index.html.zh-cn +share/httpd/manual/developer/modguide.html +share/httpd/manual/developer/modguide.html.en share/httpd/manual/developer/modules.html share/httpd/manual/developer/modules.html.en share/httpd/manual/developer/modules.html.ja.utf8 @@ -629,6 +630,9 @@ share/httpd/manual/howto/ssi.html.fr share/httpd/manual/howto/ssi.html.ja.utf8 share/httpd/manual/howto/ssi.html.ko.euc-kr share/httpd/manual/images/apache_header.gif +share/httpd/manual/images/build_a_mod_2.png +share/httpd/manual/images/build_a_mod_3.png +share/httpd/manual/images/build_a_mod_4.png share/httpd/manual/images/caching_fig1.gif share/httpd/manual/images/caching_fig1.png share/httpd/manual/images/caching_fig1.tr.png @@ -651,6 +655,8 @@ share/httpd/manual/images/mod_rewrite_fig1.png share/httpd/manual/images/mod_rewrite_fig2.gif share/httpd/manual/images/mod_rewrite_fig2.png share/httpd/manual/images/pixel.gif +share/httpd/manual/images/rewrite_backreferences.png +share/httpd/manual/images/rewrite_process_uri.png share/httpd/manual/images/rewrite_rule_flow.png share/httpd/manual/images/right.gif share/httpd/manual/images/ssl_intro_fig1.gif @@ -895,6 +901,7 @@ share/httpd/manual/mod/mod_dir.html.ko.euc-kr share/httpd/manual/mod/mod_dir.html.tr.utf8 share/httpd/manual/mod/mod_dumpio.html share/httpd/manual/mod/mod_dumpio.html.en +share/httpd/manual/mod/mod_dumpio.html.fr share/httpd/manual/mod/mod_dumpio.html.ja.utf8 share/httpd/manual/mod/mod_echo.html share/httpd/manual/mod/mod_echo.html.en @@ -972,6 +979,7 @@ share/httpd/manual/mod/mod_log_debug.html share/httpd/manual/mod/mod_log_debug.html.en share/httpd/manual/mod/mod_log_forensic.html share/httpd/manual/mod/mod_log_forensic.html.en +share/httpd/manual/mod/mod_log_forensic.html.fr share/httpd/manual/mod/mod_log_forensic.html.ja.utf8 share/httpd/manual/mod/mod_log_forensic.html.tr.utf8 share/httpd/manual/mod/mod_logio.html @@ -1012,12 +1020,14 @@ share/httpd/manual/mod/mod_proxy_express.html share/httpd/manual/mod/mod_proxy_express.html.en share/httpd/manual/mod/mod_proxy_fcgi.html share/httpd/manual/mod/mod_proxy_fcgi.html.en +share/httpd/manual/mod/mod_proxy_fcgi.html.fr share/httpd/manual/mod/mod_proxy_fdpass.html share/httpd/manual/mod/mod_proxy_fdpass.html.en share/httpd/manual/mod/mod_proxy_ftp.html share/httpd/manual/mod/mod_proxy_ftp.html.en share/httpd/manual/mod/mod_proxy_html.html share/httpd/manual/mod/mod_proxy_html.html.en +share/httpd/manual/mod/mod_proxy_html.html.fr share/httpd/manual/mod/mod_proxy_http.html share/httpd/manual/mod/mod_proxy_http.html.en share/httpd/manual/mod/mod_proxy_http.html.fr @@ -1043,6 +1053,7 @@ share/httpd/manual/mod/mod_sed.html.en share/httpd/manual/mod/mod_sed.html.fr share/httpd/manual/mod/mod_session.html share/httpd/manual/mod/mod_session.html.en +share/httpd/manual/mod/mod_session.html.fr share/httpd/manual/mod/mod_session_cookie.html share/httpd/manual/mod/mod_session_cookie.html.en share/httpd/manual/mod/mod_session_crypto.html @@ -1254,6 +1265,8 @@ share/httpd/manual/programs/index.html.es share/httpd/manual/programs/index.html.ko.euc-kr share/httpd/manual/programs/index.html.tr.utf8 share/httpd/manual/programs/index.html.zh-cn +share/httpd/manual/programs/log_server_status.html +share/httpd/manual/programs/log_server_status.html.en share/httpd/manual/programs/logresolve.html share/httpd/manual/programs/logresolve.html.en share/httpd/manual/programs/logresolve.html.ko.euc-kr @@ -1266,6 +1279,8 @@ share/httpd/manual/programs/rotatelogs.html share/httpd/manual/programs/rotatelogs.html.en share/httpd/manual/programs/rotatelogs.html.ko.euc-kr share/httpd/manual/programs/rotatelogs.html.tr.utf8 +share/httpd/manual/programs/split-logfile.html +share/httpd/manual/programs/split-logfile.html.en share/httpd/manual/programs/suexec.html share/httpd/manual/programs/suexec.html.en share/httpd/manual/programs/suexec.html.ko.euc-kr @@ -1364,11 +1379,13 @@ share/httpd/manual/style/css/manual-print.css share/httpd/manual/style/css/manual-zip-100pc.css share/httpd/manual/style/css/manual-zip.css share/httpd/manual/style/css/manual.css +share/httpd/manual/style/css/prettify.css share/httpd/manual/style/faq.dtd share/httpd/manual/style/lang.dtd share/httpd/manual/style/latex/atbeginend.sty share/httpd/manual/style/manualpage.dtd share/httpd/manual/style/modulesynopsis.dtd +share/httpd/manual/style/scripts/prettify.js share/httpd/manual/style/sitemap.dtd share/httpd/manual/style/version.ent share/httpd/manual/suexec.html diff --git a/www/apache24/distinfo b/www/apache24/distinfo index faf330eec84..9b8a698f422 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2012/07/05 13:11:24 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2012/08/26 12:37:34 ryoon Exp $ -SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 -RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b -Size (httpd-2.4.2.tar.bz2) = 4132105 bytes +SHA1 (httpd-2.4.3.tar.bz2) = 0ef1281bb758add937efe61c345287be2f27f662 +RMD160 (httpd-2.4.3.tar.bz2) = 56f18ab27b3a8f27207144fa6d51fd6cdfff473e +Size (httpd-2.4.3.tar.bz2) = 4559279 bytes SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839 SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d diff --git a/www/apache24/options.mk b/www/apache24/options.mk index 6de5ca76f5f..dfb4653f954 100644 --- a/www/apache24/options.mk +++ b/www/apache24/options.mk @@ -1,9 +1,7 @@ -# $NetBSD: options.mk,v 1.5 2012/08/20 14:14:16 fhajny Exp $ +# $NetBSD: options.mk,v 1.6 2012/08/26 12:37:34 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache -PKG_OPTIONS_REQUIRED_GROUPS= mpm -PKG_OPTIONS_GROUP.mpm= apache-mpm-event apache-mpm-prefork apache-mpm-worker -PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-shared +PKG_SUPPORTED_OPTIONS= lua suexec apache-mpm-event apache-mpm-prefork apache-mpm-worker PKG_SUGGESTED_OPTIONS= apache-mpm-prefork .include "../../mk/bsd.options.mk" @@ -18,24 +16,23 @@ PKG_SUGGESTED_OPTIONS= apache-mpm-prefork # prefork non-threaded, pre-forking web server # worker hybrid multi-threaded multi-process web server # -PLIST_VARS+= worker prefork mpm-shared +PLIST_VARS+= worker prefork event + +CONFIGURE_ARGS+= --enable-mpms-shared='event prefork worker' + .if !empty(PKG_OPTIONS:Mapache-mpm-event) CONFIGURE_ARGS+= --with-mpm=event -PLIST.worker= yes -.elif !empty(PKG_OPTIONS:Mapache-mpm-worker) +PLIST.event= yes +.endif + +.if !empty(PKG_OPTIONS:Mapache-mpm-worker) CONFIGURE_ARGS+= --with-mpm=worker PLIST.worker= yes -.else -CONFIGURE_ARGS+= --with-mpm=prefork -. if empty(PKG_OPTIONS:Mapache-mpm-shared) -PLIST.prefork= yes -. endif .endif -.if !empty(PKG_OPTIONS:Mapache-mpm-shared) -CONFIGURE_ARGS+= --enable-mpms-shared='prefork worker event' -PLIST.mpm-shared= yes -PLIST.worker= yes +.if !empty(PKG_OPTIONS:Mapache-mpm-prefork) +CONFIGURE_ARGS+= --with-mpm=prefork +PLIST.prefork= yes .endif BUILD_DEFS+= APACHE_MODULES |