- rel 9; drop unmaintained metuxmpm

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index e219b2ecc5f3dcfdc8b1a883bad9826dd074aa27..ae457cde6939a687ff395c90112e91fa69d18577 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -11,11 +11,11 @@
 # - 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    distcache       # distcache support
@@ -33,12 +33,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.10
-Release:       4
+Version:       2.2.11
+Release:       9
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: f611aff3ddba114499e623a5259faa5c
+# Source0-md5: 03e0a99a5de0f3f568a0087fb9993af9
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -72,9 +72,6 @@ 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
@@ -90,9 +87,10 @@ 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}-suexec_fcgi.patch
 Patch24:       %{name}-revert-bug-40463.patch
+Patch25:       %{name}-prefork-graceful-fix.patch
+Patch26:       %{name}-pollset-segv.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= 1:1.2
 BuildRequires: apr-util-devel >= 1:1.3
@@ -112,12 +110,9 @@ 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}
@@ -194,8 +189,7 @@ Requires(pre):      /usr/sbin/useradd
 Requires:      /sbin/chkconfig
 Requires:      apr >= 1:1.2
 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)
@@ -1470,6 +1464,7 @@ 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
@@ -1735,7 +1730,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
@@ -1748,9 +1742,10 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-%patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p0
+%patch26 -p0
 
 # using system apr, apr-util and pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -1784,7 +1779,7 @@ 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_peruser:peruser} %{?with_event:event}; do
 install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
 ../%configure \
        --enable-layout=PLD \
@@ -1868,7 +1863,7 @@ cd ..
 
 done
 
-for mpm in %{?with_metuxmpm:metuxmpm} %{?with_peruser:peruser} worker %{?with_event:event}; do
+for mpm in %{?with_peruser:peruser} worker %{?with_event:event}; 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."
@@ -1888,7 +1883,7 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
        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 %{?with_peruser:peruser} worker %{?with_event:event}; do
        install buildmpm-${mpm}/httpd.${mpm} $RPM_BUILD_ROOT%{_sbindir}/httpd.${mpm}
 done
 
@@ -2345,8 +2340,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)