provide /openpkg-cgi/printenv again and provide a new /apache-manual

apache/apache.base

@@ -104,6 +104,13 @@ AccessFileName          .htaccess
         Order           allow,deny
         Allow           from all
     </Directory>
+    Alias               /apache-manual @l_prefix@/share/apache/manual
+    <Directory "@l_prefix@/share/apache/manual">
+        Options         Indexes MultiViews
+        AllowOverride   None
+        Order           allow,deny
+        Allow           from all
+    </Directory>
     ScriptAlias         /openpkg-cgi "@l_prefix@/cgi"
     <Directory "@l_prefix@/cgi">
         AllowOverride   None

apache/apache.patch

@@ -1,6 +1,6 @@
 Index: build/config_vars.sh.in
 --- build/config_vars.sh.in.orig	2006-07-12 05:38:44 +0200
-+++ build/config_vars.sh.in	2007-06-22 13:49:29 +0200
++++ build/config_vars.sh.in	2007-06-22 16:45:16 +0200
 @@ -35,7 +35,7 @@
     APU_CONFIG=@APU_CONFIG@
  fi
@@ -10,9 +10,21 @@ Index: build/config_vars.sh.in
  APR_INCLUDEDIR="`${APR_CONFIG} --includedir`"
  APU_INCLUDEDIR="`${APU_CONFIG} --includedir`"
  
+Index: config.layout
+--- config.layout.orig	2004-11-21 19:50:36 +0100
++++ config.layout	2007-06-22 16:45:33 +0200
+@@ -50,7 +50,7 @@
+     iconsdir:      ${datadir}/icons
+     htdocsdir:     ${datadir}/htdocs
+     manualdir:     ${datadir}/manual
+-    cgidir:        ${datadir}/cgi-bin
++    cgidir:        ${exec_prefix}/cgi
+     includedir:    ${prefix}/include+
+     localstatedir: ${prefix}/var+
+     runtimedir:    ${localstatedir}/run
 Index: configure
 --- configure.orig	2007-01-06 07:40:00 +0100
-+++ configure	2007-06-22 13:48:25 +0200
++++ configure	2007-06-22 16:45:16 +0200
 @@ -2711,6 +2711,11 @@
     { (exit 1); exit 1; }; }
  fi
@@ -39,7 +51,7 @@ Index: configure
  reconfig.yes)
 Index: docs/conf/mime.types
 --- docs/conf/mime.types.orig	2006-01-29 23:34:37 +0100
-+++ docs/conf/mime.types	2007-06-22 13:48:25 +0200
++++ docs/conf/mime.types	2007-06-22 16:45:16 +0200
 @@ -265,6 +265,22 @@
  application/vnd.novadigm.edm
  application/vnd.novadigm.edx
@@ -65,7 +77,7 @@ Index: docs/conf/mime.types
  application/vnd.palm
 Index: server/Makefile.in
 --- server/Makefile.in.orig	2006-03-09 22:29:55 +0100
-+++ server/Makefile.in	2007-06-22 13:48:25 +0200
++++ server/Makefile.in	2007-06-22 16:45:16 +0200
 @@ -56,7 +56,8 @@
  	tmp=export_files_unsorted.txt; \
  	rm -f $$tmp && touch $$tmp; \
@@ -78,7 +90,7 @@ Index: server/Makefile.in
  	    (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
 Index: srclib/apr-util/crypto/getuuid.c
 --- srclib/apr-util/crypto/getuuid.c.orig	2006-04-14 20:01:58 +0200
-+++ srclib/apr-util/crypto/getuuid.c	2007-06-22 13:48:25 +0200
++++ srclib/apr-util/crypto/getuuid.c	2007-06-22 16:45:16 +0200
 @@ -131,7 +131,7 @@
  
      /* crap. this isn't crypto quality, but it will be Good Enough */
@@ -90,7 +102,7 @@ Index: srclib/apr-util/crypto/getuuid.c
      return rand() & 0x0FFFF;
 Index: support/apxs.in
 --- support/apxs.in.orig	2006-07-12 05:38:44 +0200
-+++ support/apxs.in	2007-06-22 13:48:25 +0200
++++ support/apxs.in	2007-06-22 16:45:16 +0200
 @@ -338,8 +338,7 @@
      exit(1);
  }

apache/apache.spec

@@ -277,6 +277,7 @@ Conflicts:    apache13
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   strip down installation
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/cgi/test-cgi
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
     ( cd $RPM_BUILD_ROOT%{l_prefix}/share/apache/manual