[httpd] avoid use of "core" GIF for a "core" directory (#168776)

[jorton]

commit a0dc2432651149d62c36efdded201e5788db9540
Author: Joe Orton <jorton at redhat.com>
Date:   Fri Jun 8 13:52:50 2012 +0100

    avoid use of "core" GIF for a "core" directory (#168776)

 httpd-2.4.2-iconlink.patch |   14 --------------
 httpd-2.4.2-icons.patch    |   25 +++++++++++++++++++++++++
 httpd.spec                 |    7 +++++--
 3 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/httpd-2.4.2-icons.patch b/httpd-2.4.2-icons.patch
new file mode 100644
index 0000000..9f26494
--- /dev/null
+++ b/httpd-2.4.2-icons.patch
@@ -0,0 +1,25 @@
+
+- Fix config for /icons/ dir to allow symlink to poweredby.png.
+
+- Avoid using coredump GIF for a directory called "core"
+
+--- httpd-2.4.2/docs/conf/extra/httpd-autoindex.conf.in.icons
++++ httpd-2.4.2/docs/conf/extra/httpd-autoindex.conf.in
+@@ -21,7 +21,7 @@ IndexOptions FancyIndexing HTMLTable Ver
+ Alias /icons/ "@exp_iconsdir@/"
+ 
+ <Directory "@exp_iconsdir@">
+-    Options Indexes MultiViews
++    Options Indexes MultiViews FollowSymlinks
+     AllowOverride None
+     Require all granted
+ </Directory>
+@@ -53,7 +53,7 @@ AddIcon /icons/dvi.gif .dvi
+ AddIcon /icons/uuencoded.gif .uu
+ AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
+ AddIcon /icons/tex.gif .tex
+-AddIcon /icons/bomb.gif core
++AddIcon /icons/bomb.gif core.
+ 
+ AddIcon /icons/back.gif ..
+ AddIcon /icons/hand.right.gif README
diff --git a/httpd.spec b/httpd.spec
index 2130416..5828a8c 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -44,7 +44,7 @@ Patch23: httpd-2.4.1-export.patch
 Patch24: httpd-2.4.1-corelimit.patch
 Patch25: httpd-2.4.1-selinux.patch
 Patch26: httpd-2.4.2-r1337344+.patch
-Patch27: httpd-2.4.2-iconlink.patch
+Patch27: httpd-2.4.2-icons.patch
 # Bug fixes
 Patch40: httpd-2.4.2-restart.patch
 Patch41: httpd-2.4.2-r1327036+.patch
@@ -156,7 +156,7 @@ authentication to the Apache HTTP Server.
 %patch24 -p1 -b .corelimit
 %patch25 -p1 -b .selinux
 %patch26 -p1 -b .r1337344+
-%patch27 -p1 -b .iconlink
+%patch27 -p1 -b .icons
 
 %patch40 -p1 -b .restart
 %patch41 -p1 -b .r1327036+
@@ -567,6 +567,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Fri Jun  8 2012 Joe Orton <jorton at redhat.com> - 2.4.2-18
+- avoid use of "core" GIF for a "core" directory (#168776)
+
 * Thu Jun  7 2012 Joe Orton <jorton at redhat.com> - 2.4.2-17
 - use _unitdir for systemd unit file
 - use /run in unit file, ssl.conf