# - --with-suexec-uidmin=500 or =1000 ?
# - subpackages for MPMs
# - check if all modules (*.so) are exactly the same for different MPMs
+# - install stage fails with distcc (make -jN)
+# - polish description and summary at package htpasswd
#
# Conditional build:
%bcond_without ssl # build without SSL support
%bcond_without ldap # build without LDAP support
+%bcond_with external_pcre # build with external PCRE support (Apache bug #27550)
#
%include /usr/lib/rpm/macros.perl
# this is internal macro, don't change to %%apache_modules_api
Summary(ru): óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
Summary(tr): Lider WWW tarayýcý
Name: apache
-Version: 2.0.52
-Release: 9
+Version: 2.0.53
+Release: 3.2
License: Apache Group License
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: eba528fa8613dc5bfb0615a69c11f053
+# Source0-md5: b089bdc7065c3be166bcc516b0d92416
# Source0-size: 6918995
Source1: %{name}.init
Source2: %{name}.logrotate
Patch22: httpd-2.0.50-peruser-r3.patch
Patch23: %{name}-apr1.patch
Patch24: %{name}-normalize-path.patch
+# http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre
+Patch25: %{name}2-pcre-patch.diff
URL: http://httpd.apache.org/
BuildRequires: automake
BuildRequires: apr-devel >= 1:1.0.0
%{?with_ldap:BuildRequires: openldap-devel}
%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
%{?with_ssl:BuildRequires: openssl-tools >= 0.9.7d}
+%{?with_external_pcre:BuildRequires: pcre-devel}
BuildRequires: perl-devel >= 1:5.6
BuildRequires: rpm-perlprov >= 4.1-13
BuildRequires: rpmbuild(macros) >= 1.159
%description -l es
El servidor web Apache es el mejor servidor gratuito disponible en el
mundo UNIX hoy. Usa HTTP (HyperText Transfer Protocol) para permitir
-que browsers web vean documentos y sometan datos remotamente. Puede
+que navegadores vean documentos y sometan datos remotamente. Puede
ejecutar varias funciones diferentes, incluyendo funciones de proxy y
caché, y nos ofrece características como monitor de estado, conversión
dinámica de tipo, y otras más.
%package suexec
Summary: Apache suexec wrapper
Summary(pl): Wrapper suexec do serwera WWW Apache
-Group: Development/Tools
+Group: Networking/Daemons
Requires: %{name} = %{version}-%{release}
%description suexec
Summary: Apache module for run CGI whenever a file of a certain type is requested
Summary(pl): Modu³ Apache'a do uruchamiania skryptów CGI
Group: Networking/Daemons
+Provides: apache(mod_actions) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_actions
Summary: Apache module with user authentication using textual files
Summary(pl): Modu³ Apache'a identyfikuj±cy u¿ytkowników na podstawie plików tekstowych
Group: Networking/Daemons
+Provides: apache(mod_auth) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
+Requires: htpasswd
%description mod_auth
This package contains mod_auth module. It provides for user
Summary: Apache module with "anonymous" user access authentication
Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkownika "anonimowego"
Group: Networking/Daemons
+Provides: apache(mod_auth_anon) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_anon
Summary: Apache module with LDAP user access authentication
Summary(pl): Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
Group: Networking/Daemons
+Provides: apache(mod_auth_ldap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-mod_ldap = %{version}-%{release}
Summary(pl): Modu³ Apache'a z mechanizmem identyfikacji korzystaj±cym z plików DBM
Group: Networking/Daemons
Obsoletes: apache-mod_auth_db
+Provides: apache(mod_auth_dbm) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_dbm
Summary(pl): Modu³ Apache'a do autoryzacji MD5
Group: Networking/Daemons
Obsoletes: apache-mod_digest
+Provides: apache(mod_auth_digest) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_auth_digest
Summary: Apache module - display index of files
Summary(pl): Modu³ apache do wy¶wietlania indeksu plików
Group: Networking/Daemons
+Provides: apache(mod_autoindex) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_autoindex
Summary: Content cache keyed to URIs
Summary(pl): Pamiêæ podrêczna wg klucza URI
Group: Networking/Daemons
+Provides: apache(mod_cache) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_cache
Summary: Execution of CGI scripts using an external CGI daemon
Summary(pl): Uruchamianie zewnêtrznych skryptów CGI za pomoc± daemona CGI
Group: Networking/Daemons
+Provides: apache(mod_cgid) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_cgid
Summary: Specify character set translation or recoding
Summary(pl): Translacja lub przekodowywanie znaków
Group: Networking/Daemons
+Provides: apache(mod_charset_lite) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_charset_lite
Summary: Apache module - Distributed Authoring and Versioning
Summary(pl): Modu³ Apache'a - rozproszone autorstwo i wersjonowanie
Group: Networking/Daemons
+Provides: apache(mod_dav) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_dav
Summary: Apache module: Compress content before it is delivered to the client
Summary(pl): Modu³ Apache'a kompresuj±cy dane przed przes³aniem ich do klienta
Group: Networking/Daemons
+Provides: apache(mod_deflate) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: %{name}-mod_headers = %{version}-%{release}
Summary: Apache module for "trailing slash" redirects and serving directory index files
Summary(pl): Modu³ Apache'a oferuj±cy przekierowania i udostêpnianie informacji o zawarto¶ci katalogu
Group: Networking/Daemons
+Provides: apache(mod_dir) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_dir
Summary: Apache module allows for the customization of HTTP response headers
Summary(pl): Modu³ Apache'a pozwalaj±cy na modyfikacjê nag³ówków HTTP
Group: Networking/Daemons
+Provides: apache(mod_headers) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_headers
Summary: Apache module with imap-file handler
Summary(pl): Modu³ Apache'a z obs³ug± imap-file
Group: Networking/Daemons
+Provides: apache(mod_imap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_imap
Summary: Apache module with comprehensive overview of the server configuration
Summary(pl): Modu³ Apache'a udostêpniaj±cy informacje o serwerze
Group: Networking/Daemons
+Provides: apache(mod_info) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_info
Summary: Apache module to use LDAP connections
Summary(pl): Modu³ Apache'a umo¿liwiaj±cy korzystanie z po³±czeñ LDAP
Group: Networking/Daemons
+Provides: apache(mod_ldap) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_ldap
Summary: Apache module with Web proxy
Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê serwera proxy
Group: Networking/Daemons
+Provides: apache(mod_proxy) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_proxy
Summary: Apache module with rule-based engine for rewrite requested URLs on the fly
Summary(pl): Modu³ Apache'a do "przepisywania" adresów URL w locie
Group: Networking/Daemons
+Provides: apache(mod_rewrite) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_rewrite
Summary(ru): íÏÄÕÌØ SSL/TLS ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
Group: Networking/Daemons
Epoch: 1
+Provides: apache(mod_ssl) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_ssl
Summary: Server status report module for Apache
Summary(pl): Modu³ udostêpniaj±cy informacje statystyczne z serwera Apache
Group: Networking/Daemons
+Provides: apache(mod_status) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_status
Summary: Apache module for user tracking using cookies
Summary(pl): Modu³ Apache'a s³u¿±cy do ¶ledzenia "ciasteczek"
Group: Networking/Daemons
+Provides: apache(mod_usertrack) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_usertrack
Summary: Apache module for dynamically configured mass virtual hosting
Summary(pl): Modu³ Apache'a dodaj±cy obs³ugê hostów wirtualnych
Group: Networking/Daemons
+Provides: apache(mod_vhost_alias) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_vhost_alias
Summary: Apache module which provides a magic token for each request
Summary(pl): Modu³ Apache'a nadaj±cy ka¿demu zapytaniu unikalny token
Group: Networking/Daemons
+Provides: apache(mod_unique_id) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_unique_id
Summary: Apache module which generates Expires HTTP headers
Summary(pl): Modu³ Apache'a generuj±cy nag³ówki HTTP Expires
Group: Networking/Daemons
+Provides: apache(mod_expires) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_expires
Summary(pl): Modu³ Apache'a cache'uj±cy statyczn± listê plików w pamiêci
Group: Networking/Daemons
Obsoletes: apache-mmap_static
+Provides: apache(mod_file_cache) = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description mod_file_cache
%description mod_file_cache -l pl
Modu³ cache'uj±cy statyczn± listê plików w pamiêci.
+%package -n htpasswd-%{name}
+Summary: Apache2 htpasswd utility
+Group: Networking/Utilities
+Provides: htpasswd
+Obsoletes: htpasswd
+
+%description -n htpasswd-%{name}
+htpasswd from Apache2
+
+Usage:
+ htpasswd [-cmdpsD] passwordfile username
+ htpasswd -b[cmdpsD] passwordfile username password
+
+ htpasswd -n[mdps] username
+ htpasswd -nb[mdps] username password
+ -c Create a new file.
+ -n Don't update file; display results on stdout.
+ -m Force MD5 encryption of the password.
+ -d Force CRYPT encryption of the password (default).
+ -p Do not encrypt the password (plaintext).
+ -s Force SHA encryption of the password.
+ -b Use the password from the command line rather than prompting for it.
+ -D Delete the specified user.
+
%prep
%setup -q -n httpd-%{version}
%patch0 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
+%{?with_external_pcre:%patch25 -p2}
%{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)
%{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in
--with-suexec-gidmin=500 \
--with-suexec-umask=077 \
--with-apr=%{_bindir}/apr-1-config \
- --with-apr-util=%{_bindir}/apu-1-config
+ --with-apr-util=%{_bindir}/apu-1-config \
+ %{?_with_external_pcre:--with-external-pcre}
%{__make}
./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside
-name '*.xml' -o -name '*.xml.*' -o -name '*.html' \
| xargs rm -f
+# htpasswd goes to %{_bindir}
+mv $RPM_BUILD_ROOT%{_sbindir}/htpasswd $RPM_BUILD_ROOT%{_bindir}/
+ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}/
+
%clean
rm -rf $RPM_BUILD_ROOT
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun
%groupremove http
fi
-%triggerpostun -- %{name} <= 2.0.50-6
+%triggerpostun -- %{name} <= 2.0.50-6
echo "WARNING!!!"
echo "Since that version autoindex module has been separated to package %{name}-mod_autoindex"
echo "If you want to have the same functionality do:"
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_actions
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth_anon
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth_dbm
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_autoindex
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_cache
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_cgid
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_charset_lite
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_dav
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_auth_digest
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_deflate
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_dir
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_expires
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_file_cache
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_headers
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_imap
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_info
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_proxy
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_rewrite
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_ssl
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_status
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_usertrack
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_unique_id
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd restart 1>&2
else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
fi
%preun mod_vhost_alias
%{_datadir}/manual/mod/mod_rewrite.html.en
%{_datadir}/manual/images/mod_rewrite*
%dir %{_datadir}/manual/ssl
-%{_datadir}/manual/ssl/*.gif
-%{_datadir}/manual/ssl/*.png
%{_datadir}/manual/ssl/*.html.en
%lang(ja) %{_datadir}/manual/ssl/*.html.ja*
%{_datadir}/manual/mod/mod_ssl.html.en
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
%attr(755,root,root) %{_libexecdir}/mod_auth.so
-%attr(755,root,root) %{_sbindir}/htpasswd
-%{_mandir}/man1/htpasswd.1*
%files mod_auth_anon
%defattr(644,root,root,755)
%defattr(644,root,root,755)
%attr(755,root,root) %{_libexecdir}/mod_vhost_alias.so
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_vhost_alias.conf
+
+%files -n htpasswd-%{name}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/htpasswd
+%{_sbindir}/htpasswd
+%{_mandir}/man1/htpasswd.1*