OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=32

apache2-default-server.conf

@@ -104,5 +104,3 @@ Include /etc/apache2/conf.d/*.conf
 # The manual... if it is installed ('?' means it won't complain)
 Include /etc/apache2/conf.d/apache2-manual?conf
 
-# Disable TRACE command as it can be exploited for XSS attacks
-TraceEnable off

apache2-httpd.conf

@@ -15,7 +15,7 @@
 # configuration of your virtual hosts.
 
 # Quickstart guide:
-# http://www.opensuse.org/Apache_Howto_Quickstart
+# http://en.opensuse.org/Apache_Quickstart_HOWTO
 
 
 # Overview of include files, chronologically:

apache2-vhost.template

@@ -39,7 +39,7 @@
     #
     # For example, to allow execution of PHP scripts:
     #
-    # Include /etc/apache2/conf.d/mod_php4.conf
+    # Include /etc/apache2/conf.d/php5.conf
     #
     # or, to include all configuration snippets added by packages:
     # Include /etc/apache2/conf.d/*.conf

apache2.changes

@@ -1,19 +1,52 @@
 -------------------------------------------------------------------
-Sun Apr 26 10:52:27 CEST 2009 - ro@suse.de
+Tue Jun  9 17:09:35 CEST 2009 - poeml@suse.de
 
-- buildfix: replace "shadow" by "pwdutils" in requires 
+- merge changes from openSUSE:Factory:
+  - trailing spaces removed from robots.txt
+  - moved Snakeoil certificates to separate subpackage
+    example-certificates [bnc#419601]
+  - removed outdated ca-bundle.crt
+  - NOT merging the change from [bnc#301380] (setting TraceEnable
+    Off), since there is no reason to deviate from upstream
 
 -------------------------------------------------------------------
-Fri Feb 27 16:51:58 CET 2009 - anicka@suse.cz
+Tue Jun  9 08:52:34 CEST 2009 - poeml@suse.de
 
-- set TraceEnable off (bnc#301380)
+- avoid useless (and potentially irritating) messages from usermod
+  called in %post when updating the package - this should probably
+  only be run when updating from very old installs anyway.
+- likewise, avoid similar useless messages about creation of the
+  httpd user when installing on Fedora.
 
 -------------------------------------------------------------------
-Wed Feb 25 16:59:27 CET 2009 - prusnak@suse.cz
+Tue May  5 12:43:29 CEST 2009 - poeml@suse.de
 
-- moved Snakeoil certificates to separate subpackage example-certificates
+- fix hyperref to the quickstart howto in the installed httpd.conf
-  [bnc#419601]
+  [bnc#500938] Thanks, Frank!
-- removed outdated ca-bundle.crt
+
+-------------------------------------------------------------------
+Mon Apr 27 16:12:46 CEST 2009 - poeml@suse.de
+
+- add ITK MPM (apache2.2-mpm-itk-20090414-00.patch)
+  see http://mpm-itk.sesse.net/
+
+-------------------------------------------------------------------
+Mon Apr 27 11:21:43 CEST 2009 - poeml@suse.de
+
+- buildfix (from Factory): replace "shadow" by "pwdutils" in requires
+
+-------------------------------------------------------------------
+Thu Mar 12 07:01:58 CET 2009 - crrodriguez@suse.de
+
+- update apache2-vhost.template mod_php4 references [bnc#444205] 
+
+-------------------------------------------------------------------
+Mon Mar  9 15:33:40 CET 2009 - poeml@suse.de
+
+- fixed the ed script which turns apxs into
+  apxs-{prefork,worker,event) to work on Fedora, by using - instead
+  of ^ to go "up" one line. Thereby fixing Fedora build. (Package
+  probably needs further tuning to fit into a Fedora environment.)
 
 -------------------------------------------------------------------
 Sat Dec 20 00:49:29 CET 2008 - poeml@suse.de

apache2.spec

@@ -31,14 +31,15 @@ BuildRequires:  expat-devel
 %endif
 #
 %define pname 		apache2
-%define vers		2
+%define vers   		2
 %define httpd 		httpd2
 %define apache_mmn	%(test -s %{S:0} && { echo -n apache_mmn_; bzcat %{S:0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; })
 %define	default_mpm	prefork
 %{!?prefork:%define prefork 1}
 %{!?worker:%define worker 1}
 %{!?event:%define event 1}
-%define mpms_to_build	%(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event)
+%{!?itk:%define itk 1}
+%define mpms_to_build	%(test %prefork = 1 && printf prefork) %(test %worker = 1 && printf worker) %(test %event = 1 && printf event) %(test %itk = 1 && printf itk)
 # dir names
 %define datadir		/srv/www
 %define htdocsdir	%{datadir}/htdocs
@@ -63,7 +64,7 @@ License:        The Apache Software License
 Group:          Productivity/Networking/Web/Servers
 %define realver 2.2.11
 Version:        2.2.11
-Release:        4
+Release:        5
 #Source0:      http://www.apache.org/dist/httpd-%{version}.tar.bz2
 Source0:        http://httpd.apache.org/dev/dist/httpd-%{realver}.tar.bz2
 Source10:       SUSE-NOTICE
@@ -116,6 +117,7 @@ Patch65:        httpd-2.0.49-log_server_status.dif
 Patch66:        httpd-2.0.54-envvars.dif
 Patch67:        httpd-2.2.0-apxs-a2enmod.dif
 Patch68:        httpd-2.x.x-logresolve.patch
+Patch100:       apache2.2-mpm-itk-20090414-00.patch
 Url:            http://httpd.apache.org/
 Icon:           Apache.xpm
 Summary:        The Apache Web Server Version 2.0
@@ -205,6 +207,15 @@ Group:          Productivity/Networking/Web/Servers
 Provides:       %{pname}-MPM
 Requires:       %{name} = %{version}
 %endif
+%if %itk
+
+%package itk
+License:        The Apache Software License
+Summary:        Apache 2 "ITK" MPM (Multi-Processing Module)
+Group:          Productivity/Networking/Web/Servers
+Provides:       %{pname}-MPM
+Requires:       %{name} = %{version}
+%endif
 %if %worker
 
 %description worker
@@ -253,6 +264,31 @@ synchronization.
 
 
 
+Authors:
+--------
+    Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
+
+%endif
+%if %itk
+
+%description itk
+The "ITK" MPM (Multi-Processing Module) is experimental and NOT
+officially endorsed by the Apache Software Foundation, so it may or may
+not work as expected.
+
+Apache2-mpm-itk (just mpm-itk for short) is a MPM for the Apache 2 web
+server. mpm-itk allows you to run each of your vhosts under a separate
+uid and gid -- in short, the scripts and configuration files for one
+vhost no longer have to be readable for all the other vhosts.
+
+See http://mpm-itk.sesse.net/
+
+Authors: Too many to list here -- see
+/usr/share/doc/packages/apache2/ABOUT_APACHE Steinar H. Gunderson (ITK
+module)
+
+
+
 Authors:
 --------
     Too many to list here -- see /usr/share/doc/packages/apache2/ABOUT_APACHE
@@ -348,6 +384,7 @@ Authors:
 %patch66 -p1
 %patch67 -p1
 %patch68 -p1
+%patch100 -p1
 #
 cat $RPM_SOURCE_DIR/SUSE-NOTICE >> NOTICE
 #
@@ -696,7 +733,7 @@ pushd $RPM_BUILD_ROOT/%{_sbindir}
 			H
 			,s/^\(.*\)config_vars.mk\(.*\)$/\1config_vars.mk\$mpm_suffix\2/
 			/config_vars.mk
-			^
+			-
 			i
 			my \$mpm_suffix = "-$mpm";
 			.
@@ -895,6 +932,14 @@ mv $RPM_BUILD_ROOT/%{sysconfdir}/original .
 %dir %{_libdir}/%{pname}-event
 %{_libdir}/%{pname}-event/mod_*.so
 %endif
+%if %itk
+
+%files itk
+%defattr(-,root,root)
+%{_sbindir}/%{httpd}-itk
+%dir %{_libdir}/%{pname}-itk
+%{_libdir}/%{pname}-itk/mod_*.so
+%endif
 
 %files devel -f filelist-devel
 %defattr(-,root,root)
@@ -962,23 +1007,29 @@ exit 0
 /usr/share/%{pname}/get_module_list &>/dev/null
 exit 0
 %endif
-%if %{?suse_version:0}%{!?suse_version:1}
+%if %itk
 
-%pre
+%post itk
-# on Fedora, add the "apache" user
+/usr/share/%{pname}/get_module_list &>/dev/null
-/usr/sbin/useradd -c "Apache" -u 48 \
+exit 0
-        -s /sbin/nologin -r -d %{localstatedir} apache 2> /dev/null || :
 %endif
-
-%preun
 #  
 #  O/ ._ .__    / ._  _  __|_
 #  /O |_)|(/_  /  |_)(_)_> |_
 #     |           |
 #  
-#if %suse_version > 810
+# on Fedora, add the "apache" user
-#stop_on_removal %{pname}
+%if %{?suse_version:0}%{!?suse_version:1}
-#endif
+
+%pre
+if ! /usr/bin/getent passwd %httpduser &>/dev/null; then
+  echo "Creating %httpduser user"
+  /usr/sbin/useradd -c "Apache" -u 48 \
+        -s /sbin/nologin -r -d %{localstatedir} %httpduser 2> /dev/null || :
+fi
+%endif
+
+%preun
 for i in %{_sbindir}/%{httpd} \
 	 %{installbuilddir}/config_vars.mk
 do
@@ -998,10 +1049,10 @@ exit 0
 # a group wwwadmin has existed in the distant past, and it was renamed to www
 if grep -q "^wwwadmin:" /etc/group; then
 	groupmod -n www wwwadmin 2>/dev/null ||:
+	usermod -g %httpdgroup %httpduser 2>/dev/null ||:
+	usermod -s /bin/false %httpduser 2>/dev/null ||:
 fi
 %endif
-usermod -g %httpdgroup %httpduser 2>/dev/null ||:
-usermod -s /bin/false %httpduser 2>/dev/null ||:
 tmpdir=$(mktemp -d etc/%{pname}/%{pname}-post.XXXXXX); test $? = 0 || { echo >&2 Could not create tmpdir. Exiting; exit 1; }
 tmpfile=$tmpdir/tmpfile
 if test -s etc/sysconfig/%{pname} && grep -q "^LOADMODULES" etc/sysconfig/%{pname}; then 
@@ -1045,14 +1096,35 @@ if ! test -f /.buildenv; then
 fi
 
 %changelog
-* Sun Apr 26 2009 ro@suse.de
+* Tue Jun 09 2009 poeml@suse.de
-- buildfix: replace "shadow" by "pwdutils" in requires
+- merge changes from openSUSE:Factory:
-* Fri Feb 27 2009 anicka@suse.cz
+  - trailing spaces removed from robots.txt
-- set TraceEnable off (bnc#301380)
+  - moved Snakeoil certificates to separate subpackage
-* Wed Feb 25 2009 prusnak@suse.cz
+  example-certificates [bnc#419601]
-- moved Snakeoil certificates to separate subpackage example-certificates
+  - removed outdated ca-bundle.crt
-  [bnc#419601]
+  - NOT merging the change from [bnc#301380] (setting TraceEnable
-- removed outdated ca-bundle.crt
+  Off), since there is no reason to deviate from upstream
+* Tue Jun 09 2009 poeml@suse.de
+- avoid useless (and potentially irritating) messages from usermod
+  called in %%post when updating the package - this should probably
+  only be run when updating from very old installs anyway.
+- likewise, avoid similar useless messages about creation of the
+  httpd user when installing on Fedora.
+* Tue May 05 2009 poeml@suse.de
+- fix hyperref to the quickstart howto in the installed httpd.conf
+  [bnc#500938] Thanks, Frank!
+* Mon Apr 27 2009 poeml@suse.de
+- add ITK MPM (apache2.2-mpm-itk-20090414-00.patch)
+  see http://mpm-itk.sesse.net/
+* Mon Apr 27 2009 poeml@suse.de
+- buildfix (from Factory): replace "shadow" by "pwdutils" in requires
+* Thu Mar 12 2009 crrodriguez@suse.de
+- update apache2-vhost.template mod_php4 references [bnc#444205]
+* Mon Mar 09 2009 poeml@suse.de
+- fixed the ed script which turns apxs into
+  apxs-{prefork,worker,event) to work on Fedora, by using - instead
+  of ^ to go "up" one line. Thereby fixing Fedora build. (Package
+  probably needs further tuning to fit into a Fedora environment.)
 * Sat Dec 20 2008 poeml@suse.de
 - update to 2.2.11:
   core:

find_mpm

@@ -27,6 +27,7 @@ if ! ${mpm_set:=false}; then
 			*leader*)	APACHE_MPM=leader;;
 			*metuxmpm*)	APACHE_MPM=metuxmpm;;
 			*threadpool*)	APACHE_MPM=threadpool;;
+			*itk*)          APACHE_MPM=itk;;
 			esac
 		fi
 

get_module_list

@@ -45,7 +45,7 @@ fi
 
 for i in ${APACHE_MODULES[*]}; do
 	unset module_path module_id
-	case $i in mod_cgid|cgid) case $APACHE_MPM in prefork|leader)  i=${i%d};; esac;; esac
+	case $i in mod_cgid|cgid) case $APACHE_MPM in prefork|leader|itk)  i=${i%d};; esac;; esac
 	case $i in mod_cgi|cgi)   case $APACHE_MPM in event|worker) i=${i}d;; esac;; esac
 
 	module_id=${i##*/}

sysconfig.apache2

@@ -124,7 +124,7 @@ APACHE_SERVER_FLAGS=""
 #
 APACHE_HTTPD_CONF=""
 
-## Type:	list(prefork,worker)
+## Type:	list(prefork,worker,event,itk)
 ## Default:	""
 ## ServiceRestart: apache2
 #