diff options
author | martti <martti> | 2003-01-28 14:21:56 +0000 |
---|---|---|
committer | martti <martti> | 2003-01-28 14:21:56 +0000 |
commit | 7e48d1cfe9e35ba78b13a231299e18cec82101a4 (patch) | |
tree | 97c4fbaf482823d114ba9c5c09116e2548f17317 | |
parent | 398a0bcd74cb60a5e4bb825e0d6f501951b4539c (diff) | |
download | pkgsrc-7e48d1cfe9e35ba78b13a231299e18cec82101a4.tar.gz |
Updated apache2 to 2.0.44 (patch provided by Eric Gillespie in pkg/20086)
* lots of bug fixes
-rw-r--r-- | www/apache2/Makefile | 4 | ||||
-rw-r--r-- | www/apache2/PLIST | 112 | ||||
-rw-r--r-- | www/apache2/distinfo | 12 | ||||
-rw-r--r-- | www/apache2/patches/patch-ag | 11 | ||||
-rw-r--r-- | www/apache2/patches/patch-an | 26 | ||||
-rw-r--r-- | www/apache2/patches/patch-ao | 30 |
6 files changed, 115 insertions, 80 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 118b33d739b..a971039f8ac 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.17 2002/12/09 20:23:42 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2003/01/28 14:21:56 martti Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} -APACHE_VERSION= 2.0.43 +APACHE_VERSION= 2.0.44 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://httpd.apache.org/dist/httpd/old/ \ diff --git a/www/apache2/PLIST b/www/apache2/PLIST index 7acca5ed64f..6077514d517 100644 --- a/www/apache2/PLIST +++ b/www/apache2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2002/10/04 02:35:51 itojun Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/01/28 14:21:56 martti Exp $ bin/apr-config bin/apu-config etc/rc.d/apache @@ -9,6 +9,7 @@ include/httpd/ap_config_layout.h include/httpd/ap_listen.h include/httpd/ap_mmn.h include/httpd/ap_mpm.h +include/httpd/ap_provider.h include/httpd/ap_regkey.h include/httpd/ap_release.h include/httpd/apr.h @@ -32,6 +33,7 @@ include/httpd/apr_hash.h include/httpd/apr_hooks.h include/httpd/apr_inherit.h include/httpd/apr_ldap.h +include/httpd/apr_ldap_url.h include/httpd/apr_lib.h include/httpd/apr_md4.h include/httpd/apr_md5.h @@ -126,9 +128,7 @@ man/man1/dbmmanage.1 man/man1/htdigest.1 man/man1/htpasswd.1 man/man8/ab.8 -man/man8/apachectl.8 man/man8/apxs.8 -man/man8/httpd.8 man/man8/logresolve.8 man/man8/rotatelogs.8 man/man8/suexec.8 @@ -443,6 +443,8 @@ share/httpd/manual/bind.xml share/httpd/manual/bind.xml.ja share/httpd/manual/cgi_path.html.en share/httpd/manual/cgi_path.html.ja.jis +share/httpd/manual/cgi_path.xml +share/httpd/manual/cgi_path.xml.ja share/httpd/manual/configuring.html.en share/httpd/manual/configuring.html.ja.jis share/httpd/manual/configuring.xml @@ -469,7 +471,9 @@ share/httpd/manual/developer/modules.html.ja.jis share/httpd/manual/developer/request.html share/httpd/manual/developer/thread_safety.html share/httpd/manual/dns-caveats.html.en +share/httpd/manual/dns-caveats.html.ja.jis share/httpd/manual/dns-caveats.xml +share/httpd/manual/dns-caveats.xml.ja share/httpd/manual/dso.html.en share/httpd/manual/dso.html.ja.jis share/httpd/manual/dso.html.ko.euc-kr @@ -478,6 +482,7 @@ share/httpd/manual/dso.xml.ja share/httpd/manual/env.html.en share/httpd/manual/env.html.ja.jis share/httpd/manual/env.xml +share/httpd/manual/env.xml.ja share/httpd/manual/faq/index.html share/httpd/manual/filter.html.en share/httpd/manual/filter.html.ja.jis @@ -496,15 +501,19 @@ share/httpd/manual/howto/auth.html.ja.jis share/httpd/manual/howto/cgi.html.en share/httpd/manual/howto/cgi.html.ja.jis share/httpd/manual/howto/cgi.xml +share/httpd/manual/howto/cgi.xml.ja share/httpd/manual/howto/footer.html share/httpd/manual/howto/header.html share/httpd/manual/howto/htaccess.html.en share/httpd/manual/howto/htaccess.xml +share/httpd/manual/howto/index.html.en +share/httpd/manual/howto/index.xml share/httpd/manual/howto/public_html.html.en share/httpd/manual/howto/public_html.xml share/httpd/manual/howto/ssi.html.en share/httpd/manual/howto/ssi.html.ja.jis share/httpd/manual/howto/ssi.xml +share/httpd/manual/howto/ssi.xml.ja share/httpd/manual/images/apache_header.gif share/httpd/manual/images/apache_header.png share/httpd/manual/images/custom_errordocs.gif @@ -529,6 +538,7 @@ share/httpd/manual/images/right.gif share/httpd/manual/images/sub.gif share/httpd/manual/images/sub.png share/httpd/manual/images/up.gif +share/httpd/manual/index.html.de share/httpd/manual/index.html.en share/httpd/manual/index.html.fr share/httpd/manual/index.html.ja.jis @@ -537,12 +547,16 @@ share/httpd/manual/install.html.de share/httpd/manual/install.html.en share/httpd/manual/install.html.ja.jis share/httpd/manual/install.html.ko.euc-kr +share/httpd/manual/install.html.ru.koi8-r share/httpd/manual/install.xml share/httpd/manual/install.xml.de share/httpd/manual/install.xml.ja +share/httpd/manual/install.xml.ru +share/httpd/manual/invoking.html.de share/httpd/manual/invoking.html.en share/httpd/manual/invoking.html.ja.jis share/httpd/manual/invoking.xml +share/httpd/manual/invoking.xml.de share/httpd/manual/invoking.xml.ja share/httpd/manual/logs.html.en share/httpd/manual/logs.html.ja.jis @@ -563,22 +577,30 @@ share/httpd/manual/misc/rewriteguide.xml share/httpd/manual/misc/security_tips.html.en share/httpd/manual/misc/security_tips.xml share/httpd/manual/misc/tutorials.html +share/httpd/manual/mod/beos.html.en +share/httpd/manual/mod/beos.xml share/httpd/manual/mod/core.html.en share/httpd/manual/mod/core.xml share/httpd/manual/mod/directive-dict.html.en share/httpd/manual/mod/directive-dict.html.ja.jis share/httpd/manual/mod/directive-dict.xml share/httpd/manual/mod/directive-dict.xml.ja +share/httpd/manual/mod/directives.html.de share/httpd/manual/mod/directives.html.en share/httpd/manual/mod/directives.html.ja.jis share/httpd/manual/mod/directives.xml +share/httpd/manual/mod/directives.xml.de share/httpd/manual/mod/directives.xml.ja share/httpd/manual/mod/footer.html share/httpd/manual/mod/header.html +share/httpd/manual/mod/index.html.de share/httpd/manual/mod/index.html.en share/httpd/manual/mod/index.html.ja.jis share/httpd/manual/mod/index.xml +share/httpd/manual/mod/index.xml.de share/httpd/manual/mod/index.xml.ja +share/httpd/manual/mod/leader.html.en +share/httpd/manual/mod/leader.xml share/httpd/manual/mod/mod_access.html.en share/httpd/manual/mod/mod_access.html.ja.jis share/httpd/manual/mod/mod_access.xml @@ -627,6 +649,8 @@ share/httpd/manual/mod/mod_dav.html.en share/httpd/manual/mod/mod_dav.html.ja.jis share/httpd/manual/mod/mod_dav.xml share/httpd/manual/mod/mod_dav.xml.ja +share/httpd/manual/mod/mod_dav_fs.html.en +share/httpd/manual/mod/mod_dav_fs.xml share/httpd/manual/mod/mod_deflate.html.en share/httpd/manual/mod/mod_deflate.html.ja.jis share/httpd/manual/mod/mod_deflate.xml @@ -658,7 +682,9 @@ share/httpd/manual/mod/mod_headers.xml share/httpd/manual/mod/mod_imap.html.en share/httpd/manual/mod/mod_imap.xml share/httpd/manual/mod/mod_include.html.en +share/httpd/manual/mod/mod_include.html.ja.jis share/httpd/manual/mod/mod_include.xml +share/httpd/manual/mod/mod_include.xml.ja share/httpd/manual/mod/mod_info.html.en share/httpd/manual/mod/mod_info.html.ja.jis share/httpd/manual/mod/mod_info.xml @@ -674,7 +700,9 @@ share/httpd/manual/mod/mod_logio.xml share/httpd/manual/mod/mod_mem_cache.html.en share/httpd/manual/mod/mod_mem_cache.xml share/httpd/manual/mod/mod_mime.html.en +share/httpd/manual/mod/mod_mime.html.ja.jis share/httpd/manual/mod/mod_mime.xml +share/httpd/manual/mod/mod_mime.xml.ja share/httpd/manual/mod/mod_mime_magic.html.en share/httpd/manual/mod/mod_mime_magic.xml share/httpd/manual/mod/mod_negotiation.html.en @@ -683,6 +711,12 @@ share/httpd/manual/mod/mod_negotiation.xml share/httpd/manual/mod/mod_negotiation.xml.ja share/httpd/manual/mod/mod_proxy.html.en share/httpd/manual/mod/mod_proxy.xml +share/httpd/manual/mod/mod_proxy_connect.html.en +share/httpd/manual/mod/mod_proxy_connect.xml +share/httpd/manual/mod/mod_proxy_ftp.html.en +share/httpd/manual/mod/mod_proxy_ftp.xml +share/httpd/manual/mod/mod_proxy_http.html.en +share/httpd/manual/mod/mod_proxy_http.xml share/httpd/manual/mod/mod_rewrite.html.en share/httpd/manual/mod/mod_rewrite.xml share/httpd/manual/mod/mod_setenvif.html.en @@ -731,15 +765,21 @@ share/httpd/manual/mod/mpm_winnt.html.en share/httpd/manual/mod/mpm_winnt.html.ja.jis share/httpd/manual/mod/mpm_winnt.xml share/httpd/manual/mod/mpm_winnt.xml.ja +share/httpd/manual/mod/mpmt_os2.html.en +share/httpd/manual/mod/mpmt_os2.xml share/httpd/manual/mod/perchild.html.en share/httpd/manual/mod/perchild.xml share/httpd/manual/mod/prefork.html.en share/httpd/manual/mod/prefork.html.ja.jis share/httpd/manual/mod/prefork.xml share/httpd/manual/mod/prefork.xml.ja +share/httpd/manual/mod/quickreference.html.de share/httpd/manual/mod/quickreference.html.en share/httpd/manual/mod/quickreference.html.ja.jis share/httpd/manual/mod/quickreference.xml +share/httpd/manual/mod/quickreference.xml.de +share/httpd/manual/mod/threadpool.html.en +share/httpd/manual/mod/threadpool.xml share/httpd/manual/mod/quickreference.xml.ja share/httpd/manual/mod/worker.html.en share/httpd/manual/mod/worker.html.ja.jis @@ -755,9 +795,11 @@ share/httpd/manual/new_features_2_0.html.en share/httpd/manual/new_features_2_0.html.fr share/httpd/manual/new_features_2_0.html.ja.jis share/httpd/manual/new_features_2_0.html.ko.euc-kr +share/httpd/manual/new_features_2_0.html.ru.koi8-r share/httpd/manual/new_features_2_0.xml share/httpd/manual/new_features_2_0.xml.de share/httpd/manual/new_features_2_0.xml.ja +share/httpd/manual/new_features_2_0.xml.ru share/httpd/manual/platform/ebcdic.html.en share/httpd/manual/platform/ebcdic.xml share/httpd/manual/platform/footer.html @@ -770,20 +812,21 @@ share/httpd/manual/platform/perf-hp.html.en share/httpd/manual/platform/perf-hp.xml share/httpd/manual/platform/win_compiling.html.en share/httpd/manual/platform/win_compiling.xml -share/httpd/manual/platform/win_service.html.en -share/httpd/manual/platform/win_service.xml share/httpd/manual/platform/windows.html.en share/httpd/manual/platform/windows.xml share/httpd/manual/programs/ab.html -share/httpd/manual/programs/apachectl.html +share/httpd/manual/programs/apachectl.html.en +share/httpd/manual/programs/apachectl.xml share/httpd/manual/programs/apxs.html share/httpd/manual/programs/dbmmanage.html share/httpd/manual/programs/footer.html share/httpd/manual/programs/header.html share/httpd/manual/programs/htdigest.html share/httpd/manual/programs/htpasswd.html -share/httpd/manual/programs/httpd.html -share/httpd/manual/programs/index.html +share/httpd/manual/programs/httpd.html.en +share/httpd/manual/programs/httpd.xml +share/httpd/manual/programs/index.html.en +share/httpd/manual/programs/index.xml share/httpd/manual/programs/logresolve.html share/httpd/manual/programs/other.html share/httpd/manual/programs/rotatelogs.html @@ -796,15 +839,18 @@ share/httpd/manual/server-wide.html.en share/httpd/manual/server-wide.html.ja.jis share/httpd/manual/server-wide.xml share/httpd/manual/server-wide.xml.ja +share/httpd/manual/sitemap.html.de share/httpd/manual/sitemap.html.en share/httpd/manual/sitemap.html.ja.jis share/httpd/manual/sitemap.xml +share/httpd/manual/sitemap.xml.de share/httpd/manual/sitemap.xml.ja share/httpd/manual/ssl/footer.html share/httpd/manual/ssl/header.html share/httpd/manual/ssl/index.html.en share/httpd/manual/ssl/index.html.ja.jis share/httpd/manual/ssl/index.xml +share/httpd/manual/ssl/index.xml.ja share/httpd/manual/ssl/ssl_compat.html.en share/httpd/manual/ssl/ssl_compat.xml share/httpd/manual/ssl/ssl_cover_logo.jpg @@ -821,36 +867,15 @@ share/httpd/manual/ssl/ssl_intro_fig3.gif share/httpd/manual/ssl/ssl_overview_fig1.gif share/httpd/manual/ssl/ssl_template.imgdot-1x1-000000.gif share/httpd/manual/ssl/ssl_template.imgdot-1x1-transp.gif +share/httpd/manual/stopping.html.de share/httpd/manual/stopping.html.en share/httpd/manual/stopping.html.ja.jis share/httpd/manual/stopping.xml +share/httpd/manual/stopping.xml.de share/httpd/manual/stopping.xml.ja share/httpd/manual/style/common.dtd -share/httpd/manual/style/css/manual-loose-100pc-b.css share/httpd/manual/style/css/manual-loose-100pc.css -share/httpd/manual/style/css/manual-loose-90pc-b.css -share/httpd/manual/style/css/manual-loose-90pc.css -share/httpd/manual/style/css/manual-loose-fix13-b.css -share/httpd/manual/style/css/manual-loose-fix13.css -share/httpd/manual/style/css/manual-loose-fix15-b.css -share/httpd/manual/style/css/manual-loose-fix15.css share/httpd/manual/style/css/manual-print.css -share/httpd/manual/style/css/manual-sbar-left-100pc-b.css -share/httpd/manual/style/css/manual-sbar-left-100pc.css -share/httpd/manual/style/css/manual-sbar-left-90pc-b.css -share/httpd/manual/style/css/manual-sbar-left-90pc.css -share/httpd/manual/style/css/manual-sbar-left-fix13-b.css -share/httpd/manual/style/css/manual-sbar-left-fix13.css -share/httpd/manual/style/css/manual-sbar-left-fix15-b.css -share/httpd/manual/style/css/manual-sbar-left-fix15.css -share/httpd/manual/style/css/manual-sbar-right-100pc-b.css -share/httpd/manual/style/css/manual-sbar-right-100pc.css -share/httpd/manual/style/css/manual-sbar-right-90pc-b.css -share/httpd/manual/style/css/manual-sbar-right-90pc.css -share/httpd/manual/style/css/manual-sbar-right-fix13-b.css -share/httpd/manual/style/css/manual-sbar-right-fix13.css -share/httpd/manual/style/css/manual-sbar-right-fix15-b.css -share/httpd/manual/style/css/manual-sbar-right-fix15.css share/httpd/manual/style/css/manual.css share/httpd/manual/style/lang/de.xml share/httpd/manual/style/lang/en.xml @@ -866,6 +891,11 @@ share/httpd/manual/style/manual.sv.xsl share/httpd/manual/style/manualpage.dtd share/httpd/manual/style/modulesynopsis.dtd share/httpd/manual/style/sitemap.dtd +share/httpd/manual/style/w3c/xhtml-lat1.ent +share/httpd/manual/style/w3c/xhtml-special.ent +share/httpd/manual/style/w3c/xhtml-symbol.ent +share/httpd/manual/style/w3c/xhtml1-strict.dtd +share/httpd/manual/style/w3c/xhtml1-transitional.dtd share/httpd/manual/style/xsl/common.xsl share/httpd/manual/style/xsl/directiveindex.xsl share/httpd/manual/style/xsl/manualpage.xsl @@ -882,25 +912,36 @@ share/httpd/manual/upgrading.html.en share/httpd/manual/upgrading.html.fr share/httpd/manual/upgrading.html.ja.jis share/httpd/manual/upgrading.html.ko.euc-kr +share/httpd/manual/upgrading.html.ru.koi8-r share/httpd/manual/upgrading.xml share/httpd/manual/upgrading.xml.de share/httpd/manual/upgrading.xml.ja +share/httpd/manual/upgrading.xml.ru share/httpd/manual/urlmapping.html.en share/httpd/manual/urlmapping.html.ja.jis share/httpd/manual/urlmapping.xml share/httpd/manual/urlmapping.xml.ja -share/httpd/manual/vhosts/details.html -share/httpd/manual/vhosts/examples.html +share/httpd/manual/vhosts/details.html.en +share/httpd/manual/vhosts/details.xml +share/httpd/manual/vhosts/examples.html.en +share/httpd/manual/vhosts/examples.xml share/httpd/manual/vhosts/fd-limits.html.en share/httpd/manual/vhosts/fd-limits.html.ja.jis +share/httpd/manual/vhosts/fd-limits.xml +share/httpd/manual/vhosts/fd-limits.xml.ja share/httpd/manual/vhosts/footer.html share/httpd/manual/vhosts/header.html share/httpd/manual/vhosts/index.html.en share/httpd/manual/vhosts/index.html.ja.jis -share/httpd/manual/vhosts/ip-based.html -share/httpd/manual/vhosts/mass.html +share/httpd/manual/vhosts/index.xml +share/httpd/manual/vhosts/index.xml.ja +share/httpd/manual/vhosts/ip-based.html.en +share/httpd/manual/vhosts/ip-based.xml +share/httpd/manual/vhosts/mass.html.en +share/httpd/manual/vhosts/mass.xml share/httpd/manual/vhosts/name-based.html.en share/httpd/manual/vhosts/name-based.html.ja.jis +share/httpd/manual/vhosts/name-based.xml @dirrm share/httpd/manual/developer @dirrm share/httpd/manual/faq @dirrm share/httpd/manual/howto @@ -912,6 +953,7 @@ share/httpd/manual/vhosts/name-based.html.ja.jis @dirrm share/httpd/manual/search @dirrm share/httpd/manual/ssl @dirrm share/httpd/manual/style/xsl +@dirrm share/httpd/manual/style/w3c @dirrm share/httpd/manual/style/lang @dirrm share/httpd/manual/style/css @dirrm share/httpd/manual/style diff --git a/www/apache2/distinfo b/www/apache2/distinfo index 3303be0452e..3d30fc4e433 100644 --- a/www/apache2/distinfo +++ b/www/apache2/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.12 2002/10/04 02:35:52 itojun Exp $ +$NetBSD: distinfo,v 1.13 2003/01/28 14:21:57 martti Exp $ -SHA1 (httpd-2.0.43.tar.gz) = 92f1feac1232919f5c6eaac5de0cc7d7eb44e237 -Size (httpd-2.0.43.tar.gz) = 4835188 bytes +SHA1 (httpd-2.0.44.tar.gz) = 606a8a371c753e0bc452dacf7512e3e117818e78 +Size (httpd-2.0.44.tar.gz) = 5505246 bytes SHA1 (patch-aa) = 9d74b4ddeab96761f1bb3a7d39a5ab9001e3ea84 SHA1 (patch-ad) = e4a0c729ce5fbf43855ea080946052ef025334f1 -SHA1 (patch-ag) = 3d68e475caef0555097a9756533034686e81d474 +SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 SHA1 (patch-ah) = f655dbabb32884a20e77f4791fa762e6c0e6cf74 SHA1 (patch-ak) = f11a86b1235d5c595fa381bbb474db4fe8448215 SHA1 (patch-al) = 29cc52616c50b7ec998339cca386112a8f1611cc SHA1 (patch-am) = ff60a7b69ad949363ebec194141e9b95cb796426 -SHA1 (patch-an) = c596758ee0c9327be8d748c95921903dba4dc971 -SHA1 (patch-ao) = 8e26a8d43f578071e4ec1b2c2f442e9753667f02 +SHA1 (patch-an) = 6b8aff418e1c3af3be7e280cc373c9555c6f8005 +SHA1 (patch-ao) = 30fa298dc4ae6c6f48276034d07667b909829abf diff --git a/www/apache2/patches/patch-ag b/www/apache2/patches/patch-ag index 17311fc94cf..f4abb2f6a89 100644 --- a/www/apache2/patches/patch-ag +++ b/www/apache2/patches/patch-ag @@ -1,15 +1,16 @@ -$NetBSD: patch-ag,v 1.6 2002/08/25 21:51:56 jlam Exp $ +$NetBSD: patch-ag,v 1.7 2003/01/28 14:21:58 martti Exp $ ---- support/Makefile.in.orig Sat Jun 15 13:41:52 2002 -+++ support/Makefile.in Wed Jun 19 07:39:51 2002 -@@ -22,8 +22,10 @@ +--- support/Makefile.in.orig 2002-08-29 22:25:40.000000000 +0300 ++++ support/Makefile.in 2003-01-28 16:09:07.000000000 +0200 +@@ -24,9 +24,11 @@ done @if test -f "$(builddir)/envvars-std"; then \ cp -p envvars-std $(DESTDIR)$(sbindir); \ + if false; then \ if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ -+ fi ; \ fi ; \ ++ fi ; \ fi + htpasswd_OBJECTS = htpasswd.lo diff --git a/www/apache2/patches/patch-an b/www/apache2/patches/patch-an index 264c3633679..2b9ac6c753e 100644 --- a/www/apache2/patches/patch-an +++ b/www/apache2/patches/patch-an @@ -1,15 +1,13 @@ -$NetBSD: patch-an,v 1.4 2002/08/29 14:12:29 martti Exp $ +$NetBSD: patch-an,v 1.5 2003/01/28 14:21:58 martti Exp $ ---- srclib/apr/configure.in.orig Mon Aug 5 11:28:24 2002 -+++ srclib/apr/configure.in Mon Aug 12 15:02:37 2002 -@@ -1590,8 +1590,8 @@ - fi - elif test "$apr_devrandom" != "no"; then - if test -r "$apr_devrandom"; then -- AC_DEFINE(DEV_RANDOM, [$apr_devrandom]) -- AC_MSG_RESULT($apr_devrandom) -+ AC_DEFINE(DEV_RANDOM, [/dev/urandom]) -+ AC_MSG_RESULT([/dev/urandom]) - rand="1" - else - AC_ERROR([$apr_devrandom not found or unreadable.]) +--- srclib/apr/configure.in.orig 2003-01-06 21:04:08.000000000 +0200 ++++ srclib/apr/configure.in 2003-01-28 16:11:24.000000000 +0200 +@@ -1635,7 +1635,7 @@ + if test "$apr_devrandom" = "yes"; then + # /dev/random on OpenBSD doesn't provide random data, so + # prefer /dev/arandom, which does; see random(4). +- for f in /dev/arandom /dev/random /dev/urandom; do ++ for f in /dev/arandom /dev/urandom /dev/random; do + if test -r $f; then + apr_devrandom=$f + rand=1 diff --git a/www/apache2/patches/patch-ao b/www/apache2/patches/patch-ao index 9db1c6a53e0..827a75af3a6 100644 --- a/www/apache2/patches/patch-ao +++ b/www/apache2/patches/patch-ao @@ -1,19 +1,13 @@ -$NetBSD: patch-ao,v 1.4 2002/08/29 14:12:29 martti Exp $ +$NetBSD: patch-ao,v 1.5 2003/01/28 14:21:59 martti Exp $ ---- srclib/apr/configure.orig Fri Aug 9 19:47:46 2002 -+++ srclib/apr/configure Mon Aug 12 15:02:57 2002 -@@ -25353,11 +25353,11 @@ - elif test "$apr_devrandom" != "no"; then - if test -r "$apr_devrandom"; then - cat >>confdefs.h <<\_ACEOF --#define DEV_RANDOM $apr_devrandom -+#define DEV_RANDOM /dev/urandom - _ACEOF - -- echo "$as_me:$LINENO: result: $apr_devrandom" >&5 --echo "${ECHO_T}$apr_devrandom" >&6 -+ echo "$as_me:$LINENO: result: /dev/urandom" >&5 -+echo "${ECHO_T}/dev/urandom" >&6 - rand="1" - else - { { echo "$as_me:$LINENO: error: $apr_devrandom not found or unreadable." >&5 +--- srclib/apr/configure.orig 2003-01-18 17:20:31.000000000 +0200 ++++ srclib/apr/configure 2003-01-28 16:13:11.000000000 +0200 +@@ -24713,7 +24713,7 @@ + if test "$apr_devrandom" = "yes"; then + # /dev/random on OpenBSD doesn't provide random data, so + # prefer /dev/arandom, which does; see random(4). +- for f in /dev/arandom /dev/random /dev/urandom; do ++ for f in /dev/arandom /dev/urandom /dev/random; do + if test -r $f; then + apr_devrandom=$f + rand=1 |