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

mod_ssl: fix mod_nss compat patch (Rob Crittenden, #1566511)

Browse Source 
mod_md: change hard-coded default MdStoreDir to state/md (#1563846)
Resolves: rhbz#1566511
Resolves: rhbz#1563846
This commit is contained in:
Joe Orton 2018-04-16 08:25:48 +01:00
parent 07274a959f
commit 5dbb1d7cab
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
httpd.spec
View File

@ -13,7 +13,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.33 Version: 2.4.33
Release: 3%{?dist} Release: 4%{?dist}
URL: https://httpd.apache.org/ URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -60,6 +60,7 @@ Patch6: httpd-2.4.3-apctl-systemd.patch
# Needed for socket activation and mod_systemd patch # Needed for socket activation and mod_systemd patch
Patch19: httpd-2.4.25-detect-systemd.patch Patch19: httpd-2.4.25-detect-systemd.patch
# Features/functional changes # Features/functional changes
Patch21: httpd-2.4.33-mddefault.patch
Patch23: httpd-2.4.33-export.patch Patch23: httpd-2.4.33-export.patch
Patch24: httpd-2.4.1-corelimit.patch Patch24: httpd-2.4.1-corelimit.patch
Patch25: httpd-2.4.25-selinux.patch Patch25: httpd-2.4.25-selinux.patch
@ -218,6 +219,7 @@ interface for storing and accessing per-user session data.
%patch19 -p1 -b .detectsystemd %patch19 -p1 -b .detectsystemd
%patch21 -p1 -b .mddefault
%patch23 -p1 -b .export %patch23 -p1 -b .export
%patch24 -p1 -b .corelimit %patch24 -p1 -b .corelimit
%patch25 -p1 -b .selinux %patch25 -p1 -b .selinux
@ -225,7 +227,7 @@ interface for storing and accessing per-user session data.
%patch27 -p1 -b .icons %patch27 -p1 -b .icons
%patch29 -p1 -b .systemd %patch29 -p1 -b .systemd
%patch30 -p1 -b .cachehardmax %patch30 -p1 -b .cachehardmax
#patch31 -p1 -b .sslmultiproxy %patch31 -p1 -b .sslmultiproxy
%patch34 -p1 -b .socketactivation %patch34 -p1 -b .socketactivation
%patch35 -p1 -b .sslciphdefault %patch35 -p1 -b .sslciphdefault
%patch58 -p1 -b .r1738878 %patch58 -p1 -b .r1738878
@ -707,6 +709,10 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Mon Apr 16 2018 Joe Orton <jorton@redhat.com> - 2.4.33-4
- mod_ssl: fix mod_nss compat patch (Rob Crittenden, #1566511)
- mod_md: change hard-coded default MdStoreDir to state/md (#1563846)
* Thu Apr 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-3 * Thu Apr 12 2018 Joe Orton <jorton@redhat.com> - 2.4.33-3
- mod_ssl: drop implicit 'SSLEngine on' for vhost w/o certs (#1564537) - mod_ssl: drop implicit 'SSLEngine on' for vhost w/o certs (#1564537)