From 2f74eecf85362e67c403b7b1386a729da3e5c33d Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Nov 04 2020 02:52:21 +0000
Subject: CentOS debranding


---

diff --git a/.gitignore b/.gitignore
index 6e3f15e..a320398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/httpd-2.4.37.tar.bz2
+SOURCES/centos-noindex-8.0.tar.gz
diff --git a/.httpd.metadata b/.httpd.metadata
index e540f7e..6270a61 100644
--- a/.httpd.metadata
+++ b/.httpd.metadata
@@ -1 +1,2 @@
 4a38471de821288b0300148016f2b03dfee8adf2 SOURCES/httpd-2.4.37.tar.bz2
+6aa65f45c247226fc922c455e0187abd90c839e8 SOURCES/centos-noindex-8.0.tar.gz
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/welcome.conf b/SOURCES/welcome.conf
index 5d1e452..44d6a56 100644
--- a/SOURCES/welcome.conf
+++ b/SOURCES/welcome.conf
@@ -7,12 +7,24 @@
 #
 <LocationMatch "^/+$">
     Options -Indexes
-    ErrorDocument 403 /.noindex.html
+    ErrorDocument 403 /noindex/index.html
 </LocationMatch>
 
 <Directory /usr/share/httpd/noindex>
+    Options MultiViews
+    DirectoryIndex index.html
+
+    AddLanguage en-US .en-US
+    AddLanguage es-ES .es-ES
+    AddLanguage zh-CN .zh-CN
+    AddLanguage zh-HK .zh-HK
+    AddLanguage zh-TW .zh-TW
+
+    LanguagePriority en
+    ForceLanguagePriority Fallback
+
     AllowOverride None
     Require all granted
 </Directory>
 
-Alias /.noindex.html /usr/share/httpd/noindex/index.html
+Alias /noindex /usr/share/httpd/noindex
diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec
index 1ed15dd..8322bd8 100644
--- a/SPECS/httpd.spec
+++ b/SPECS/httpd.spec
@@ -16,7 +16,7 @@ Version: 2.4.37
 Release: 30%{?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
@@ -530,8 +530,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
@@ -745,7 +744,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
@@ -829,9 +828,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
-* Tue Nov 03 2020 CentOS Sources <bugs@centos.org> - 2.4.37-30.el8.centos
-- Apply debranding changes
-
 * Mon Jun 15 2020 Joe Orton <jorton@redhat.com> - 2.4.37-30
 - Resolves: #1209162 - support logging to journald from CustomLog