fix build with OpenSSL 1.1 (#1392900)

- fix typos in ssl.conf (josef randinger, #1379407)
Resolves: rhbz#1392900
Resolves: rhbz#1379407
This commit is contained in:
Joe Orton 2016-11-14 10:46:52 +00:00
parent 45529bc72a
commit 0d708eba11
3 changed files with 1306 additions and 3 deletions

1297
httpd-2.4.23-openssl11.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.4.23 Version: 2.4.23
Release: 5%{?dist} Release: 6%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html Source1: index.html
@ -48,6 +48,7 @@ Patch2: httpd-2.4.9-apxs.patch
Patch3: httpd-2.4.1-deplibs.patch Patch3: httpd-2.4.1-deplibs.patch
Patch5: httpd-2.4.3-layout.patch Patch5: httpd-2.4.3-layout.patch
Patch6: httpd-2.4.3-apctl-systemd.patch Patch6: httpd-2.4.3-apctl-systemd.patch
Patch7: httpd-2.4.23-openssl11.patch
# Needed for socket activation and mod_systemd patch # Needed for socket activation and mod_systemd patch
Patch19: httpd-2.4.10-detect-systemd.patch Patch19: httpd-2.4.10-detect-systemd.patch
# Features/functional changes # Features/functional changes
@ -193,6 +194,7 @@ interface for storing and accessing per-user session data.
%patch3 -p1 -b .deplibs %patch3 -p1 -b .deplibs
%patch5 -p1 -b .layout %patch5 -p1 -b .layout
%patch6 -p1 -b .apctlsystemd %patch6 -p1 -b .apctlsystemd
%patch7 -p1 -b .openssl11
%patch19 -p1 -b .detectsystemd %patch19 -p1 -b .detectsystemd
@ -682,6 +684,10 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd %{_rpmconfigdir}/macros.d/macros.httpd
%changelog %changelog
* Mon Nov 14 2016 Joe Orton <jorton@redhat.com> - 2.4.23-6
- fix build with OpenSSL 1.1 (#1392900)
- fix typos in ssl.conf (josef randinger, #1379407)
* Wed Nov 2 2016 Joe Orton <jorton@redhat.com> - 2.4.23-5 * Wed Nov 2 2016 Joe Orton <jorton@redhat.com> - 2.4.23-5
- no longer package /etc/sysconfig/httpd - no longer package /etc/sysconfig/httpd
- synch ssl.conf with upstream - synch ssl.conf with upstream

View File

@ -1,6 +1,6 @@
# #
# When we also provide SSL we have to listen to the # When we also provide SSL we have to listen to the
# the HTTPS port in addition. # standard HTTPS port in addition.
# #
Listen 443 https Listen 443 https
@ -216,5 +216,5 @@ BrowserMatch "MSIE [2-5]" \
CustomLog logs/ssl_request_log \ CustomLog logs/ssl_request_log \
"%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
</VirtualHost> </VirtualHost>