Update apache to 1.3.14. Changes from version 1.3.12 are listed below.

   The security fixes are:
     * A problem with the Rewrite module, mod_rewrite, allowed access to
       any file on the web server under certain circumstances
     * The handling of Host: headers in mass virtual hosting
       configurations, mod_vhost_alias, could allow access to any file on
       the server
     * If a cgi-bin directory is under the document root, the source to
       the scripts inside it could be sent if using mass virtual hosting

   The main new features include:
     * Support for a directory-based configuration system. If any of the
       configuration directives point to directories instead of files,
       all files in that directory (and in subdirectories) will be also
       parsed as configuration files
     * Support name-based virtual hosting without needing to specify an
       IP address in the Apache configuration file. This enables sites
       that use dynamic IP addresses to support name-based virtual
       hosting as well as allowing identical machines to share a
       configuration file, say in a load-balanced cluster
     * The SetEnvIf and BrowserMatch range of directives are now able to
       be used in .htaccess files.
     * Administrators who are nervous about their full server version
       details being public can use the new keyword 'ProductOnly' in the
       ServerTokens directive. This keyword forces the server to only
       return the string "Apache" as the server version.
     * The new digest authentication module, mod_auth_digest has had a
       number of fixes and upgrades applied

9 files changed, 90 insertions, 72 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 7b632c93667..80068b71842 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2000/09/20 05:14:12 jlam Exp $
+# $NetBSD: Makefile,v 1.52 2000/10/13 21:46:45 jlam Exp $
 #
 # The fourth number in the PKGNAME version indicates a NetBSD pkg revision
 # (to indicate changes in the shipped third party patches such as the mod_ssl
@@ -7,8 +7,8 @@
 # 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_1.3.12
-PKGNAME=		apache-1.3.12
+DISTNAME=		apache_1.3.14
+PKGNAME=		apache-1.3.14
 CATEGORIES=		www
 MASTER_SITES=		http://www.apache.org/dist/ \
 			ftp://ftp.modssl.org/source/ \
@@ -22,7 +22,7 @@ HOMEPAGE=		http://www.apache.org/
 
 CONFLICTS=		apache-*modssl-* apache6-*
 
-SSL_DISTNAME=		mod_ssl-2.6.6-1.3.12
+SSL_DISTNAME=		mod_ssl-2.7.0-1.3.14
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
 HAS_CONFIGURE=		# defined
@@ -93,14 +93,15 @@ pre-patch:
 	cd ${WRKSRC} && ${TAIL} +148 \
 		${WRKDIR}/${SSL_DISTNAME}/pkg.ssldoc/ssldoc.patch \
 		| ${PATCH} ${PATCH_ARGS}
-
-post-patch:
-	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+	${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
 post-build:
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		< ${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 
+pre-install:
+	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+
 post-install:
 .if !defined(NOPIC)
 	cd ${PREFIX}/lib/httpd; ${MV} libproxy.so mod_proxy.so
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index 32784ab260a..ee75e0eea06 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.15 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: md5,v 1.16 2000/10/13 21:46:45 jlam Exp $
 
-MD5 (apache_1.3.12.tar.gz) = de3ccff384b0d4ab94c3251cb85d49d2
-MD5 (mod_ssl-2.6.6-1.3.12.tar.gz) = 573b4d89c1f203216a55fb5c2aece009
+MD5 (apache_1.3.14.tar.gz) = 34803e3d83a0a9ed981b571657b33109
+MD5 (mod_ssl-2.7.0-1.3.14.tar.gz) = 65aae4a18dcd0e36140dbfda4584f8d7
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/files/patch-sum b/www/apache/files/patch-sum
index e7f1e659db3..179f9ab3a2a 100644
--- a/www/apache/files/patch-sum
+++ b/www/apache/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.9 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-sum,v 1.10 2000/10/13 21:46:45 jlam Exp $
 
 MD5 (patch-aa) = 0051d044e6e1c4a6cdfd793d8b69ffb6
-MD5 (patch-ab) = e14fea44aad40628c7aaad9f0cf60d82
-MD5 (patch-ac) = cba94ba78c7fe69e4016bdf7ba1902c8
+MD5 (patch-ab) = 86886e1e816bcc5527072c4027586cd3
+MD5 (patch-ac) = 7b43e8d3467d6a13480991fcaba44350
 MD5 (patch-ad) = 40f2b9c12d7ef36bbc842480af61b833
-MD5 (patch-ae) = 7e394585ccd02038ce16484fd9b0e8c9
+MD5 (patch-ae) = b76129eb2aa925e8531cbc73593191c1
 MD5 (patch-af) = 40600e577259ca9afc36f1ff2aa1a9f9
 MD5 (patch-ag) = 6c7b5fd3185385e0b5309cb707516d18
 MD5 (patch-ah) = e27e529142e5ee6fc1be0f965e5510e0
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
index baba26c38fc..7b6b423e85f 100644
--- a/www/apache/patches/patch-ab
+++ b/www/apache/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2000/10/13 21:46:45 jlam Exp $
 
---- conf/httpd.conf-dist.orig	Thu Sep  7 01:19:50 2000
+--- conf/httpd.conf-dist.orig	Fri Oct 13 15:58:57 2000
 +++ conf/httpd.conf-dist
-@@ -199,7 +199,16 @@
+@@ -199,7 +199,14 @@
  # the order below without expert advice.
  #
  # Example:
@@ -10,8 +10,6 @@ $NetBSD: patch-ab,v 1.7 2000/09/12 14:17:32 jlam Exp $
 +# LoadModule foo_module lib/httpd/mod_foo.so
 +
 +<IfDefine SSL>
-+### Uncomment the following if you wish to use SSL and you need RSAREF: ###
-+#LoadFile !librsaref.so
 +LoadFile !libcrypto.so
 +LoadFile !libssl.so
 +LoadModule ssl_module lib/httpd/mod_ssl.so
diff --git a/www/apache/patches/patch-ac b/www/apache/patches/patch-ac
index 03a4f9c92ec..f5fb2124ff4 100644
--- a/www/apache/patches/patch-ac
+++ b/www/apache/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2000/10/13 21:46:46 jlam Exp $
 
 --- htdocs/index.html.en.orig	Sat Nov 20 16:29:40 1999
 +++ htdocs/index.html.en
@@ -7,32 +7,31 @@ $NetBSD: patch-ac,v 1.3 2000/09/12 14:17:32 jlam Exp $
  
  <P>
 -The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.
--
-+The Apache <A HREF="manual/index.html">documentation</A>
-+has been included with this distribution.<BR>
++The Apache <A HREF="manual/index.html">documentation</A> has been included with this distribution.<BR>
 +If the <STRONG>mod_ssl</STRONG> SSL extension has been installed, read the
-+<A
-+ HREF="manual/mod/mod_ssl/index.html"
-+>SSL documentation</A>
-+carefully.
++<A HREF="manual/mod/mod_ssl/index.html">SSL documentation</A> carefully.
 +</P>
 +<P>
-+Information on the NetBSD multiplatform operating system can be found
-+at <A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
++Information on the NetBSD multiplatform operating system can be found at
++<A HREF="http://www.netbsd.org/">NetBSD's homepage</A> on the net.
 +</P>
+ 
  <P>
 -You are free to use the image below on an Apache-powered web server.  Thanks for using Apache!
-+The Webmaster of this site is free to use the images below on
-+an Apache/NetBSD-powered Web server.  Thanks for using
++The Webmaster of this site is free to use the images below on an
++Apache/NetBSD-powered Web server.  Thanks for using
 +<A HREF="http://www.apache.org/">Apache</A> on
 +<A HREF="http://www.netbsd.org/">NetBSD</A>!
 +</P>
  
 -<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT=""></DIV>
-+<DIV ALIGN="CENTER"><IMG SRC="apache_pb.gif" ALT="">
-+<A HREF="http://www.netbsd.org/">
-+<IMG SRC="sitedrivenby.gif" border=0 
-+ ALT="Site driven by NetBSD - NetBSD rocks!"></A>
++<DIV ALIGN="CENTER">
++ <A HREF="http://www.apache.org/">
++  <IMG SRC="apache_pb.gif" BORDER=0 ALT="Powered by Apache">
++ </A>
++ <A HREF="http://www.netbsd.org/">
++  <IMG SRC="sitedrivenby.gif" BORDER=0 ALT="Site driven by NetBSD">
++ </A>
 +</DIV>
  </BODY>
  </HTML>
diff --git a/www/apache/patches/patch-ae b/www/apache/patches/patch-ae
index eed25315c3a..2d934d81f95 100644
--- a/www/apache/patches/patch-ae
+++ b/www/apache/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2000/10/13 21:46:46 jlam Exp $
 
---- src/modules/standard/mod_include.c.orig	Wed Feb  2 15:44:03 2000
+--- src/modules/standard/mod_include.c.orig	Fri Sep 22 14:26:32 2000
 +++ src/modules/standard/mod_include.c
 @@ -92,7 +92,11 @@
  #include "http_log.h"
@@ -24,16 +24,17 @@ $NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
  {
      char *t = tag, *tag_val, c, term;
  
-@@ -470,7 +475,7 @@
+@@ -470,7 +475,8 @@
  /*
   * Do variable substitution on strings
   */
 -static void parse_string(request_rec *r, const char *in, char *out,
-+API_EXPORT(void) ap_include_parse_string(request_rec *r, const char *in, char *out,
++API_EXPORT(void)
++ap_include_parse_string(request_rec *r, const char *in, char *out,
  			size_t length, int leave_name)
  {
      char ch;
-@@ -663,7 +668,8 @@
+@@ -668,7 +674,8 @@
              parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
              if (tag[0] == 'f') {
                  /* be safe; only files in this directory or below allowed */
@@ -43,18 +44,17 @@ $NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
                      error_fmt = "unable to include file \"%s\" "
                          "in parsed file %s";
                  }
-@@ -1075,7 +1081,9 @@
+@@ -1080,7 +1087,8 @@
                          "in parsed file %s";
          }
          else {
 -            ap_getparents(tag_val);    /* get rid of any nasties */
-+            if (ap_allow_options(r) & OPT_INCNOEXEC)
-+               	ap_getparents(tag_val);    /* get rid of any nasties */
-+
++	    if (ap_allow_options(r) & OPT_INCNOEXEC)
++                ap_getparents(tag_val);    /* get rid of any nasties */
              rr = ap_sub_req_lookup_file(tag_val, r);
  
              if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
-@@ -2154,6 +2162,16 @@
+@@ -2159,6 +2167,16 @@
      }
  }
  
@@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.2 2000/09/12 14:17:32 jlam Exp $
  
  
  /* -------------------------- The main function --------------------------- */
-@@ -2278,6 +2296,13 @@
+@@ -2283,6 +2301,13 @@
              }
  #endif
              else {
diff --git a/www/apache/pkg/DEINSTALL b/www/apache/pkg/DEINSTALL
index 4b331146323..6e25e23fb05 100644
--- a/www/apache/pkg/DEINSTALL
+++ b/www/apache/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2000/09/07 04:55:30 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.3 2000/10/13 21:46:46 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -18,7 +18,7 @@ POST-DEINSTALL)
 	rmdir ${LOGDIR} 2>/dev/null || true
 	rmdir ${SERVERROOT}/ssl.prm 2>/dev/null || true
 	rmdir ${SERVERROOT}/ssl.key 2>/dev/null || true
-	rmdir ${SERVERROOT}/ssl.crs 2>/dev/null || true
+	rmdir ${SERVERROOT}/ssl.csr 2>/dev/null || true
 	rmdir ${SERVERROOT}/ssl.crt 2>/dev/null || true
 	rmdir ${SERVERROOT}/ssl.crl 2>/dev/null || true
 	rmdir ${SERVERROOT} 2>/dev/null || true
diff --git a/www/apache/pkg/INSTALL b/www/apache/pkg/INSTALL
index c2d612330f4..9ee3eaab221 100644
--- a/www/apache/pkg/INSTALL
+++ b/www/apache/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2000/09/06 06:17:56 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2000/10/13 21:46:46 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -16,7 +16,7 @@ POST-INSTALL)
 	mkdir -p ${SERVERROOT}
 	mkdir -p ${SERVERROOT}/ssl.crl
 	mkdir -p ${SERVERROOT}/ssl.crt
-	mkdir -p ${SERVERROOT}/ssl.crs
+	mkdir -p ${SERVERROOT}/ssl.csr
 	mkdir -p ${SERVERROOT}/ssl.key
 	mkdir -p ${SERVERROOT}/ssl.prm
 	mkdir -p ${LOGDIR}
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index be0bd45a7ef..a4c2dd025e9 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2000/09/20 05:14:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.17 2000/10/13 21:46:46 jlam Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -6,8 +6,8 @@ etc/httpd/httpd.conf.default
 etc/httpd/magic.default
 etc/httpd/mime.types.default
 etc/rc.d/apache
-include/httpd/alloc.h
 include/httpd/ap.h
+include/httpd/ap_alloc.h
 include/httpd/ap_compat.h
 include/httpd/ap_config.h
 include/httpd/ap_config_auto.h
@@ -35,8 +35,8 @@ include/httpd/http_request.h
 include/httpd/http_vhost.h
 include/httpd/httpd.h
 include/httpd/multithread.h
-include/httpd/os.h
 include/httpd/os-inline.c
+include/httpd/os.h
 include/httpd/rfc1413.h
 include/httpd/scoreboard.h
 include/httpd/util_date.h
@@ -44,15 +44,15 @@ include/httpd/util_md5.h
 include/httpd/util_script.h
 include/httpd/util_uri.h
 include/httpd/xml/asciitab.h
-include/httpd/xml/xmltok.h
-include/httpd/xml/xmlrole.h
-include/httpd/xml/xmlparse.h
-include/httpd/xml/xmldef.h
-include/httpd/xml/utf8tab.h
-include/httpd/xml/nametab.h
-include/httpd/xml/latin1tab.h
-include/httpd/xml/iasciitab.h
 include/httpd/xml/hashtable.h
+include/httpd/xml/iasciitab.h
+include/httpd/xml/latin1tab.h
+include/httpd/xml/nametab.h
+include/httpd/xml/utf8tab.h
+include/httpd/xml/xmldef.h
+include/httpd/xml/xmlparse.h
+include/httpd/xml/xmlrole.h
+include/httpd/xml/xmltok.h
 include/httpd/xml/xmltok_impl.h
 libexec/cgi-bin/printenv
 libexec/cgi-bin/test-cgi
@@ -71,6 +71,7 @@ sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
+share/httpd/htdocs/README.rus
 share/httpd/htdocs/apache_pb.gif
 share/httpd/htdocs/index.html.ca
 share/httpd/htdocs/index.html.cz
@@ -80,17 +81,29 @@ share/httpd/htdocs/index.html.ee
 share/httpd/htdocs/index.html.en
 share/httpd/htdocs/index.html.es
 share/httpd/htdocs/index.html.fr
+share/httpd/htdocs/index.html.he.iso8859-8
 share/httpd/htdocs/index.html.it
 share/httpd/htdocs/index.html.ja.jis
+share/httpd/htdocs/index.html.kr.iso-kr
 share/httpd/htdocs/index.html.lu
 share/httpd/htdocs/index.html.nl
+share/httpd/htdocs/index.html.no
 share/httpd/htdocs/index.html.po.iso-pl
 share/httpd/htdocs/index.html.pt
 share/httpd/htdocs/index.html.pt-br
+share/httpd/htdocs/index.html.ru.cp-1251
+share/httpd/htdocs/index.html.ru.cp866
+share/httpd/htdocs/index.html.ru.iso-ru
+share/httpd/htdocs/index.html.ru.koi8-r
+share/httpd/htdocs/index.html.ru.ucs2
+share/httpd/htdocs/index.html.ru.ucs4
+share/httpd/htdocs/index.html.ru.utf8
 share/httpd/htdocs/index.html.se
+share/httpd/htdocs/index.html.tw.Big5
 share/httpd/htdocs/manual/LICENSE
 share/httpd/htdocs/manual/bind.html
 share/httpd/htdocs/manual/cgi_path.html
+share/httpd/htdocs/manual/configuring.html
 share/httpd/htdocs/manual/content-negotiation.html
 share/httpd/htdocs/manual/custom-error.html
 share/httpd/htdocs/manual/dns-caveats.html
@@ -109,8 +122,8 @@ share/httpd/htdocs/manual/images/mod_rewrite_fig2.fig
 share/httpd/htdocs/manual/images/mod_rewrite_fig2.gif
 share/httpd/htdocs/manual/images/sub.gif
 share/httpd/htdocs/manual/index.html
-share/httpd/htdocs/manual/install.html
 share/httpd/htdocs/manual/install-tpf.html
+share/httpd/htdocs/manual/install.html
 share/httpd/htdocs/manual/invoking.html
 share/httpd/htdocs/manual/keepalive.html
 share/httpd/htdocs/manual/location.html
@@ -136,6 +149,7 @@ 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
+share/httpd/htdocs/manual/misc/tutorials.html
 share/httpd/htdocs/manual/misc/vif-info.html
 share/httpd/htdocs/manual/misc/windoz_keepalive.html
 share/httpd/htdocs/manual/mod/core.html
@@ -143,6 +157,7 @@ share/httpd/htdocs/manual/mod/directive-dict.html
 share/httpd/htdocs/manual/mod/directives.html
 share/httpd/htdocs/manual/mod/footer.html
 share/httpd/htdocs/manual/mod/header.html
+share/httpd/htdocs/manual/mod/index-bytype.html
 share/httpd/htdocs/manual/mod/index.html
 share/httpd/htdocs/manual/mod/mod_access.html
 share/httpd/htdocs/manual/mod/mod_actions.html
@@ -151,8 +166,8 @@ share/httpd/htdocs/manual/mod/mod_asis.html
 share/httpd/htdocs/manual/mod/mod_auth.html
 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_digest.html
 share/httpd/htdocs/manual/mod/mod_auth_dbm.html
+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
@@ -188,12 +203,15 @@ share/httpd/htdocs/manual/mod/mod_unique_id.html
 share/httpd/htdocs/manual/mod/mod_userdir.html
 share/httpd/htdocs/manual/mod/mod_usertrack.html
 share/httpd/htdocs/manual/mod/mod_vhost_alias.html
+share/httpd/htdocs/manual/mod/module-dict.html
+share/httpd/htdocs/manual/mpeix.html
 share/httpd/htdocs/manual/multilogs.html
 share/httpd/htdocs/manual/netware.html
 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
 share/httpd/htdocs/manual/new_features_1_3.html
+share/httpd/htdocs/manual/new_features_2_0.html
 share/httpd/htdocs/manual/process-model.html
 share/httpd/htdocs/manual/readme-tpf.html
 share/httpd/htdocs/manual/search/manual-index.cgi
@@ -217,6 +235,8 @@ share/httpd/htdocs/manual/vhosts/mass.html
 share/httpd/htdocs/manual/vhosts/name-based.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
+share/httpd/htdocs/manual/win_service.html
 share/httpd/htdocs/manual/windows.html
 share/httpd/htdocs/sitedrivenby.gif
 share/httpd/icons/README
@@ -328,16 +348,16 @@ share/httpd/icons/uu.gif
 share/httpd/icons/uuencoded.gif
 share/httpd/icons/world1.gif
 share/httpd/icons/world2.gif
-@dirrm include/httpd/xml
-@dirrm include/httpd
-@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true
-@dirrm share/httpd/htdocs/manual/images
-@dirrm share/httpd/htdocs/manual/misc
-@dirrm share/httpd/htdocs/manual/mod
-@dirrm share/httpd/htdocs/manual/search
+@dirrm share/httpd/icons/small
+@dirrm share/httpd/icons
 @dirrm share/httpd/htdocs/manual/vhosts
+@dirrm share/httpd/htdocs/manual/search
+@dirrm share/httpd/htdocs/manual/mod
+@dirrm share/httpd/htdocs/manual/misc
+@dirrm share/httpd/htdocs/manual/images
 @dirrm share/httpd/htdocs/manual
 @dirrm share/httpd/htdocs
-@dirrm share/httpd/icons/small
-@dirrm share/httpd/icons
 @dirrm share/httpd
+@dirrm include/httpd/xml
+@dirrm include/httpd
+@unexec rmdir %D/libexec/cgi-bin 2>/dev/null || true