From 9266d8fd591dce85d6497ab200d133c75e37a20d Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 18 May 2018 11:26:29 -0700
Subject: [PATCH] Update to 4.9.6. Fixes bug #1579584

---
 .gitignore                          |  1 +
 sources                             |  2 +-
 wordpress-4.8-tinymce_noflash.patch | 31 -------------------------
 wordpress-4.9-tinymce_noflash.patch | 36 +++++++++++++++++++++++++++++
 wordpress.spec                      |  7 ++++--
 5 files changed, 43 insertions(+), 34 deletions(-)
 delete mode 100644 wordpress-4.8-tinymce_noflash.patch
 create mode 100644 wordpress-4.9-tinymce_noflash.patch

diff --git a/.gitignore b/.gitignore
index caa1e80..740bd79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /wordpress-4.9.2-strip.tar.xz
 /wordpress-4.9.4-strip.tar.xz
 /wordpress-4.9.5-strip.tar.xz
+/wordpress-4.9.6-strip.tar.xz
diff --git a/sources b/sources
index f6747ba..386fadf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (wordpress-4.9.5-strip.tar.xz) = 5b763b833c9e6758a86b2eecd0cd74e5a7671851351eb7bb56454b15611f9b12bfda6181e2df09cad485611ce5f32e61dcd9b86906e32afe95b86b0077876a4a
+SHA512 (wordpress-4.9.6-strip.tar.xz) = 9364c6b9fa4a8872bdb1bd2fba7185d6253d83b61aa7665ab94fd0016f5c1059ab41af3001fe54ce7d7354f0ac49d79b3278bad3c2f54fb7d52543cb07c18538
diff --git a/wordpress-4.8-tinymce_noflash.patch b/wordpress-4.8-tinymce_noflash.patch
deleted file mode 100644
index f2a5cde..0000000
--- a/wordpress-4.8-tinymce_noflash.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./wp-includes/js/tinymce/plugins/media/plugin.js.orig	2017-06-09 13:24:42.303748183 +0200
-+++ ./wp-includes/js/tinymce/plugins/media/plugin.js	2017-06-09 13:25:21.965958105 +0200
-@@ -937,8 +937,7 @@
-         'wav': 'audio/wav',
-         'mp4': 'video/mp4',
-         'webm': 'video/webm',
--        'ogg': 'video/ogg',
--        'swf': 'application/x-shockwave-flash'
-+        'ogg': 'video/ogg'
-       };
-       var fileEnd = url.toLowerCase().split('.').pop();
-       var mime = mimes[fileEnd];
-@@ -1111,18 +1110,6 @@
-             '" width="' + data.width +
-             '" height="' + data.height +
-             '"' + allowFullscreen + '></iframe>';
--        } else if (data.source1mime === "application/x-shockwave-flash") {
--          html +=
--            '<object data="' + data.source1 +
--            '" width="' + data.width +
--            '" height="' + data.height +
--            '" type="application/x-shockwave-flash">';
--
--          if (data.poster) {
--            html += '<img src="' + data.poster + '" width="' + data.width + '" height="' + data.height + '" />';
--          }
--
--          html += '</object>';
-         } else if (data.source1mime.indexOf('audio') !== -1) {
-           if (editor.settings.audio_template_callback) {
-             html = editor.settings.audio_template_callback(data);
diff --git a/wordpress-4.9-tinymce_noflash.patch b/wordpress-4.9-tinymce_noflash.patch
new file mode 100644
index 0000000..6dee5ae
--- /dev/null
+++ b/wordpress-4.9-tinymce_noflash.patch
@@ -0,0 +1,36 @@
+diff -Nur wordpress.orig/wp-includes/js/tinymce/plugins/media/plugin.js wordpress/wp-includes/js/tinymce/plugins/media/plugin.js
+--- wordpress.orig/wp-includes/js/tinymce/plugins/media/plugin.js	2018-05-01 15:31:24.000000000 -0700
++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js	2018-05-18 11:22:34.648500557 -0700
+@@ -166,7 +166,6 @@
+       mp4: 'video/mp4',
+       webm: 'video/webm',
+       ogg: 'video/ogg',
+-      swf: 'application/x-shockwave-flash'
+     };
+     var fileEnd = url.toLowerCase().split('.').pop();
+     var mime = mimes[fileEnd];
+@@ -424,14 +423,6 @@
+     var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : '';
+     return '<iframe src="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '"' + allowFullscreen + '></iframe>';
+   };
+-  var getFlashHtml = function (data) {
+-    var html = '<object data="' + data.source1 + '" width="' + data.width + '" height="' + data.height + '" type="application/x-shockwave-flash">';
+-    if (data.poster) {
+-      html += '<img src="' + data.poster + '" width="' + data.width + '" height="' + data.height + '" />';
+-    }
+-    html += '</object>';
+-    return html;
+-  };
+   var getAudioHtml = function (data, audioTemplateCallback) {
+     if (audioTemplateCallback) {
+       return audioTemplateCallback(data);
+@@ -494,8 +485,6 @@
+       });
+       if (data.type === 'iframe') {
+         return getIframeHtml(data);
+-      } else if (data.source1mime === 'application/x-shockwave-flash') {
+-        return getFlashHtml(data);
+       } else if (data.source1mime.indexOf('audio') !== -1) {
+         return getAudioHtml(data, audioTemplateCallback);
+       } else if (data.type === 'script') {
+Binary files wordpress.orig/wp-includes/js/tinymce/wp-tinymce.js.gz and wordpress/wp-includes/js/tinymce/wp-tinymce.js.gz differ
diff --git a/wordpress.spec b/wordpress.spec
index 064b807..b82c511 100644
--- a/wordpress.spec
+++ b/wordpress.spec
@@ -19,7 +19,7 @@
 Summary:    Blog tool and publishing platform
 URL:        http://www.wordpress.org
 Name:       wordpress
-Version:    4.9.5
+Version:    4.9.6
 Group:      Applications/Publishing
 Release:    1%{?dist}
 License:    GPLv2
@@ -45,7 +45,7 @@ Patch2: wordpress-4.9-no_swfupload.patch
 # Adjust tinymce's media plugin not to use its SWF plugin. This changes
 # 'p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"))'
 # to 'false'
-Patch3: wordpress-4.8-tinymce_noflash.patch
+Patch3: wordpress-4.9-tinymce_noflash.patch
 # We drop the SWF files from mediaelement
 Patch4: wordpress-4.9-mediaelement_no_swf.patch
 # RPM configuration:
@@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig
 
 
 %changelog
+* Fri May 18 2018 Kevin Fenzi <kevin@scrye.com> - 4.9.6-1
+- Update to 4.9.6. Fixes bug #1579584
+
 * Wed Apr  4 2018 Remi Collet <remi@remirepo.net> - 4.9.5-1
 - WordPress 4.9.5 Security and Maintenance Release