summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvsdist <cvsdist@fedoraproject.org>2004-09-09 06:20:52 +0000
committercvsdist <cvsdist@fedoraproject.org>2004-09-09 06:20:52 +0000
commitc4da67dd4d43f3d844c2440c1686c9e019371f6a (patch)
tree44d3368c581c523d260880a40d48133f7e6fde3c
parent69dde6e1f5c70242716cfced86a30517a9073f83 (diff)
downloadhttpd-c4da67dd4d43f3d844c2440c1686c9e019371f6a.tar.gz
httpd-c4da67dd4d43f3d844c2440c1686c9e019371f6a.tar.xz
httpd-c4da67dd4d43f3d844c2440c1686c9e019371f6a.zip
auto-import changelog data from httpd-2.0.50-1.src.rpmhttpd-2_0_50-1
Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-1 - update to 2.0.50
-rw-r--r--.cvsignore2
-rw-r--r--httpd.spec35
-rw-r--r--index.html12
-rw-r--r--sources2
4 files changed, 15 insertions, 36 deletions
diff --git a/.cvsignore b/.cvsignore
index ed025a3..1296c6e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-httpd-2.0.49.tar.gz
+httpd-2.0.50.tar.gz
diff --git a/httpd.spec b/httpd.spec
index a81c9ec..9944264 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -1,13 +1,13 @@
%define contentdir /var/www
%define suexec_caller apache
%define mmn 20020903
-%define vstring Red Hat
-%define distro Red Hat Enterprise Linux
+%define vstring Fedora
+%define distro Fedora Core
Summary: Apache HTTP Server
Name: httpd
-Version: 2.0.49
-Release: 8.ent
+Version: 2.0.50
+Release: 1
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -47,16 +47,9 @@ Patch27: httpd-2.0.48-sslpphrase.patch
Patch28: httpd-2.0.48-worker.patch
Patch29: httpd-2.0.48-workerhup.patch
Patch30: httpd-2.0.48-davmisc.patch
-Patch31: httpd-2.0.48-limitxml.patch
Patch32: httpd-2.0.48-vhost.patch
-Patch33: httpd-2.0.46-sslscache.patch
-Patch34: httpd-2.0.49-sslcleanup.patch
Patch35: httpd-2.0.49-eocbucket.patch
-Patch36: httpd-2.0.49-nolcrash.patch
Patch37: httpd-2.0.46-autoindex.patch
-Patch38: httpd-2.0.46-deflate2.patch
-Patch39: httpd-2.0.49-suexecsuid.patch
-Patch40: httpd-2.0.49-vhostaddr.patch
# Features/functional changes
Patch70: httpd-2.0.48-release.patch
Patch71: httpd-2.0.40-xfsz.patch
@@ -67,7 +60,6 @@ Patch75: httpd-2.0.48-dynlimit.patch
Patch76: httpd-2.0.48-dynamic.patch
Patch77: httpd-2.0.48-sslstatus.patch
Patch78: httpd-2.0.48-corelimit.patch
-Patch79: httpd-2.0.46-rolog.patch
Patch80: httpd-2.0.48-distcache.patch
Patch81: httpd-2.0.48-debuglog.patch
Patch82: httpd-2.0.48-abench.patch
@@ -75,12 +67,8 @@ Patch83: httpd-2.0.48-fdsetsize.patch
Patch84: httpd-2.0.48-sslheader.patch
Patch85: httpd-2.0.48-sslvars2.patch
Patch86: httpd-2.0.48-rewritessl.patch
-Patch87: httpd-2.0.49-largefile.patch
-Patch88: httpd-2.0.46-cgibucket.patch
Patch89: httpd-2.0.49-headerssl.patch
Patch90: httpd-2.0.49-workerstack.patch
-# Security fixes
-Patch200: httpd-2.0.46-CAN-2004-0488.patch
License: Apache Software License
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-root
@@ -170,16 +158,9 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch28 -p1 -b .worker
%patch29 -p1 -b .workerhup
%patch30 -p1 -b .davmisc
-%patch31 -p1 -b .limitxml
%patch32 -p1 -b .vhost
-%patch33 -p1 -b .sslscache
-%patch34 -p1 -b .sslcleanup
%patch35 -p1 -b .eocbucket
-%patch36 -p1 -b .nolcrash
%patch37 -p1 -b .autoindex
-%patch38 -p1 -b .deflate2
-%patch39 -p1 -b .suexecsuid
-%patch40 -p1 -b .vhostaddr
%patch71 -p0 -b .xfsz
%patch72 -p1 -b .pod
@@ -189,7 +170,6 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch76 -p1 -b .dynamic
%patch77 -p1 -b .sslstatus
%patch78 -p1 -b .corelimit
-%patch79 -p1 -b .rolog
%patch80 -p1 -b .distcache
%patch81 -p1 -b .debuglog
%patch82 -p1 -b .abench
@@ -197,13 +177,9 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch84 -p1 -b .sslheader
%patch85 -p1 -b .sslvars2
%patch86 -p1 -b .rewritessl
-%patch87 -p1 -b .largefile
-%patch88 -p1 -b .cgibucket
%patch89 -p1 -b .headerssl
%patch90 -p1 -b .workerstack
-%patch200 -p1 -b .can0488
-
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
@@ -600,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/suexec.8*
%changelog
+* Tue Jun 29 2004 Joe Orton <jorton@redhat.com> 2.0.50-1
+- update to 2.0.50
+
* 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
diff --git a/index.html b/index.html
index 7f33e0f..37d41a8 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<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" />
<style type="text/css">
/*<![CDATA[*/
@@ -27,7 +27,7 @@
text-align: center;
margin: 0;
padding: 0.6em 2em 0.4em;
- background-color: #900;
+ background-color: #22437f;
color: #fff;
font-weight: normal;
font-size: 1.75em;
@@ -85,7 +85,7 @@
</head>
<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-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 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 />
</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>
<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>
diff --git a/sources b/sources
index 017e9fb..49d0616 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-275d3d37eed1b070f333d3618f7d1954 httpd-2.0.49.tar.gz
+8b251767212aebf41a13128bb70c0b41 httpd-2.0.50.tar.gz