apache2

- update to 2.2.23
- add R(pre): www-common, BR: www-common
- move apache contents to /usr/share/apache2
- change default docroot to /var/www/apache2/html

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6959 ec354946-7b23-47d6-9f5a-488ba84defc7

a/apache2/apache2-vl.spec

@@ -1,11 +1,12 @@
-%define contentdir /var/www
+%define contentdir %{_datadir}/apache2
+%define docroot /var/www/apache2
 %define suexec_caller apache
 %define mmn 20051115
 %define pkgname apache2
 
 Summary: Apache HTTP Server
 Name: %{pkgname}
-Version: 2.2.22
+Version: 2.2.23
 Release: 1%{_dist_release}
 URL: http://httpd.apache.org/
 
@@ -38,7 +39,7 @@ Patch3: httpd-2.0.45-deplibs.patch
 Patch4: httpd-2.1.10-disablemods.patch
 # features/functional changes
 Patch21: httpd-2.0.40-xfsz.patch
-Patch22: httpd-2.1.10-pod.patch
+Patch22: httpd-2.2.23-pod.patch
 Patch23: httpd-2.0.45-export.patch
 Patch24: httpd-2.0.48-corelimit.patch
 # Bug fixes
@@ -49,12 +50,15 @@ Patch60: httpd-2.2.3-sslusername.patch
 
 License: Apache Software License
 Group: System Environment/Daemons
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: db4-devel, expat-devel
 BuildRequires: findutils, perl, openldap-devel, zlib-devel
 BuildRequires: apr-devel, apr-util-devel
 BuildRequires: pcre-devel, sqlite3-devel
+BuildRequires: www-common
 Requires: mailcap, gawk, file, findutils, apr, apr-util
+Requires(pre): www-common
 Requires(pre): chkconfig, mktemp, fileutils
 Requires(pre): sh-utils, textutils, shadow-utils
 Requires(post): alternatives
@@ -175,7 +179,7 @@ AP_CONFOPTS="\
 	--with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--enable-suexec --with-suexec \
 	--with-suexec-caller=%{suexec_caller} \
-	--with-suexec-docroot=%{contentdir} \
+	--with-suexec-docroot=%{docroot} \
 	--with-suexec-logfile=%{_localstatedir}/log/apache2/suexec.log \
 	--with-suexec-bin=%{_libdir}/%{pkgname}/suexec \
 	--with-suexec-uidmin=500 --with-suexec-gidmin=500 \
@@ -244,8 +248,8 @@ mv $RPM_BUILD_ROOT%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
 # Make the MMN accessible to module packages
 echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/apache2/.mmn
 
-# docroot
-# mkdir $RPM_BUILD_ROOT%{contentdir}/html
+# contentdir
+#mkdir $RPM_BUILD_ROOT%{contentdir}/html
 install -m 644 $RPM_SOURCE_DIR/index.html.ja \
 	$RPM_BUILD_ROOT%{contentdir}/error/noindex.html
 rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
@@ -253,6 +257,9 @@ rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
 install -m 644 $RPM_SOURCE_DIR/vine.png \
 	$RPM_BUILD_ROOT%{contentdir}/icons
 
+# docroot
+mkdir -p $RPM_BUILD_ROOT%{docroot}/html
+
 # logs
 # rmdir $RPM_BUILD_ROOT%{_sysconfdir}/apache2/logs
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/apache2
@@ -303,7 +310,7 @@ done;
 
 mv $RPM_BUILD_ROOT/%{_sbindir}/apxs $RPM_BUILD_ROOT/%{_bindir}/apxs
 
-%define cflman usr/share/man/man1/dbmmanage.1 usr/share/man/man1/htdigest.1 usr/share/man/man1/htpasswd.1 usr/share/man/man8/rotatelogs.8 usr/share/man/man8/suexec.8 usr/share/man/man1/apxs.1 usr/share/man/man8/httpd.8
+%define cflman usr/share/man/man1/dbmmanage.1 usr/share/man/man1/htdigest.1 usr/share/man/man1/htpasswd.1 usr/share/man/man8/rotatelogs.8 usr/share/man/man8/suexec.8 usr/share/man/man8/apxs.8 usr/share/man/man8/httpd.8
 
 (cd $RPM_BUILD_ROOT;
 for i in %{cflman}; do \
@@ -329,14 +336,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/mime.types \
       $RPM_BUILD_ROOT%{_libdir}/apache2/modules/*.exp \
       $RPM_BUILD_ROOT%{_libdir}/apache2/build/config.nice \
       $RPM_BUILD_ROOT%{_sbindir}/{apache2,checkgid,dbmmanage,envvars*} \
+      $RPM_BUILD_ROOT%{docroot}/html/* \
       $RPM_BUILD_ROOT%{contentdir}/html/* \
       $RPM_BUILD_ROOT%{contentdir}/cgi-bin/*
 
-%pre
-# Add the "apache" user
-/usr/sbin/useradd -c "Apache" -u 48 \
-	-s /sbin/nologin -r -d %{contentdir} apache 2> /dev/null || :
-
 %triggerpostun -- apache < 2.0
 /sbin/chkconfig --add apache2
 
@@ -446,9 +449,11 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{contentdir}/error/*.var
 %config(noreplace) %{contentdir}/error/include/*.html
 
+%dir %{docroot}/html
+
 %attr(0700,root,root) %dir %{_localstatedir}/log/apache2
 
-%attr(0700,apache,apache) %dir %{_localstatedir}/lib/dav
+%attr(0700,www-data,www-data) %dir %{_localstatedir}/lib/dav
 
 %{_mandir}/man1/*
 
@@ -465,10 +470,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0700,root,root) %dir %{_sysconfdir}/apache2/conf/ssl.*
 %config %{_sysconfdir}/apache2/conf/Makefile
 %config %{_sysconfdir}/apache2/conf/ssl.*/*
-%attr(0700,apache,root) %dir %{_localstatedir}/cache/mod_ssl
-%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
-%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
-%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
+%attr(0700,www-data,root) %dir %{_localstatedir}/cache/mod_ssl
+%attr(0600,www-data,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
+%attr(0600,www-data,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
+%attr(0600,www-data,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
 
 %files devel
 %defattr(-,root,root)
@@ -480,12 +485,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/apache2/build/*.sh
 
 %changelog
+* Wed Mar 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.23-1
+- update to 2.2.23
+- add R(pre): www-common, BR: www-common
+- move apache contents to %{contentdir}
+
 * Wed Mar 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.2.22-1
 - update to 2.2.22
   - CVE-2012-0021 (mod_log_config)
   - CVE-2012-0031
   - CVE-2012-0053
-- remove upstreamed patches
+  - remove upstreamed patches
 
 * Fri Dec  9 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.2.21-5
 - add patch120 for fix CVE-2011-4317 (mod_rewrite/mod_proxy)