rpms/phpMyAdmin/F-7 .cvsignore, 1.8, 1.9 phpMyAdmin.htaccess, 1.3, 1.4 phpMyAdmin.spec, 1.16, 1.17 sources, 1.13, 1.14 phpMyAdmin-2.11.3-CVE-2007-0095.patch, 1.1, NONE

[Robert Scheck (robert)]

Author: robert

Update of /cvs/pkgs/rpms/phpMyAdmin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15716/F-7

Modified Files:
	.cvsignore phpMyAdmin.htaccess phpMyAdmin.spec sources 
Removed Files:
	phpMyAdmin-2.11.3-CVE-2007-0095.patch 
Log Message:
- Upstream released 2.11.4
- Corrected mod_security example in configuration file (#427119)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Dec 2007 15:47:30 -0000	1.8
+++ .cvsignore	13 Jan 2008 19:40:18 -0000	1.9
@@ -1 +1 @@
-phpMyAdmin-2.11.3-all-languages.tar.bz2
+phpMyAdmin-2.11.4-all-languages.tar.bz2


Index: phpMyAdmin.htaccess
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/phpMyAdmin.htaccess,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- phpMyAdmin.htaccess	9 Dec 2007 15:47:30 -0000	1.3
+++ phpMyAdmin.htaccess	13 Jan 2008 19:40:18 -0000	1.4
@@ -27,7 +27,7 @@
 #
 #<IfModule mod_security.c>
 #    <LocationMatch "/phpMyAdmin/(.+)">
-#        SecFilterInheritance Off
+#        SecRuleInheritance Off
 #    </LocationMatch>
 #</IfModule>
 


Index: phpMyAdmin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/phpMyAdmin.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- phpMyAdmin.spec	9 Dec 2007 15:47:30 -0000	1.16
+++ phpMyAdmin.spec	13 Jan 2008 19:40:18 -0000	1.17
@@ -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 @@
 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 @@
 
 %prep
 %setup -qn phpMyAdmin-%{version}-all-languages
-%patch0 -p1
 
 %install
 rm -rf %{buildroot}
@@ -56,7 +54,11 @@
 %config(noreplace) %{_sysconfdir}/%{name}
 
 %changelog
-* Sun Dec 09 2007 Robert Scheck <robert at fedoraproject.org> 2.11.2.2-1
+* Sun Jan 13 2008 Robert Scheck <robert at 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 at 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phpMyAdmin/F-7/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Dec 2007 15:47:30 -0000	1.13
+++ sources	13 Jan 2008 19:40:18 -0000	1.14
@@ -1 +1 @@
-fb3f8e5d1023b571ba44c574578538b8  phpMyAdmin-2.11.3-all-languages.tar.bz2
+0b6d797a0c14a015d19b94e839f48d1b  phpMyAdmin-2.11.4-all-languages.tar.bz2


--- phpMyAdmin-2.11.3-CVE-2007-0095.patch DELETED ---