From d18778a333b7bb7d7f36409d95ae9645a01da7ba Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:26:27 +0000 Subject: debrand httpd-2.4.6-67.el7 --- diff --git a/.gitignore b/.gitignore index 9969f1d..260a2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/httpd-2.4.6.tar.bz2 +SOURCES/centos-noindex.tar.gz diff --git a/.httpd.metadata b/.httpd.metadata index d335a99..17ede1b 100644 --- a/.httpd.metadata +++ b/.httpd.metadata @@ -1 +1,2 @@ 16d8ec72535ded65d035122b0d944b0e64eaa2a2 SOURCES/httpd-2.4.6.tar.bz2 +6ce5ab3c765b9efeceb2e636e32373bc6e6ed489 SOURCES/centos-noindex.tar.gz diff --git a/SOURCES/welcome.conf b/SOURCES/welcome.conf index 5d1e452..c1b6c11 100644 --- a/SOURCES/welcome.conf +++ b/SOURCES/welcome.conf @@ -16,3 +16,7 @@ Alias /.noindex.html /usr/share/httpd/noindex/index.html +Alias /noindex/css/bootstrap.min.css /usr/share/httpd/noindex/css/bootstrap.min.css +Alias /noindex/css/open-sans.css /usr/share/httpd/noindex/css/open-sans.css +Alias /images/apache_pb.gif /usr/share/httpd/noindex/images/apache_pb.gif +Alias /images/poweredby.png /usr/share/httpd/noindex/images/poweredby.png diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec index cc1763c..6ba91d0 100644 --- a/SPECS/httpd.spec +++ b/SPECS/httpd.spec @@ -4,7 +4,7 @@ %define mmn 20120211 %define oldmmnisa %{mmn}-%{__isa_name}-%{__isa_bits} %define mmnisa %{mmn}%{__isa_name}%{__isa_bits} -%define vstring %(source /etc/os-release; echo ${REDHAT_SUPPORT_PRODUCT}) +%define vstring CentOS # Drop automatic provides for module DSOs %{?filter_setup: @@ -18,7 +18,7 @@ Version: 2.4.6 Release: 67%{?dist} URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 -Source1: index.html +Source1: centos-noindex.tar.gz Source2: httpd.logrotate Source3: httpd.sysconf Source4: httpd-ssl-pass-dialog @@ -542,8 +542,10 @@ 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 $RPM_SOURCE_DIR/centos-noindex.tar.gz \ + -C $RPM_BUILD_ROOT%{contentdir}/noindex/ \ + --strip-components=1 + rm -rf %{contentdir}/htdocs # remove manual sources @@ -566,7 +568,7 @@ rm -v $RPM_BUILD_ROOT%{docroot}/html/*.html \ $RPM_BUILD_ROOT%{docroot}/cgi-bin/* # Symlink for the powered-by-$DISTRO image: -ln -s ../../pixmaps/poweredby.png \ +ln -s ../noindex/images/poweredby.png \ $RPM_BUILD_ROOT%{contentdir}/icons/poweredby.png # symlinks for /etc/httpd @@ -752,7 +754,7 @@ rm -rf $RPM_BUILD_ROOT %{contentdir}/error/README %{contentdir}/error/*.var %{contentdir}/error/include/*.html -%{contentdir}/noindex/index.html +%{contentdir}/noindex/* %dir %{docroot} %dir %{docroot}/cgi-bin @@ -818,6 +820,12 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/rpm/macros.httpd %changelog +* Mon Jul 31 2017 CentOS Sources - 2.4.6-67.el7.centos +- Remove index.html, add centos-noindex.tar.gz +- change vstring +- change symlink for poweredby.png +- update welcome.conf with proper aliases + * Tue May 09 2017 Luboš Uhliarik - 2.4.6-67 - Related: #1332242 - Explicitly disallow the '#' character in allow,deny directives