diff options
| author | Joe Orton <jorton@redhat.com> | 2015-07-07 09:41:55 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@redhat.com> | 2015-07-07 09:41:55 +0100 |
| commit | db205dad277f6b7712dc2fd57d9e3b056b637c14 (patch) | |
| tree | aae2b3f97f28584d063e98b30682cf11759fa943 | |
| parent | b274835c1b998db7f70b9ef722492ac6c52cd3cf (diff) | |
| download | httpd-db205dad277f6b7712dc2fd57d9e3b056b637c14.tar.gz httpd-db205dad277f6b7712dc2fd57d9e3b056b637c14.tar.xz httpd-db205dad277f6b7712dc2fd57d9e3b056b637c14.zip | |
mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars
| -rw-r--r-- | httpd.spec | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -8,7 +8,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.12 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 Source1: index.html @@ -508,7 +508,8 @@ fi %{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null FQDN=`hostname` -if [ "x${FQDN}" = "x" ]; then +# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress +if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then FQDN=localhost.localdomain fi @@ -666,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Tue Jul 7 2015 Joe Orton <jorton@redhat.com> - 2.4.12-3 +- mod_ssl: use "localhost" in the dummy SSL cert if len(FQDN) > 59 chars + * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild |