auto-import changelog data from httpd-2.0.49-8.src.rpm

Mon Jun 21 2004 Joe Orton <jorton@redhat.com> 2.0.49-8
- split out suexec into httpd-suexec package (#77972)
- link to system pcreposix.h to fix including httpd.h
This commit is contained in:
cvsdist 2004-09-09 06:20:37 +00:00
parent a0e310d5c6
commit d01424a8b3
2 changed files with 34 additions and 12 deletions

View File

@ -1,13 +1,13 @@
%define contentdir /var/www %define contentdir /var/www
%define suexec_caller apache %define suexec_caller apache
%define mmn 20020903 %define mmn 20020903
%define vstring Red Hat %define vstring Fedora
%define distro Red Hat Enterprise Linux %define distro Fedora Core
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.0.49 Version: 2.0.49
Release: 7.ent Release: 8
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
@ -104,7 +104,7 @@ Internet.
Group: Development/Libraries Group: Development/Libraries
Summary: Development tools for the Apache HTTP server. Summary: Development tools for the Apache HTTP server.
Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
Requires: apr-devel, apr-util-devel, httpd = %{version} Requires: apr-devel, apr-util-devel, httpd = %{version}, pcre-devel
%description devel %description devel
The httpd-devel package contains the APXS binary and other files The httpd-devel package contains the APXS binary and other files
@ -138,6 +138,16 @@ The mod_ssl module provides strong cryptography for the Apache Web
server via the Secure Sockets Layer (SSL) and Transport Layer server via the Secure Sockets Layer (SSL) and Transport Layer
Security (TLS) protocols. Security (TLS) protocols.
%package suexec
Group: System Environment/Daemons
Summary: suexec binary for the Apache HTTP server
Requires: httpd = %{version}-%{release}
%description suexec
This package includes the /usr/sbin/suexec binary which can be installed
to allow the Apache HTTP server to run CGI programs (and any programs
executed by SSI pages) as a user other than the 'apache' user.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .apctl %patch1 -p1 -b .apctl
@ -318,6 +328,9 @@ popd
# install worker binary # install worker binary
install -m 755 worker/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.worker install -m 755 worker/httpd $RPM_BUILD_ROOT%{_sbindir}/httpd.worker
# link to system pcreposix.h
ln -s ../pcre/pcreposix.h $RPM_BUILD_ROOT%{_includedir}/httpd/pcreposix.h
# install conf file/directory # install conf file/directory
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d mkdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
install -m 644 $RPM_SOURCE_DIR/README.confd \ install -m 644 $RPM_SOURCE_DIR/README.confd \
@ -503,7 +516,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING %doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
%doc migration.html migration.css %doc migration.html migration.css
%dir %{_sysconfdir}/httpd %dir %{_sysconfdir}/httpd
@ -528,7 +541,6 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/httpd.worker %{_sbindir}/httpd.worker
%{_sbindir}/apachectl %{_sbindir}/apachectl
%{_sbindir}/rotatelogs %{_sbindir}/rotatelogs
%attr(4510,root,%{suexec_caller}) %{_sbindir}/suexec
%dir %{_libdir}/httpd %dir %{_libdir}/httpd
%dir %{_libdir}/httpd/modules %dir %{_libdir}/httpd/modules
@ -553,6 +565,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man?/* %{_mandir}/man?/*
%exclude %{_mandir}/man8/apxs.8* %exclude %{_mandir}/man8/apxs.8*
%exclude %{_mandir}/man8/suexec.8*
%files manual %files manual
%defattr(-,root,root) %defattr(-,root,root)
@ -581,7 +594,16 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/instdso.sh %{_libdir}/httpd/build/instdso.sh
%{_libdir}/httpd/build/libtool %{_libdir}/httpd/build/libtool
%files suexec
%defattr(-,root,root)
%attr(4510,root,%{suexec_caller}) %{_sbindir}/suexec
%{_mandir}/man8/suexec.8*
%changelog %changelog
* Mon Jun 21 2004 Joe Orton <jorton@redhat.com> 2.0.49-8
- split out suexec into httpd-suexec package (#77972)
- link to system pcreposix.h to fix including httpd.h
* Wed Jun 16 2004 Joe Orton <jorton@redhat.com> 2.0.49-7 * Wed Jun 16 2004 Joe Orton <jorton@redhat.com> 2.0.49-7
- don't install or use bundled pcreposix.h - don't install or use bundled pcreposix.h
- bump default MaxClients to 256 - bump default MaxClients to 256

View File

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head> <head>
<title>Test Page for the Apache HTTP Server on Red Hat Enterprise Linux</title> <title>Test Page for the Apache HTTP Server on Fedora Core</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<style type="text/css"> <style type="text/css">
/*<![CDATA[*/ /*<![CDATA[*/
@ -27,7 +27,7 @@
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #900; background-color: #22437f;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -85,7 +85,7 @@
</head> </head>
<body> <body>
<h1>Red Hat Enterprise Linux <strong>Test Page</strong></h1> <h1>Fedora Core <strong>Test Page</strong></h1>
<div class="content"> <div class="content">
<div class="content-middle"> <div class="content-middle">
@ -103,7 +103,7 @@
<p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p> <p>For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".</p>
<p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</p> <p>For information on Fedora Core, please visit the <a href="http://fedora.redhat.com/">Fedora Project website</a>.</p>
<hr /> <hr />
</div> </div>
@ -113,9 +113,9 @@
<p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p> <p>You may now add content to the directory <tt>/var/www/html/</tt>. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file <tt>/etc/httpd/conf.d/welcome.conf</tt>.</p>
<div class="logos"> <div class="logos">
<p>You are free to use the images below on Apache and Red Hat powered HTTP servers. Thanks for using Apache and Red Hat Enterprise Linux!</p> <p>You are free to use the images below on Apache and Fedora Core powered HTTP servers. Thanks for using Apache and Fedora Core!</p>
<p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://www.redhat.com/"><img src="/icons/powered_by_rh.png" alt="[ Powered by Red Hat ]" width="88" height="31" /></a></p> <p><a href="http://httpd.apache.org/"><img src="/icons/apache_pb2.gif" alt="[ Powered by Apache ]"/></a> <a href="http://fedora.redhat.com/"><img src="/icons/powered_by_fedora.png" alt="[ Powered by Fedora Core ]" width="88" height="31" /></a></p>
</div> </div>
</div> </div>
</div> </div>