# - --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)
+# - /var/run/apache is also owned by apache1.spec, so rename it to /var/run/httpd spec here (NOTE: if you fix this also adjust apache-mod_fastcgi.spec)
+# - does main package really need apxs dep?
+# - review: http://securitytracker.com/alerts/2005/Aug/1014826.html
+# - http://www.gentoo.org/security/en/glsa/glsa-200509-12.xml (ssl and pcre)
#
# 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: 8
+Version: 2.0.54
+Release: 6
License: Apache Group License
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: eba528fa8613dc5bfb0615a69c11f053
-# Source0-size: 6918995
+# Source0-md5: 772503748ffb85301385d47fb2b96eca
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: %{name}-icons.tar.gz
# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83
-# Source3-size: 46320
Source4: %{name}.sysconfig
Source5: %{name}.monitrc
Source6: %{name}-httpd.conf
# 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: httpd-2.0.45-davetag.patch
Patch8: httpd-2.0.45-encode.patch
Patch9: httpd-2.0.45-export.patch
Patch10: httpd-2.0.46-dav401dest.patch
Patch11: httpd-2.0.46-md5dig.patch
-Patch13: httpd-2.0.46-sslmutex.patch
-Patch14: httpd-2.0.47-sslcleanup.patch
-Patch15: httpd-2.0.48-corelimit.patch
-Patch16: httpd-2.0.48-debuglog.patch
-Patch17: httpd-2.0.48-dynlimit.patch
-Patch18: httpd-2.0.48-sslpphrase.patch
-Patch19: %{name}-v6only-ENOPROTOOPT.patch
-Patch20: %{name}-conffile-path.patch
-Patch21: %{name}-apxs.patch
+Patch12: httpd-2.0.46-sslmutex.patch
+Patch13: httpd-2.0.47-sslcleanup.patch
+Patch14: httpd-2.0.48-corelimit.patch
+Patch15: httpd-2.0.48-debuglog.patch
+Patch16: httpd-2.0.48-dynlimit.patch
+Patch17: httpd-2.0.48-sslpphrase.patch
+Patch18: %{name}-v6only-ENOPROTOOPT.patch
+Patch19: %{name}-conffile-path.patch
+Patch20: %{name}-apxs.patch
# http://www.telana.com/peruser.php
-Patch22: httpd-2.0.50-peruser-r3.patch
-Patch23: %{name}-apr1.patch
+Patch21: httpd-2.0.52-peruser-0.1.6.patch
+Patch22: %{name}-apr1.patch
+Patch23: %{name}-normalize-path.patch
+# http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre
+Patch24: %{name}2-pcre-patch.diff
+# http://issues.apache.org/bugzilla/attachment.cgi?id=16102 DoS
+Patch25: %{name}2-byterange.patch
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-build >= 4.4.0
BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.228
BuildRequires: zlib-devel
PreReq: perl-base
-PreReq: rc-scripts
+PreReq: rc-scripts >= 0.4.0.15
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(postun): /usr/sbin/userdel
Requires(postun): /usr/sbin/groupdel
Requires(post,preun): /sbin/chkconfig
-Requires(post,postun): /sbin/ldconfig
Requires(post): fileutils
Requires: /etc/mime.types
Requires: apr >= 1:1.0.0-2
Requires: %{name}-apxs = %{version}-%{release}
+Requires: FHS >= 2.3-12
Requires: mailcap
Requires: psmisc >= 20.1
Provides: apache(modules-api) = %{_apache_modules_api}
+Provides: apache(mod_access)
+Provides: apache(mod_alias)
+Provides: apache(mod_asis)
+Provides: apache(mod_autoindex)
+Provides: apache(mod_cern_meta)
+Provides: apache(mod_cgi)
+Provides: apache(mod_env)
+Provides: apache(mod_include)
+Provides: apache(mod_log_config)
+Provides: apache(mod_mime)
+Provides: apache(mod_mime_magic)
+Provides: apache(mod_negotiation)
+Provides: apache(mod_setenvif)
+Provides: apache(mod_speling)
+Provides: apache(mod_userdir)
Provides: group(http)
Provides: httpd = %{version}
Provides: user(http)
Provides: webserver = apache
Obsoletes: apache-extra
Obsoletes: apache6
+# for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
+Conflicts: rpm < 4.4.2-0.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/httpd
%define _includedir %{_prefix}/include/apache
%define _datadir /home/services/httpd
%define _libexecdir %{_libdir}/apache
+%define _cgibindir %{_prefix}/lib/cgi-bin/%{name}
%description
Apache is a powerful, full-featured, efficient and freely-available
%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.
%description -l pl
Apache jest serwerem WWW (World Wide Web). Instaluj±c ten pakiet
-bêdziesz móg³ prezentowaæ w³asne strony WWW w sieci internet.
+bêdziesz móg³ prezentowaæ w³asne strony WWW w sieci Internet.
%description -l pt_BR
O servidor web Apache é o melhor servidor gratuito disponível no mundo
%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
Apache index.html* files.
%description index -l pl
-Pliki Apache index.html*.
+Pliki index.html* Apache'a.
%package doc
Summary: Apache manual
%description devel -l pl
Pliki nag³ówkowe i inne zasoby niezbêdne przy budowaniu modu³ów DSO
-(Dynamic Shared Objects) dla Apache.
+(Dynamic Shared Objects) dla Apache'a.
%description devel -l ru
óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache.
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
This package contains mod_auth_anon module. It allows "anonymous" user
access to authenticated areas. It does access control in a manner
-similar to anonymous-ftp sites; i.e. have a 'magic' user id
+similar to anonymous FTP sites; i.e. have a 'magic' user id
'anonymous' and the email address as a password. These email addresses
can be logged. Combined with other (database) access control methods,
this allows for effective user tracking and customization according to
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}
Apache module with LDAP user access authentication.
%description mod_auth_ldap -l pl
-Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP
+Modu³ Apache'a oferuj±cy autoryzacjê u¿ytkowników poprzez LDAP.
%package mod_auth_dbm
Summary: Apache module with user authentication which uses DBM files
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
Implementacja zgodnej z RFC 2616 pamiêci podrêcznej, która mo¿e byæ
u¿ywana do zapamiêtywania zawarto¶ci lokalnej lub dostêpnej przez
proxy. Do³±czono dwa modu³y pozwalaj±ce magazynowaæ dane w pamiêci
-(g³ównie u¿yteczne przy cacheowaniu lokalnej zawarto¶ci) oraz na dysku
-(u¿ywane do cacheowania proxy).
+(g³ównie u¿yteczne przy cache'owaniu lokalnej zawarto¶ci) oraz na
+dysku (u¿ywane do cache'owania proxy).
%package mod_cgid
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}
%description mod_deflate
Compress content before it is delivered to the client.
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
replaced or removed.
%description mod_headers -l pl
-Modu³ pozwalaj±cy na ³±czenie, usuwania, zamianê nag³ówków HTTP
+Modu³ pozwalaj±cy na ³±czenie, usuwanie oraz zamianê nag³ówków HTTP
wysy³anych do przegl±darki.
%package mod_imap
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) = 1:%{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
%description mod_status -l pl
Modu³ pozwala administratorowi na przegl±danie statystyk dotycz±cych
-pracy serwera apache (w postaci strony HTML).
+pracy serwera Apache (w postaci strony HTML).
%package mod_usertrack
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: Apache 2 htpasswd utility: manage user files for basic authentication
+Summary(pl): Narzêdzie htpasswd z Apache'a 2 do zarz±dzania plikami uwierzytelnienia basic
+Group: Networking/Utilities
+Provides: htpasswd
+Obsoletes: htpasswd
+
+%description -n htpasswd-%{name}
+htpasswd is used to create and update the flat-files used to store
+usernames and password for basic authentication of HTTP users. This
+package contains htpasswd from Apache 2; this version supports
+plaintext passwords and CRYPT (default), MD5 and SHA1 encryptions.
+
+%description -n htpasswd-%{name} -l pl
+htpasswd s³u¿y do tworzenia i uaktualniania plików tekstowych
+s³u¿±cych do przechowywania nazw u¿ytkowników i hase³ do podstawowego
+uwierzytelnienia u¿ytkowników HTTP. Ten pakiet zawiera htpasswd z
+Apache'a 2; ta wersja obs³uguje has³a zapisane czystym tekstem oraz
+zakodowane algorytmami CRYPT (domy¶lnym), MD5 i SHA1.
+
+%package cgi_test
+Summary: cgi test/demo programs
+Summary(pl): Programy testowe/przyk³adowe cgi
+Group: Networking/Utilities
+Requires: %{name} = %{version}-%{release}
+
+%description cgi_test
+Two cgi test/demo programs: test-cgi and print-env.
+
+%description cgi_test -l pl
+Dwa programy testowe/przyk³adowe cgi: test-cgi and print-env.
+
%prep
%setup -q -n httpd-%{version}
%patch0 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
+%{?with_external_pcre:%patch24 -p2}
+%patch25 -p0
%{__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
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
- $RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache}
+ $RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/apache,lock/mod_dav} \
+ $RPM_BUILD_ROOT%{_datadir}/cgi-bin
# prefork is default one
%{__make} -C buildmpm-prefork install \
errordir=%{_datadir}/error \
htdocsdir=%{_datadir}/html \
manualdir=%{_datadir}/manual \
- cgidir=%{_datadir}/cgi-bin \
+ cgidir=%{_cgibindir} \
runtimedir=%{_var}/run \
logdir=%{_var}/log/httpd \
proxycachedir=%{_var}/cache/httpd
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apache
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/apache
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit
touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
-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}/
+
+# cgi_test: create config file with ScriptAlias
+cat << EOF > $CFG/09_cgi_test.conf
+ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv
+ScriptAlias /cgi-bin/test-cgi %{_cgibindir}/test-cgi
+EOF
+
%clean
rm -rf $RPM_BUILD_ROOT
%pre
-if [ -n "`getgid http`" ]; then
- if [ "`getgid http`" != "51" ]; then
- echo "Error: group http doesn't have gid=51. Correct this before installing apache." 1>&2
- exit 1
- fi
-else
- /usr/sbin/groupadd -g 51 -r -f http
-fi
-if [ -n "`id -u http 2>/dev/null`" ]; then
- if [ "`id -u http`" != "51" ]; then
- echo "Error: user http doesn't have uid=51. Correct this before installing apache." 1>&2
- exit 1
- fi
-else
- /usr/sbin/useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http 1>&2
-fi
+%groupadd -g 51 http
+%useradd -u 51 -r -d /home/services/httpd -s /bin/false -c "HTTP User" -g http http
%post
-/sbin/ldconfig
/sbin/chkconfig --add httpd
umask 137
touch /var/log/httpd/{access,error,agent,referer}_log
-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."
-fi
%preun
if [ "$1" = "0" ]; then
if [ -f /var/lock/subsys/httpd ]; then
/etc/rc.d/init.d/httpd stop 1>&2
fi
- /sbin/chkconfig --del httpd
+ # see http://thread.gmane.org/gmane.linux.pld.devel.english/712
+ [ ! -x /sbin/chkconfig ] || /sbin/chkconfig --del httpd
fi
%postun
-/sbin/ldconfig
if [ "$1" = "0" ]; then
%userremove http
%groupremove http
fi
-%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:"
-echo "poldek --upgrade %{name}-mod_autoindex"
-echo
+%triggerpostun -- %{name} <= 2.0.50-6
+%banner %{name}-2.0.50-6 << EOF
+WARNING!!!
+Since apache-2.0.50-6 autoindex module has been separated to package
+%{name}-mod_autoindex If you want to have the same functionality do:
+poldek -Uv %{name}-mod_autoindex
+EOF
+
+%triggerpostun -- %{name} < 2.0.54-4
+%banner %{name}-2.0.54-2 << EOF
+WARNING!!!
+CGI demo/test programs - printenv and test-cgi, have been released
+from package apache into separate subpackage apache-cgi_test. If you
+need printenv and/or test-cgi, please install apache-cgi_test package,
+e.g. by running poldek -Uv apache-cgi_test
+EOF
+
+# update /etc/sysconfig/apache -> httpd rename
+if [ -f /etc/sysconfig/apache.rpmsave ]; then
+ cp -f /etc/sysconfig/httpd{,.rpmnew}
+ mv -f /etc/sysconfig/{apache.rpmsave,httpd}
+fi
+
+%posttrans
+# minimizing apache restarts logics. we restart webserver:
+#
+# 1. at the end of transaction. (posttrans, feature from rpm 4.4.2)
+# 2. first install of module (post: $1 = 1)
+# 2. uninstall of module (postun: $1 == 0)
+#
+# the strict internal deps between apache modules and
+# main package are very important for all this to work.
-%post 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."
+# restart webserver at the end of transaction
+%service httpd restart
+
+# macro called at module post scriptlet
+%define module_post \
+if [ "$1" = "1" ]; then \
+ %service -q httpd restart \
fi
-%preun mod_actions
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+# macro called at module postun scriptlet
+%define module_postun \
+if [ "$1" = "0" ]; then \
+ %service -q httpd restart \
fi
+%post mod_actions
+%module_post
+
+%postun mod_actions
+%module_postun
+
%post 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."
-fi
+%module_post
-%preun mod_auth
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_auth
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_auth_anon
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_auth_anon
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_auth_dbm
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_auth_dbm
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_autoindex
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_autoindex
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_cache
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_cache
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_cgid
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_cgid
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_charset_lite
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_charset_lite
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_dav
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_dav
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_auth_digest
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_auth_digest
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_deflate
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_deflate
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_dir
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_dir
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_expires
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_expires
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_file_cache
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_file_cache
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_headers
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_headers
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_imap
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_imap
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_info
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_info
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_proxy
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_proxy
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_rewrite
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_rewrite
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_ssl
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_ssl
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_status
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_status
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_usertrack
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_usertrack
+%module_postun
%post 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."
-fi
+%module_post
-%preun mod_unique_id
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
+%postun mod_unique_id
+%module_postun
%post mod_vhost_alias
-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."
+%module_post
+
+%postun mod_vhost_alias
+%module_postun
+
+%post cgi_test
+if [ "$1" = "1" ]; then
+ %service -q httpd reload
fi
-%preun mod_vhost_alias
+%postun cgi_test
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+ %service -q httpd reload
fi
%files
%attr(750,root,root) %dir %{_sysconfdir}/httpd.conf
%attr(750,root,root) %dir %{_sysconfdir}/modules
%attr(750,root,root) %dir %{_sysconfdir}/run
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_httpd.conf
%attr(640,root,root) %{_sysconfdir}/magic
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
-%attr(750,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/monit/*.monitrc
+%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/*
+%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
%attr(755,root,root) %{_libexecdir}/mod_access.so
%attr(755,root,root) %{_libexecdir}/mod_alias.so
%{_mandir}/man8/logresolve.8*
%{_mandir}/man8/rotatelogs.8*
-%attr(750,root,logs) %dir /var/log/httpd
-%attr(750,root,logs) %dir /var/log/archiv/httpd
+%attr(2750,root,logs) %dir /var/log/httpd
+%attr(2750,root,logs) %dir /var/log/archiv/httpd
%attr(640,root,logs) %ghost /var/log/httpd/*
%dir %{_datadir}
-%attr(755,root,root) %dir %{_datadir}/html
+%dir %{_datadir}/cgi-bin
+%dir %{_datadir}/html
%{_datadir}/icons
-%attr(755,root,root) %{_datadir}/cgi-bin
-
%{_datadir}/error
%files doc
%lang(ko) %{_datadir}/manual/mod/module-dict.html.ko.euc-kr
%{_datadir}/manual/mod/mpm_common.html.en
%lang(de) %{_datadir}/manual/mod/mpm_common.html.de
+%lang(es) %{_datadir}/manual/mod/mpm_common.html.es
%lang(ja) %{_datadir}/manual/mod/mpm_common.html.ja*
%{_datadir}/manual/mod/mod_access.html.en
%lang(ja) %{_datadir}/manual/mod/mod_access.html.ja*
%{_datadir}/manual/mod/mod_alias.html.en
%lang(ja) %{_datadir}/manual/mod/mod_alias.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_alias.html.ko.euc-kr
%{_datadir}/manual/mod/mod_asis.html.en
%lang(ja) %{_datadir}/manual/mod/mod_asis.html.ja*
%lang(ko) %{_datadir}/manual/mod/mod_asis.html.ko.euc-kr
%{_datadir}/manual/mod/mod_include.html.en
%lang(ja) %{_datadir}/manual/mod/mod_include.html.ja*
%{_datadir}/manual/mod/mod_log_config.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_log_config.html.ja.euc-jp
+%lang(ko) %{_datadir}/manual/mod/mod_log_config.html.ko.euc-kr
%{_datadir}/manual/mod/mod_log_forensic.html.en
%{_datadir}/manual/mod/mod_mime*.html.en
%lang(ja) %{_datadir}/manual/mod/mod_mime*.html.ja*
%{_datadir}/manual/mod/mod_ldap.html.en
%{_datadir}/manual/mod/mod_auth_dbm.html.en
%{_datadir}/manual/mod/mod_auth_digest.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_auth_digest.html.ko.euc-kr
%{_datadir}/manual/mod/mod_cache.html.en
%lang(ko) %{_datadir}/manual/mod/mod_cache.html.ko.euc-kr
%{_datadir}/manual/mod/mod_disk_cache.html.en
%lang(ko) %{_datadir}/manual/mod/mod_disk_cache.html.ko.euc-kr
%{_datadir}/manual/mod/mod_mem_cache.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_mem_cache.html.ko.euc-kr
%{_datadir}/manual/mod/mod_cgid.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_cgid.html.ja.euc-jp
%lang(ko) %{_datadir}/manual/mod/mod_cgid.html.ko.euc-kr
%{_datadir}/manual/mod/mod_charset_lite.html.en
%lang(ko) %{_datadir}/manual/mod/mod_charset_lite.html.ko.euc-kr
%lang(ja) %{_datadir}/manual/mod/mod_dir.html.ja*
%lang(ko) %{_datadir}/manual/mod/mod_dir.html.ko.euc-kr
%{_datadir}/manual/mod/mod_expires.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_expires.html.ja.euc-jp
%lang(ko) %{_datadir}/manual/mod/mod_expires.html.ko.euc-kr
%{_datadir}/manual/mod/mod_file_cache.html.en
%lang(ko) %{_datadir}/manual/mod/mod_file_cache.html.ko.euc-kr
%{_datadir}/manual/mod/mod_headers.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_headers.html.ko.euc-kr
%{_datadir}/manual/mod/mod_imap.html.en
+%lang(ko) %{_datadir}/manual/mod/mod_imap.html.ko.euc-kr
%{_datadir}/manual/mod/mod_info.html.en
%lang(ja) %{_datadir}/manual/mod/mod_info.html.ja*
+%lang(ko) %{_datadir}/manual/mod/mod_info.html.ko.euc-kr
%{_datadir}/manual/mod/mod_proxy*.html.en
%{_datadir}/manual/mod/mod_rewrite.html.en
+%{_datadir}/manual/mod/mod_so.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_so.html.ja.euc-jp
+%lang(ko) %{_datadir}/manual/mod/mod_so.html.ko.euc-kr
%{_datadir}/manual/images/mod_rewrite*
+%dir %{_datadir}/manual/rewrite
+%{_datadir}/manual/rewrite/index.html.en
+%{_datadir}/manual/rewrite/rewrite_guide.html.en
+%{_datadir}/manual/rewrite/rewrite_guide_advanced.html.en
+%{_datadir}/manual/rewrite/rewrite_intro.html.en
+%{_datadir}/manual/rewrite/rewrite_tech.html.en
%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
%{_datadir}/manual/mod/mod_status.html.en
+%lang(ja) %{_datadir}/manual/mod/mod_status.html.ja.euc-jp
%lang(ko) %{_datadir}/manual/mod/mod_status.html.ko.euc-kr
%{_datadir}/manual/mod/mod_usertrack.html.en
%{_datadir}/manual/mod/mod_unique_id.html.en
%defattr(644,root,root,755)
%attr(4755,root,root) %{_sbindir}/suexec
%attr(755,root,root) %{_libexecdir}/mod_suexec.so
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_suexec.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_suexec.conf
%{_mandir}/man8/suexec.8*
%files index
%files mod_actions
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_actions.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_actions.conf
%attr(755,root,root) %{_libexecdir}/mod_actions.so
%files mod_auth
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_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)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_anon.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_anon.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_anon.so
%if %{with ldap}
%files mod_auth_ldap
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_ldap.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_ldap.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_ldap.so
%endif
%if %{with ldap}
%files mod_ldap
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_ldap.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_ldap.conf
%attr(755,root,root) %{_libexecdir}/mod_ldap.so
%endif
%files mod_auth_dbm
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_dbm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_dbm.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_dbm.so
%attr(755,root,root) %{_sbindir}/dbmmanage
%attr(755,root,root) %{_sbindir}/htdbm
%files mod_auth_digest
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_auth_digest.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_digest.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_digest.so
%files mod_autoindex
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_autoindex.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_autoindex.conf
%attr(755,root,root) %{_libexecdir}/mod_autoindex.so
%files mod_cache
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_cache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_cache.conf
%attr(755,root,root) %{_libexecdir}/mod_cache.so
%attr(755,root,root) %{_libexecdir}/mod_disk_cache.so
%attr(755,root,root) %{_libexecdir}/mod_mem_cache.so
%files mod_cgid
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_cgid.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_cgid.conf
%attr(755,root,root) %{_libexecdir}/mod_cgid.so
%files mod_charset_lite
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_charset_lite.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_charset_lite.conf
%attr(755,root,root) %{_libexecdir}/mod_charset_lite.so
%files mod_dav
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_dav.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_dav.conf
%attr(755,root,root) %{_libexecdir}/mod_dav*.so
+%dir %attr(770,root,http) /var/lock/mod_dav
%files mod_deflate
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_deflate.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_deflate.conf
%attr(755,root,root) %{_libexecdir}/mod_deflate.so
%files mod_dir
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_dir.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_dir.conf
%attr(755,root,root) %{_libexecdir}/mod_dir.so
%files mod_expires
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_expires.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_expires.conf
%attr(755,root,root) %{_libexecdir}/mod_expires.so
%files mod_file_cache
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_file_cache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_file_cache.conf
%attr(755,root,root) %{_libexecdir}/mod_file_cache.so
%files mod_headers
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_headers.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_headers.conf
%attr(755,root,root) %{_libexecdir}/mod_headers.so
%files mod_imap
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_imap.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_imap.conf
%attr(755,root,root) %{_libexecdir}/mod_imap.so
%files mod_info
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_info.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_info.conf
%attr(755,root,root) %{_libexecdir}/mod_info.so
%files mod_proxy
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_proxy.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_proxy.conf
%attr(755,root,root) %{_libexecdir}/mod_proxy*.so
%files mod_rewrite
%defattr(644,root,root,755)
%attr(755,root,root) %{_libexecdir}/mod_rewrite.so
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_rewrite.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_rewrite.conf
%if %{with ssl}
%files mod_ssl
%defattr(644,root,root,755)
%attr(750,root,root) %dir %{_sysconfdir}/ssl
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ssl/server.*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_ssl.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ssl/server.*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_ssl.conf
%attr(755,root,root) %{_libexecdir}/mod_ssl.so
%endif
%files mod_status
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_status.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_status.conf
%attr(755,root,root) %{_libexecdir}/mod_status.so
%files mod_usertrack
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_usertrack.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_usertrack.conf
%attr(755,root,root) %{_libexecdir}/mod_usertrack.so
%files mod_unique_id
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*_mod_unique_id.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_unique_id.conf
%attr(755,root,root) %{_libexecdir}/mod_unique_id.so
%files mod_vhost_alias
%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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_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*
+
+%files cgi_test
+%defattr(644,root,root,755)
+%dir %{_cgibindir}
+%attr(755,root,root) %{_cgibindir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/09_cgi_test.conf