Skip to content
Snippets Groups Projects
Commit 0e9cb877 authored by Brian Stinson's avatar Brian Stinson
Browse files

reapply debranding for httpd

parent 9fdac3bf
No related branches found
No related tags found
No related merge requests found
......@@ -2,3 +2,4 @@ SOURCES/htcacheclean.service.xml
SOURCES/httpd-2.4.37.tar.bz2
SOURCES/httpd.conf.xml
SOURCES/httpd.service.xml
SOURCES/centos-noindex-8.0.tar.gz
......@@ -2,3 +2,4 @@ a34c31169efbe6140496c37801489610461bdf9b SOURCES/htcacheclean.service.xml
4a38471de821288b0300148016f2b03dfee8adf2 SOURCES/httpd-2.4.37.tar.bz2
fa18caadd0afbddc2c7a7fc404bf4f2b41867148 SOURCES/httpd.conf.xml
888df830bdc465de3bced6f075c33380018e544f SOURCES/httpd.service.xml
6aa65f45c247226fc922c455e0187abd90c839e8 SOURCES/centos-noindex-8.0.tar.gz
......@@ -16,7 +16,7 @@ Version: 2.4.37
Release: 12%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
Source1: centos-noindex-8.0.tar.gz
Source2: httpd.logrotate
Source3: instance.conf
Source4: httpd-ssl-pass-dialog
......@@ -484,8 +484,7 @@ EOF
# Handle contentdir
mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
install -m 644 -p $RPM_SOURCE_DIR/index.html \
$RPM_BUILD_ROOT%{contentdir}/noindex/index.html
tar xzf %{SOURCE1} -C $RPM_BUILD_ROOT%{contentdir}/noindex/ --strip-components=1
rm -rf %{contentdir}/htdocs
# remove manual sources
......@@ -700,7 +699,7 @@ rm -rf $RPM_BUILD_ROOT
%{contentdir}/error/README
%{contentdir}/error/*.var
%{contentdir}/error/include/*.html
%{contentdir}/noindex/index.html
%{contentdir}/noindex/*
%attr(0710,root,apache) %dir /run/httpd
%attr(0700,apache,apache) %dir /run/httpd/htcacheclean
......@@ -789,6 +788,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Mon Oct 07 2019 bstinson@centosproject.org - 2.4.37-12.el8.centos
- Reapply debranding changes from areguera
* Tue Sep 24 2019 CentOS Sources <bugs@centos.org> - 2.4.37-12.el8.centos
- Apply debranding changes
......@@ -800,6 +802,10 @@ rm -rf $RPM_BUILD_ROOT
- Resolves: #1745152 - CVE-2019-9517 httpd:2.4/mod_http2: HTTP/2: request
for large response leads to denial of service
* Sun May 26 2019 Alain Reguera Delgado <areguera@centosproject.org> - 2.4.37-11.el8.centos
- Remove index.html, add centos-noindex-8.0.tar.gz
- Update welcome.conf to support content negotiation based on locale
* Wed Apr 03 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.4.37-11
- Resolves: #1695431 - CVE-2019-0211 httpd: privilege escalation
from modules scripts
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment