commit ddbc2585c8b4f019f4dbc168354c0ab6f2dcfab9
Author: Elan Ruusamäe <[email protected]>
Date: Mon Aug 17 14:19:07 2015 +0300
up to 1.12.15, Released 2015-08-11
ZendFramework-deps.patch | 17 ++++++++---------
ZendFramework.spec | 6 +++---
2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/ZendFramework.spec b/ZendFramework.spec
index bf87f6a..be0650c 100644
--- a/ZendFramework.spec
+++ b/ZendFramework.spec
@@ -13,14 +13,14 @@
Summary: Zend Framework
Summary(pl.UTF-8): Szkielet Zend
Name: ZendFramework
-Version: 1.12.11
+Version: 1.12.15
Release: 1
License: New BSD License
Group: Development/Languages/PHP
Source0:
http://framework.zend.com/releases/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fb05390d22bb0ab9b340c456c4b25af5
+# Source0-md5: 933b37f96ff7fa6efdc69f9f8cc99839
Source1:
http://framework.zend.com/releases/%{name}-%{version}/%{name}-%{version}-manual-en.tar.gz
-# Source1-md5: ca6ab6b20ca0a0f32b680c8111404286
+# Source1-md5: ed18cb5ddab7889ab9c9df2254d0514e
Source2: %{name}-find-lang.sh
Patch0: %{name}-additional-locales.patch
Patch1: %{name}-deps.patch
diff --git a/ZendFramework-deps.patch b/ZendFramework-deps.patch
index c24fb47..06066ff 100644
--- a/ZendFramework-deps.patch
+++ b/ZendFramework-deps.patch
@@ -33,17 +33,16 @@
+class Zend_Service_Audioscrobbler_Exception extends Exception
+{
+}
---- ZendFramework-1.12.4/library/Zend/Xml/Security.php~ 2014-05-19
22:41:57.000000000 +0300
-+++ ZendFramework-1.12.4/library/Zend/Xml/Security.php 2014-05-19
23:12:43.208009810 +0300
-@@ -39,7 +39,7 @@
- protected static function heuristicScan($xml)
+--- ZendFramework-1.12.15/library/Zend/Xml/Security.php~ 2015-08-17
14:18:52.000000000 +0300
++++ ZendFramework-1.12.15/library/Zend/Xml/Security.php 2015-08-17
14:19:42.795236199 +0300
+@@ -40,6 +40,7 @@
{
- if (strpos($xml, '<!ENTITY') !== false) {
-- require_once 'Exception.php';
-+ require_once 'Zend/Xml/Exception.php';
- throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+ foreach (self::getEntityComparison($xml) as $compare) {
+ if (strpos($xml, $compare) !== false) {
++ require_once 'Zend/Xml/Exception.php';
+ throw new Zend_Xml_Exception(self::ENTITY_DETECT);
+ }
}
- }
@@ -96,7 +96,7 @@
foreach ($dom->childNodes as $child) {
if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ZendFramework.git/commitdiff/ddbc2585c8b4f019f4dbc168354c0ab6f2dcfab9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
