From 0ed8f6afa09df6464743b26be8408cc0f3886d91 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jan 13 2008 19:40:09 +0000
Subject: - Upstream released 2.11.4

- Corrected mod_security example in configuration file (#427119)

---

diff --git a/.cvsignore b/.cvsignore
index 40472ed..0d97530 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-phpMyAdmin-2.11.3-all-languages.tar.bz2
+phpMyAdmin-2.11.4-all-languages.tar.bz2
diff --git a/phpMyAdmin-2.11.3-CVE-2007-0095.patch b/phpMyAdmin-2.11.3-CVE-2007-0095.patch
deleted file mode 100644
index f579db0..0000000
--- a/phpMyAdmin-2.11.3-CVE-2007-0095.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Possible fix for CVE-2007-0095 in phpMyAdmin proposed by Robert Scheck <robert@fedoraproject.org>.
-See the following links for further information:
-
- - http://nvd.nist.gov/nvd.cfm?cvename=CVE-2007-0095
- - https://bugzilla.redhat.com/show_bug.cgi?id=221694
-
---- phpMyAdmin/themes/darkblue_orange/layout.inc.php		2007-10-16 00:08:43.000000000 +0200
-+++ phpMyAdmin/themes/darkblue_orange/layout.inc.php.rsc	2007-12-09 15:02:23.000000000 +0100
-@@ -72,7 +72,10 @@
- // border
- $GLOBALS['cfg']['Border']               = 0;
- // table header and footer color
--$GLOBALS['cfg']['ThBackground']         = '#ff9900 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top';
-+if(isset($_SESSION['PMA_Theme']))
-+  $GLOBALS['cfg']['ThBackground']       = '#ff9900 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top';
-+else
-+  $GLOBALS['cfg']['ThBackground']       = '#ff9900';
- // table header and footer background
- $GLOBALS['cfg']['ThColor']              = '#000000';
- // table data row background
diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess
index 4bbb570..3198d05 100644
--- a/phpMyAdmin.htaccess
+++ b/phpMyAdmin.htaccess
@@ -27,7 +27,7 @@ Alias /phpmyadmin /usr/share/phpMyAdmin
 #
 #<IfModule mod_security.c>
 #    <LocationMatch "/phpMyAdmin/(.+)">
-#        SecFilterInheritance Off
+#        SecRuleInheritance Off
 #    </LocationMatch>
 #</IfModule>
 
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 5be184b..d5f952a 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -1,5 +1,5 @@
 Name: phpMyAdmin
-Version: 2.11.3
+Version: 2.11.4
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -9,7 +9,6 @@ URL: http://www.phpmyadmin.net/
 Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-all-languages.tar.bz2
 Source1: phpMyAdmin-config.inc.php
 Source2: phpMyAdmin.htaccess
-Patch0: phpMyAdmin-2.11.3-CVE-2007-0095.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -28,7 +27,6 @@ is available in 50 languages
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
-%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -56,7 +54,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
-* Sun Dec 09 2007 Robert Scheck <robert@fedoraproject.org> 2.11.2.2-1
+* Sun Jan 13 2008 Robert Scheck <robert@fedoraproject.org> 2.11.4-1
+- Upstream released 2.11.4
+- Corrected mod_security example in configuration file (#427119)
+
+* Sun Dec 09 2007 Robert Scheck <robert@fedoraproject.org> 2.11.3-1
 - Upstream released 2.11.3
 - Removed the RPM scriptlets doing httpd restarts (#227025)
 - Patched an information disclosure known as CVE-2007-0095 (#221694)
diff --git a/sources b/sources
index b8d0aa9..2aa548c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb3f8e5d1023b571ba44c574578538b8  phpMyAdmin-2.11.3-all-languages.tar.bz2
+0b6d797a0c14a015d19b94e839f48d1b  phpMyAdmin-2.11.4-all-languages.tar.bz2