[httpd] update to 2.4.3 (#849883)
jorton
jorton at fedoraproject.org
Tue Aug 21 08:48:32 UTC 2012
commit 871c952230a86c14df9fba08f1d7c24f959651bf
Author: Joe Orton <jorton at redhat.com>
Date: Tue Aug 21 09:48:14 2012 +0100
update to 2.4.3 (#849883)
- own the docroot (#848121)
Resolves: rhbz#848121
Resolves: rhbz#849883
httpd-2.4.2-r1326980+.patch | 65 -----
httpd-2.4.2-r1327036+.patch | 80 ------
httpd-2.4.2-r1337344+.patch | 7 -
httpd-2.4.2-r1346905.patch | 65 -----
httpd-2.4.2-r1357685.patch | 38 ---
httpd-2.4.2-r1365604.patch | 15 --
httpd-2.4.2-r1366693.patch | 252 --------------------
httpd-2.4.2-restart.patch | 31 ---
httpd-2.4.1-apxs.patch => httpd-2.4.3-apxs.patch | 12 +-
...-2.4.1-layout.patch => httpd-2.4.3-layout.patch | 16 +-
...0.48-release.patch => httpd-2.4.3-release.patch | 6 +-
httpd.spec | 37 +--
12 files changed, 32 insertions(+), 592 deletions(-)
---
diff --git a/httpd-2.4.2-r1337344+.patch b/httpd-2.4.2-r1337344+.patch
index 69bb40f..60c77bb 100644
--- a/httpd-2.4.2-r1337344+.patch
+++ b/httpd-2.4.2-r1337344+.patch
@@ -109,13 +109,6 @@ http://svn.apache.org/viewvc?view=revision&revision=1344712
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
-@@ -615,4 +639,4 @@
- </div><div id="footer">
- <p class="apache">Copyright 2012 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
- <p class="menu"><a href="./mod/">Modules</a> | <a href="./mod/directives.html">Directives</a> | <a href="./faq/">FAQ</a> | <a href="./glossary.html">Glossary</a> | <a href="./sitemap.html">Sitemap</a></p></div>
--</body></html>
-\ No newline at end of file
-+</body></html>
--- httpd-2.4.2/Makefile.in.r1337344+
+++ httpd-2.4.2/Makefile.in
@@ -236,11 +236,22 @@ install-man:
diff --git a/httpd-2.4.1-apxs.patch b/httpd-2.4.3-apxs.patch
similarity index 87%
rename from httpd-2.4.1-apxs.patch
rename to httpd-2.4.3-apxs.patch
index 62003ec..f4d2a87 100644
--- a/httpd-2.4.1-apxs.patch
+++ b/httpd-2.4.3-apxs.patch
@@ -1,5 +1,5 @@
---- httpd-2.4.1/support/apxs.in.apxs
-+++ httpd-2.4.1/support/apxs.in
+--- httpd-2.4.3/support/apxs.in.apxs
++++ httpd-2.4.3/support/apxs.in
@@ -25,7 +25,18 @@ package apxs;
my %config_vars = ();
@@ -20,7 +20,7 @@
get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
# read the configuration variables once
-@@ -273,7 +284,7 @@ if ($opt_g) {
+@@ -275,7 +286,7 @@ if ($opt_g) {
$data =~ s|%NAME%|$name|sg;
$data =~ s|%TARGET%|$CFG_TARGET|sg;
$data =~ s|%PREFIX%|$prefix|sg;
@@ -29,8 +29,8 @@
my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
-@@ -450,11 +461,11 @@ if ($opt_c) {
-
+@@ -453,11 +464,11 @@ if ($opt_c) {
+ my $ldflags = "$CFG_LDFLAGS";
if ($opt_p == 1) {
- my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
@@ -43,7 +43,7 @@
chomp($apu_libs);
}
-@@ -669,8 +680,8 @@ __DATA__
+@@ -672,8 +683,8 @@ __DATA__
builddir=.
top_srcdir=%PREFIX%
diff --git a/httpd-2.4.1-layout.patch b/httpd-2.4.3-layout.patch
similarity index 73%
rename from httpd-2.4.1-layout.patch
rename to httpd-2.4.3-layout.patch
index 57cf13b..163c66b 100644
--- a/httpd-2.4.1-layout.patch
+++ b/httpd-2.4.3-layout.patch
@@ -1,9 +1,13 @@
---- httpd-2.4.1/config.layout.layout
-+++ httpd-2.4.1/config.layout
-@@ -347,3 +347,26 @@
- proxycachedir: ${localstatedir}/proxy
+
+Add layout for Fedora.
+
+--- httpd-2.4.3/config.layout.layout
++++ httpd-2.4.3/config.layout
+@@ -370,3 +370,27 @@
+ logfiledir: ${localstatedir}/log/httpd
+ proxycachedir: ${localstatedir}/cache/httpd
</Layout>
-
++
+# Fedora/RHEL layout
+<Layout Fedora>
+ prefix: /usr
@@ -25,5 +29,5 @@
+ localstatedir: /var
+ runtimedir: /run/httpd
+ logfiledir: ${localstatedir}/log/httpd
-+ proxycachedir: ${localstatedir}/cache/httpd
++ proxycachedir: ${localstatedir}/cache/httpd/proxy
+</Layout>
diff --git a/httpd-2.0.48-release.patch b/httpd-2.4.3-release.patch
similarity index 74%
rename from httpd-2.0.48-release.patch
rename to httpd-2.4.3-release.patch
index fd6fd2b..0b2fb77 100644
--- a/httpd-2.0.48-release.patch
+++ b/httpd-2.4.3-release.patch
@@ -3,9 +3,9 @@ Upstream-HEAD: vendor
Upstream-2.0: vendor
Upstream-Status: vendor-specific change
---- httpd-2.0.48/server/core.c.release
-+++ httpd-2.0.48/server/core.c
-@@ -2758,7 +2758,7 @@
+--- httpd-2.4.3/server/core.c.release
++++ httpd-2.4.3/server/core.c
+@@ -3189,7 +3189,7 @@ static void set_banner(apr_pool_t *pconf
ap_add_version_component(pconf, AP_SERVER_BASEPRODUCT "/" AP_SERVER_MAJORVERSION);
}
else {
diff --git a/httpd.spec b/httpd.spec
index 1a12469..134ea77 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,8 +7,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.2
-Release: 23%{?dist}
+Version: 2.4.3
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -37,25 +37,17 @@ Source23: manual.conf
Source30: README.confd
# build/scripts patches
Patch1: httpd-2.4.1-apctl.patch
-Patch2: httpd-2.4.1-apxs.patch
+Patch2: httpd-2.4.3-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch
-Patch5: httpd-2.4.1-layout.patch
+Patch5: httpd-2.4.3-layout.patch
# Features/functional changes
-Patch20: httpd-2.0.48-release.patch
+Patch20: httpd-2.4.3-release.patch
Patch23: httpd-2.4.1-export.patch
Patch24: httpd-2.4.1-corelimit.patch
Patch25: httpd-2.4.1-selinux.patch
Patch26: httpd-2.4.2-r1337344+.patch
Patch27: httpd-2.4.2-icons.patch
-# Bug fixes
-Patch40: httpd-2.4.2-restart.patch
-Patch41: httpd-2.4.2-r1327036+.patch
-Patch42: httpd-2.4.2-r1326980+.patch
-Patch43: httpd-2.4.2-r1332643+.patch
-Patch44: httpd-2.4.2-r1346905.patch
-Patch45: httpd-2.4.2-r1357685.patch
-Patch46: httpd-2.4.2-r1366693.patch
-Patch47: httpd-2.4.2-r1365604.patch
+Patch28: httpd-2.4.2-r1332643+.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -162,18 +154,10 @@ authentication to the Apache HTTP Server.
%patch25 -p1 -b .selinux
%patch26 -p1 -b .r1337344+
%patch27 -p1 -b .icons
-
-%patch40 -p1 -b .restart
-%patch41 -p1 -b .r1327036+
-%patch42 -p1 -b .r1326980+
-%patch43 -p1 -b .r1332643+
-%patch44 -p1 -b .r1346905
-%patch45 -p1 -b .r1357685
-%patch46 -p1 -b .r1366693
-%patch47 -p1 -b .r1365604
+%patch28 -p1 -b .r1332643+
# Patch in vendor/release string
-sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
+sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch --fuzz=%{_default_patch_fuzz} -p1
# Prevent use of setcap in "install-suexec-caps" target.
sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
@@ -530,6 +514,7 @@ rm -rf $RPM_BUILD_ROOT
%{contentdir}/error/include/*.html
%{contentdir}/noindex/index.html
+%dir %{docroot}
%dir %{docroot}/cgi-bin
%dir %{docroot}/html
@@ -585,6 +570,10 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Tue Aug 21 2012 Joe Orton <jorton at redhat.com> - 2.4.3-1
+- update to 2.4.3 (#849883)
+- own the docroot (#848121)
+
* Mon Aug 6 2012 Joe Orton <jorton at redhat.com> - 2.4.2-23
- add mod_proxy fixes from upstream (r1366693, r1365604)
More information about the scm-commits
mailing list