flush pending changes

apache2/apache2.conf

@@ -1,21 +1,49 @@
 ##
-##  apache2.conf -- Apache Custom Configuration
+##  apache.conf -- Apache Custom Configuration
 ##
 
 #   include Apache default/base configuration
-Include "@l_prefix@/etc/apache2/apache2.base"
+Include "@l_prefix@/etc/apache/apache.base"
 
 Listen          127.0.0.1:80
 NameVirtualHost 127.0.0.1:80
 
+<IfModule mod_ssl.c>
+Listen          127.0.0.1:443
+</IfModule>
+
 <VirtualHost 127.0.0.1:80>
     ServerName        @l_hostname@.@l_domainname@
     ServerAlias       localhost.@l_domainname@
     ServerAdmin       root@localhost.@l_domainname@
     ServerSignature   on
 
-    DocumentRoot @l_prefix@/share/apache2/htdocs
-    <Directory @l_prefix@/share/apache2/htdocs>
+    DocumentRoot @l_prefix@/share/apache/htdocs
+    <Directory @l_prefix@/share/apache/htdocs>
+        Options       Indexes FollowSymLinks MultiViews
+        AllowOverride none
+        Order         allow,deny
+        Allow         from all
+    </Directory>
+
+    ScriptAlias /cgi-bin @l_prefix@/cgi
+    <Directory @l_prefix@/cgi>
+        Options       Indexes FollowSymLinks MultiViews ExecCGI
+        AllowOverride None
+        Order         allow,deny
+        Allow         from all
+    </Directory>
+</VirtualHost>
+
+<IfModule mod_ssl.c>
+<VirtualHost 127.0.0.1:443>
+    ServerName        @l_hostname@.@l_domainname@
+    ServerAlias       localhost.@l_domainname@
+    ServerAdmin       root@localhost.@l_domainname@
+    ServerSignature   on
+
+    DocumentRoot @l_prefix@/share/apache/htdocs
+    <Directory @l_prefix@/share/apache/htdocs>
         Options       Indexes FollowSymLinks MultiViews
         AllowOverride none
         Order         allow,deny
@@ -29,5 +57,12 @@ NameVirtualHost 127.0.0.1:80
         Order         allow,deny
         Allow         from all
     </Directory>
+
+    SSLEngine             on
+    SSLCertificateFile    @l_prefix@/etc/apache/ssl.crt/snakeoil-rsa.crt
+    SSLCertificateKeyFile @l_prefix@/etc/apache/ssl.key/snakeoil-rsa.key
+    SSLCertificateFile    @l_prefix@/etc/apache/ssl.crt/snakeoil-dsa.crt
+    SSLCertificateKeyFile @l_prefix@/etc/apache/ssl.key/snakeoil-dsa.key
 </VirtualHost>
+</IfModule>
 

apache2/apache2.spec

@@ -33,7 +33,7 @@ Class:        PLUS
 Group:        Web
 License:      ASF
 Version:      2.2.4
-Release:      20070529
+Release:      20070530
 
 #   package options (generic)
 %option       with_mpm                  prefork
@@ -54,7 +54,6 @@ Release:      20070529
 %option       with_mod_memcache         no
 %option       with_mod_filecache        no
 %option       with_mod_expires          no
-%option       with_shared_core          no
 
 #   fixing implicit inter-module dependencies and correlations
 %if "%{with_mod_memcache}" == "yes" || "%{with_mod_diskcache}" == "yes"
@@ -213,9 +212,7 @@ Conflicts:    apache
 %if "%{with_mod_expires}" == "yes"
           --enable-expires \
 %endif
-%if "%{with_shared_core}" == "yes"
           --enable-so \
-%endif
           --enable-speling \
           --enable-rewrite \
           --enable-headers \
@@ -224,6 +221,7 @@ Conflicts:    apache
           --enable-vhost-alias \
           --enable-auth-dbm \
           --disable-shared \
+          --with-included-apr \
           --with-dbm=db42 \
           --with-berkeley-db=%{l_prefix} \
           --with-expat=%{l_prefix} \
@@ -253,11 +251,10 @@ Conflicts:    apache
       rm -fr $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/{extra,original}
     ) || exit $?
 
-%if "%{with_shared_core}" == "yes"
+    #   adjust GNU libtool configuration
     %{l_shtool} subst \
         -e 's;^build_libtool_libs=no;build_libtool_libs=yes;' \
         $RPM_BUILD_ROOT%{l_prefix}/share/apache2/build/libtool
-%endif
 
     #   install shell environment script
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
@@ -287,9 +284,8 @@ Conflicts:    apache
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   strip down installation
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr*
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libapr*
     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/apache2/manual
       find . -name "*.xml"   -print | xargs rm -f
       find . -name "*.xml.*" -print | xargs rm -f