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

Fix mismerge.

Browse Source
This commit is contained in:
Joe Orton 2017-10-03 10:05:44 +01:00
parent 9c5d9117f5
commit 783f274da8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
httpd.spec
View File

@ -710,12 +710,12 @@ rm -rf $RPM_BUILD_ROOT
- use sscg defaults; append CA cert to generated cert - use sscg defaults; append CA cert to generated cert
- document httpd-init.service in httpd-init.service(8) - document httpd-init.service in httpd-init.service(8)
* Wed Sep 20 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-8.1
- Generate SSL certificates on service start, not %%posttrans
* Thu Sep 21 2017 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 2.4.27-8 * Thu Sep 21 2017 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 2.4.27-8
- Address CVE-2017-9798 by applying patch from upstream (#1490344) - Address CVE-2017-9798 by applying patch from upstream (#1490344)
* Wed Sep 20 2017 Stephen Gallagher <sgallagh@redhat.com> - 2.4.27-8.1
- Generate SSL certificates on service start, not %%posttrans
* Tue Sep 19 2017 Joe Orton <jorton@redhat.com> - 2.4.27-8.1 * Tue Sep 19 2017 Joe Orton <jorton@redhat.com> - 2.4.27-8.1
- move httpd.service.d, httpd.socket.d dirs to -filesystem - move httpd.service.d, httpd.socket.d dirs to -filesystem