From 0761b61a928b5845d11dd4d5ba42cfa71d1cc8e7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 17 Aug 2018 09:37:59 +0200
Subject: v3.4.14 from Fedora

---
 php-symfony3.spec | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'php-symfony3.spec')

diff --git a/php-symfony3.spec b/php-symfony3.spec
index b6a3614..ea77c35 100644
--- a/php-symfony3.spec
+++ b/php-symfony3.spec
@@ -13,8 +13,8 @@
 
 %global github_owner     symfony
 %global github_name      symfony
-%global github_version   3.4.12
-%global github_commit    c36f8cb21b5f1661a14fdb8cef9cc611d54a3494
+%global github_version   3.4.14
+%global github_commit    f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e
 
 %global composer_vendor  symfony
 %global composer_project symfony
@@ -49,9 +49,9 @@
 # "doctrine/doctrine-bundle": "~1.4"
 %global doctrine_bundle_min_ver 1.4
 %global doctrine_bundle_max_ver 2.0
-# "doctrine/orm": "~2.4,>=2.4.5"
+# "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0"
 %global doctrine_orm_min_ver 2.4.5
-%global doctrine_orm_max_ver 3.0
+%global doctrine_orm_max_ver 2.7.0
 # "egulias/email-validator": "~1.2,>=1.2.8|~2.0"
 #     NOTE: Min version not 3.0 to restrict to single major version
 %global email_validator_min_ver 1.2.8
@@ -67,7 +67,7 @@
 %global proxy_manager_min_ver 1.0
 %global proxy_manager_max_ver 3.0
 # Require:  "phpdocumentor/reflection-docblock": "^3.0|^4.0"
-# Conflict: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",  (
+# Conflict: "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2"
 %global phpdocumentor_reflection_docblock_min_ver 3.2.2
 %global phpdocumentor_reflection_docblock_max_ver 4.0
 # "psr/cache": "~1.0"
@@ -204,6 +204,8 @@ BuildRequires: php-xml
 BuildRequires: php-xmlreader
 ## Autoloader
 BuildRequires: php-composer(fedora/autoloader)
+# Conflicts
+BuildConflicts: php-composer(phpdocumentor/type-resolver) < 0.3.0
 
 # Bridges
 Requires:      php-composer(%{composer_vendor}/doctrine-bridge) = %{version}
@@ -263,6 +265,9 @@ Requires:      php-composer(%{composer_vendor}/yaml) = %{version}
 # Composer
 Provides:      php-composer(%{composer_vendor}/%{composer_project}) = %{version}
 
+# Conflicts
+Conflicts:     php-composer(phpdocumentor/type-resolver) < 0.3.0
+
 %description
 %{summary}.
 
@@ -2802,6 +2807,10 @@ exit $RET
 # ##############################################################################
 
 %changelog
+* Wed Aug 01 2018 Shawn Iwinski <shawn.iwinski@gmail.com> - 3.4.14-1
+- Update to 3.4.14 (CVE-2018-14773 / CVE-2018-14774)
+- Add conflict php-composer(phpdocumentor/type-resolver) < 0.3.0
+
 * Mon Jun 25 2018 Shawn Iwinski <shawn@iwin.ski> - 3.4.12-1
 - Update 3.4.12
 
-- 
cgit