summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2013-05-22 16:04:58 +0200
committerRemi Collet <fedora@famillecollet.com>2013-05-22 16:04:58 +0200
commit389b290f60e922bf10b688d097160fdeb2f989cd (patch)
tree338abb073c271326e8f88fc08d6efa9899f553b3 /httpd.spec
parentcc4bb240afc8320737e6ed8908291c7599113d3e (diff)
httpd: sync with rawhideHEADmaster
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec19
1 files changed, 17 insertions, 2 deletions
diff --git a/httpd.spec b/httpd.spec
index 71fe641..2e36c2b 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.4
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -64,6 +64,9 @@ Patch31: httpd-2.4.4-sslmultiproxy.patch
# Bug fixes
Patch50: httpd-2.4.2-r1374214+.patch
Patch51: httpd-2.4.3-sslsninotreq.patch
+Patch52: httpd-2.4.4-r1476674.patch
+Patch53: httpd-2.4.4-mod_cache-tmppath.patch
+Patch54: httpd-2.4.4-dump-vhost-twice.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -188,6 +191,9 @@ interface for storing and accessing per-user session data.
%patch50 -p1 -b .r1374214+
%patch51 -p1 -b .sninotreq
+%patch52 -p1 -b .r1476674
+%patch53 -p1 -b .tmppath
+%patch54 -p1 -b .vhosttwice
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -216,7 +222,7 @@ autoheader && autoconf || exit 1
%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
support/apxs.in
-export CFLAGS="$RPM_OPT_FLAGS -DFCGI_DUMP_ENV_VARS -DFCGI_DUMP_HEADERS"
+export CFLAGS="$RPM_OPT_FLAGS -DFCGI_DUMP_ENV_VARS"
export LDFLAGS="-Wl,-z,relro,-z,now"
# Hard-code path to links to avoid unnecessary builddep
@@ -632,6 +638,15 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Wed May 22 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.4.4-6
+- sync with rawhide, rebuild for remi repo
+- keep -DDFCGI_DUMP_ENV_VARS, remove -DFCGI_DUMP_HEADERS
+
+* Mon May 20 2013 Jan Kaluza <jkaluza@redhat.com> - 2.4.4-6
+- htpasswd/htdbm: fix hash generation bug (#956344)
+- do not dump vhosts twice in httpd -S output (#928761)
+- mod_cache: fix potential crash caused by uninitialized variable (#954109)
+
* Mon Apr 29 2013 Remi Collet <RPMS@FamilleCollet.com> - 2.4.4-5
- sync with rawhide, rebuild for remi repo
- add -DDFCGI_DUMP_ENV_VARS -DFCGI_DUMP_HEADERS