rpms/httpd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 2.2.2

Browse Source
This commit is contained in:
jorton 2006-05-03 14:14:28 +00:00
parent a29a19c983
commit d2bf1a2666
5 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
httpd-2.2.0.tar.gz httpd-2.2.2.tar.gz

9
httpd-2.0.45-export.patch
View File

@ -6,15 +6,14 @@ Upstream-HEAD: needed
Upstream-2.0: omit Upstream-2.0: omit
Upstream-Status: EXPORT_DIRS change is conditional on using shared apr Upstream-Status: EXPORT_DIRS change is conditional on using shared apr
--- httpd-2.0.53/server/Makefile.in.export --- httpd-2.2.2/server/Makefile.in.export
+++ httpd-2.0.53/server/Makefile.in +++ httpd-2.2.2/server/Makefile.in
@@ -59,10 +59,6 @@ @@ -58,9 +58,6 @@
for dir in $(EXPORT_DIRS); do \ for dir in $(EXPORT_DIRS); do \
ls $$dir/*.h >> $$tmp; \ ls $$dir/*.h >> $$tmp; \
done; \ done; \
- for dir in $(EXPORT_DIRS_APR); do \ - for dir in $(EXPORT_DIRS_APR); do \
- ls $$dir/ap[ru].h >> $$tmp; \ - (ls $$dir/ap[ru].h $$dir/ap[ru]_*.h >> $$tmp 2>/dev/null); \
- ls $$dir/ap[ru]_*.h >> $$tmp; \
- done; \ - done; \
sort -u $$tmp > $@; \ sort -u $$tmp > $@; \
rm -f $$tmp rm -f $$tmp

19
httpd.spec
View File

@ -6,8 +6,8 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.2.0 Version: 2.2.2
Release: 6 Release: 2
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
@ -40,13 +40,7 @@ Patch24: httpd-2.0.48-corelimit.patch
Patch25: httpd-2.0.54-selinux.patch Patch25: httpd-2.0.54-selinux.patch
# Bug fixes # Bug fixes
Patch50: httpd-2.0.45-encode.patch Patch50: httpd-2.0.45-encode.patch
Patch51: httpd-2.2.0-headclength.patch
Patch52: httpd-2.2.0-ajpcookie.patch
Patch53: httpd-2.2.0-cppheader.patch
Patch54: httpd-2.2.0-authnoprov.patch Patch54: httpd-2.2.0-authnoprov.patch
# Security fixes
Patch200: httpd-2.2.0-CVE-2005-3352.patch
Patch201: httpd-2.2.0-CVE-2005-3357.patch
License: Apache Software License License: Apache Software License
Group: System Environment/Daemons Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-root BuildRoot: %{_tmppath}/%{name}-root
@ -124,14 +118,8 @@ Security (TLS) protocols.
# no -b to prevent droplets in install root # no -b to prevent droplets in install root
%patch50 -p1 %patch50 -p1
%patch51 -p1 -b .headclength
%patch52 -p1 -b .ajpcookie
%patch53 -p1 -b .cppheader
%patch54 -p1 -b .authnoprov %patch54 -p1 -b .authnoprov
%patch200 -p1 -b .cve3352
%patch201 -p1 -b .cve3352
# Patch in vendor/release string # Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@ -491,6 +479,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh %{_libdir}/httpd/build/*.sh
%changelog %changelog
* Wed May 3 2006 Joe Orton <jorton@redhat.com> 2.2.2-2
- update to 2.2.2
* Thu Apr 6 2006 Joe Orton <jorton@redhat.com> 2.2.0-6 * Thu Apr 6 2006 Joe Orton <jorton@redhat.com> 2.2.0-6
- rebuild to pick up apr-util LDAP interface fix (#188073) - rebuild to pick up apr-util LDAP interface fix (#188073)

2
sources
View File

@ -1 +1 @@
760aecf26a071e15141170636af43456 httpd-2.2.0.tar.gz a0d9f7f6f70110a5965340eb7f3a3e66 httpd-2.2.2.tar.gz

2
upstream
View File

@ -1 +1 @@
httpd-2.2.0.tar.gz httpd-2.2.2.tar.gz