summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJoe Orton <jorton@redhat.com>2014-08-29 14:45:59 +0100
committerJoe Orton <jorton@redhat.com>2014-08-29 14:45:59 +0100
commit793563ad40c65d89906e61a3f83ded4dcb7996f8 (patch)
tree1f287a3861f088d2e4145d8a8a890b322762781f /httpd.spec
parent452da8d9b6122b29a1d1df51fdba4b4a494c389a (diff)
downloadhttpd-793563ad40c65d89906e61a3f83ded4dcb7996f8.tar.gz
httpd-793563ad40c65d89906e61a3f83ded4dcb7996f8.tar.xz
httpd-793563ad40c65d89906e61a3f83ded4dcb7996f8.zip
pull in httpd-filesystem as Requires(pre) (#1128328)
- fix cipher selection in default ssl.conf, depend on new OpenSSL (#1134348) - require hostname for mod_ssl post script (#1135118) Resolves: rhbz#1135118 Resolves: rhbz#1134348 Resolves: rhbz#1128328
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec6
1 files changed, 5 insertions, 1 deletions
diff --git a/httpd.spec b/httpd.spec
index ed5e365..05ba3d7 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -148,10 +148,12 @@ Group: System Environment/Daemons
Summary: SSL/TLS module for the Apache HTTP Server
Epoch: 1
BuildRequires: openssl-devel
-Requires(post): openssl, /bin/cat
+Requires(post): openssl, /bin/cat, /bin/hostname
Requires(pre): httpd-filesystem
Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
Obsoletes: stronghold-mod_ssl
+# Require an OpenSSL which supports PROFILE=SYSTEM
+Conflicts: openssl < 1:1.0.1h-4
%description -n mod_ssl
The mod_ssl module provides strong cryptography for the Apache Web
@@ -669,6 +671,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Aug 29 2014 Joe Orton <jorton@redhat.com> - 2.4.10-8
- pull in httpd-filesystem as Requires(pre) (#1128328)
+- fix cipher selection in default ssl.conf, depend on new OpenSSL (#1134348)
+- require hostname for mod_ssl post script (#1135118)
* Fri Aug 22 2014 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-7
- mod_systemd: updated to the latest version