diff options
| -rw-r--r-- | www/apache22/Makefile | 5 | ||||
| -rw-r--r-- | www/apache22/PLIST | 13 | ||||
| -rw-r--r-- | www/apache22/distinfo | 11 | ||||
| -rw-r--r-- | www/apache22/patches/patch-docs_man_apxs.8 (renamed from www/apache22/patches/patch-af) | 10 | ||||
| -rw-r--r-- | www/apache22/patches/patch-support_envvars-std.in | 24 |
5 files changed, 20 insertions, 43 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 3f5936e50df..36d0903c25f 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.80 2012/04/22 19:08:03 spz Exp $ +# $NetBSD: Makefile,v 1.80.2.1 2012/09/27 11:06:01 tron Exp $ -DISTNAME= httpd-2.2.22 -PKGREVISION= 1 +DISTNAME= httpd-2.2.23 PKGNAME= ${DISTNAME:S/httpd/apache/} CATEGORIES= www diff --git a/www/apache22/PLIST b/www/apache22/PLIST index 75d4f406a2a..eac4bc419c3 100644 --- a/www/apache22/PLIST +++ b/www/apache22/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2012/02/01 19:53:21 tron Exp $ -${PLIST.suexec}sbin/suexec +@comment $NetBSD: PLIST,v 1.20.4.1 2012/09/27 11:06:01 tron Exp $ include/httpd/ap_compat.h include/httpd/ap_config.h include/httpd/ap_config_auto.h @@ -127,17 +126,17 @@ ${PLIST.all-shared}lib/httpd/mod_version.so ${PLIST.all-shared}lib/httpd/mod_vhost_alias.so libexec/cgi-bin/printenv libexec/cgi-bin/test-cgi -man/man1/ab.1 -man/man1/apxs.1 man/man1/dbmmanage.1 man/man1/htdbm.1 man/man1/htdigest.1 man/man1/htpasswd.1 man/man1/httxt2dbm.1 -man/man1/logresolve.1 +man/man8/ab.8 man/man8/apachectl.8 +man/man8/apxs.8 man/man8/htcacheclean.8 man/man8/httpd.8 +man/man8/logresolve.8 man/man8/rotatelogs.8 man/man8/suexec.8 sbin/ab @@ -156,6 +155,7 @@ sbin/httxt2dbm sbin/logresolve sbin/mkcert sbin/rotatelogs +${PLIST.suexec}sbin/suexec share/examples/httpd/extra/httpd-autoindex.conf share/examples/httpd/extra/httpd-dav.conf share/examples/httpd/extra/httpd-default.conf @@ -576,6 +576,7 @@ 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_rule_flow.png share/httpd/manual/images/right.gif share/httpd/manual/images/ssl_intro_fig1.gif @@ -1180,11 +1181,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/apache22/distinfo b/www/apache22/distinfo index 17882d1469c..480f98b4c56 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,19 +1,18 @@ -$NetBSD: distinfo,v 1.51 2012/04/22 19:08:03 spz Exp $ +$NetBSD: distinfo,v 1.51.2.1 2012/09/27 11:06:01 tron Exp $ -SHA1 (httpd-2.2.22.tar.bz2) = 766cd0843050a8dfb781e48b976f3ba6ebcf8696 -RMD160 (httpd-2.2.22.tar.bz2) = 237a26a7759e7e1af175900d598e25fb082a4eb9 -Size (httpd-2.2.22.tar.bz2) = 5378934 bytes +SHA1 (httpd-2.2.23.tar.bz2) = 2776145201068045d4ed83157a0e2e1c28c4c453 +RMD160 (httpd-2.2.23.tar.bz2) = 16b15876d8296a2733d4d28a8a78362d0677792d +Size (httpd-2.2.23.tar.bz2) = 5485205 bytes SHA1 (patch-aa) = e0bfdf6bc9cb034bea46a390a12a5508e363c9a7 SHA1 (patch-ab) = 365cc3b0ac2d9d68ccb94f5699fe168a1c9b0150 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13 SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913 -SHA1 (patch-af) = 580950dbf0154ba1c93f5c58eae766c7d6c0c00c SHA1 (patch-ag) = 78dcb023f524ef65928b529320932c9664ec0d01 SHA1 (patch-ai) = 4ebc3bd580a298973928eb6d13d2ce745eac0312 SHA1 (patch-al) = 56b9f5c2f6fd01fe5067f9210e328cbf674c68f1 SHA1 (patch-am) = ab4a2f7e5a1a3064e908b61157e7fd349c0b0c08 SHA1 (patch-aw) = ca53d67beeb2c2c4d9adb04d3d79e24a8c427fd4 +SHA1 (patch-docs_man_apxs.8) = 70797ea73ae6379492971bec1106a8427ae7fdaa SHA1 (patch-lock.c) = 770ca03f1cb4421879bd5baa5a7c30cc91acb6e1 SHA1 (patch-repos.c) = 0e0361b91d4b0fe6c7c55a12fdfd2e6aacc710e1 -SHA1 (patch-support_envvars-std.in) = 03e4989e104f4a1902a9135649d603f3e8d53d4c diff --git a/www/apache22/patches/patch-af b/www/apache22/patches/patch-docs_man_apxs.8 index 278ba6db864..aec1171f5a1 100644 --- a/www/apache22/patches/patch-af +++ b/www/apache22/patches/patch-docs_man_apxs.8 @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.6 2012/02/01 19:53:21 tron Exp $ +$NetBSD: patch-docs_man_apxs.8,v 1.1.2.2 2012/09/27 11:06:02 tron Exp $ -Fix markup glitch. +Fix document for pkgsrc. ---- docs/man/apxs.1.orig 2012-01-10 23:32:02.000000000 +0000 -+++ docs/man/apxs.1 2012-02-01 19:18:34.000000000 +0000 -@@ -96,7 +96,11 @@ +--- docs/man/apxs.8.orig 2012-03-21 09:33:55.000000000 +0000 ++++ docs/man/apxs.8 +@@ -96,7 +96,11 @@ This explicitly sets the module name for .TP -q diff --git a/www/apache22/patches/patch-support_envvars-std.in b/www/apache22/patches/patch-support_envvars-std.in deleted file mode 100644 index c667e60aa84..00000000000 --- a/www/apache22/patches/patch-support_envvars-std.in +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-support_envvars-std.in,v 1.1 2012/04/22 19:08:03 spz Exp $ - -http://svn.apache.org/viewvc?view=revision&revision=1296428 : - -Fix insecure handling of LD_LIBRARY_PATH that could lead to the -current working directory to be searched for DSOs - -CVE-2012-0883 - ---- support/envvars-std.in.orig 2006-07-12 03:38:44.000000000 +0000 -+++ support/envvars-std.in -@@ -18,7 +18,11 @@ - # - # This file is generated from envvars-std.in - # --@SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@" -+if test "x$@SHLIBPATH_VAR@" != "x" ; then -+ @SHLIBPATH_VAR@="@exp_libdir@:$@SHLIBPATH_VAR@" -+else -+ @SHLIBPATH_VAR@="@exp_libdir@" -+fi - export @SHLIBPATH_VAR@ - # - @OS_SPECIFIC_VARS@ |