From e888a188343f2af9968725f911d775a7de6e8832 Mon Sep 17 00:00:00 2001 From: agc Date: Fri, 11 Oct 2002 21:09:04 +0000 Subject: Pullup the following versions: ap-ssl/Makefile 1.61 ap-ssl/distinfo 1.14 apache/Makefile 1.108 apache/PLIST 1.7 apache/distinfo 1.23 to the netbsd-1-6 branch of pkgsrc. Requested by Manuel Bouyer. These patches update apache and ap-ssl for securities issues. Tested on one 1.6 and 2 1.5.3 servers with a few other modules (ap-php, ap-roaming) without problems. --- www/ap-ssl/Makefile | 9 ++++----- www/ap-ssl/distinfo | 6 +++--- www/apache/Makefile | 7 +++---- www/apache/PLIST | 43 +++++++++++++++++++++++-------------------- www/apache/distinfo | 10 +++++----- 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index c450b9623b6..94a61e4f523 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.58 2002/08/01 01:03:17 mycroft Exp $ +# $NetBSD: Makefile,v 1.58.4.1 2002/10/11 21:09:04 agc Exp $ -DISTNAME= mod_ssl-2.8.10-1.3.26 -PKGNAME= ap-ssl-2.8.10 -PKGREVISION= 1 +DISTNAME= mod_ssl-2.8.11-1.3.27 +PKGNAME= ap-ssl-2.8.11 CATEGORIES= www security MASTER_SITES= http://www.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ @@ -14,7 +13,7 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -DEPENDS+= apache-1.3.26nb4:../../www/apache +DEPENDS+= apache-1.3.27:../../www/apache USE_BUILDLINK_ONLY= YES diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index d74201615a6..d7f61080d9f 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2002/06/24 16:26:50 taca Exp $ +$NetBSD: distinfo,v 1.12.6.1 2002/10/11 21:09:04 agc Exp $ -SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e -Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes +SHA1 (mod_ssl-2.8.11-1.3.27.tar.gz) = 565bbb5b976c43890ac6d4626536c9a0acc42380 +Size (mod_ssl-2.8.11-1.3.27.tar.gz) = 753416 bytes SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15 SHA1 (patch-ab) = bd1d4eeff91f87a2b46f1ce0ad95dab8a3c23c84 diff --git a/www/apache/Makefile b/www/apache/Makefile index 965fef03d7e..eec29e7a016 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.103 2002/08/01 00:58:33 mycroft Exp $ +# $NetBSD: Makefile,v 1.103.4.1 2002/10/11 21:09:04 agc Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). DISTNAME= apache_${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} -APACHE_VERSION= 1.3.26 -PKGREVISION= 4 +APACHE_VERSION= 1.3.27 CATEGORIES= www MASTER_SITES= http://httpd.apache.org/dist/httpd/ \ http://www.apache.de/dist/httpd/ @@ -20,7 +19,7 @@ NETBSD_LOGO= sitedrivenby.gif SITES_${NETBSD_LOGO}= http://www.netbsd.org/images/logos/ DISTFILES+= ${NETBSD_LOGO} -MODSSL_VERSION= 2.8.10 +MODSSL_VERSION= 2.8.11 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-${APACHE_VERSION} MODSSL_DIST= ${MODSSL_DISTNAME}${EXTRACT_SUFX} MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} diff --git a/www/apache/PLIST b/www/apache/PLIST index b7c37dcfef4..0c5658ba341 100644 --- a/www/apache/PLIST +++ b/www/apache/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/06/20 17:12:37 taca Exp $ +@comment $NetBSD: PLIST,v 1.5.6.1 2002/10/11 21:09:05 agc Exp $ bin/checkgid bin/dbmmanage bin/htdigest @@ -135,14 +135,15 @@ share/httpd/htdocs/manual/handler.html.en share/httpd/htdocs/manual/handler.html.html share/httpd/htdocs/manual/handler.html.ja.jis share/httpd/htdocs/manual/header.html -share/httpd/htdocs/manual/howto/cgi.html.html share/httpd/htdocs/manual/howto/auth.html share/httpd/htdocs/manual/howto/cgi.html.en +share/httpd/htdocs/manual/howto/cgi.html.html share/httpd/htdocs/manual/howto/cgi.html.ja.jis -share/httpd/htdocs/manual/howto/ssi.html.html share/httpd/htdocs/manual/howto/footer.html share/httpd/htdocs/manual/howto/header.html +share/httpd/htdocs/manual/howto/htaccess.html share/httpd/htdocs/manual/howto/ssi.html.en +share/httpd/htdocs/manual/howto/ssi.html.html share/httpd/htdocs/manual/howto/ssi.html.ja.jis share/httpd/htdocs/manual/images/apache_header.gif share/httpd/htdocs/manual/images/custom_errordocs.gif @@ -173,24 +174,24 @@ share/httpd/htdocs/manual/keepalive.html.ja.jis share/httpd/htdocs/manual/location.html share/httpd/htdocs/manual/logs.html share/httpd/htdocs/manual/man-template.html -share/httpd/htdocs/manual/misc/fin_wait_2.html share/httpd/htdocs/manual/misc/API.html share/httpd/htdocs/manual/misc/FAQ.html -share/httpd/htdocs/manual/misc/known_client_problems.html +share/httpd/htdocs/manual/misc/HTTP_Features.tsv share/httpd/htdocs/manual/misc/client_block_api.html share/httpd/htdocs/manual/misc/compat_notes.html share/httpd/htdocs/manual/misc/custom_errordocs.html share/httpd/htdocs/manual/misc/descriptors.html +share/httpd/htdocs/manual/misc/fin_wait_2.html share/httpd/htdocs/manual/misc/footer.html -share/httpd/htdocs/manual/misc/HTTP_Features.tsv share/httpd/htdocs/manual/misc/header.html share/httpd/htdocs/manual/misc/howto.html share/httpd/htdocs/manual/misc/index.html -share/httpd/htdocs/manual/misc/perf-bsd44.html +share/httpd/htdocs/manual/misc/known_client_problems.html share/httpd/htdocs/manual/misc/nopgp.html -share/httpd/htdocs/manual/misc/perf-tuning.html +share/httpd/htdocs/manual/misc/perf-bsd44.html share/httpd/htdocs/manual/misc/perf-dec.html share/httpd/htdocs/manual/misc/perf-hp.html +share/httpd/htdocs/manual/misc/perf-tuning.html share/httpd/htdocs/manual/misc/perf.html share/httpd/htdocs/manual/misc/rewriteguide.html share/httpd/htdocs/manual/misc/security_tips.html @@ -209,6 +210,7 @@ share/httpd/htdocs/manual/mod/directives.html.en share/httpd/htdocs/manual/mod/directives.html.fr share/httpd/htdocs/manual/mod/directives.html.html share/httpd/htdocs/manual/mod/directives.html.ja.jis +share/httpd/htdocs/manual/mod/footer.html share/httpd/htdocs/manual/mod/header.html share/httpd/htdocs/manual/mod/index-bytype.html.en share/httpd/htdocs/manual/mod/index-bytype.html.fr @@ -224,12 +226,13 @@ share/httpd/htdocs/manual/mod/mod_access.html.ja.jis share/httpd/htdocs/manual/mod/mod_actions.html.en share/httpd/htdocs/manual/mod/mod_actions.html.html share/httpd/htdocs/manual/mod/mod_actions.html.ja.jis -share/httpd/htdocs/manual/mod/mod_alias.html +share/httpd/htdocs/manual/mod/mod_alias.html.en +share/httpd/htdocs/manual/mod/mod_alias.html.ja.jis share/httpd/htdocs/manual/mod/mod_asis.html.en share/httpd/htdocs/manual/mod/mod_asis.html.html share/httpd/htdocs/manual/mod/mod_asis.html.ja.jis -share/httpd/htdocs/manual/mod/mod_auth.html -share/httpd/htdocs/manual/mod/mod_cgi.html.en +share/httpd/htdocs/manual/mod/mod_auth.html.en +share/httpd/htdocs/manual/mod/mod_auth.html.ja.jis share/httpd/htdocs/manual/mod/mod_auth_anon.html share/httpd/htdocs/manual/mod/mod_auth_db.html share/httpd/htdocs/manual/mod/mod_auth_dbm.html @@ -237,9 +240,11 @@ share/httpd/htdocs/manual/mod/mod_auth_digest.html share/httpd/htdocs/manual/mod/mod_autoindex.html share/httpd/htdocs/manual/mod/mod_browser.html share/httpd/htdocs/manual/mod/mod_cern_meta.html +share/httpd/htdocs/manual/mod/mod_cgi.html.en share/httpd/htdocs/manual/mod/mod_cgi.html.html share/httpd/htdocs/manual/mod/mod_cgi.html.ja.jis share/httpd/htdocs/manual/mod/mod_cookies.html +share/httpd/htdocs/manual/mod/mod_define.html share/httpd/htdocs/manual/mod/mod_digest.html share/httpd/htdocs/manual/mod/mod_dir.html.en share/httpd/htdocs/manual/mod/mod_dir.html.html @@ -248,7 +253,6 @@ share/httpd/htdocs/manual/mod/mod_dld.html share/httpd/htdocs/manual/mod/mod_env.html.en share/httpd/htdocs/manual/mod/mod_env.html.html share/httpd/htdocs/manual/mod/mod_env.html.ja.jis -share/httpd/htdocs/manual/mod/footer.html share/httpd/htdocs/manual/mod/mod_example.html share/httpd/htdocs/manual/mod/mod_expires.html share/httpd/htdocs/manual/mod/mod_headers.html @@ -267,10 +271,10 @@ share/httpd/htdocs/manual/mod/mod_mime.html.html share/httpd/htdocs/manual/mod/mod_mime.html.ja.jis share/httpd/htdocs/manual/mod/mod_mime_magic.html share/httpd/htdocs/manual/mod/mod_mmap_static.html -share/httpd/htdocs/manual/mod/mod_proxy.html share/httpd/htdocs/manual/mod/mod_negotiation.html.en share/httpd/htdocs/manual/mod/mod_negotiation.html.html share/httpd/htdocs/manual/mod/mod_negotiation.html.ja.jis +share/httpd/htdocs/manual/mod/mod_proxy.html share/httpd/htdocs/manual/mod/mod_rewrite.html share/httpd/htdocs/manual/mod/mod_setenvif.html.en share/httpd/htdocs/manual/mod/mod_setenvif.html.html @@ -283,10 +287,9 @@ share/httpd/htdocs/manual/mod/mod_speling.html.html share/httpd/htdocs/manual/mod/mod_speling.html.ja.jis share/httpd/htdocs/manual/mod/mod_status.html share/httpd/htdocs/manual/mod/mod_unique_id.html.en -share/httpd/htdocs/manual/mod/mod_userdir.html.en -share/httpd/htdocs/manual/mod/mod_define.html share/httpd/htdocs/manual/mod/mod_unique_id.html.html share/httpd/htdocs/manual/mod/mod_unique_id.html.ja.jis +share/httpd/htdocs/manual/mod/mod_userdir.html.en share/httpd/htdocs/manual/mod/mod_userdir.html.html share/httpd/htdocs/manual/mod/mod_userdir.html.ja.jis share/httpd/htdocs/manual/mod/mod_usertrack.html @@ -297,7 +300,6 @@ share/httpd/htdocs/manual/mod/module-dict.html.ja.jis share/httpd/htdocs/manual/mpeix.html share/httpd/htdocs/manual/multilogs.html share/httpd/htdocs/manual/netware.html -share/httpd/htdocs/manual/search/manual-index.cgi share/httpd/htdocs/manual/new_features_1_0.html share/httpd/htdocs/manual/new_features_1_1.html share/httpd/htdocs/manual/new_features_1_2.html @@ -308,15 +310,15 @@ share/httpd/htdocs/manual/new_features_2_0.html share/httpd/htdocs/manual/process-model.html.en share/httpd/htdocs/manual/process-model.html.html share/httpd/htdocs/manual/process-model.html.ja.jis -share/httpd/htdocs/manual/programs/apxs.html share/httpd/htdocs/manual/programs/ab.html share/httpd/htdocs/manual/programs/apachectl.html.en share/httpd/htdocs/manual/programs/apachectl.html.html share/httpd/htdocs/manual/programs/apachectl.html.ja.jis +share/httpd/htdocs/manual/programs/apxs.html share/httpd/htdocs/manual/programs/dbmmanage.html -share/httpd/htdocs/manual/programs/htdigest.html share/httpd/htdocs/manual/programs/footer.html share/httpd/htdocs/manual/programs/header.html +share/httpd/htdocs/manual/programs/htdigest.html share/httpd/htdocs/manual/programs/htpasswd.html.en share/httpd/htdocs/manual/programs/htpasswd.html.html share/httpd/htdocs/manual/programs/htpasswd.html.ja.jis @@ -333,6 +335,7 @@ share/httpd/htdocs/manual/programs/suexec.html.en share/httpd/htdocs/manual/programs/suexec.html.html share/httpd/htdocs/manual/programs/suexec.html.ja.jis share/httpd/htdocs/manual/readme-tpf.html +share/httpd/htdocs/manual/search/manual-index.cgi share/httpd/htdocs/manual/sections.html.en share/httpd/htdocs/manual/sections.html.html share/httpd/htdocs/manual/sections.html.ja.jis @@ -358,10 +361,10 @@ share/httpd/htdocs/manual/vhosts/examples.html share/httpd/htdocs/manual/vhosts/fd-limits.html.en share/httpd/htdocs/manual/vhosts/fd-limits.html.html share/httpd/htdocs/manual/vhosts/fd-limits.html.ja.jis -share/httpd/htdocs/manual/vhosts/index.html.en share/httpd/htdocs/manual/vhosts/footer.html share/httpd/htdocs/manual/vhosts/header.html share/httpd/htdocs/manual/vhosts/host.html +share/httpd/htdocs/manual/vhosts/index.html.en share/httpd/htdocs/manual/vhosts/index.html.html share/httpd/htdocs/manual/vhosts/index.html.ja.jis share/httpd/htdocs/manual/vhosts/ip-based.html @@ -369,8 +372,8 @@ share/httpd/htdocs/manual/vhosts/mass.html share/httpd/htdocs/manual/vhosts/name-based.html.en share/httpd/htdocs/manual/vhosts/name-based.html.html share/httpd/htdocs/manual/vhosts/name-based.html.ja.jis -share/httpd/htdocs/manual/vhosts/virtual-host.html share/httpd/htdocs/manual/vhosts/vhosts-in-depth.html +share/httpd/htdocs/manual/vhosts/virtual-host.html share/httpd/htdocs/manual/win_compiling.html.en share/httpd/htdocs/manual/win_compiling.html.html share/httpd/htdocs/manual/win_compiling.html.ja.jis diff --git a/www/apache/distinfo b/www/apache/distinfo index d07d4a48d57..f5c349cada3 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.21 2002/06/24 16:26:19 taca Exp $ +$NetBSD: distinfo,v 1.21.6.1 2002/10/11 21:09:05 agc Exp $ -SHA1 (apache_1.3.26.tar.gz) = c8ab59541267c3e570592115b280e6cb2fb2b30f -Size (apache_1.3.26.tar.gz) = 2303147 bytes +SHA1 (apache_1.3.27.tar.gz) = 2e3a2c8acd546d84f0c4a42de2b1f69dca6828f8 +Size (apache_1.3.27.tar.gz) = 2306052 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (mod_ssl-2.8.10-1.3.26.tar.gz) = 6af4bbd91f2323c95f8d3ca1c461edc17fc1d13e -Size (mod_ssl-2.8.10-1.3.26.tar.gz) = 753241 bytes +SHA1 (mod_ssl-2.8.11-1.3.27.tar.gz) = 565bbb5b976c43890ac6d4626536c9a0acc42380 +Size (mod_ssl-2.8.11-1.3.27.tar.gz) = 753416 bytes SHA1 (patch-aa) = d188ab15483eb9e099a9398083413267570b9f9b SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd -- cgit v1.2.3