From b435e7bbc4260d696ef2de40ae8fa8e0237abea5 Mon Sep 17 00:00:00 2001
From: Shawn Iwinski <shawn@iwin.ski>
Date: Aug 01 2018 21:51:30 +0000
Subject: Update to 3.4.14 (CVE-2018-14773 / CVE-2018-14774)


- Add conflict php-composer(phpdocumentor/type-resolver) < 0.3.0

---

diff --git a/.gitignore b/.gitignore
index 1e966e8..8f01047 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ clog
 /php-symfony3-3.4.10-816bf5030e3ac7cf6a88575a27138a088d3041b0.tar.gz
 /php-symfony3-3.4.11-8eb567d8398ce31a402ea8db3e6b5b1faf121cbc.tar.gz
 /php-symfony3-3.4.12-c36f8cb21b5f1661a14fdb8cef9cc611d54a3494.tar.gz
+/php-symfony3-3.4.14-f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e.tar.gz
diff --git a/composer.json b/composer.json
index 8c7d87c..e0a1c53 100644
--- a/composer.json
+++ b/composer.json
@@ -92,7 +92,7 @@
         "doctrine/cache": "~1.6",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
-        "doctrine/orm": "~2.4,>=2.4.5",
+        "doctrine/orm": "~2.4,>=2.4.5,<=2.7.0",
         "doctrine/doctrine-bundle": "~1.4",
         "monolog/monolog": "~1.11",
         "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
@@ -104,7 +104,7 @@
     },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-        "phpdocumentor/type-resolver": "<0.2.1",
+        "phpdocumentor/type-resolver": "<0.3.0",
         "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
     },
     "provide": {
diff --git a/php-symfony3.spec b/php-symfony3.spec
index a2f6d02..a977da9 100644
--- a/php-symfony3.spec
+++ b/php-symfony3.spec
@@ -12,8 +12,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
@@ -48,9 +48,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
@@ -66,7 +66,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"
@@ -111,7 +111,7 @@
 
 Name:          php-%{composer_project}3
 Version:       %{github_version}
-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       Symfony PHP framework (version 3)
 
 Group:         Development/Libraries
@@ -203,6 +203,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}
@@ -262,6 +264,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}.
 
@@ -2801,6 +2806,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
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index c3a5290..c64560e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-symfony3-3.4.12-c36f8cb21b5f1661a14fdb8cef9cc611d54a3494.tar.gz) = 43e1de3601466132b57239f96b55794f8e4378c8bbe9e34f6d78b46b182069d731e12953aeb721cf480b0910888daeb956221575ab937e7568518a977ac0a76e
+SHA512 (php-symfony3-3.4.14-f50e17fa4edd6216f7fe5b908f04e64ba1d19a9e.tar.gz) = 15d01cebe5dcd3169e9bf747d8526bfb9b6b53e81b95533f389a62a6594be5a935e31fbeac1cc7556e55e92c8cf42022ba25f5957d653b329a9c1149be6b7a93