X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache.spec;h=9712ec44a9648fbbdaea995423064abfeaf25a12;hb=e31ca1d3165a8716680ac91e00d32ce16d744c7c;hp=0ffb93a2ffb4382e5e793c9906dbb91f86f11dda;hpb=873f953957b9917479fe60630cbebf0e53340182;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 0ffb93a..9712ec4 100644
--- a/apache.spec
+++ b/apache.spec
@@ -1,29 +1,37 @@
-# TODO:
+# # TODO:
 # - config examples for mod_*
 # - --with-suexec-uidmin=500 or =1000 ?
 # - subpackages for MPMs
 # - !!!check if all modules (*.so) are exactly the same for different MPMs
 # - check those autn modules inner deps
 # - for external packages: don't use any apache module name in dep as they
-#   differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
-# - for mod_auth_* modules require each auth module to require virtual authn so at least *_default is chosen?
+#  differ for apache 1.3/2.0/2.2!? any better ideas? rpm Suggests: tags?
+# - for mod_auth_* modules require each auth module to require virtual authn so at least *_default
+#  is chosen?
 # - same for mod_authz
 # - mod_auth_digest and mod_auth_basic R: apache(authn) ?
 # - drop mod_case_filter* or find summary and description for them
 # - build modules only once (not with each mpm)
+# - FYI: http://wiki.apache.org/httpd/InternalDummyConnection
 
 # Conditional build:
 %bcond_without	ssl		# build without SSL support
 %bcond_without	ldap		# build without LDAP support
-%bcond_without	metuxmpm	# metux MPM
 %bcond_without	peruser		# peruser MPM
 %bcond_without	event		# event MPM
+%bcond_with	itk		# ITK MPM
 %bcond_with	distcache	# distcache support
 %bcond_with	bucketeer	# debug one
-#
-%include	/usr/lib/rpm/macros.perl
+
 # this is internal macro, don't change to %%apache_modules_api
 %define		_apache_modules_api 20051115
+
+%if "%{pld_release}" != "ac"
+%define		openssl_ver	0.9.8i
+%else
+%define		openssl_ver	0.9.7d
+%endif
+%include	/usr/lib/rpm/macros.perl
 Summary:	The most widely used Web server on the Internet
 Summary(de.UTF-8):	Leading World Wide Web-Server
 Summary(es.UTF-8):	Servidor HTTPD para proveer servicios WWW
@@ -33,12 +41,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.2.8
-Release:	4
-License:	Apache
-Group:		Networking/Daemons
+Version:	2.2.17
+Release:	9
+License:	Apache v2.0
+Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5:	39a755eb0f584c279336387b321e3dfc
+# Source0-md5:	66d8e107f85acc039fd5e624e85728a9
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -67,14 +75,12 @@ Source25:	%{name}-mod_cgid.conf
 Source26:	%{name}-mod_log_config.conf
 Source27:	%{name}-mod_mime_magic.conf
 Source28:	%{name}-mod_cache.conf
+Source29:	%{name}-example.net.conf
 Patch0:		%{name}-configdir_skip_backups.patch
 Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
 Patch3:		%{name}-branding.patch
 Patch4:		%{name}-apr.patch
-# project homepage http://www.metux.de/mpm/en/?patpage=index
-# http://www.sannes.org/metuxmpm/
-Patch5:		httpd-2.0.48-metuxmpm-r8.patch
 # what about this? it isn't applied...
 Patch6:		httpd-2.0.40-xfsz.patch
 Patch7:		%{name}-syslibs.patch
@@ -87,13 +93,17 @@ Patch15:	httpd-2.0.48-debuglog.patch
 Patch18:	%{name}-v6only-ENOPROTOOPT.patch
 Patch19:	%{name}-conffile-path.patch
 Patch20:	%{name}-apxs.patch
-# http://www.telana.com/peruser.php (2.2.3-0.3.0)
-Patch21:	httpd-peruser.patch
-Patch22:	%{name}-libtool.patch
-Patch23:	%{name}-revert-bug-40463.patch
+Patch23:	%{name}-suexec_fcgi.patch
+Patch24:	%{name}-bug-48094.patch
+# http://scripts.mit.edu/trac/browser/trunk/server/common/patches/httpd-2.2.x-mod_ssl-sessioncaching.patch?rev=1348
+Patch25:	httpd-2.2.x-mod_ssl-sessioncaching.patch
+Patch26:	apache-mod_vhost_alias_docroot.patch
+Patch27:	apache-bug-41743.patch
+# http://mpm-itk.sesse.net/
+Patch28:	apache-mpm-itk.patch
 URL:		http://httpd.apache.org/
 BuildRequires:	apr-devel >= 1:1.2
-BuildRequires:	apr-util-devel >= 1:1.2
+BuildRequires:	apr-util-devel >= 1:1.3
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	db-devel
@@ -101,24 +111,21 @@ BuildRequires:	db-devel
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	libtool >= 2:1.5
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
-%{?with_ssl:BuildRequires:	openssl-tools >= 0.9.7d}
+%{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
+%{?with_ssl:BuildRequires:	openssl-devel >= %{openssl_ver}}
+%{?with_ssl:BuildRequires:	openssl-tools >= %{openssl_ver}}
 BuildRequires:	pcre-devel
+BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
-# packages that were in apache-2.0.rpm, for compatibility
 Requires:	%{name}-errordocs = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
-Requires:	%{name}-mod_asis = %{version}-%{release}
 Requires:	%{name}-mod_auth = %{version}-%{release}
-Requires:	%{name}-mod_cern_meta = %{version}-%{release}
-Requires:	%{name}-mod_cgi = %{version}-%{release}
 Requires:	%{name}-mod_env = %{version}-%{release}
-Requires:	%{name}-mod_include = %{version}-%{release}
 Requires:	%{name}-mod_log_config = %{version}-%{release}
 Requires:	%{name}-mod_mime = %{version}-%{release}
 Requires:	%{name}-mod_mime_magic = %{version}-%{release}
@@ -180,7 +187,7 @@ sunucusudur.
 %package base
 Summary:	The Number One HTTP Server On The Internet
 Summary(pl.UTF-8):	Wiodący w Internecie serwer HTTP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -189,13 +196,10 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	/etc/mime.types
 Requires:	/sbin/chkconfig
 Requires:	apr >= 1:1.2
-Requires:	mailcap
 Requires:	psmisc >= 20.1
-Requires:	rc-scripts >= 0.4.0.15
-Requires:	webapps
+Requires:	rc-scripts >= 0.4.1.23
 Provides:	apache(modules-api) = %{_apache_modules_api}
 Provides:	group(http)
 Provides:	user(http)
@@ -225,7 +229,7 @@ serwerem WWW w Internecie.
 %package suexec
 Summary:	Apache suexec wrapper
 Summary(pl.UTF-8):	Wrapper suexec do serwera WWW Apache
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/suexec.html
 Requires:	%{name}-base = %{version}-%{release}
 
@@ -340,7 +344,7 @@ desenvolver módulos adicionais para o Apache.
 %package mod_actions
 Summary:	Apache module for executing CGI scripts based on media type or request method
 Summary(pl.UTF-8):	Moduł Apache'a do uruchamiania skryptów CGI w oparciu o rodzaj danych lub żądania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_actions.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_actions) = %{version}-%{release}
@@ -362,7 +366,7 @@ pliki.
 %package mod_alias
 Summary:	Mapping different parts of the host filesystem in the document tree and for URL redirection
 Summary(pl.UTF-8):	Odwzorowywanie różnych części systemu plików w drzewie dokumentów i przekierowywanie URL-i
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_alias.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_alias) = %{version}-%{release}
@@ -405,7 +409,7 @@ URL-ach. Bardziej skomplikowane zadania, takie jak modyfikowanie
 %package mod_asis
 Summary:	Sends files that contain their own HTTP headers
 Summary(pl.UTF-8):	Wysyłanie plików zawierających własne nagłówki HTTP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_asis.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_asis) = %{version}-%{release}
@@ -431,9 +435,9 @@ włącznie z przekierowaniami i innymi specjalnymi odpowiedziami HTTP
 bez wymagania skryptu CGI lub nph.
 
 %package mod_auth
-Summary:	Virtual package which which provides backward compatibility with apache 2.0
+Summary:	Virtual package which provides backward compatibility with apache 2.0
 Summary(pl.UTF-8):	Pakiet wirtualny zapewniający kompatybilność wsteczną z apache 2.0
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_auth_basic = %{version}-%{release}
 Requires:	%{name}-mod_authn_file = %{version}-%{release}
@@ -455,7 +459,7 @@ wstecznej z apache 2.0.
 %package mod_auth_basic
 Summary:	Apache module that allows Basic authentication
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający korzystawnie z uwierzytelnienia Basic
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_auth_basic.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_auth_basic) = %{version}-%{release}
@@ -474,9 +478,9 @@ Ten moduł pozwala używać uwierzytelnienia HTTP Basic do ograniczania
 dostępu poprzez wyszukiwanie użytkowników we wskazanych miejscach
 
 %package mod_auth_dbm
-Summary:	Virtual package which which provides backward compatibility with apache 2.0
+Summary:	Virtual package which provides backward compatibility with apache 2.0
 Summary(pl.UTF-8):	Pakiet wirtualny zapewniający kompatybilność wsteczną z apache 2.0
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-dbmtools = %{version}-%{release}
 Requires:	%{name}-mod_authn_dbm = %{version}-%{release}
@@ -494,7 +498,7 @@ apache-mod_authz_dbm dla kompatybilności wstecznej z apache 2.0.
 %package mod_auth_digest
 Summary:	User authentication using MD5 Digest Authentication
 Summary(pl.UTF-8):	Uwierzytelnianie użytkowników przy użyciu MD5 Digest
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_auth_digest) = %{version}-%{release}
@@ -511,7 +515,7 @@ eksperymentalny.
 %package mod_authn_alias
 Summary:	Apache module that provides the ability to create extended authentication
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający tworzenie rozszerzonego uwierzytelniania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_alias.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_alias) = %{version}-%{release}
@@ -527,7 +531,7 @@ w pliku konfiguracyjnym i nadawanie im aliasów.
 %package mod_authn_anon
 Summary:	Apache module that allows "anonymous" user access to authenticated areas
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający dostęp anonimowych użytkowników do stref uwierzytelnianych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_anon.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_anon) = %{version}-%{release}
@@ -552,7 +556,7 @@ być logowane.
 %package mod_authn_dbd
 Summary:	Apache module that allows user authentication using an SQL
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie użytkowników przy użyciu tabel SQL
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_dbd.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_dbd = %{version}-%{release}
@@ -571,7 +575,7 @@ wyszukiwanie w tabelach SQL.
 %package mod_authn_dbm
 Summary:	Apache module that allows user authentication using DBM files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie użytkowników przy użyciu plików DBM
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_dbm.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_dbm) = %{version}-%{release}
@@ -589,7 +593,7 @@ wyszukiwanie w tabelach haseł DBM.
 %package mod_authn_default
 Summary:	Apache module that rejects any credentials supplied by the user
 Summary(pl.UTF-8):	Moduł Apache'a odrzucający wszystkie dane podane przez użytkownika
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_default.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_default) = %{version}-%{release}
@@ -608,7 +612,7 @@ przez użytkownika.
 %package mod_authn_file
 Summary:	Apache module that allows user authentication using text files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie użytkowników poprzez pliki tekstowe
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authn_file.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authn_file) = %{version}-%{release}
@@ -626,10 +630,11 @@ wyszukiwanie w plikach tekstowych z hasłami.
 %package mod_authnz_ldap
 Summary:	Apache module that allows an LDAP directory to be used to store the database for HTTP Basic authentication
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający przechowywanie danych dla uwierzytelnienia HTTP Basic w bazie LDAP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authnz_ldap.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_ldap = %{version}-%{release}
+Requires:	apr-util-ldap
 Provides:	apache(mod_authnz_ldap) = %{version}-%{release}
 # compat
 Provides:	apache(mod_auth_ldap) = %{version}-%{release}
@@ -647,7 +652,7 @@ mod_auth_basic uwierzytelnianie użytkowników poprzez katalog LDAP.
 %package mod_authz_dbm
 Summary:	Apache module that allows group authorization using DBM files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający uwierzytelnianie grup z użyciem plików DBM
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_dbm.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_dbm) = %{version}-%{release}
@@ -665,7 +670,7 @@ do grupy zapisywanej w pliku DBM.
 %package mod_authz_default
 Summary:	Apache module that rejects any authorization request
 Summary(pl.UTF-8):	Moduł Apache'a odrzucający wszystkie żądania autoryzacji
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_default.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_default) = %{version}-%{release}
@@ -684,7 +689,7 @@ autoryzacji.
 %package mod_authz_groupfile
 Summary:	Apache module that allows group authorization using plaintext files
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzację grup przy użyciu plików tekstowych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_groupfile.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_groupfile) = %{version}-%{release}
@@ -702,7 +707,7 @@ do grupy zapisywanej w pliku tekstowym.
 %package mod_authz_host
 Summary:	Apache module that allows group authorizations based on host (name or IP address)
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzację grup w oparcu o host (nazwę lub IP)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_authz_host.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_host) = %{version}-%{release}
@@ -727,7 +732,7 @@ charakterystyki żądania klienta dostępnej w zmiennych środowiskowych.
 %package mod_authz_owner
 Summary:	Apache module that allows authorization based on file ownership
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzacje w oparciu o własność plików
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_authz_owner.html
 Requires:	%{name}-base = %{version}-%{release}
 #Requires:	any-auth-module
@@ -751,7 +756,7 @@ mod_auth_digest.
 %package mod_authz_user
 Summary:	Apache module that allows user authorization
 Summary(pl.UTF-8):	Moduł Apache'a umożliwiający autoryzację użytkowników
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_authz_user.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_authz_user) = %{version}-%{release}
@@ -767,7 +772,7 @@ WWW dla uwierzytelnionych użytkowników.
 %package mod_autoindex
 Summary:	Apache module - display index of files
 Summary(pl.UTF-8):	Moduł apache do wyświetlania indeksu plików
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_autoindex.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
@@ -783,7 +788,7 @@ Ten pakiet dostarcza moduł autoindex, który generuje indeks plików.
 %package mod_bucketeer
 Summary:	buckets manipulation filter
 Summary(pl.UTF-8):	Dzielenie kubełków po znalezieniu znaku sterującego
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_bucketeer) = %{version}-%{release}
 
@@ -796,7 +801,7 @@ Dzielenie kubełków po znalezieniu znaku sterującego.
 %package mod_cache
 Summary:	Content cache keyed to URIs
 Summary(pl.UTF-8):	Pamięć podręczna wg klucza URI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cache.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_cache) = %{version}-%{release}
@@ -817,25 +822,38 @@ proxy. Dołączono dwa moduły pozwalające magazynować dane w pamięci
 dysku (używane do cache'owania proxy).
 
 %package mod_case_filter
-Summary:	TODO
-Group:		Networking/Daemons
+Summary:	Apache output filter that converts all output to upper case
+Summary(pl.UTF-8):	Filtr wyjściowy Apache'a zamieniający wszystkie litery na wielkie
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_case_filter) = %{version}-%{release}
 
 %description mod_case_filter
+Apache output filter that converts all output to upper case.
+
+%description mod_case_filter -l pl.UTF-8
+Filtr wyjściowy Apache'a zamieniający wszystkie litery w wyjściu na
+wielkie.
 
 %package mod_case_filter_in
-Summary:	TODO
-Group:		Networking/Daemons
+Summary:	Apache input filter that converts all request body to upper case
+Summary(pl.UTF-8):	Filtr wejściowy Apache'a zamieniający wszystkie litery w żądaniu na wielkie
+Group:		Networking/Daemons/HTTP
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_case_filter_in) = %{version}-%{release}
 
 %description mod_case_filter_in
+Apache input filter that converts all request body (not headers) to
+upper case.
+
+%description mod_case_filter_in -l pl.UTF-8
+Filtr wejściowy Apache'a zamieniający wszystkie litery w ciele żądania
+(ale nie nagłówkach) na wielkie.
 
 %package mod_cern_meta
 Summary:	CERN httpd metafile semantics
 Summary(pl.UTF-8):	Obsługa semantyki metaplików CERN httpd
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cern_meta.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_cern_meta) = %{version}-%{release}
@@ -861,10 +879,11 @@ użytkowników CERN wykorzystujących ten moduł.
 %package mod_cgi
 Summary:	Execution of CGI scripts
 Summary(pl.UTF-8):	Uruchamianie skryptów CGI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cgi.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
+Suggests:	%{name}-suexec = %{version}-%{release}
 Provides:	apache(mod_cgi) = %{version}-%{release}
 Provides:	webserver(cgi)
 
@@ -895,7 +914,7 @@ zachowują się identycznie.
 %package mod_cgid
 Summary:	Execution of CGI scripts using an external CGI daemon
 Summary(pl.UTF-8):	Uruchamianie zewnętrznych skryptów CGI za pomocą daemona CGI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_cgid.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
@@ -923,7 +942,7 @@ wielowątkowy MPM.
 %package mod_charset_lite
 Summary:	Specify character set translation or recoding
 Summary(pl.UTF-8):	Translacja lub przekodowywanie znaków
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_charset_lite.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_charset_lite) = %{version}-%{release}
@@ -947,11 +966,12 @@ Jest to moduł eksperymentalny i należy używać go z uwagą.
 %package mod_dav
 Summary:	Apache module - Distributed Authoring and Versioning
 Summary(pl.UTF-8):	Moduł Apache'a - rozproszone autorstwo i wersjonowanie
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_dav.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	apache-mod_authn_file
 Requires:	apache-mod_setenvif
+Requires:	apr-util-dbm-db
 Provides:	apache(mod_dav) = %{version}-%{release}
 
 %description mod_dav
@@ -969,7 +989,7 @@ zdalnym serwerze WWW.
 %package mod_dbd
 Summary:	Manages SQL database connections
 Summary(pl.UTF-8):	Zarządzanie połączeniami z bazą danych SQL
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/en/mod/mod_dbd.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_dbd) = %{version}-%{release}
@@ -990,7 +1010,7 @@ niewątkowych MPM.
 %package mod_deflate
 Summary:	Apache module: Compress content before it is delivered to the client
 Summary(pl.UTF-8):	Moduł Apache'a kompresujący dane przed przesłaniem ich do klienta
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_deflate.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_headers = %{version}-%{release}
@@ -1005,7 +1025,7 @@ Moduł kompresujący dane przed przesłaniem ich do klienta.
 %package mod_dir
 Summary:	Apache module for "trailing slash" redirects and serving directory index files
 Summary(pl.UTF-8):	Moduł Apache'a oferujący przekierowania i udostępnianie informacji o zawartości katalogu
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_dir.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_dir) = %{version}-%{release}
@@ -1022,7 +1042,7 @@ katalogu.
 %package mod_dumpio
 Summary:	Dumps all I/O to error log as desired
 Summary(pl.UTF-8):	Zrzucanie całości wejścia/wyjścia do logu błędów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_dumpio.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_dumpio) = %{version}-%{release}
@@ -1050,7 +1070,7 @@ przy diagnostyce problemów.
 %package mod_echo
 Summary:	A simple echo server to illustrate protocol modules
 Summary(pl.UTF-8):	Prosty serwer ocho ilustrujący moduły protokołów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_echo.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_echo) = %{version}-%{release}
@@ -1068,10 +1088,11 @@ napisać cokolwiek, a on odpowie tym samym.
 %package mod_env
 Summary:	Modifies the environment which is passed to CGI scripts and SSI pages
 Summary(pl.UTF-8):	Modyfikowanie środowiska przekazywanego skryptom CGI i stronom SSI
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_env.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_env) = %{version}-%{release}
+Provides:	webserver(setenv)
 
 %description mod_env
 This module allows for control of the environment that will be
@@ -1089,10 +1110,11 @@ usuwane w procesie konfiguracji.
 %package mod_expires
 Summary:	Apache module which generates Expires HTTP headers
 Summary(pl.UTF-8):	Moduł Apache'a generujący nagłówki HTTP Expires
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_expires.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_expires) = %{version}-%{release}
+Provides:	webserver(expires)
 
 %description mod_expires
 This module controls the setting of the Expires HTTP header in server
@@ -1108,7 +1130,7 @@ ważności może być ustalana w zależności od czasu modyfikacji plików
 %package mod_ext_filter
 Summary:	Pass the response body through an external program before delivery to the client
 Summary(pl.UTF-8):	Przekazywanie ciała odpowiedzi do zewnętrznego programu przed przekazaniem klientowi
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ext_filter) = %{version}-%{release}
@@ -1155,7 +1177,7 @@ dla filtrów.
 %package mod_file_cache
 Summary:	Apache module: caches a static list of files in memory
 Summary(pl.UTF-8):	Moduł Apache'a cache'ujący statyczną listę plików w pamięci
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_file_cache.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_file_cache) = %{version}-%{release}
@@ -1173,7 +1195,7 @@ Moduł cache'ujący statyczną listę plików w pamięci.
 %package mod_filter
 Summary:	Context-sensitive smart filter configuration module
 Summary(pl.UTF-8):	Moduł inteligentnej, zależnej od kontekstu konfiguracji filtrów
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_filter.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_filter) = %{version}-%{release}
@@ -1193,7 +1215,7 @@ jeśli content-type nie jest znany z góry (np. w wypadku proxy).
 %package mod_headers
 Summary:	Apache module allows for the customization of HTTP response headers
 Summary(pl.UTF-8):	Moduł Apache'a pozwalający na modyfikację nagłówków HTTP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_headers.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_headers) = %{version}-%{release}
@@ -1210,7 +1232,7 @@ wysyłanych do przeglądarki.
 %package mod_ident
 Summary:	RFC 1413 ident lookups
 Summary(pl.UTF-8):	Sprawdzanie identyfikacji RFC 1413
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ident.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ident) = %{version}-%{release}
@@ -1226,7 +1248,7 @@ sprawdzenia właściciela połączenia.
 %package mod_imagemap
 Summary:	Server-side imagemap processing
 Summary(pl.UTF-8):	Przetwarzanie map obrazów po stronie serwera
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_imagemap.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_imagemap) = %{version}-%{release}
@@ -1248,7 +1270,7 @@ SetHandler) będzie przetwarzany przez ten moduł.
 %package mod_include
 Summary:	Server-parsed html documents (Server Side Includes)
 Summary(pl.UTF-8):	Dokumenty przetwarzane przez serwer (Server Side Includes)
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_include.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_include) = %{version}-%{release}
@@ -1270,7 +1292,7 @@ a także ustawianie i wypisywanie zmiennych środowiskowych.
 %package mod_info
 Summary:	Apache module with comprehensive overview of the server configuration
 Summary(pl.UTF-8):	Moduł Apache'a udostępniający informacje o serwerze
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_info.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1288,7 +1310,7 @@ zainstalowanych modułach itp.
 %package mod_ldap
 Summary:	Apache module for LDAP connection pooling and result caching services for other LDAP modules
 Summary(pl.UTF-8):	Moduł Apache'a zarządzający połączeniami z serwerami LDAP
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ldap.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_ldap) = %{version}-%{release}
@@ -1308,7 +1330,7 @@ i współdzieloną pamięć podręczną zapytań.
 %package mod_log_config
 Summary:	Logging of the requests made to the server
 Summary(pl.UTF-8):	Logowanie żądań zgłaszanych do serwera
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_log_config.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_log_config) = %{version}-%{release}
@@ -1332,7 +1354,7 @@ charakterystyki żądania.
 %package mod_log_forensic
 Summary:	Forensic Logging of the requests made to the server
 Summary(pl.UTF-8):	Logowanie żadań zgłaszanych do serwera w celu późniejszej analizy
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_log_forensic.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_log_forensic) = %{version}-%{release}
@@ -1350,7 +1372,7 @@ zawiera dwie linie dla każdego żądania.
 %package mod_logio
 Summary:	Logging of input and output bytes per request
 Summary(pl.UTF-8):	Logowanie liczby bajtów wejścia i wyjścia dla zapytań
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_logio.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_log_config = %{version}-%{release}
@@ -1375,10 +1397,12 @@ odzwierciedlały wszystkie zmiany dokonywane przez szyfrowanie.
 %package mod_mime
 Summary:	Associates the requested filename's extensions with the file's behavior and content
 Summary(pl.UTF-8):	Wiązanie określonych rozszerzeń plików z zachowaniem i zawartością
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_mime.html
 Requires:	%{name}-base = %{version}-%{release}
+Requires:	mailcap
 Provides:	apache(mod_mime) = %{version}-%{release}
+Provides:	webserver(mime)
 
 %description mod_mime
 This module is used to associate various bits of "meta information"
@@ -1401,7 +1425,7 @@ informacji o negocjacji treści jest w dokumentacji do mod_negotiation.
 %package mod_mime_magic
 Summary:	Determines the MIME type of a file by looking at a few bytes of its contents
 Summary(pl.UTF-8):	Określanie typu MIME pliku poprzez sprawdzanie kilku bajtów jego zawartości
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_mime_magic.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	file
@@ -1422,7 +1446,7 @@ rozwiązać mod_mime.
 %package mod_negotiation
 Summary:	Provides for content negotiation
 Summary(pl.UTF-8):	Moduł do negocjacji treści
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_negotiation.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_mime = %{version}-%{release}
@@ -1441,7 +1465,7 @@ kilku możliwych dokumentów.
 %package mod_proxy
 Summary:	Apache module with Web proxy
 Summary(pl.UTF-8):	Moduł Apache'a dodający obsługę serwera proxy
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_proxy.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1458,13 +1482,31 @@ Moduł zawiera implementację serwera proxy/cache dla Apache.
 Implementacja zawiera obsługę FTP, CONNECT (dla SSL), HTTP/0.9,
 HTTP/1.0 i HTTP/1.1.
 
+%package mod_reqtimeout
+Summary:	Apache module to set timeout and minimum data rate for receiving requests
+Summary(pl.UTF-8):	Moduł Apache'a pozwalający na ustawianie limitu czasu oraz minimalnego transferu danych
+Group:		Networking/Daemons/HTTP
+URL:		http://httpd.apache.org/docs/2.2/mod/mod_reqtimeout.html
+Requires:	%{name}-base = %{version}-%{release}
+Provides:	apache(mod_reqtimeout) = %{version}-%{release}
+Provides:	webserver(reqtimeout)
+
+%description mod_reqtimeout
+Apache module to set timeout and minimum data rate for receiving
+requests.
+
+%description mod_reqtimeout -l pl.UTF-8
+Moduł Apache'a pozwalający na ustawianie limitu czasu oraz minimalnego
+transferu danych.
+
 %package mod_rewrite
 Summary:	Apache module with rule-based engine for rewrite requested URLs on the fly
 Summary(pl.UTF-8):	Moduł Apache'a do "przepisywania" adresów URL w locie
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_rewrite.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_rewrite) = %{version}-%{release}
+Provides:	webserver(rewrite)
 
 %description mod_rewrite
 This package contains It provides a rule-based rewriting engine to
@@ -1476,7 +1518,7 @@ Moduł oferujący możliwość "przepisywania" adresów URL w locie.
 %package mod_setenvif
 Summary:	Allows the setting of environment variables based on characteristics of the request
 Summary(pl.UTF-8):	Ustawianie zmiennych środowiskowych w oparciu o charakterystykę żądania
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_setenvif.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_setenvif) = %{version}-%{release}
@@ -1496,7 +1538,7 @@ części serwera do podejmowania decyzji o podejmowanych akcjach.
 %package mod_speling
 Summary:	Attempts to correct mistaken URLs by ignoring capitalization and by allowing up to one misspelling
 Summary(pl.UTF-8):	Próba poprawiania błędnych URL-i poprzez ignorowanie wielkości liter i zezwalanie na jedną literówkę
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_speling.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_speling) = %{version}-%{release}
@@ -1528,9 +1570,13 @@ Summary:	SSL/TLS module for the Apache HTTP server
 Summary(pl.UTF-8):	Moduł SSL/TSL dla serwera Apache
 Summary(ru.UTF-8):	Модуль SSL/TLS для веб-сервера Apache
 Epoch:		1
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ssl.html
 Requires:	%{name}-base = %{version}-%{release}
+Requires:	openssl >= %{openssl_ver}
+%if "%{pld_release}" != "ac"
+Requires:	apr-util-dbm-db
+%endif
 Provides:	apache(mod_ssl) = 1:%{version}-%{release}
 
 %description mod_ssl
@@ -1550,7 +1596,7 @@ Security).
 %package mod_status
 Summary:	Server status report module for Apache
 Summary(pl.UTF-8):	Moduł udostępniający informacje statystyczne z serwera Apache
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_status.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1570,7 +1616,7 @@ pracy serwera Apache (w postaci strony HTML).
 %package mod_substitute
 Summary:	Substitute module for Apache
 Summary(pl.UTF-8):	Moduł pozwalający na znajdywanie i zastępowanie wyjścia dla serwera Apache
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_substitute.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_substitute) = %{version}-%{release}
@@ -1586,7 +1632,7 @@ podstawie wyrażenia regularnego.
 %package mod_unique_id
 Summary:	Apache module which provides a magic token for each request
 Summary(pl.UTF-8):	Moduł Apache'a nadający każdemu zapytaniu unikalny token
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_unique_id.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_unique_id) = %{version}-%{release}
@@ -1609,7 +1655,7 @@ UNIQUE_ID.
 %package mod_userdir
 Summary:	User-specific directories
 Summary(pl.UTF-8):	Katalogi specyficzne dla użytkowników
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_userdir.html
 Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-mod_authz_host = %{version}-%{release}
@@ -1626,7 +1672,7 @@ użytkowników przy użyciu składni http://example.com/~user/ .
 %package mod_usertrack
 Summary:	Apache module for user tracking using cookies
 Summary(pl.UTF-8):	Moduł Apache'a służący do śledzenia "ciasteczek"
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_usertrack.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_usertrack) = %{version}-%{release}
@@ -1643,7 +1689,7 @@ przy użyciu katalogu CookieLog. Pozwala na użycie wielu plików logów.
 %package mod_version
 Summary:	Version dependent configuration
 Summary(pl.UTF-8):	Konfiguracja zależna od wersji
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_version.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_version) = %{version}-%{release}
@@ -1665,7 +1711,7 @@ wyrażeniami regularnymi.
 %package mod_vhost_alias
 Summary:	Apache module for dynamically configured mass virtual hosting
 Summary(pl.UTF-8):	Moduł Apache'a dodający obsługę hostów wirtualnych
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_vhost_alias.html
 Requires:	%{name}-base = %{version}-%{release}
 Provides:	apache(mod_vhost_alias) = %{version}-%{release}
@@ -1715,7 +1761,7 @@ Summary:	cgi test/demo programs
 Summary(pl.UTF-8):	Programy testowe/przykładowe cgi
 Group:		Networking/Utilities
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	filesystem >= 3.0-11
+Requires:	filesystem >= 2.0-1
 
 %description cgi_test
 Two cgi test/demo programs: test-cgi and print-env.
@@ -1730,7 +1776,6 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -1741,9 +1786,12 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
-%patch21 -p1
-%patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p0
+%patch28 -p1
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -1760,7 +1808,8 @@ sed -i -e 's,/lib$,/%{_lib},' config.layout
 
 %build
 cp /usr/share/apr/build/apr_common.m4 build
-cp /usr/share/libtool/ltmain.sh build
+%{__libtoolize}
+%{__aclocal} -I build
 cp /usr/share/automake/config.* build
 %{__autoheader}
 %{__autoconf}
@@ -1776,12 +1825,12 @@ touch ssl_expr_scan.c
 cd ../..
 
 CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
-for mpm in prefork worker %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} %{?with_event:event}; do
+for mpm in prefork worker %{?with_event:event} %{?with_itk:itk}; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
 	--enable-layout=PLD \
 	--disable-v4-mapped \
-	$( [ "${mpm}" = "prefork" -o "${mpm}" = "worker" -o "${mpm}" = "event" ] && echo "--enable-exception-hook" ) \
+	$( [ "${mpm}" = "prefork" -o "${mpm}" = "worker" -o "${mpm}" = "event" -o "${mpm}" = "itk" ] && echo "--enable-exception-hook" ) \
 	--enable-modules=all \
 	--enable-mods-shared=all \
 	--enable-auth-anon \
@@ -1860,7 +1909,7 @@ cd ..
 
 done
 
-for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in worker %{?with_event:event} %{?with_itk:itk}; do
 	if ! cmp -s buildmpm-prefork/modules-inside buildmpm-${mpm}/modules-inside; then
 		echo "List of compiled modules is different between prefork-MPM and ${mpm}-MPM!"
 		echo "Build failed."
@@ -1872,15 +1921,15 @@ done
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
-	$RPM_BUILD_ROOT%{_datadir}/cgi-bin
+	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
+	$RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts}
 
 # prefork is default one
 %{__make} -C buildmpm-prefork install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # install other mpm-s
-for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in worker %{?with_event:event} %{?with_itk:itk}; do
 	install buildmpm-${mpm}/httpd.${mpm} $RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm}
 done
 
@@ -1890,45 +1939,45 @@ ln -s %{_localstatedir}/run/httpd $RPM_BUILD_ROOT%{_sysconfdir}/run
 ln -s %{_var}/log/httpd $RPM_BUILD_ROOT%{_sysconfdir}/logs
 ln -s conf.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/httpd
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/httpd
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
 
 %if %{with ssl}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ssl
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
 %endif
 
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/"
-
-install %{SOURCE7} $CFG/10_common.conf
-
-install %{SOURCE23} $CFG/01_mod_mime.conf
-install %{SOURCE24} $CFG/01_mod_authz_host.conf
-install %{SOURCE25} $CFG/01_mod_cgid.conf
-install %{SOURCE26} $CFG/01_mod_log_config.conf
-install %{SOURCE27} $CFG/01_mod_mime_magic.conf
-install %{SOURCE28} $CFG/01_mod_cache.conf
-install %{SOURCE8} $CFG/20_mod_vhost_alias.conf
-install %{SOURCE9} $CFG/25_mod_status.conf
-install %{SOURCE10} $CFG/30_mod_proxy.conf
-install %{SOURCE11} $CFG/35_mod_info.conf
-install %{SOURCE12} $CFG/40_mod_ssl.conf
-install %{SOURCE13} $CFG/45_mod_dav.conf
-install %{SOURCE14} $CFG/59_mod_dir.conf
-install %{SOURCE15} $CFG/13_mod_suexec.conf
-install %{SOURCE16} $CFG/58_mod_deflate.conf
-install %{SOURCE17} $CFG/57_mod_autoindex.conf
-install %{SOURCE18} $CFG/30_errordocs.conf
-install %{SOURCE19} $CFG/30_manual.conf
-install %{SOURCE20} $CFG/16_mod_userdir.conf
-install %{SOURCE21} $CFG/10_mpm.conf
-install %{SOURCE22} $CFG/20_languages.conf
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+
+CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
+
+cp -a %{SOURCE7} $CFG/10_common.conf
+cp -a %{SOURCE23} $CFG/01_mod_mime.conf
+cp -a %{SOURCE24} $CFG/01_mod_authz_host.conf
+cp -a %{SOURCE25} $CFG/01_mod_cgid.conf
+cp -a %{SOURCE26} $CFG/01_mod_log_config.conf
+cp -a %{SOURCE27} $CFG/01_mod_mime_magic.conf
+cp -a %{SOURCE28} $CFG/01_mod_cache.conf
+cp -a %{SOURCE8} $CFG/20_mod_vhost_alias.conf
+cp -a %{SOURCE9} $CFG/25_mod_status.conf
+cp -a %{SOURCE10} $CFG/30_mod_proxy.conf
+cp -a %{SOURCE11} $CFG/35_mod_info.conf
+cp -a %{SOURCE12} $CFG/40_mod_ssl.conf
+cp -a %{SOURCE13} $CFG/45_mod_dav.conf
+cp -a %{SOURCE14} $CFG/59_mod_dir.conf
+cp -a %{SOURCE15} $CFG/13_mod_suexec.conf
+cp -a %{SOURCE16} $CFG/58_mod_deflate.conf
+cp -a %{SOURCE17} $CFG/57_mod_autoindex.conf
+cp -a %{SOURCE18} $CFG/30_errordocs.conf
+cp -a %{SOURCE19} $CFG/30_manual.conf
+cp -a %{SOURCE20} $CFG/16_mod_userdir.conf
+cp -a %{SOURCE21} $CFG/10_mpm.conf
+cp -a %{SOURCE22} $CFG/20_languages.conf
+cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
 
 echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf
 echo "LoadModule authn_file_module	modules/mod_authn_file.so" > $CFG/00_mod_authn_file.conf
@@ -1977,7 +2026,8 @@ echo "LoadModule headers_module	modules/mod_headers.so" > $CFG/00_mod_headers.co
 echo "LoadModule rewrite_module	modules/mod_rewrite.so" > $CFG/00_mod_rewrite.conf
 echo "LoadModule usertrack_module	modules/mod_usertrack.so" > $CFG/00_mod_usertrack.conf
 echo "LoadModule unique_id_module	modules/mod_unique_id.so" > $CFG/00_mod_unique_id.conf
-echo "LoadModule substitute_module	modules/mod_subsitute.so" > $CFG/00_mod_substitute.conf
+echo "LoadModule substitute_module	modules/mod_substitute.so" > $CFG/00_mod_substitute.conf
+echo "LoadModule reqtimeout_module	modules/mod_reqtimeout.so" >> $CFG/00_mod_reqtimeout.conf
 
 # anything in style dir not ending with .css is trash
 rm -rf $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
@@ -2004,6 +2054,10 @@ ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv
 ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
 EOF
 
+# our suexec is patched to support php + fcgi + suexec with
+# virtual users when called as suexec.fcgi
+ln -sf suexec $RPM_BUILD_ROOT%{_sbindir}/suexec.fcgi
+
 # no value
 rm $RPM_BUILD_ROOT%{_libexecdir}/build/config.nice
 rm $RPM_BUILD_ROOT%{_libexecdir}/*.exp
@@ -2237,6 +2291,7 @@ fi
 %module_scripts mod_mime_magic
 %module_scripts mod_negotiation
 %module_scripts mod_proxy
+%module_scripts mod_reqtimeout
 %module_scripts mod_rewrite
 %module_scripts mod_setenvif
 %module_scripts mod_speling
@@ -2284,10 +2339,12 @@ fi
 %{_sysconfdir}/logs
 %ghost %{_sysconfdir}/httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/conf.d
+%attr(750,root,root) %dir %{_sysconfdir}/vhosts.d
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mpm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vhosts.d/example.net.conf
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
@@ -2311,6 +2368,8 @@ fi
 
 %dir %{_datadir}/cgi-bin
 %dir %{_datadir}/html
+%dir %{_datadir}/vhosts
+# do not adapter here, %{_datadir} != /usr/share here
 %{_datadir}/icons
 
 %files doc -f manual.files
@@ -2325,6 +2384,7 @@ fi
 %files suexec
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_sbindir}/suexec
+%attr(755,root,root) %{_sbindir}/suexec.fcgi
 %attr(755,root,root) %{_libexecdir}/mod_suexec.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_suexec.conf
 %{_mandir}/man8/suexec.8*
@@ -2332,8 +2392,6 @@ fi
 %files index
 %defattr(644,root,root,755)
 %config(noreplace,missingok) %{_datadir}/html/index.html*
-%{_datadir}/html/*.gif
-%{_datadir}/html/*.png
 
 %files tools
 %defattr(644,root,root,755)
@@ -2633,6 +2691,11 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_proxy.conf
 %attr(755,root,root) %{_libexecdir}/mod_proxy*.so
 
+%files mod_reqtimeout
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/mod_reqtimeout.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_reqtimeout.conf
+
 %files mod_rewrite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/httxt2dbm