From ba51457200e72c43c4aa6c3a67bcd268cac59c14 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Wed, 1 Oct 2014 15:32:51 +0200
Subject: phpMyAdmin: 4.2.9.1 (security)

---
 phpMyAdmin.htaccess | 2 ++
 phpMyAdmin.spec     | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/phpMyAdmin.htaccess b/phpMyAdmin.htaccess
index 0b8ae1a..4ac6cb4 100644
--- a/phpMyAdmin.htaccess
+++ b/phpMyAdmin.htaccess
@@ -9,6 +9,8 @@ Alias /phpMyAdmin /usr/share/phpMyAdmin
 Alias /phpmyadmin /usr/share/phpMyAdmin
 
 <Directory /usr/share/phpMyAdmin/>
+   AddDefaultCharset UTF-8
+
    <IfModule mod_authz_core.c>
      # Apache 2.4
      Require local
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index de36b9d..29b6224 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -13,7 +13,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_datadir}/doc/%{name}-%{version}}
 
 Name: phpMyAdmin
-Version: 4.2.9
+Version: 4.2.9.1
 Release: 1%{?dist}
 Summary: Web based MySQL browser written in php
 
@@ -185,6 +185,10 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN
 
 
 %changelog
+* Wed Oct  1 2014 Remi Collet <rpms@famillecollet.com> 4.2.9.1-1
+- update to 4.2.9.1 (Wed, 1 Oct 2014, security)
+- fix for PMASA-2014-11
+
 * Sat Sep 20 2014 Remi Collet <rpms@famillecollet.com> 4.2.9-1
 - update to 4.2.9 (Sat, 20 Sep 2014, bugfix)
 
-- 
cgit