-# TODO
-# - move DocumentRoot and cgi-dir out of /home/services
#
# Conditional build:
%bcond_with rewrite_ldap # enable ldap map support for mod_rewrite (alpha)
%bcond_without ipv6 # disable IPv6 support
-%bcond_with minimal # minimal apache, without any modules
-%bcond_with lingerd # build with lingerd support
+%bcond_without lingerd # don't build lingerd support
#
%include /usr/lib/rpm/macros.perl
Summary: The most widely used Web server on the Internet
Summary(uk): îÁÊÐÏÐÕÌÑÒΦÛÉÊ Web-Server
Summary(zh_CN): Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
Name: apache1
-Version: 1.3.34
-Release: 8
+Version: 1.3.37
+Release: 5
License: Apache Group
Group: Networking/Daemons
Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
-# Source0-md5: 9978cc552b423f0015c1052d23ab619e
+# Source0-md5: b278f0969a9ccadeb781316e79e3520f
Source1: %{name}.init
Source2: %{name}.logrotate
Source3: apache-icons.tar.gz
Patch21: %{name}-apxs-quiet.patch
Patch22: %{name}-db4.patch
Patch23: %{name}-less-libs.patch
-Patch24: %{name}-CVE-2005-3352.patch
+Patch24: %{name}-rwrite-debug.patch
+Patch25: %{name}-apxs-DESTDIR.patch
+# from debian apache_1.3.34-2.diff.gz
+Patch26: %{name}-regex_must_conform_to_posix_for_LFS_to_work.patch
+Patch27: %{name}-suexec_of_death.patch
+Patch28: %{name}-suexec_reopenlog.patch
+Patch29: %{name}-autoindex_studly.patch
+Patch30: %{name}-autoindex_indexes.patch
+Patch31: %{name}-autoindex_generator.patch
+Patch32: %{name}-ab.8_formatting_error.patch
+Patch33: %{name}-proxy_content_base.patch
+Patch34: %{name}-inetdfix.patch
+Patch35: %{name}-configure_hashbang.patch
+Patch36: %{name}-log_files_permission.patch
+Patch37: %{name}-htpasswd_do_not_trash_extra_fields.patch
+Patch38: %{name}-GNU_xargs.patch
+Patch39: %{name}-security_htdigest_local_buffer_overflow.patch
+Patch40: %{name}-security_htpasswd_user_buffer_overflow.patch
+Patch41: %{name}-security_check_forensic_tempfiles.patch
URL: http://httpd.apache.org/
+BuildRequires: bash
BuildRequires: db-devel >= 4.1
BuildRequires: mm-devel >= 1.3.0
%{?with_rewrite_ldap:BuildRequires: openldap-devel}
BuildRequires: perl-base
BuildRequires: rpm-build >= 4.4.0
BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.247
-Requires: mm
-Requires: rc-scripts
-%if %{without minimal}
-# essental modules (maybe remove these in future if all Requires in
-# place for other packages).
+BuildRequires: rpmbuild(macros) >= 1.268
Requires: %{name}-mod_access = %{version}-%{release}
Requires: %{name}-mod_alias = %{version}-%{release}
+Requires: %{name}-mod_dir = %{version}-%{release}
Requires: %{name}-mod_log_config = %{version}-%{release}
Requires: %{name}-mod_mime = %{version}-%{release}
-%endif
-Requires(post,preun): /sbin/chkconfig
-Requires(postun): /usr/sbin/groupdel
-Requires(postun): /usr/sbin/userdel
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getent
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires(pre): /usr/sbin/usermod
-Requires(pre): textutils
-Requires(triggerpostun): sed >= 4.0
-Requires: /etc/mime.types
-Requires: mailcap
-Requires: psmisc >= 20.1
-Provides: %{name}(EAPI) = %{version}-%{release}
-Provides: group(http)
-Provides: user(http)
-Provides: webserver = apache
-%{?with_ipv6:Provides: apache1(ipv6)}
-%{?with_lingerd:Provides: apache1(lingerd)}
-Obsoletes: apache < 2.0.0
-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/apache
Èç¹ûÄúÐèÒª Web ·þÎñ³ÌÐò£¬Çë°²×° apache Èí¼þ°ü¡£
+%package base
+Summary: The most widely used Web server on the Internet
+Summary(pl): Serwer WWW (World Wide Web)
+Group: Networking/Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getent
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/usermod
+Requires(pre): textutils
+Requires(triggerpostun): sed >= 4.0
+Requires: /etc/mime.types
+Requires: mailcap
+Requires: psmisc >= 20.1
+Requires: rc-scripts
+Provides: %{name}(EAPI) = %{version}-%{release}
+%{?with_ipv6:Provides: apache1(ipv6)}
+%{?with_lingerd:Provides: apache1(lingerd)}
+Provides: group(http)
+Provides: user(http)
+Provides: webserver = apache
+Obsoletes: apache < 2.0.0
+Obsoletes: apache-extra
+Obsoletes: apache6
+Conflicts: apache1 < 1.3.37-4
+# for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
+Conflicts: rpm < 4.4.2-0.2
+
+%description base
+Apache is a powerful, full-featured, efficient and freely-available
+Web server. Apache is also the most popular Web server on the
+Internet.
+
+%description base -l pl
+Apache jest potê¿nym, w pe³ni funkcjonalnym, wydajnym i wolnodostêpnym
+serwerem WWW (World Wide Web). Jest tak¿e najbardziej popularnym
+serwerem WWW w Internecie.
+
%package suexec
Summary: Apache suexec wrapper
Summary(pl): Suexec wrapper do serwera WWW Apache
Summary: Apache index.html* files
Summary(pl): Pliki Apache index.html*
Group: Documentation
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-base = %{version}-%{release}
Obsoletes: indexhtml
%description index
Summary: Apache 1.3.x manual
Summary(pl): Podrêcznik do Apache'a 1.3.x
Group: Documentation
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-base = %{version}-%{release}
%description doc
Apache 1.3.x manual.
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
Provides: apache(mod_access) = %{version}-%{release}
+Provides: webserver(access)
%description mod_access
The directives provided by mod_access are used in <Directory>,
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
Provides: apache(mod_alias) = %{version}-%{release}
+Provides: webserver(alias)
%description mod_alias
This module provides for mapping different parts of the host
Summary(pl): Modu³ uwierzytelniania u¿ytkownika przy u¿yciu plików tekstowych dla Apache
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
-Requires: htpasswd
Provides: apache(mod_auth) = %{version}-%{release}
+Provides: webserver(auth)
Obsoletes: apache-mod_auth < 2.0.0
%description mod_auth
Summary(pl): Modu³ Apache'a do uwierzytelniania metod± MD5 Digest Authentication
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
-Obsoletes: %{name}-mod_digest
Provides: apache(mod_auth_digest) = %{version}-%{release}
Obsoletes: apache-mod_auth_digest < 2.0.0
+Obsoletes: apache1-mod_digest
%description mod_auth_digest
This package contains mod_digest module. It provides user
Summary(pl): Modu³ apache do wy¶wietlania indeksu plików
Group: Networking/Daemons
Requires(triggerpostun): sed >= 4.0
-Provides: apache(mod_autoindex) = %{version}-%{release}
Requires: %{name}(EAPI) = %{version}-%{release}
+Provides: apache(mod_autoindex) = %{version}-%{release}
%description mod_autoindex
This package contains mod_autoindex module. It provides generation
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
Provides: apache(mod_cgi) = %{version}-%{release}
+Provides: webserver(cgi)
%description mod_cgi
Any file that has the MIME type application/x-httpd-cgi or handler
Group: Networking/Daemons
Requires: %{name}(EAPI) = %{version}-%{release}
Provides: apache(mod_dir) = %{version}-%{release}
+Provides: webserver(indexfile)
Obsoletes: apache-mod_dir < 2.0.0
%description mod_dir
%patch21 -p1
%patch22 -p1
%patch23 -p1
-%patch24 -p0
+%patch24 -p1
+%patch25 -p1
+
+%patch26 -p2
+%patch27 -p2
+%patch28 -p2
+%patch29 -p2
+%patch30 -p2
+%patch31 -p2
+%patch32 -p2
+%patch33 -p2
+%patch34 -p2
+%patch35 -p2
+%patch36 -p2
+%patch37 -p2
+%patch38 -p2
+%patch39 -p2
+%patch40 -p2
+%patch41 -p2
%if %{with lingerd}
mv lingerd-* _lingerd
--enable-module=auth_digest \
--enable-shared=max \
--proxycachedir=/var/cache/apache \
- --with-perl=%{_bindir}/perl \
+ --with-perl=%{__perl} \
--enable-suexec \
--suexec-caller=http \
--suexec-uidmin=500 \
%{?with_ipv6:--enable-rule=INET6}
%{__make} \
+ CC="%{__cc}"
LIBS1="-lm -lcrypt -lmm -ldl"
rm -f src/modules/standard/mod_auth_db.so
%{__make} -C src/modules/standard mod_auth_db.so \
+ CC="%{__cc}"
LIBS_SHLIB="-ldb"
rm -f src/modules/standard/mod_rewrite.so
%{__make} -C src/modules/standard mod_rewrite.so \
+ CC="%{__cc}"
LIBS_SHLIB="-ldb %{?with_rewrite_ldap:-lldap -llber}"
%if %{with lingerd}
mv $RPM_BUILD_ROOT%{_sysconfdir}/modules/* $RPM_BUILD_ROOT%{_libexecdir}
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s /var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
+ln -s ../..%{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -s ../../var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}
%clean
rm -rf $RPM_BUILD_ROOT
-%pre
+%pre base
%groupadd -g 51 -r -f http
%useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http
/usr/sbin/usermod -d %{httpdir} http
fi
-%post
+%post base
/sbin/chkconfig --add apache
umask 137
touch /var/log/apache/{access,error,agent,referer}_log
-%preun
+%preun base
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache stop 1>&2
- fi
+ %service apache stop
/sbin/chkconfig --del apache
fi
-%postun
+%postun base
if [ "$1" = "0" ]; then
%userremove http
%groupremove http
fi
-%triggerpostun -- apache < 2.0.0
+%triggerpostun base -- apache < 2.0.0
%groupadd -g 51 -r -f http
%useradd -u 51 -r -d %{httpdir} -s /bin/false -c "HTTP User" -g http http
/sbin/chkconfig --add apache
-%triggerpostun -- apache1 < 1.3.33-1.85
+%triggerpostun base -- apache1 < 1.3.33-1.85
# upgrading from older version
if [ "$1" = "2" ]; then
sed -i -e '
' /etc/apache/apache.conf
fi
-%triggerpostun -- %{name} <= 1.3.31-5
+%triggerpostun base -- %{name} <= 1.3.31-5
%banner %{name} -e -a <<EOF
WARNING!!!
Since 1.3.31-5 version autoindex module has been separated to package %{name}-mod_autoindex
EOF
-%triggerpostun -- %{name} < 1.3.33-3.4
+%triggerpostun base -- %{name} < 1.3.33-3.4
%banner %{name} -e -a <<EOF
WARNING!!!
Since 1.3.33-3.4 version following modules have been separated to subpackages
mod_userdir
EOF
-%triggerpostun -- %{name} < 1.3.33-6.7
+%triggerpostun base -- %{name} < 1.3.33-6.7
# update /etc/sysconfig/apache1 -> apache rename
if [ -f /etc/sysconfig/apache1.rpmsave ]; then
cp -f /etc/sysconfig/apache{,.rpmnew}
mv -f /etc/sysconfig/apache{1.rpmsave,}
fi
-%triggerpostun -- %{name} < 1.3.34-5.9
+%triggerpostun base -- %{name} < 1.3.34-5.9
if ! grep -q 'Include webapps.d/' /etc/apache/apache.conf; then
# make sure webapps.d is included
cp -f /etc/apache/apache.conf{,.rpmsave}
s,^Include.*mod_vhost_alias.conf,Include %{_sysconfdir}/conf.d/*_mod_vhost_alias.conf,
' /etc/apache/apache.conf
-%posttrans
+%posttrans base
# minimizing apache restarts logics. we restart webserver:
#
# 1. at the end of transaction. (posttrans, feature from rpm 4.4.2)
# restart webserver at the end of transaction
%service apache restart "Apache HTTP daemon"
-exit 0
# macro called at module post scriptlet
%define module_post \
if [ "$1" = "1" ]; then \
- %service -q apache restart "Apache HTTP daemon" \
+ %service -q apache restart \
fi
# macro called at module postun scriptlet
%define module_postun \
if [ "$1" = "0" ]; then \
- %service -q apache restart "Apache HTTP daemon" \
+ %service -q apache restart \
fi
%post errordocs
if [ "$1" = "1" ]; then
- %service -q apache reload "Apache HTTP daemon"
+ %service -q apache reload
fi
%postun errordocs
if [ "$1" = "0" ]; then
- %service -q apache reload "Apache HTTP daemon"
+ %service -q apache reload
fi
%post mod_access
%files
%defattr(644,root,root,755)
+
+%files base
+%defattr(644,root,root,755)
%doc ABOUT_APACHE src/CHANGES README
%doc conf/mime.types conf/apache.conf.dist
%{?with_lingerd:%doc lingerd}
-
%attr(754,root,root) /etc/rc.d/init.d/apache
-
%attr(750,root,root) %dir %{_sysconfdir}
%{_sysconfdir}/modules
%{_sysconfdir}/logs
%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) /etc/sysconfig/apache
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
-
%dir %{_libexecdir}
-
%if %{with lingerd}
%attr(755,root,root) %{_libexecdir}/lingerd
%attr(770,root,http) %dir %{_localstatedir}/run/lingerd
%endif
-
%attr(755,root,root) %{_bindir}/checkgid
-
%attr(755,root,root) %{_sbindir}/apache
-
%dir %attr(1773,root,http) /var/run/apache
-
%{_mandir}/man8/apache.8*
-
-%attr(2750,root,logs) %dir /var/log/apache
+%attr(2751,root,logs) %dir /var/log/apache
%attr(2750,root,logs) %dir /var/log/archiv/apache
%attr(640,root,logs) %ghost /var/log/apache/*
-
%dir %{_datadir}
%attr(755,root,root) %dir %{_datadir}/html
-
%dir %{_datadir}/icons
%{_datadir}/icons/*.gif
%{_datadir}/icons/*.png
projects / packages / apache1.git / blobdiff