From 9225f10391b5101e4bb4530dcb1d83dd3693d31d Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Wed, 11 Sep 2013 21:57:45 -0400 Subject: [PATCH 001/184] * Thu Sep 12 2013 Paul Wouters - 3.6.1-1 - update to 3.6.1, various bugs and security fixes: CVE-2013-4338 CVE-2013-4339 CVE-2013-4340 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index baa16c5..5be7fdc 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.5.2.tar.gz /wordpress-3.6.tar.gz +/wordpress-3.6.1.tar.gz diff --git a/sources b/sources index 36c9fae..ab49b3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddbe1549dc27a260d28b47ad32eadd34 wordpress-3.6.tar.gz +3f2c0b6f7f0626b5170a7b5df99d78b8 wordpress-3.6.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index e3d91c9..4e83f69 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -4,7 +4,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.6 +Version: 3.6.1 Group: Applications/Publishing #Release: 0.5.%{betatag}%{?dist} Release: 1%{?dist} @@ -205,6 +205,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Thu Sep 12 2013 Paul Wouters - 3.6.1-1 +- update to 3.6.1, various bugs and security fixes: + CVE-2013-4338 CVE-2013-4339 CVE-2013-4340 + * Thu Aug 22 2013 Adam Williamson - 3.6.0-1 - update to 3.6.0 - drop pre-compiled Flash and Silverlight binaries - #1000267 From 0497598d8986595cfbcbf236474bf9054814c4a4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Oct 2013 14:29:46 +0200 Subject: [PATCH 002/184] - update to 3.7 - requires ca-certificates for ca-bundle.crt --- .gitignore | 1 + sources | 2 +- wordpress.spec | 51 ++++++++++++++++++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 5be7fdc..943354d 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ wordpress-3.0.1.tar.gz /wordpress-3.6.tar.gz /wordpress-3.6.1.tar.gz +/wordpress-3.7.tar.gz diff --git a/sources b/sources index ab49b3f..a1a980b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f2c0b6f7f0626b5170a7b5df99d78b8 wordpress-3.6.1.tar.gz +aaad36cd739b825952cf3e09de5e7856 wordpress-3.7.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 4e83f69..fe73fa8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,19 +1,24 @@ %global wp_content %{_datadir}/wordpress/wp-content -%global betatag RC3 -Summary: Blog tool and publishing platform -URL: http://www.wordpress.org -Name: wordpress -Version: 3.6.1 -Group: Applications/Publishing -#Release: 0.5.%{betatag}%{?dist} -Release: 1%{?dist} -License: GPLv2 -#Source0: http://wordpress.org/%{name}-%{version}-%{betatag}.tar.gz -Source0: http://wordpress.org/%{name}-%{version}.tar.gz -Source1: wordpress-httpd-conf -Source2: README.fedora.wordpress -Source3: README.fedora.wordpress-mu +%if 0%{?rhel} == 5 +%global with_cacert 0 +%else +%global with_cacert 1 +%endif + +Summary: Blog tool and publishing platform +URL: http://www.wordpress.org +Name: wordpress +Version: 3.7 +Group: Applications/Publishing +Release: 1%{?dist} +License: GPLv2 + +Source0: http://wordpress.org/%{name}-%{version}.tar.gz +Source1: wordpress-httpd-conf +Source2: README.fedora.wordpress +Source3: README.fedora.wordpress-mu + # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) Patch0: wordpress-debian_patches_hello.patch @@ -41,7 +46,7 @@ Requires: php53-simplepie >= 1.3.1 Requires: php >= 5.2.4 Requires: php-simplepie >= 1.3.1 %endif -# Required php extension (detected by phpci) +# Required php extension (detected by phpcompatinfo) Requires: php-curl Requires: php-date Requires: php-dom @@ -71,6 +76,9 @@ Requires: php-zlib # Unbundled libraries Requires: php-PHPMailer Requires: webserver +%if %{with_cacert} +Requires: ca-certificates +%endif Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -160,8 +168,15 @@ for fic in phpmailer smtp; do ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php done +# Remove bundled ca-bundle.crt +%if %{with_cacert} +rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt +ln -s /etc/pki/tls/certs/ca-bundle.crt \ + ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt +%endif + # Remove backup copies of patches -find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.FSFaddr \) \ +find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \ -print -delete ## Move wp-content directory to /var/www location @@ -205,6 +220,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Fri Oct 25 2013 Remi Collet - 3.7-1 +- update to 3.7 +- requires ca-certificates for ca-bundle.crt + * Thu Sep 12 2013 Paul Wouters - 3.6.1-1 - update to 3.6.1, various bugs and security fixes: CVE-2013-4338 CVE-2013-4339 CVE-2013-4340 From 41f06786049c7965556afd1e6c674a05836d8e05 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Oct 2013 14:48:22 +0200 Subject: [PATCH 003/184] cleanup --- .gitignore | 41 ----------------------------------------- 1 file changed, 41 deletions(-) diff --git a/.gitignore b/.gitignore index 943354d..eaa76bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,44 +1,3 @@ *spec~ clog -wordpress-3.0.1.tar.gz -/wordpress-3.0.2.tar.gz -/wordpress-3.0.3.tar.gz -/wordpress-3.0.4.tar.gz -/wordpress-3.1.tar.gz -/wordpress-3.1.1.tar.gz -/wordpress-3.1.2.tar.gz -/wordpress-3.1.3.tar.gz -/wordpress-3.2-RC1.zip -/wordpress-3.2-RC3.zip -/wordpress-3.2.tar.gz -/wordpress-3.2.1.tar.gz -/wordpress-3.3-beta2.tar.gz -/wordpress-3.3-beta3.tar.gz -/wordpress-3.3-beta4.tar.gz -/wordpress-3.3-RC1.tar.gz -/wordpress-3.3-RC2.tar.gz -/wordpress-3.3.tar.gz -/wordpress-3.3.1.tar.gz -/wordpress-3.4-beta1.tar.gz -/wordpress-3.4-beta2.tar.gz -/wordpress-3.4-beta3.tar.gz -/wordpress-3.4-beta4.tar.gz -/wordpress-3.4-RC1.tar.gz -/wordpress-3.4-RC2.tar.gz -/wordpress-3.4-RC3.tar.gz -/wordpress-3.4.tar.gz -/wordpress-3.4.1.tar.gz -/wordpress-3.4.2.tar.gz -/wordpress-3.5-beta-1.tar.gz -/wordpress-3.5-beta2.tar.gz -/wordpress-3.5-beta3.tar.gz -/wordpress-3.5-RC1.tar.gz -/wordpress-3.5-RC2.tar.gz -/wordpress-3.5-RC3.tar.gz -/wordpress-3.5.tar.gz -/wordpress-3.5.1.tar.gz -/wordpress-3.5.2.tar.gz -/wordpress-3.6.tar.gz - -/wordpress-3.6.1.tar.gz /wordpress-3.7.tar.gz From 18130dfcb7644b6815026612848558642f324100 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Oct 2013 15:06:20 +0200 Subject: [PATCH 004/184] clean --- wordpress-FSF-address.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 wordpress-FSF-address.patch diff --git a/wordpress-FSF-address.patch b/wordpress-FSF-address.patch deleted file mode 100644 index 8992779..0000000 --- a/wordpress-FSF-address.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up wordpress/wp-includes/kses.php.FSFaddr wordpress/wp-includes/kses.php ---- wordpress/wp-includes/kses.php.FSFaddr 2011-05-25 23:54:34.347025847 +0200 -+++ wordpress/wp-includes/kses.php 2011-05-25 23:56:18.403727954 +0200 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., -- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit -+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * http://www.gnu.org/licenses/gpl.html - * - * [kses strips evil scripts!] From 64afcf22feb90eaf0c5f3545224e5ca7d5d024e5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Oct 2013 08:08:32 +0100 Subject: [PATCH 005/184] update to 3.7.1 (bugfixes) --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eaa76bd..d0e02cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *spec~ clog /wordpress-3.7.tar.gz +/wordpress-3.7.1.tar.gz diff --git a/sources b/sources index a1a980b..9fc516f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaad36cd739b825952cf3e09de5e7856 wordpress-3.7.tar.gz +8af9a4885ad134d354eb5f12dcc17fd9 wordpress-3.7.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index fe73fa8..b60962f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -9,7 +9,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.7 +Version: 3.7.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -220,6 +220,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Oct 30 2013 Remi Collet - 3.7.1-1 +- update to 3.7.1 (bugfixes) + * Fri Oct 25 2013 Remi Collet - 3.7-1 - update to 3.7 - requires ca-certificates for ca-bundle.crt From b99791fd2e08e1beff311032ce16ca7b0d579345 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Dec 2013 15:36:44 +0100 Subject: [PATCH 006/184] =?UTF-8?q?-=20update=20to=203.8=20=E2=80=9CParker?= =?UTF-8?q?=E2=80=9D=20#1043104=20-=20link=20to=20README.fedora=20in=20pac?= =?UTF-8?q?kage=20description=20-=20add=20note=20about=20optional=20packag?= =?UTF-8?q?es=20#1037516=20-=20add=20php=20dependencies:=20ereg,=20ftp,=20?= =?UTF-8?q?gd,=20xml=20-=20del=20php=20dependencies:=20pdo,=20reflection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + README.fedora.wordpress | 20 ++++++++++++++++++++ sources | 2 +- wordpress.spec | 23 +++++++++++++++++------ 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d0e02cd..2dc89cd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /wordpress-3.7.tar.gz /wordpress-3.7.1.tar.gz +/wordpress-3.8.tar.gz diff --git a/README.fedora.wordpress b/README.fedora.wordpress index 20f8739..7fdb058 100644 --- a/README.fedora.wordpress +++ b/README.fedora.wordpress @@ -1,3 +1,5 @@ +------------------------------------------------------------------------------- + Wordpress is a database driven blogging program designed to make it exceedingly easy to publish an online blog, sometimes also called a weblog or journal. @@ -44,6 +46,8 @@ open a web browser to http://localhost/wordpress/wp-admin/install.php and follow the instructions given to you on the pages you see to set up the database tables and begin publishing your blog. +------------------------------------------------------------------------------- + Wordpress ships with Flash and Silverlight plugins for the 'plupload' file uploader and the 'mediaelement' media player embedder. The idea is to try and be able to provide a multi-file uploader and an embedded video player when @@ -64,3 +68,19 @@ b) If you try to embed media into a Wordpress post using the [video] and a browser that has HTML5 support for the media format in question; if not, the 'Download Media' link will be offered. No Flash or Silverlight-based player element will be included. + +------------------------------------------------------------------------------- + +Optional dependencies: + +You may wish to install the following packages: + + php-pecl-imagick: optimize image transformation + php-pecl-ssh2: for file transfert using ssh + +An opcode cache is also recommended: + php 5.5: php-opcache + php 5.4: php-pecl-zendopcache + php 5.3: php-pecl-apc + +------------------------------------------------------------------------------- diff --git a/sources b/sources index 9fc516f..bcc3eca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8af9a4885ad134d354eb5f12dcc17fd9 wordpress-3.7.1.tar.gz +0999d444137ecc4a36355403a67096e4 wordpress-3.8.tar.gz diff --git a/wordpress.spec b/wordpress.spec index b60962f..c60d6ef 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,3 +1,4 @@ +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content %if 0%{?rhel} == 5 @@ -9,7 +10,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.7.1 +Version: 3.8 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -46,15 +47,16 @@ Requires: php53-simplepie >= 1.3.1 Requires: php >= 5.2.4 Requires: php-simplepie >= 1.3.1 %endif -# Required php extension (detected by phpcompatinfo) +# From phpcompatinfo report for version 3.8 Requires: php-curl Requires: php-date Requires: php-dom Requires: php-enchant -# not yet available for RHEL Requires: php-ereg +Requires: php-ereg Requires: php-exif Requires: php-fileinfo -# not yet available for RHEL Requires: php-filter +Requires: php-ftp +Requires: php-gd Requires: php-gettext Requires: php-hash Requires: php-iconv @@ -64,13 +66,12 @@ Requires: php-mbstring Requires: php-mysql Requires: php-openssl Requires: php-pcre -Requires: php-pdo Requires: php-posix -Requires: php-reflection Requires: php-simplexml Requires: php-sockets Requires: php-spl Requires: php-tokenizer +Requires: php-xml Requires: php-zip Requires: php-zlib # Unbundled libraries @@ -86,6 +87,9 @@ Obsoletes: wordpress-mu < 2.9.3 Wordpress is an online publishing / weblog package that makes it very easy, almost trivial, to get information out to people on the web. +Important information in %{_pkgdocdir}/README.fedora + + %prep %setup -q -n wordpress @@ -220,6 +224,13 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Mon Dec 16 2013 Remi Collet - 3.8-1 +- update to 3.8 “Parker” #1043104 +- link to README.fedora in package description +- add note about optional packages #1037516 +- add php dependencies: ereg, ftp, gd, xml +- del php dependencies: pdo, reflection + * Wed Oct 30 2013 Remi Collet - 3.7.1-1 - update to 3.7.1 (bugfixes) From 6e160d9f0492ff0e4c9b85ff75b758d4fb041a3a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 23 Jan 2014 19:41:32 -0800 Subject: [PATCH 007/184] new release 3.8.1 (bugfix, no security) --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2dc89cd..fb01b80 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /wordpress-3.7.tar.gz /wordpress-3.7.1.tar.gz /wordpress-3.8.tar.gz +/wordpress-3.8.1.tar.gz diff --git a/sources b/sources index bcc3eca..f55410e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0999d444137ecc4a36355403a67096e4 wordpress-3.8.tar.gz +6da5f73a2c7a46457b6ceb20fb6166c2 wordpress-3.8.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index c60d6ef..eceea7c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,7 +10,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.8 +Version: 3.8.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -224,6 +224,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Thu Jan 23 2014 Adam Williamson - 3.8.1-1 +- new upstream release 3.8.1 (bugfixes) + * Mon Dec 16 2013 Remi Collet - 3.8-1 - update to 3.8 “Parker” #1043104 - link to README.fedora in package description From 814a0b32a570d9a9099af7720606f8acaef6542e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jan 2014 20:17:57 +0100 Subject: [PATCH 008/184] - comment provided configuration about auto-updater - disable auto-updater on default configuration #1057521 - switch some sed to patch (more robust) --- wordpress-3.8.1-config.patch | 33 +++++++++++++++ wordpress-3.8.1-noupdate.patch | 76 ++++++++++++++++++++++++++++++++++ wordpress.spec | 40 ++++++++++++------ 3 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 wordpress-3.8.1-config.patch create mode 100644 wordpress-3.8.1-noupdate.patch diff --git a/wordpress-3.8.1-config.patch b/wordpress-3.8.1-config.patch new file mode 100644 index 0000000..2447c5a --- /dev/null +++ b/wordpress-3.8.1-config.patch @@ -0,0 +1,33 @@ +--- wp-config.php.old 2014-01-24 19:43:02.483075882 +0100 ++++ wp-config.php 2014-01-24 19:52:30.401841036 +0100 +@@ -72,6 +72,21 @@ + define('WPLANG', ''); + + /** ++ * See http://make.wordpress.org/core/2013/10/25/the-definitive-guide-to-disabling-auto-updates-in-wordpress-3-7 ++ */ ++ ++/* Disable all file change, as RPM base installation are read-only */ ++define('DISALLOW_FILE_MODS', true); ++ ++/* Disable automatic updater, in case you want to allow ++ above FILE_MODS for plugins, themes, ... */ ++define('AUTOMATIC_UPDATER_DISABLED', true); ++ ++/* Disable change of core, in case you really want to ++ enable AUTOMATIC_UPDATER above, core is manage by package updates */ ++define('WP_AUTO_UPDATE_CORE', false); ++ ++/** + * For developers: WordPress debugging mode. + * + * Change this to true to enable the display of notices during development. +@@ -84,7 +99,7 @@ + + /** Absolute path to the WordPress directory. */ + if ( !defined('ABSPATH') ) +- define('ABSPATH', dirname(__FILE__) . '/'); ++ define('ABSPATH', '/usr/share/wordpress'); + + /** Sets up WordPress vars and included files. */ + require_once(ABSPATH . 'wp-settings.php'); diff --git a/wordpress-3.8.1-noupdate.patch b/wordpress-3.8.1-noupdate.patch new file mode 100644 index 0000000..58f5d97 --- /dev/null +++ b/wordpress-3.8.1-noupdate.patch @@ -0,0 +1,76 @@ +diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php +--- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-01-24 20:07:50.969565823 +0100 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-01-24 20:08:07.431612588 +0100 +@@ -1640,7 +1640,7 @@ class WP_Automatic_Updater { + */ + public function is_disabled() { + // Background updates are disabled if you don't want file changes. +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + return true; + + if ( defined( 'WP_INSTALLING' ) ) +diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.nop 2014-01-24 19:54:56.488272053 +0100 ++++ wordpress/wp-admin/includes/update.php 2014-01-24 19:57:08.816663110 +0100 +@@ -216,8 +216,6 @@ function update_nag() { + } + echo "
$msg
"; + } +-add_action( 'admin_notices', 'update_nag', 3 ); +-add_action( 'network_admin_notices', 'update_nag', 3 ); + + // Called directly from dashboard + function update_right_now_message() { +@@ -227,7 +225,7 @@ function update_right_now_message() { + $cur = get_preferred_from_update_core(); + + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) +- $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; ++ $msg .= ''; + } + + echo "$msg"; +diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php +--- wordpress/wp-includes/capabilities.php.nop 2014-01-24 20:06:55.607405027 +0100 ++++ wordpress/wp-includes/capabilities.php 2014-01-24 20:07:29.225504605 +0100 +@@ -1251,7 +1251,7 @@ function map_meta_cap( $cap, $user_id ) + // Disallow the file editors. + if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) + $caps[] = 'do_not_allow'; +- elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + $caps[] = 'do_not_allow'; + elseif ( is_multisite() && ! is_super_admin( $user_id ) ) + $caps[] = 'do_not_allow'; +@@ -1267,7 +1267,7 @@ function map_meta_cap( $cap, $user_id ) + case 'update_core': + // Disallow anything that creates, deletes, or updates core, plugin, or theme files. + // Files in uploads are excepted. +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + $caps[] = 'do_not_allow'; + elseif ( is_multisite() && ! is_super_admin( $user_id ) ) + $caps[] = 'do_not_allow'; +diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.nop 2014-01-24 19:53:55.978094909 +0100 ++++ wordpress/wp-includes/update.php 2014-01-24 19:56:38.817574394 +0100 +@@ -574,9 +574,6 @@ function _maybe_update_themes() { + * @since 3.1.0 + */ + function wp_schedule_update_checks() { +- if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') ) +- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); +- + if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) + wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); + +@@ -602,8 +599,6 @@ if ( ( ! is_main_site() && ! is_network_ + return; + + add_action( 'admin_init', '_maybe_update_core' ); +-add_action( 'wp_version_check', 'wp_version_check' ); +-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 ); + + add_action( 'load-plugins.php', 'wp_update_plugins' ); + add_action( 'load-update.php', 'wp_update_plugins' ); diff --git a/wordpress.spec b/wordpress.spec index eceea7c..ce754b6 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -36,6 +36,14 @@ Patch3: wordpress-3.6-tinymce_noflash.patch # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' Patch4: wordpress-3.6-mediaelement-noflash_silverlight.patch +# RPM configuration: +# Path to installation +# Disable auto-updater +Patch5: wordpress-3.8.1-config.patch +# RPM are readonly +# disable version check and updated +# change DISALLOW_FILE_MODS default value to true +Patch6: wordpress-3.8.1-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -118,31 +126,34 @@ rm -f wp-includes/js/plupload/plupload.flash.js rm -rf wp-includes/js/swfupload %patch0 -p1 -b .dolly -#%patch1 -p1 -b .rhbz522897 +#patch1 -p1 -b .rhbz522897 %patch2 -p1 %patch3 -p1 %patch4 -p1 -# disable wp_version_check, updates are always installed via rpm -sed -i -e "s,\(.*\)'wp_version_check'\(.*\),#\1'wp_version_check'\2,g" \ - wp-includes/update.php -# disable update_nag() function -sed -i -e "s,\(.*\)'update_nag'\(.*\),#\1'update_nag'\2,g; \ - s,\(.*\)\$msg .=\(.*\),\1\$msg .= '';,g;" \ - wp-admin/includes/update.php +# Create RPM configuration +cp wp-config-sample.php wp-config.php +%patch5 -p0 +%patch6 -p1 + # fix file encoding sed -i -e 's/\r//' license.txt + %build %install -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress +# Apache configuration install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf + +# Application +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress cp -pr * ${RPM_BUILD_ROOT}%{_datadir}/wordpress -cat wp-config-sample.php | sed -e "s|dirname(__FILE__).'/'|'/usr/share/wordpress/'|g" > \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php + +# Configuration +install -m 0644 -D wp-config.php ${RPM_BUILD_ROOT}%{_sysconfdir}/wordpress/wp-config.php /bin/ln -sf ../../../etc/wordpress/wp-config.php ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-config.php + /bin/cp %{SOURCE2} ./README.fedora /bin/cp %{SOURCE3} ./README.fedora-multiuser @@ -224,6 +235,11 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sat Jan 24 2014 Remi Collet - 3.8.1-2 +- comment provided configuration about auto-updater +- disable auto-updater on default configuration #1057521 +- switch some sed to patch (more robust) + * Thu Jan 23 2014 Adam Williamson - 3.8.1-1 - new upstream release 3.8.1 (bugfixes) From b9760ef6c31141ef8e3e1e01065ec613560ddc24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jan 2014 20:18:55 +0100 Subject: [PATCH 009/184] date... --- wordpress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index ce754b6..688c6e1 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -235,7 +235,7 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog -* Sat Jan 24 2014 Remi Collet - 3.8.1-2 +* Fri Jan 24 2014 Remi Collet - 3.8.1-2 - comment provided configuration about auto-updater - disable auto-updater on default configuration #1057521 - switch some sed to patch (more robust) From 790e02509f82113e1f7b332c93f326b080a808b3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jan 2014 20:23:08 +0100 Subject: [PATCH 010/184] release --- wordpress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 688c6e1..129788f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -12,7 +12,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.8.1 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz From cd9521671bfaf8c9abf720013bfa7a4bf8e3fd3e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 25 Jan 2014 08:00:17 +0100 Subject: [PATCH 011/184] ignore WP_AUTO_UPDATE_CORE --- wordpress-3.8.1-config.patch | 15 +++++++-------- wordpress-3.8.1-noupdate.patch | 28 +++++++++++++++++++--------- wordpress.spec | 8 ++++++-- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/wordpress-3.8.1-config.patch b/wordpress-3.8.1-config.patch index 2447c5a..9f50f11 100644 --- a/wordpress-3.8.1-config.patch +++ b/wordpress-3.8.1-config.patch @@ -1,6 +1,7 @@ ---- wp-config.php.old 2014-01-24 19:43:02.483075882 +0100 -+++ wp-config.php 2014-01-24 19:52:30.401841036 +0100 -@@ -72,6 +72,21 @@ +diff -up wordpress/wp-config.php.old wordpress/wp-config.php +--- wordpress/wp-config.php.old 2014-01-25 07:47:17.622959116 +0100 ++++ wordpress/wp-config.php 2014-01-25 07:54:06.816454385 +0100 +@@ -72,6 +72,19 @@ $table_prefix = 'wp_'; define('WPLANG', ''); /** @@ -10,19 +11,17 @@ +/* Disable all file change, as RPM base installation are read-only */ +define('DISALLOW_FILE_MODS', true); + -+/* Disable automatic updater, in case you want to allow ++/* Disable automatic updater, in case you want to allow + above FILE_MODS for plugins, themes, ... */ +define('AUTOMATIC_UPDATER_DISABLED', true); + -+/* Disable change of core, in case you really want to -+ enable AUTOMATIC_UPDATER above, core is manage by package updates */ -+define('WP_AUTO_UPDATE_CORE', false); ++/* Core update is always disabled, WP_AUTO_UPDATE_CORE value is ignore */ + +/** * For developers: WordPress debugging mode. * * Change this to true to enable the display of notices during development. -@@ -84,7 +99,7 @@ +@@ -84,7 +97,7 @@ define('WP_DEBUG', false); /** Absolute path to the WordPress directory. */ if ( !defined('ABSPATH') ) diff --git a/wordpress-3.8.1-noupdate.patch b/wordpress-3.8.1-noupdate.patch index 58f5d97..c2b2f6f 100644 --- a/wordpress-3.8.1-noupdate.patch +++ b/wordpress-3.8.1-noupdate.patch @@ -1,7 +1,17 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-01-24 20:07:50.969565823 +0100 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-01-24 20:08:07.431612588 +0100 -@@ -1640,7 +1640,7 @@ class WP_Automatic_Updater { +--- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2013-12-11 20:49:11.000000000 +0100 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-01-25 07:51:32.794892043 +0100 +@@ -1479,6 +1479,9 @@ class Core_Upgrader extends WP_Upgrader + } + } + ++ // RPM: nether allow core update ++ return false; ++ + // 1: If we're already on that version, not much point in updating? + if ( $offered_ver == $wp_version ) + return false; +@@ -1640,7 +1643,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -11,8 +21,8 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi if ( defined( 'WP_INSTALLING' ) ) diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.nop 2014-01-24 19:54:56.488272053 +0100 -+++ wordpress/wp-admin/includes/update.php 2014-01-24 19:57:08.816663110 +0100 +--- wordpress/wp-admin/includes/update.php.nop 2013-12-02 22:55:10.000000000 +0100 ++++ wordpress/wp-admin/includes/update.php 2014-01-25 07:48:42.202268342 +0100 @@ -216,8 +216,6 @@ function update_nag() { } echo "
$msg
"; @@ -32,8 +42,8 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/ echo "$msg"; diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.nop 2014-01-24 20:06:55.607405027 +0100 -+++ wordpress/wp-includes/capabilities.php 2014-01-24 20:07:29.225504605 +0100 +--- wordpress/wp-includes/capabilities.php.nop 2013-11-13 05:39:08.000000000 +0100 ++++ wordpress/wp-includes/capabilities.php 2014-01-25 07:48:42.202268342 +0100 @@ -1251,7 +1251,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) @@ -53,8 +63,8 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.nop 2014-01-24 19:53:55.978094909 +0100 -+++ wordpress/wp-includes/update.php 2014-01-24 19:56:38.817574394 +0100 +--- wordpress/wp-includes/update.php.nop 2013-11-15 04:04:10.000000000 +0100 ++++ wordpress/wp-includes/update.php 2014-01-25 07:48:42.202268342 +0100 @@ -574,9 +574,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ diff --git a/wordpress.spec b/wordpress.spec index 129788f..fe80974 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -12,7 +12,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.8.1 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -43,6 +43,7 @@ Patch5: wordpress-3.8.1-config.patch # RPM are readonly # disable version check and updated # change DISALLOW_FILE_MODS default value to true +# ignore WP_AUTO_UPDATE_CORE (always false) Patch6: wordpress-3.8.1-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -133,7 +134,7 @@ rm -rf wp-includes/js/swfupload # Create RPM configuration cp wp-config-sample.php wp-config.php -%patch5 -p0 +%patch5 -p1 %patch6 -p1 # fix file encoding @@ -235,6 +236,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sat Jan 25 2014 Remi Collet - 3.8.1-3 +- ignore WP_AUTO_UPDATE_CORE (always false) + * Fri Jan 24 2014 Remi Collet - 3.8.1-2 - comment provided configuration about auto-updater - disable auto-updater on default configuration #1057521 From 8bfaea7ed1ea22c4e73ae8fa7c98d36f336adb72 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Apr 2014 16:47:16 +0200 Subject: [PATCH 012/184] update to 3.8.2 Security Release - fix privilege escalation issue CVE-2014-0165 - fix authentication bypass issue CVE-2014-0166 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fb01b80..eee2838 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /wordpress-3.7.1.tar.gz /wordpress-3.8.tar.gz /wordpress-3.8.1.tar.gz +/wordpress-3.8.2.tar.gz diff --git a/sources b/sources index f55410e..d265090 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6da5f73a2c7a46457b6ceb20fb6166c2 wordpress-3.8.1.tar.gz +436fecefe21b1d2df6beb1c201fc6426 wordpress-3.8.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index fe80974..4f91eb0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,9 +10,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.8.1 +Version: 3.8.2 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -236,6 +236,11 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed Apr 9 2014 Remi Collet - 3.8.2-1 +- update to 3.8.2 Security Release +- fix privilege escalation issue CVE-2014-0165 +- fix authentication bypass issue CVE-2014-0166 + * Sat Jan 25 2014 Remi Collet - 3.8.1-3 - ignore WP_AUTO_UPDATE_CORE (always false) From c56b667be2bbbbf0a611ffdf7f3185852bf998f8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Apr 2014 13:26:08 +0200 Subject: [PATCH 013/184] update to 3.8.3 (cherry picked from commit 2f2b541a658bd208655a7479f843057853727e56) --- .gitignore | 1 + sources | 2 +- wordpress.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eee2838..8662ae3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /wordpress-3.8.tar.gz /wordpress-3.8.1.tar.gz /wordpress-3.8.2.tar.gz +/wordpress-3.8.3.tar.gz diff --git a/sources b/sources index d265090..0000d7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -436fecefe21b1d2df6beb1c201fc6426 wordpress-3.8.2.tar.gz +90e9ec8a90e59322144737f30ef8799f wordpress-3.8.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 4f91eb0..6ceaa69 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,7 +10,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.8.2 +Version: 3.8.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -236,6 +236,10 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Tue Apr 15 2014 Remi Collet - 3.8.3-1 +- update to 3.8.3 Maintenance Release + http://wordpress.org/news/2014/04/wordpress-3-8-3/ + * Wed Apr 9 2014 Remi Collet - 3.8.2-1 - update to 3.8.2 Security Release - fix privilege escalation issue CVE-2014-0165 From 74719500d2087b79b5fcaf0aa88b320643f6cb78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 May 2014 17:45:55 +0200 Subject: [PATCH 014/184] =?UTF-8?q?=20update=20to=203.9=20=E2=80=9CSmith?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress-3.6-tinymce_noflash.patch | 6 --- ...3.9-mediaelement-noflash_silverlight.patch | 12 ++--- ....patch => wordpress-3.9-no_swfupload.patch | 11 ++--- ...date.patch => wordpress-3.9-noupdate.patch | 32 +++++++------- wordpress-3.9-tinymce_noflash.patch | 22 ++++++++++ wordpress.spec | 44 ++++++++++++++----- 8 files changed, 84 insertions(+), 46 deletions(-) delete mode 100644 wordpress-3.6-tinymce_noflash.patch rename wordpress-3.6-mediaelement-noflash_silverlight.patch => wordpress-3.9-mediaelement-noflash_silverlight.patch (67%) rename wordpress-3.6-no_swfupload.patch => wordpress-3.9-no_swfupload.patch (72%) rename wordpress-3.8.1-noupdate.patch => wordpress-3.9-noupdate.patch (72%) create mode 100644 wordpress-3.9-tinymce_noflash.patch diff --git a/.gitignore b/.gitignore index 8662ae3..4b3fcfe 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /wordpress-3.8.1.tar.gz /wordpress-3.8.2.tar.gz /wordpress-3.8.3.tar.gz +/wordpress-3.9.tar.gz diff --git a/sources b/sources index 0000d7e..287b682 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90e9ec8a90e59322144737f30ef8799f wordpress-3.8.3.tar.gz +d0b0396e84942faf87ccde819df0916f wordpress-3.9.tar.gz diff --git a/wordpress-3.6-tinymce_noflash.patch b/wordpress-3.6-tinymce_noflash.patch deleted file mode 100644 index a5d0a7f..0000000 --- a/wordpress-3.6-tinymce_noflash.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- wordpress/wp-includes/js/tinymce/plugins/media/editor_plugin.js 2012-07-07 09:22:53.000000000 -0700 -+++ wordpress/wp-includes/js/tinymce/plugins/media/editor_plugin.js.new 2013-08-23 11:57:22.032012144 -0700 -@@ -1 +1 @@ --(function(){var b=tinymce.explode("id,name,width,height,style,align,class,hspace,vspace,bgcolor,type"),a=tinymce.makeMap(b.join(",")),f=tinymce.html.Node,d,i,h=tinymce.util.JSON,g;d=[["Flash","d27cdb6e-ae6d-11cf-96b8-444553540000","application/x-shockwave-flash","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["ShockWave","166b1bca-3f9c-11cf-8075-444553540000","application/x-director","http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0"],["WindowsMedia","6bf52a52-394a-11d3-b153-00c04f79faa6,22d6f312-b0f6-11d0-94ab-0080c74c7e95,05589fa1-c356-11ce-bf01-00aa0055595a","application/x-mplayer2","http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701"],["QuickTime","02bf25d5-8c17-4b23-bc80-d3488abddc6b","video/quicktime","http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0"],["RealMedia","cfcdaa03-8be4-11cf-b84b-0020afbbccfa","audio/x-pn-realaudio-plugin","http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"],["Java","8ad9c840-044e-11d1-b3e9-00805f499d93","application/x-java-applet","http://java.sun.com/products/plugin/autodl/jinstall-1_5_0-windows-i586.cab#Version=1,5,0,0"],["Silverlight","dfeaf541-f3e1-4c24-acac-99c30715084a","application/x-silverlight-2"],["Iframe"],["Video"],["EmbeddedAudio"],["Audio"]];function e(j){return typeof(j)=="string"?j.replace(/[^0-9%]/g,""):j}function c(m){var l,j,k;if(m&&!m.splice){j=[];for(k=0;true;k++){if(m[k]){j[k]=m[k]}else{break}}return j}return m}tinymce.create("tinymce.plugins.MediaPlugin",{init:function(n,j){var r=this,l={},m,p,q,k;function o(s){return s&&s.nodeName==="IMG"&&n.dom.hasClass(s,"mceItemMedia")}r.editor=n;r.url=j;i="";for(m=0;m0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;A0){O+=(O?"&":"")+P+"="+escape(Q)}});if(O.length){G.params.flashvars=O}L=p.getParam("flash_video_player_params",{allowfullscreen:true,allowscriptaccess:true});tinymce.each(L,function(Q,P){G.params[P]=""+Q})}}G=z.attr("data-mce-json");if(!G){return}G=h.parse(G);q=this.getType(z.attr("class"));B=z.attr("data-mce-style");if(!B){B=z.attr("style");if(B){B=p.dom.serializeStyle(p.dom.parseStyle(B,"img"))}}G.width=z.attr("width")||G.width;G.height=z.attr("height")||G.height;if(q.name==="Iframe"){x=new f("iframe",1);tinymce.each(b,function(n){var J=z.attr(n);if(n=="class"&&J){J=J.replace(/mceItem.+ ?/g,"")}if(J&&J.length>0){x.attr(n,J)}});for(I in G.params){x.attr(I,G.params[I])}x.attr({style:B,src:G.params.src});z.replace(x);return}if(this.editor.settings.media_use_script){x=new f("script",1).attr("type","text/javascript");y=new f("#text",3);y.value="write"+q.name+"("+h.serialize(tinymce.extend(G.params,{width:z.attr("width"),height:z.attr("height")}))+");";x.append(y);z.replace(x);return}if(q.name==="Video"&&G.video.sources[0]){C=new f("video",1).attr(tinymce.extend({id:z.attr("id"),width:e(z.attr("width")),height:e(z.attr("height")),style:B},G.video.attrs));if(G.video.attrs){l=G.video.attrs.poster}k=G.video.sources=c(G.video.sources);for(A=0;Aadd( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array('plupload-all', 'jquery', 'json2', 'media-models'), false, 1 ); +diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.orig 2014-05-07 15:55:26.485228222 +0200 ++++ wordpress/wp-includes/script-loader.php 2014-05-07 15:55:18.019198073 +0200 +@@ -278,15 +278,6 @@ function wp_default_scripts( &$scripts ) + $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); - // keep 'swfupload' for back-compat. @@ -13,6 +14,6 @@ - $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524'); - did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n ); - - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js" ); + $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23'); diff --git a/wordpress-3.8.1-noupdate.patch b/wordpress-3.9-noupdate.patch similarity index 72% rename from wordpress-3.8.1-noupdate.patch rename to wordpress-3.9-noupdate.patch index c2b2f6f..e72d370 100644 --- a/wordpress-3.8.1-noupdate.patch +++ b/wordpress-3.9-noupdate.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2013-12-11 20:49:11.000000000 +0100 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-01-25 07:51:32.794892043 +0100 -@@ -1479,6 +1479,9 @@ class Core_Upgrader extends WP_Upgrader +--- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-04-15 12:57:14.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-05-07 17:25:04.434588696 +0200 +@@ -1546,6 +1546,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -1640,7 +1643,7 @@ class WP_Automatic_Updater { +@@ -1734,7 +1737,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -21,8 +21,8 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi if ( defined( 'WP_INSTALLING' ) ) diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.nop 2013-12-02 22:55:10.000000000 +0100 -+++ wordpress/wp-admin/includes/update.php 2014-01-25 07:48:42.202268342 +0100 +--- wordpress/wp-admin/includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2014-05-07 17:26:14.139840288 +0200 @@ -216,8 +216,6 @@ function update_nag() { } echo "
$msg
"; @@ -32,7 +32,7 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/ // Called directly from dashboard function update_right_now_message() { -@@ -227,7 +225,7 @@ function update_right_now_message() { +@@ -232,7 +230,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && $cur->response == 'upgrade' ) @@ -40,11 +40,11 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/ + $msg .= ''; } - echo "$msg"; + echo "

$msg

"; diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.nop 2013-11-13 05:39:08.000000000 +0100 -+++ wordpress/wp-includes/capabilities.php 2014-01-25 07:48:42.202268342 +0100 -@@ -1251,7 +1251,7 @@ function map_meta_cap( $cap, $user_id ) +--- wordpress/wp-includes/capabilities.php.nop 2014-03-04 04:09:15.000000000 +0100 ++++ wordpress/wp-includes/capabilities.php 2014-05-07 17:25:04.434588696 +0200 +@@ -1238,7 +1238,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -53,7 +53,7 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -1267,7 +1267,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -1254,7 +1254,7 @@ function map_meta_cap( $cap, $user_id ) case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. @@ -63,9 +63,9 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.nop 2013-11-15 04:04:10.000000000 +0100 -+++ wordpress/wp-includes/update.php 2014-01-25 07:48:42.202268342 +0100 -@@ -574,9 +574,6 @@ function _maybe_update_themes() { +--- wordpress/wp-includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200 ++++ wordpress/wp-includes/update.php 2014-05-07 17:25:04.435588699 +0200 +@@ -602,9 +602,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -602,8 +599,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -630,8 +627,6 @@ if ( ( ! is_main_site() && ! is_network_ return; add_action( 'admin_init', '_maybe_update_core' ); diff --git a/wordpress-3.9-tinymce_noflash.patch b/wordpress-3.9-tinymce_noflash.patch new file mode 100644 index 0000000..ab974d0 --- /dev/null +++ b/wordpress-3.9-tinymce_noflash.patch @@ -0,0 +1,22 @@ +--- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.old 2014-05-07 17:03:41.009962331 +0200 ++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-05-07 17:04:08.549061421 +0200 +@@ -41,10 +41,6 @@ + return 'video/ogg'; + } + +- if (url.indexOf('.swf') != -1) { +- return 'application/x-shockwave-flash'; +- } +- + return ''; + } + +@@ -198,7 +194,7 @@ + data.source1mime = guessMime(data.source1); + data.source2mime = guessMime(data.source2); + data.poster = editor.convertURL(data.poster, "poster"); +- data.flashPlayerUrl = editor.convertURL(url + '/moxieplayer.swf', "movie"); ++ data.flashPlayerUrl = false; + + if (data.embed) { + html = updateHtml(data.embed, data, true); diff --git a/wordpress.spec b/wordpress.spec index 6ceaa69..dfd39a5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,7 +10,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.8.3 +Version: 3.9 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -27,15 +27,15 @@ Patch0: wordpress-debian_patches_hello.patch # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-3.6-no_swfupload.patch +Patch2: wordpress-3.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-3.6-tinymce_noflash.patch +Patch3: wordpress-3.9-tinymce_noflash.patch # Adjust mediaelement not to use its SWF and Silverlight plugins. This # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' -Patch4: wordpress-3.6-mediaelement-noflash_silverlight.patch +Patch4: wordpress-3.9-mediaelement-noflash_silverlight.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -44,7 +44,7 @@ Patch5: wordpress-3.8.1-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-3.8.1-noupdate.patch +Patch6: wordpress-3.9-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -115,13 +115,11 @@ Important information in %{_pkgdocdir}/README.fedora # and draw a non-functional button. - AdamW, 2013/08 # https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries -rm -f wp-includes/js/mediaelement/silverlightmediaelement.xap -rm -f wp-includes/js/mediaelement/flashmediaelement.sw -rm -f wp-includes/js/tinymce/plugins/media/moxieplayer.swf -rm -f wp-includes/js/plupload/plupload.silverlight.xap -rm -f wp-includes/js/plupload/plupload.silverlight.js -rm -f wp-includes/js/plupload/plupload.flash.swf -rm -f wp-includes/js/plupload/plupload.flash.js +rm wp-includes/js/mediaelement/silverlightmediaelement.xap +rm wp-includes/js/mediaelement/flashmediaelement.swf +rm wp-includes/js/tinymce/plugins/media/moxieplayer.swf +rm wp-includes/js/plupload/plupload.silverlight.xap +rm wp-includes/js/plupload/plupload.flash.swf # swfupload can just die in its entirety rm -rf wp-includes/js/swfupload @@ -132,6 +130,25 @@ rm -rf wp-includes/js/swfupload %patch3 -p1 %patch4 -p1 +# We patch a .js file, used patched file instead of unpatch minified one +ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js + +# Re-Generated the archive +arc=wp-includes/js/tinymce/wp-tinymce.js +gunzip -dc $arc.gz | \ + grep "^// Source" | \ + while read a b c +do + if [ -f $c ]; then + echo -e "\n$a $b $c" + cat $c + else + exit 1 + fi +done >$arc +gzip --force $arc +ls -l $arc.gz + # Create RPM configuration cp wp-config-sample.php wp-config.php %patch5 -p1 @@ -236,6 +253,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Wed May 7 2014 Remi Collet - 3.9-1 +- update to 3.9 “Smith” + * Tue Apr 15 2014 Remi Collet - 3.8.3-1 - update to 3.8.3 Maintenance Release http://wordpress.org/news/2014/04/wordpress-3-8-3/ From 1e632fae73ad7c69e0eb463cf34d70fe40a643de Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 May 2014 06:44:41 +0200 Subject: [PATCH 015/184] update to 3.9.1 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4b3fcfe..76fb94e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /wordpress-3.8.2.tar.gz /wordpress-3.8.3.tar.gz /wordpress-3.9.tar.gz +/wordpress-3.9.1.tar.gz diff --git a/sources b/sources index 287b682..c975915 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0b0396e84942faf87ccde819df0916f wordpress-3.9.tar.gz +46e303b587ba3d1f951b348d2c477c3c wordpress-3.9.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index dfd39a5..3673112 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,7 +10,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.9 +Version: 3.9.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -253,6 +253,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Fri May 9 2014 Remi Collet - 3.9.1-1 +- update to 3.9.1 Maintenance Release + * Wed May 7 2014 Remi Collet - 3.9-1 - update to 3.9 “Smith” From 8349bcc8a013a38b64ae5f59ef03c1b0ad7d58a5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 23:48:49 -0500 Subject: [PATCH 016/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 3673112..5fcf2e4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -12,7 +12,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.9.1 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -253,6 +253,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %{_sysconfdir}/wordpress %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 3.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 9 2014 Remi Collet - 3.9.1-1 - update to 3.9.1 Maintenance Release From 783a17e5d1dbb738ff16f1d7ca03e94636ce3e65 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Aug 2014 16:34:09 +0200 Subject: [PATCH 017/184] - update to 3.9.2 Security Release #1127547 - config file only readable by apache user (httpd or php-fpm) #1124582 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 76fb94e..6009756 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /wordpress-3.8.3.tar.gz /wordpress-3.9.tar.gz /wordpress-3.9.1.tar.gz +/wordpress-3.9.2.tar.gz diff --git a/sources b/sources index c975915..448899a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46e303b587ba3d1f951b348d2c477c3c wordpress-3.9.1.tar.gz +c942a75d659b801195e53bcbd4770f31 wordpress-3.9.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 5fcf2e4..720f4fd 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,7 +10,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.9.1 +Version: 3.9.2 Group: Applications/Publishing Release: 2%{?dist} License: GPLv2 @@ -85,7 +85,7 @@ Requires: php-zip Requires: php-zlib # Unbundled libraries Requires: php-PHPMailer -Requires: webserver +Requires: httpd %if %{with_cacert} Requires: ca-certificates %endif @@ -124,6 +124,9 @@ rm wp-includes/js/plupload/plupload.flash.swf # swfupload can just die in its entirety rm -rf wp-includes/js/swfupload +# remove .htaccess, protected by httpd config file +rm wp-content/plugins/akismet/.htaccess + %patch0 -p1 -b .dolly #patch1 -p1 -b .rhbz522897 %patch2 -p1 @@ -248,11 +251,15 @@ rm -rf ${RPM_BUILD_ROOT} %doc README.fedora %doc README.fedora-multiuser %{_datadir}/wordpress/wp-*.php -%config(noreplace) %{_sysconfdir}/wordpress/wp-config.php +%attr(640,root,apache) %config(noreplace) %{_sysconfdir}/wordpress/wp-config.php %{_datadir}/wordpress/xmlrpc.php %dir %{_sysconfdir}/wordpress %changelog +* Thu Aug 7 2014 Remi Collet - 3.9.2-1 +- update to 3.9.2 Security Release #1127547 +- config file only readable by apache user (httpd or php-fpm) #1124582 + * Sun Jun 08 2014 Fedora Release Engineering - 3.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From ebc8928969487eecce29e14d90f0e9ae08d0ec76 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 8 Aug 2014 11:16:12 +0200 Subject: [PATCH 018/184] - config dir only readable by apache group, better fix for #1124582 - fix license handling --- wordpress.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 720f4fd..be28282 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -12,7 +12,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 3.9.2 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -246,17 +246,22 @@ rm -rf ${RPM_BUILD_ROOT} %dir %attr(0775,apache,ftp) %{wp_content}/uploads %{wp_content}/plugins/* %{wp_content}/themes/* -%doc license.txt +%{!?_licensedir:%global license %%doc} +%license license.txt %doc readme.html %doc README.fedora %doc README.fedora-multiuser %{_datadir}/wordpress/wp-*.php +%attr(750,root,apache) %dir %{_sysconfdir}/wordpress %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/wordpress/wp-config.php %{_datadir}/wordpress/xmlrpc.php -%dir %{_sysconfdir}/wordpress %changelog -* Thu Aug 7 2014 Remi Collet - 3.9.2-1 +* Fri Aug 8 2014 Remi Collet - 3.9.2-3 +- config dir only readable by apache group, better fix for #1124582 +- fix license handling + +* Thu Aug 7 2014 Remi Collet - 3.9.2-2 - update to 3.9.2 Security Release #1127547 - config file only readable by apache user (httpd or php-fpm) #1124582 From 00237e3af198bcf3c12726299dd7042569e130e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Sep 2014 13:34:42 +0200 Subject: [PATCH 019/184] =?UTF-8?q?update=20to=20WordPress=204.0=20?= =?UTF-8?q?=E2=80=9CBenny=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress-3.9-no_swfupload.patch | 2 +- ...config.patch => wordpress-4.0-config.patch | 12 ++++----- ...date.patch => wordpress-4.0-noupdate.patch | 26 +++++++++---------- ...tch => wordpress-4.0-tinymce_noflash.patch | 13 +++++----- wordpress.spec | 13 ++++++---- 7 files changed, 37 insertions(+), 32 deletions(-) rename wordpress-3.8.1-config.patch => wordpress-4.0-config.patch (72%) rename wordpress-3.9-noupdate.patch => wordpress-4.0-noupdate.patch (81%) rename wordpress-3.9-tinymce_noflash.patch => wordpress-4.0-tinymce_noflash.patch (50%) diff --git a/.gitignore b/.gitignore index 6009756..7e5bd23 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /wordpress-3.9.tar.gz /wordpress-3.9.1.tar.gz /wordpress-3.9.2.tar.gz +/wordpress-4.0.tar.gz diff --git a/sources b/sources index 448899a..291c56d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c942a75d659b801195e53bcbd4770f31 wordpress-3.9.2.tar.gz +cf235297b802fe987e444759bf30c1db wordpress-4.0.tar.gz diff --git a/wordpress-3.9-no_swfupload.patch b/wordpress-3.9-no_swfupload.patch index 06f4180..3d1395d 100644 --- a/wordpress-3.9-no_swfupload.patch +++ b/wordpress-3.9-no_swfupload.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php --- wordpress/wp-includes/script-loader.php.orig 2014-05-07 15:55:26.485228222 +0200 +++ wordpress/wp-includes/script-loader.php 2014-05-07 15:55:18.019198073 +0200 -@@ -278,15 +278,6 @@ function wp_default_scripts( &$scripts ) +@@ -273,15 +273,6 @@ function wp_default_scripts( &$scripts ) $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); diff --git a/wordpress-3.8.1-config.patch b/wordpress-4.0-config.patch similarity index 72% rename from wordpress-3.8.1-config.patch rename to wordpress-4.0-config.patch index 9f50f11..c2579b2 100644 --- a/wordpress-3.8.1-config.patch +++ b/wordpress-4.0-config.patch @@ -1,8 +1,8 @@ -diff -up wordpress/wp-config.php.old wordpress/wp-config.php ---- wordpress/wp-config.php.old 2014-01-25 07:47:17.622959116 +0100 -+++ wordpress/wp-config.php 2014-01-25 07:54:06.816454385 +0100 -@@ -72,6 +72,19 @@ $table_prefix = 'wp_'; - define('WPLANG', ''); +diff -up wordpress/wp-config.php.orig wordpress/wp-config.php +--- wordpress/wp-config.php.orig 2014-09-08 13:12:36.525908423 +0200 ++++ wordpress/wp-config.php 2014-09-08 13:14:33.583402525 +0200 +@@ -62,6 +62,19 @@ define('NONCE_SALT', 'put your uni + $table_prefix = 'wp_'; /** + * See http://make.wordpress.org/core/2013/10/25/the-definitive-guide-to-disabling-auto-updates-in-wordpress-3-7 @@ -21,7 +21,7 @@ diff -up wordpress/wp-config.php.old wordpress/wp-config.php * For developers: WordPress debugging mode. * * Change this to true to enable the display of notices during development. -@@ -84,7 +97,7 @@ define('WP_DEBUG', false); +@@ -74,7 +87,7 @@ define('WP_DEBUG', false); /** Absolute path to the WordPress directory. */ if ( !defined('ABSPATH') ) diff --git a/wordpress-3.9-noupdate.patch b/wordpress-4.0-noupdate.patch similarity index 81% rename from wordpress-3.9-noupdate.patch rename to wordpress-4.0-noupdate.patch index e72d370..2362efa 100644 --- a/wordpress-3.9-noupdate.patch +++ b/wordpress-4.0-noupdate.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php --- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-04-15 12:57:14.000000000 +0200 +++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-05-07 17:25:04.434588696 +0200 -@@ -1546,6 +1546,9 @@ class Core_Upgrader extends WP_Upgrader +@@ -1618,6 +1618,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -1734,7 +1737,7 @@ class WP_Automatic_Updater { +@@ -1806,7 +1806,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -23,7 +23,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php --- wordpress/wp-admin/includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200 +++ wordpress/wp-admin/includes/update.php 2014-05-07 17:26:14.139840288 +0200 -@@ -216,8 +216,6 @@ function update_nag() { +@@ -211,8 +211,6 @@ function update_nag() { } echo "
$msg
"; } @@ -32,7 +32,7 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/ // Called directly from dashboard function update_right_now_message() { -@@ -232,7 +230,7 @@ function update_right_now_message() { +@@ -227,7 +225,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && $cur->response == 'upgrade' ) @@ -42,9 +42,9 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/ echo "

$msg

"; diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.nop 2014-03-04 04:09:15.000000000 +0100 -+++ wordpress/wp-includes/capabilities.php 2014-05-07 17:25:04.434588696 +0200 -@@ -1238,7 +1238,7 @@ function map_meta_cap( $cap, $user_id ) +--- wordpress/wp-includes/capabilities.php.orig 2014-08-27 03:32:18.000000000 +0200 ++++ wordpress/wp-includes/capabilities.php 2014-09-08 13:22:00.463291244 +0200 +@@ -1252,7 +1252,7 @@ // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -53,19 +53,19 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -1254,7 +1254,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -1270,7 +1270,7 @@ case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { $caps[] = 'do_not_allow'; - elseif ( is_multisite() && ! is_super_admin( $user_id ) ) + } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php --- wordpress/wp-includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200 +++ wordpress/wp-includes/update.php 2014-05-07 17:25:04.435588699 +0200 -@@ -602,9 +602,6 @@ function _maybe_update_themes() { +@@ -624,9 +624,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -630,8 +627,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -652,8 +649,6 @@ if ( ( ! is_main_site() && ! is_network_ return; add_action( 'admin_init', '_maybe_update_core' ); diff --git a/wordpress-3.9-tinymce_noflash.patch b/wordpress-4.0-tinymce_noflash.patch similarity index 50% rename from wordpress-3.9-tinymce_noflash.patch rename to wordpress-4.0-tinymce_noflash.patch index ab974d0..605df1c 100644 --- a/wordpress-3.9-tinymce_noflash.patch +++ b/wordpress-4.0-tinymce_noflash.patch @@ -1,6 +1,7 @@ ---- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.old 2014-05-07 17:03:41.009962331 +0200 -+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-05-07 17:04:08.549061421 +0200 -@@ -41,10 +41,6 @@ +diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm wordpress/wp-includes/js/tinymce/plugins/media/plugin.js +--- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm 2014-08-22 01:53:18.000000000 +0200 ++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-09-08 13:10:15.717314458 +0200 +@@ -44,10 +44,6 @@ tinymce.PluginManager.add('media', funct return 'video/ogg'; } @@ -11,12 +12,12 @@ return ''; } -@@ -198,7 +194,7 @@ +@@ -239,7 +235,7 @@ tinymce.PluginManager.add('media', funct data.source1mime = guessMime(data.source1); data.source2mime = guessMime(data.source2); data.poster = editor.convertURL(data.poster, "poster"); - data.flashPlayerUrl = editor.convertURL(url + '/moxieplayer.swf', "movie"); + data.flashPlayerUrl = false; - if (data.embed) { - html = updateHtml(data.embed, data, true); + tinymce.each(urlPatterns, function(pattern) { + var match, i, url; diff --git a/wordpress.spec b/wordpress.spec index be28282..34bd21e 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -10,9 +10,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 3.9.2 +Version: 4.0 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -31,7 +31,7 @@ Patch2: wordpress-3.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-3.9-tinymce_noflash.patch +Patch3: wordpress-4.0-tinymce_noflash.patch # Adjust mediaelement not to use its SWF and Silverlight plugins. This # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' @@ -39,12 +39,12 @@ Patch4: wordpress-3.9-mediaelement-noflash_silverlight.patch # RPM configuration: # Path to installation # Disable auto-updater -Patch5: wordpress-3.8.1-config.patch +Patch5: wordpress-4.0-config.patch # RPM are readonly # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-3.9-noupdate.patch +Patch6: wordpress-4.0-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -257,6 +257,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/xmlrpc.php %changelog +* Mon Sep 8 2014 Remi Collet - 4.0-1 +- WordPress 4.0 “Benny” + * Fri Aug 8 2014 Remi Collet - 3.9.2-3 - config dir only readable by apache group, better fix for #1124582 - fix license handling From 263a9fff0e7b583fc004acdd7f3ee61f172f22c5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Sep 2014 08:34:20 +0200 Subject: [PATCH 020/184] use system php-getid3 when available #1145574 --- wordpress.spec | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 34bd21e..14fce7d 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -6,13 +6,19 @@ %else %global with_cacert 1 %endif +# https://bugzilla.redhat.com/1147802 missing in EPEL-7 +%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 +%global with_getid3 1 +%else +%global with_getid3 0 +%endif Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 4.0 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -85,6 +91,9 @@ Requires: php-zip Requires: php-zlib # Unbundled libraries Requires: php-PHPMailer +%if %{with_getid3} +Requires: php-getid3 +%endif Requires: httpd %if %{with_cacert} Requires: ca-certificates @@ -187,12 +196,12 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} # Remove bundled php-simplepie and link to system copy -rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php -rm -rf ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie +rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php +rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie %if 0%{?rhel} == 5 -ln -sf /usr/share/php/php53-simplepie/autoloader.php \ +ln -s /usr/share/php/php53-simplepie/autoloader.php \ %else -ln -sf /usr/share/php/php-simplepie/autoloader.php \ +ln -s /usr/share/php/php-simplepie/autoloader.php \ %endif ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php @@ -204,6 +213,11 @@ for fic in phpmailer smtp; do ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php done +%if %{with_getid3} +# Remove bundled php-getid3 +rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 +%endif + # Remove bundled ca-bundle.crt %if %{with_cacert} rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt @@ -228,6 +242,20 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig #/sbin/restorecon -R %{_localstatedir}/www/wordpress/ #fi +%if %{with_getid3} +%pretrans +if [ -L %{_datadir}/wordpress/wp-includes/ID3 ] ; then + rm %{_datadir}/wordpress/wp-includes/ID3 +fi + +%posttrans +if [ -d %{_datadir}/wordpress/wp-includes ] ; then + ln -sfn %{_datadir}/php/getid3 \ + %{_datadir}/wordpress/wp-includes/ID3 +fi +%endif + + %clean rm -rf ${RPM_BUILD_ROOT} @@ -257,6 +285,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/xmlrpc.php %changelog +* Tue Sep 30 2014 Remi Collet - 4.0-2 +- use system php-getid3 when available #1145574 + * Mon Sep 8 2014 Remi Collet - 4.0-1 - WordPress 4.0 “Benny” From a7a4c3a8e5f259e722bbff93c667df05d2a1a230 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Sep 2014 09:05:22 +0200 Subject: [PATCH 021/184] fix include in sources instead of fucking symlink --- wordpress-4.0-systemlibs.patch | 21 +++++++++++++++++++++ wordpress.spec | 32 ++++++++++++++------------------ 2 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 wordpress-4.0-systemlibs.patch diff --git a/wordpress-4.0-systemlibs.patch b/wordpress-4.0-systemlibs.patch new file mode 100644 index 0000000..9d16ee6 --- /dev/null +++ b/wordpress-4.0-systemlibs.patch @@ -0,0 +1,21 @@ +diff -up wordpress/wp-admin/includes/media.php.old wordpress/wp-admin/includes/media.php +--- wordpress/wp-admin/includes/media.php.old 2014-09-30 08:54:21.666519693 +0200 ++++ wordpress/wp-admin/includes/media.php 2014-09-30 08:55:11.247757421 +0200 +@@ -2907,7 +2907,7 @@ function wp_read_video_metadata( $file ) + $metadata = array(); + + if ( ! class_exists( 'getID3' ) ) +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + $id3 = new getID3(); + $data = $id3->analyze( $file ); + +@@ -2962,7 +2962,7 @@ function wp_read_audio_metadata( $file ) + $metadata = array(); + + if ( ! class_exists( 'getID3' ) ) +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + $id3 = new getID3(); + $data = $id3->analyze( $file ); + diff --git a/wordpress.spec b/wordpress.spec index 14fce7d..3f61035 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,6 +7,7 @@ %global with_cacert 1 %endif # https://bugzilla.redhat.com/1147802 missing in EPEL-7 +# https://bugzilla.redhat.com/1147817 php53-getid3 review %if 0%{?fedora} >= 17 || 0%{?rhel} == 6 %global with_getid3 1 %else @@ -18,7 +19,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.0 Group: Applications/Publishing -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -51,6 +52,8 @@ Patch5: wordpress-4.0-config.patch # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) Patch6: wordpress-4.0-noupdate.patch +# Use system libraries +Patch7: wordpress-4.0-systemlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -58,9 +61,15 @@ BuildArch: noarch %if 0%{?rhel} == 5 Requires: php53 >= 5.2.4 Requires: php53-simplepie >= 1.3.1 +%if %{with_getid3} +Requires: php53-getid3 +%endif %else Requires: php >= 5.2.4 Requires: php-simplepie >= 1.3.1 +%if %{with_getid3} +Requires: php-getid3 +%endif %endif # From phpcompatinfo report for version 3.8 Requires: php-curl @@ -91,9 +100,6 @@ Requires: php-zip Requires: php-zlib # Unbundled libraries Requires: php-PHPMailer -%if %{with_getid3} -Requires: php-getid3 -%endif Requires: httpd %if %{with_cacert} Requires: ca-certificates @@ -141,6 +147,9 @@ rm wp-content/plugins/akismet/.htaccess %patch2 -p1 %patch3 -p1 %patch4 -p1 +%if %{with_getid3} +%patch7 -p1 +%endif # We patch a .js file, used patched file instead of unpatch minified one ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js @@ -242,19 +251,6 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig #/sbin/restorecon -R %{_localstatedir}/www/wordpress/ #fi -%if %{with_getid3} -%pretrans -if [ -L %{_datadir}/wordpress/wp-includes/ID3 ] ; then - rm %{_datadir}/wordpress/wp-includes/ID3 -fi - -%posttrans -if [ -d %{_datadir}/wordpress/wp-includes ] ; then - ln -sfn %{_datadir}/php/getid3 \ - %{_datadir}/wordpress/wp-includes/ID3 -fi -%endif - %clean rm -rf ${RPM_BUILD_ROOT} @@ -285,7 +281,7 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/xmlrpc.php %changelog -* Tue Sep 30 2014 Remi Collet - 4.0-2 +* Tue Sep 30 2014 Remi Collet - 4.0-3 - use system php-getid3 when available #1145574 * Mon Sep 8 2014 Remi Collet - 4.0-1 From 42cffd36bfc10285f9eabc81bce6da87aae0dc5a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Nov 2014 08:07:44 +0100 Subject: [PATCH 022/184] WordPress 4.0.1 Security Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 10 ++++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7e5bd23..525ff56 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /wordpress-3.9.1.tar.gz /wordpress-3.9.2.tar.gz /wordpress-4.0.tar.gz +/wordpress-4.0.1.tar.gz diff --git a/sources b/sources index 291c56d..c7ce5b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf235297b802fe987e444759bf30c1db wordpress-4.0.tar.gz +531d9a4829fc40d81f5ee4a681f71f94 wordpress-4.0.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 3f61035..ea9177b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -6,9 +6,8 @@ %else %global with_cacert 1 %endif -# https://bugzilla.redhat.com/1147802 missing in EPEL-7 # https://bugzilla.redhat.com/1147817 php53-getid3 review -%if 0%{?fedora} >= 17 || 0%{?rhel} == 6 +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %global with_getid3 1 %else %global with_getid3 0 @@ -17,9 +16,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.0 +Version: 4.0.1 Group: Applications/Publishing -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -281,6 +280,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/xmlrpc.php %changelog +* Fri Nov 21 2014 Remi Collet - 4.0.1-1 +- WordPress 4.0.1 Security Release + * Tue Sep 30 2014 Remi Collet - 4.0-3 - use system php-getid3 when available #1145574 From cdc67b2be093b1023a7367f3a2a96587cb9b21a4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Dec 2014 07:01:01 +0100 Subject: [PATCH 023/184] update to 4.1 --- .gitignore | 1 + sources | 2 +- ...3.9-mediaelement-noflash_silverlight.patch | 11 ------ ...4.1-mediaelement-noflash_silverlight.patch | 11 ++++++ ...date.patch => wordpress-4.1-noupdate.patch | 38 +++++++++---------- wordpress.spec | 9 +++-- 6 files changed, 38 insertions(+), 34 deletions(-) delete mode 100644 wordpress-3.9-mediaelement-noflash_silverlight.patch create mode 100644 wordpress-4.1-mediaelement-noflash_silverlight.patch rename wordpress-4.0-noupdate.patch => wordpress-4.1-noupdate.patch (68%) diff --git a/.gitignore b/.gitignore index 525ff56..db9fba7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /wordpress-3.9.2.tar.gz /wordpress-4.0.tar.gz /wordpress-4.0.1.tar.gz +/wordpress-4.1.tar.gz diff --git a/sources b/sources index c7ce5b4..9f84c78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -531d9a4829fc40d81f5ee4a681f71f94 wordpress-4.0.1.tar.gz +5adac1bfc61b793a1ca9bcb4d67b4d28 wordpress-4.1.tar.gz diff --git a/wordpress-3.9-mediaelement-noflash_silverlight.patch b/wordpress-3.9-mediaelement-noflash_silverlight.patch deleted file mode 100644 index 0404236..0000000 --- a/wordpress-3.9-mediaelement-noflash_silverlight.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2014-05-07 17:16:34.465747946 +0200 -+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2014-05-07 17:21:09.213739591 +0200 -@@ -39,7 +39,7 @@ - mejs.MediaPluginBridge.unregisterPluginElement(this.pluginElement.id)}}; - mejs.MediaPluginBridge={pluginMediaElements:{},htmlMediaElements:{},registerPluginElement:function(a,b,c){this.pluginMediaElements[a]=b;this.htmlMediaElements[a]=c},unregisterPluginElement:function(a){delete this.pluginMediaElements[a];delete this.htmlMediaElements[a]},initPlugin:function(a){var b=this.pluginMediaElements[a],c=this.htmlMediaElements[a];if(b){switch(b.pluginType){case "flash":b.pluginElement=b.pluginApi=document.getElementById(a);break;case "silverlight":b.pluginElement=document.getElementById(b.id); - b.pluginApi=b.pluginElement.Content.MediaElementJS}b.pluginApi!=null&&b.success&&b.success(b,c)}},fireEvent:function(a,b,c){var d,e;if(a=this.pluginMediaElements[a]){b={type:b,target:a};for(d in c){a[d]=c[d];b[d]=c[d]}e=c.bufferedTime||0;b.target.buffered=b.buffered={start:function(){return 0},end:function(){return e},length:1};a.dispatchEvent(b.type,b)}}}; --mejs.MediaElementDefaults={mode:"auto",plugins:["flash","silverlight","youtube","vimeo"],enablePluginDebug:false,httpsBasicAuthSite:false,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:false,enablePseudoStreaming:false,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480, -+mejs.MediaElementDefaults={mode:"auto",plugins:["youtube","vimeo"],enablePluginDebug:false,httpsBasicAuthSite:false,type:"",pluginPath:mejs.Utility.getScriptPath(["mediaelement.js","mediaelement.min.js","mediaelement-and-player.js","mediaelement-and-player.min.js"]),flashName:"flashmediaelement.swf",flashStreamer:"",enablePluginSmoothing:false,enablePseudoStreaming:false,pseudoStreamingStartQueryParam:"start",silverlightName:"silverlightmediaelement.xap",defaultVideoWidth:480, - defaultVideoHeight:270,pluginWidth:-1,pluginHeight:-1,pluginVars:[],timerRate:250,startVolume:0.8,success:function(){},error:function(){}};mejs.MediaElement=function(a,b){return mejs.HtmlMediaElementShim.create(a,b)}; - mejs.HtmlMediaElementShim={create:function(a,b){var c=mejs.MediaElementDefaults,d=typeof a=="string"?document.getElementById(a):a,e=d.tagName.toLowerCase(),g=e==="audio"||e==="video",f=g?d.getAttribute("src"):d.getAttribute("href");e=d.getAttribute("poster");var i=d.getAttribute("autoplay"),k=d.getAttribute("preload"),h=d.getAttribute("controls"),j;for(j in b)c[j]=b[j];f=typeof f=="undefined"||f===null||f==""?null:f;e=typeof e=="undefined"||e===null?"":e;k=typeof k=="undefined"||k===null||k==="false"? - "none":k;i=!(typeof i=="undefined"||i===null||i==="false");h=!(typeof h=="undefined"||h===null||h==="false");j=this.determinePlayback(d,c,mejs.MediaFeatures.supportsMediaTag,g,f);j.url=j.url!==null?mejs.Utility.absolutizeUrl(j.url):"";if(j.method=="native"){if(mejs.MediaFeatures.isBustedAndroid){d.src=j.url;d.addEventListener("click",function(){d.play()},false)}return this.updateNative(j,c,i,k)}else if(j.method!=="")return this.createPlugin(j,c,e,i,k,h);else{this.createErrorMessage(j,c,e);return this}}, diff --git a/wordpress-4.1-mediaelement-noflash_silverlight.patch b/wordpress-4.1-mediaelement-noflash_silverlight.patch new file mode 100644 index 0000000..125eec4 --- /dev/null +++ b/wordpress-4.1-mediaelement-noflash_silverlight.patch @@ -0,0 +1,11 @@ +--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2014-12-22 06:38:12.716225091 +0100 ++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2014-12-22 06:39:30.045517161 +0100 +@@ -12,7 +12,7 @@ + * License: MIT + * + */ +-function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.2",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}$.extend(t,{playVideo:function(){t.api("play")},stopVideo:function(){t.api("unload")},pauseVideo:function(){t.api("pause")},seekTo:function(a){t.api("seekTo",a)},setVolume:function(a){t.api("setVolume",a)},setMuted:function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)}}),t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! ++function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.2",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}$.extend(t,{playVideo:function(){t.api("play")},stopVideo:function(){t.api("unload")},pauseVideo:function(){t.api("pause")},seekTo:function(a){t.api("seekTo",a)},setVolume:function(a){t.api("setVolume",a)},setMuted:function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)}}),t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! + * + * MediaElementPlayer + * http://mediaelementjs.com/ diff --git a/wordpress-4.0-noupdate.patch b/wordpress-4.1-noupdate.patch similarity index 68% rename from wordpress-4.0-noupdate.patch rename to wordpress-4.1-noupdate.patch index 2362efa..9578b76 100644 --- a/wordpress-4.0-noupdate.patch +++ b/wordpress-4.1-noupdate.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.nop 2014-04-15 12:57:14.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-05-07 17:25:04.434588696 +0200 -@@ -1618,6 +1618,9 @@ class Core_Upgrader extends WP_Upgrader +diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admin/includes/class-wp-upgrader.php +--- wordpress/wp-admin/includes/class-wp-upgrader.php.rpm 2014-12-16 20:54:23.000000000 +0100 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-12-22 06:46:28.487097611 +0100 +@@ -2141,6 +2141,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -1806,7 +1806,7 @@ class WP_Automatic_Updater { +@@ -2372,7 +2375,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -20,9 +20,9 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.nop wordpress/wp-admi return true; if ( defined( 'WP_INSTALLING' ) ) -diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2014-05-07 17:26:14.139840288 +0200 +diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.rpm 2014-11-30 12:28:24.000000000 +0100 ++++ wordpress/wp-admin/includes/update.php 2014-12-22 06:46:28.487097611 +0100 @@ -211,8 +211,6 @@ function update_nag() { } echo "
$msg
"; @@ -41,10 +41,10 @@ diff -up wordpress/wp-admin/includes/update.php.nop wordpress/wp-admin/includes/ } echo "

$msg

"; -diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.orig 2014-08-27 03:32:18.000000000 +0200 -+++ wordpress/wp-includes/capabilities.php 2014-09-08 13:22:00.463291244 +0200 -@@ -1252,7 +1252,7 @@ +diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabilities.php +--- wordpress/wp-includes/capabilities.php.rpm 2014-12-01 02:34:24.000000000 +0100 ++++ wordpress/wp-includes/capabilities.php 2014-12-22 06:46:28.487097611 +0100 +@@ -1255,7 +1255,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -53,7 +53,7 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -1270,7 +1270,7 @@ +@@ -1273,7 +1273,7 @@ function map_meta_cap( $cap, $user_id ) case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. @@ -62,10 +62,10 @@ diff -up wordpress/wp-includes/capabilities.php.nop wordpress/wp-includes/capabi $caps[] = 'do_not_allow'; } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; -diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.nop 2014-04-16 02:38:14.000000000 +0200 -+++ wordpress/wp-includes/update.php 2014-05-07 17:25:04.435588699 +0200 -@@ -624,9 +624,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.rpm 2014-12-22 06:48:34.883575009 +0100 ++++ wordpress/wp-includes/update.php 2014-12-22 06:48:44.144609988 +0100 +@@ -626,9 +626,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -75,8 +75,8 @@ diff -up wordpress/wp-includes/update.php.nop wordpress/wp-includes/update.php if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -652,8 +649,6 @@ if ( ( ! is_main_site() && ! is_network_ - return; +@@ -671,8 +668,6 @@ if ( ( ! is_main_site() && ! is_network_ + } add_action( 'admin_init', '_maybe_update_core' ); -add_action( 'wp_version_check', 'wp_version_check' ); diff --git a/wordpress.spec b/wordpress.spec index ea9177b..a234601 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.0.1 +Version: 4.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -41,7 +41,7 @@ Patch3: wordpress-4.0-tinymce_noflash.patch # Adjust mediaelement not to use its SWF and Silverlight plugins. This # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' -Patch4: wordpress-3.9-mediaelement-noflash_silverlight.patch +Patch4: wordpress-4.1-mediaelement-noflash_silverlight.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -50,7 +50,7 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.0-noupdate.patch +Patch6: wordpress-4.1-noupdate.patch # Use system libraries Patch7: wordpress-4.0-systemlibs.patch @@ -280,6 +280,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/xmlrpc.php %changelog +* Mon Dec 22 2014 Remi Collet - 4.1-1 +- WordPress 4.1 “Dinah” + * Fri Nov 21 2014 Remi Collet - 4.0.1-1 - WordPress 4.0.1 Security Release From 0bf276fc2da515b4c256ab3a480272828459bc86 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Feb 2015 08:44:09 +0100 Subject: [PATCH 024/184] WordPress 4.1.1 Maintenance Release --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index a234601..8d4619f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.1 +Version: 4.1.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -280,6 +280,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/xmlrpc.php %changelog +* Thu Feb 19 2015 Remi Collet - 4.1.1-1 +- WordPress 4.1.1 Maintenance Release + * Mon Dec 22 2014 Remi Collet - 4.1-1 - WordPress 4.1 “Dinah” From 8deee85d43e9fa16ed786b5954879b5149f758c1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Feb 2015 08:52:46 +0100 Subject: [PATCH 025/184] 4.1.1 sources --- .gitignore | 1 + sources | 2 +- wordpress.spec | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index db9fba7..719ea7a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /wordpress-4.0.tar.gz /wordpress-4.0.1.tar.gz /wordpress-4.1.tar.gz +/wordpress-4.1.1.tar.gz diff --git a/sources b/sources index 9f84c78..80218b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5adac1bfc61b793a1ca9bcb4d67b4d28 wordpress-4.1.tar.gz +bcf6532a859ad86d532259b18d78c5cb wordpress-4.1.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 8d4619f..f8b1789 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -279,6 +279,7 @@ rm -rf ${RPM_BUILD_ROOT} %attr(640,root,apache) %config(noreplace) %{_sysconfdir}/wordpress/wp-config.php %{_datadir}/wordpress/xmlrpc.php + %changelog * Thu Feb 19 2015 Remi Collet - 4.1.1-1 - WordPress 4.1.1 Maintenance Release From 146dfc159681c93d5760a199cf9e70257cfc7441 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Apr 2015 13:18:18 +0200 Subject: [PATCH 026/184] update to 4.1.2 (security) --- .gitignore | 1 + sources | 2 +- wordpress-4.1-noupdate.patch | 4 ++-- wordpress.spec | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 719ea7a..463c1b3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /wordpress-4.0.1.tar.gz /wordpress-4.1.tar.gz /wordpress-4.1.1.tar.gz +/wordpress-4.1.2.tar.gz diff --git a/sources b/sources index 80218b0..013331d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bcf6532a859ad86d532259b18d78c5cb wordpress-4.1.1.tar.gz +266abe568f3f1a82aba0b0aac3e11d16 wordpress-4.1.2.tar.gz diff --git a/wordpress-4.1-noupdate.patch b/wordpress-4.1-noupdate.patch index 9578b76..5105c23 100644 --- a/wordpress-4.1-noupdate.patch +++ b/wordpress-4.1-noupdate.patch @@ -65,7 +65,7 @@ diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabi diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php --- wordpress/wp-includes/update.php.rpm 2014-12-22 06:48:34.883575009 +0100 +++ wordpress/wp-includes/update.php 2014-12-22 06:48:44.144609988 +0100 -@@ -626,9 +626,6 @@ function _maybe_update_themes() { +@@ -624,9 +624,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -671,8 +668,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -669,8 +666,6 @@ if ( ( ! is_main_site() && ! is_network_ } add_action( 'admin_init', '_maybe_update_core' ); diff --git a/wordpress.spec b/wordpress.spec index f8b1789..04c4c47 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.1.1 +Version: 4.1.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Apr 23 2015 Remi Collet - 4.1.2-1 +- WordPress 4.1.2 Security Release + * Thu Feb 19 2015 Remi Collet - 4.1.1-1 - WordPress 4.1.1 Maintenance Release From c572f2c6f5f85f8347b5731df2a29a64df52bbd0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Apr 2015 10:49:41 +0200 Subject: [PATCH 027/184] =?UTF-8?q?WordPress=204.2=20=E2=80=9CPowell?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- ...4.1-mediaelement-noflash_silverlight.patch | 11 ------ ...4.2-mediaelement-noflash_silverlight.patch | 18 +++++++++ ....patch => wordpress-4.2-no_swfupload.patch | 4 +- ...date.patch => wordpress-4.2-noupdate.patch | 38 +++++++++---------- wordpress.spec | 11 ++++-- 7 files changed, 48 insertions(+), 37 deletions(-) delete mode 100644 wordpress-4.1-mediaelement-noflash_silverlight.patch create mode 100644 wordpress-4.2-mediaelement-noflash_silverlight.patch rename wordpress-3.9-no_swfupload.patch => wordpress-4.2-no_swfupload.patch (94%) rename wordpress-4.1-noupdate.patch => wordpress-4.2-noupdate.patch (58%) diff --git a/.gitignore b/.gitignore index 463c1b3..af2d010 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /wordpress-4.1.tar.gz /wordpress-4.1.1.tar.gz /wordpress-4.1.2.tar.gz +/wordpress-4.2.tar.gz diff --git a/sources b/sources index 013331d..abb9490 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -266abe568f3f1a82aba0b0aac3e11d16 wordpress-4.1.2.tar.gz +f48458379c82de934bb3e8539e5d9b9e wordpress-4.2.tar.gz diff --git a/wordpress-4.1-mediaelement-noflash_silverlight.patch b/wordpress-4.1-mediaelement-noflash_silverlight.patch deleted file mode 100644 index 125eec4..0000000 --- a/wordpress-4.1-mediaelement-noflash_silverlight.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2014-12-22 06:38:12.716225091 +0100 -+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2014-12-22 06:39:30.045517161 +0100 -@@ -12,7 +12,7 @@ - * License: MIT - * - */ --function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.2",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}$.extend(t,{playVideo:function(){t.api("play")},stopVideo:function(){t.api("unload")},pauseVideo:function(){t.api("pause")},seekTo:function(a){t.api("seekTo",a)},setVolume:function(a){t.api("setVolume",a)},setMuted:function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)}}),t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! -+function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.2",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}$.extend(t,{playVideo:function(){t.api("play")},stopVideo:function(){t.api("unload")},pauseVideo:function(){t.api("pause")},seekTo:function(a){t.api("seekTo",a)},setVolume:function(a){t.api("setVolume",a)},setMuted:function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)}}),t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! - * - * MediaElementPlayer - * http://mediaelementjs.com/ diff --git a/wordpress-4.2-mediaelement-noflash_silverlight.patch b/wordpress-4.2-mediaelement-noflash_silverlight.patch new file mode 100644 index 0000000..c0b23ee --- /dev/null +++ b/wordpress-4.2-mediaelement-noflash_silverlight.patch @@ -0,0 +1,18 @@ +--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2014-12-22 06:38:12.716225091 +0100 ++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2014-12-22 06:39:30.045517161 +0100 +@@ -12,7 +12,7 @@ + * License: MIT + * + */ +-function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.4",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! ++function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.4",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! + * + * MediaElementPlayer + * http://mediaelementjs.com/ +@@ -25,4 +25,4 @@ + * + */ + "undefined"!=typeof jQuery?mejs.$=jQuery:"undefined"!=typeof ender&&(mejs.$=ender),function(a){mejs.MepDefaults={poster:"",showPosterWhenEnded:!1,defaultVideoWidth:480,defaultVideoHeight:270,videoWidth:-1,videoHeight:-1,defaultAudioWidth:400,defaultAudioHeight:30,defaultSeekBackwardInterval:function(a){return.05*a.duration},defaultSeekForwardInterval:function(a){return.05*a.duration},setDimensions:!0,audioWidth:-1,audioHeight:-1,startVolume:.8,loop:!1,autoRewind:!0,enableAutosize:!0,alwaysShowHours:!1,showTimecodeFrameCount:!1,framesPerSecond:25,autosizeProgress:!0,alwaysShowControls:!1,hideVideoControlsOnLoad:!1,clickToPlayPause:!0,iPadUseNativeControls:!1,iPhoneUseNativeControls:!1,AndroidUseNativeControls:!1,features:["playpause","current","progress","duration","tracks","volume","fullscreen"],isVideo:!0,enableKeyboard:!0,pauseOtherPlayers:!0,keyActions:[{keys:[32,179],action:function(a,b){b.paused||b.ended?a.play():a.pause()}},{keys:[38],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.volume+.1,1);b.setVolume(c)}},{keys:[40],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.volume-.1,0);b.setVolume(c)}},{keys:[37,227],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.currentTime-a.options.defaultSeekBackwardInterval(b),0);b.setCurrentTime(c)}}},{keys:[39,228],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.currentTime+a.options.defaultSeekForwardInterval(b),b.duration);b.setCurrentTime(c)}}},{keys:[70],action:function(a){"undefined"!=typeof a.enterFullScreen&&(a.isFullScreen?a.exitFullScreen():a.enterFullScreen())}},{keys:[77],action:function(a){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer()),a.setMuted(a.media.muted?!1:!0)}}]},mejs.mepIndex=0,mejs.players={},mejs.MediaElementPlayer=function(b,c){if(!(this instanceof mejs.MediaElementPlayer))return new mejs.MediaElementPlayer(b,c);var d=this;return d.$media=d.$node=a(b),d.node=d.media=d.$media[0],"undefined"!=typeof d.node.player?d.node.player:(d.node.player=d,"undefined"==typeof c&&(c=d.$node.data("mejsoptions")),d.options=a.extend({},mejs.MepDefaults,c),d.id="mep_"+mejs.mepIndex++,mejs.players[d.id]=d,d.init(),d)},mejs.MediaElementPlayer.prototype={hasFocus:!1,controlsAreVisible:!0,init:function(){var b=this,c=mejs.MediaFeatures,d=a.extend(!0,{},b.options,{success:function(a,c){b.meReady(a,c)},error:function(a){b.handleError(a)}}),e=b.media.tagName.toLowerCase();if(b.isDynamic="audio"!==e&&"video"!==e,b.isVideo=b.isDynamic?b.options.isVideo:"audio"!==e&&b.options.isVideo,c.isiPad&&b.options.iPadUseNativeControls||c.isiPhone&&b.options.iPhoneUseNativeControls)b.$media.attr("controls","controls"),c.isiPad&&null!==b.media.getAttribute("autoplay")&&b.play();else if(c.isAndroid&&b.options.AndroidUseNativeControls);else{b.$media.removeAttr("controls");var f=mejs.i18n.t(b.isVideo?"Video Player":"Audio Player");if(a(''+f+"").insertBefore(b.$media),b.container=a('
').addClass(b.$media[0].className).insertBefore(b.$media).focus(function(){if(!b.controlsAreVisible){b.showControls(!0);var a=b.container.find(".mejs-playpause-button > button");a.focus()}}),b.container.addClass((c.isAndroid?"mejs-android ":"")+(c.isiOS?"mejs-ios ":"")+(c.isiPad?"mejs-ipad ":"")+(c.isiPhone?"mejs-iphone ":"")+(b.isVideo?"mejs-video ":"mejs-audio ")),c.isiOS){var g=b.$media.clone();b.container.find(".mejs-mediaelement").append(g),b.$media.remove(),b.$node=b.$media=g,b.node=b.media=g[0]}else b.container.find(".mejs-mediaelement").append(b.$media);b.controls=b.container.find(".mejs-controls"),b.layers=b.container.find(".mejs-layers");var h=b.isVideo?"video":"audio",i=h.substring(0,1).toUpperCase()+h.substring(1);b.width=b.options[h+"Width"]>0||b.options[h+"Width"].toString().indexOf("%")>-1?b.options[h+"Width"]:""!==b.media.style.width&&null!==b.media.style.width?b.media.style.width:null!==b.media.getAttribute("width")?b.$media.attr("width"):b.options["default"+i+"Width"],b.height=b.options[h+"Height"]>0||b.options[h+"Height"].toString().indexOf("%")>-1?b.options[h+"Height"]:""!==b.media.style.height&&null!==b.media.style.height?b.media.style.height:null!==b.$media[0].getAttribute("height")?b.$media.attr("height"):b.options["default"+i+"Height"],b.setPlayerSize(b.width,b.height),d.pluginWidth=b.width,d.pluginHeight=b.height}mejs.MediaElement(b.$media[0],d),"undefined"!=typeof b.container&&b.controlsAreVisible&&b.container.trigger("controlsshown")},showControls:function(a){var b=this;a="undefined"==typeof a||a,b.controlsAreVisible||(a?(b.controls.css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0,b.container.trigger("controlsshown")}),b.container.find(".mejs-control").css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0})):(b.controls.css("visibility","visible").css("display","block"),b.container.find(".mejs-control").css("visibility","visible").css("display","block"),b.controlsAreVisible=!0,b.container.trigger("controlsshown")),b.setControlsSize())},hideControls:function(b){var c=this;b="undefined"==typeof b||b,!c.controlsAreVisible||c.options.alwaysShowControls||c.keyboardAction||(b?(c.controls.stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")}),c.container.find(".mejs-control").stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block")})):(c.controls.css("visibility","hidden").css("display","block"),c.container.find(".mejs-control").css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")))},controlsTimer:null,startControlsTimer:function(a){var b=this;a="undefined"!=typeof a?a:1500,b.killControlsTimer("start"),b.controlsTimer=setTimeout(function(){b.hideControls(),b.killControlsTimer("hide")},a)},killControlsTimer:function(){var a=this;null!==a.controlsTimer&&(clearTimeout(a.controlsTimer),delete a.controlsTimer,a.controlsTimer=null)},controlsEnabled:!0,disableControls:function(){var a=this;a.killControlsTimer(),a.hideControls(!1),this.controlsEnabled=!1},enableControls:function(){var a=this;a.showControls(!1),a.controlsEnabled=!0},meReady:function(b,c){var d,e,f=this,g=mejs.MediaFeatures,h=c.getAttribute("autoplay"),i=!("undefined"==typeof h||null===h||"false"===h);if(!f.created){if(f.created=!0,f.media=b,f.domNode=c,!(g.isAndroid&&f.options.AndroidUseNativeControls||g.isiPad&&f.options.iPadUseNativeControls||g.isiPhone&&f.options.iPhoneUseNativeControls)){f.buildposter(f,f.controls,f.layers,f.media),f.buildkeyboard(f,f.controls,f.layers,f.media),f.buildoverlays(f,f.controls,f.layers,f.media),f.findTracks();for(d in f.options.features)if(e=f.options.features[d],f["build"+e])try{f["build"+e](f,f.controls,f.layers,f.media)}catch(j){}f.container.trigger("controlsready"),f.setPlayerSize(f.width,f.height),f.setControlsSize(),f.isVideo&&(mejs.MediaFeatures.hasTouch?f.$media.bind("touchstart",function(){f.controlsAreVisible?f.hideControls(!1):f.controlsEnabled&&f.showControls(!1)}):(f.clickToPlayPauseCallback=function(){f.options.clickToPlayPause&&(f.media.paused?f.play():f.pause())},f.media.addEventListener("click",f.clickToPlayPauseCallback,!1),f.container.bind("mouseenter mouseover",function(){f.controlsEnabled&&(f.options.alwaysShowControls||(f.killControlsTimer("enter"),f.showControls(),f.startControlsTimer(2500)))}).bind("mousemove",function(){f.controlsEnabled&&(f.controlsAreVisible||f.showControls(),f.options.alwaysShowControls||f.startControlsTimer(2500))}).bind("mouseleave",function(){f.controlsEnabled&&(f.media.paused||f.options.alwaysShowControls||f.startControlsTimer(1e3))})),f.options.hideVideoControlsOnLoad&&f.hideControls(!1),i&&!f.options.alwaysShowControls&&f.hideControls(),f.options.enableAutosize&&f.media.addEventListener("loadedmetadata",function(a){f.options.videoHeight<=0&&null===f.domNode.getAttribute("height")&&!isNaN(a.target.videoHeight)&&(f.setPlayerSize(a.target.videoWidth,a.target.videoHeight),f.setControlsSize(),f.media.setVideoSize(a.target.videoWidth,a.target.videoHeight))},!1)),b.addEventListener("play",function(){var a;for(a in mejs.players){var b=mejs.players[a];b.id==f.id||!f.options.pauseOtherPlayers||b.paused||b.ended||b.pause(),b.hasFocus=!1}f.hasFocus=!0},!1),f.media.addEventListener("ended",function(){if(f.options.autoRewind)try{f.media.setCurrentTime(0),window.setTimeout(function(){a(f.container).find(".mejs-overlay-loading").parent().hide()},20)}catch(b){}f.media.pause(),f.setProgressRail&&f.setProgressRail(),f.setCurrentRail&&f.setCurrentRail(),f.options.loop?f.play():!f.options.alwaysShowControls&&f.controlsEnabled&&f.showControls()},!1),f.media.addEventListener("loadedmetadata",function(){f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.isFullScreen||(f.setPlayerSize(f.width,f.height),f.setControlsSize())},!1),f.container.focusout(function(b){if(b.relatedTarget){var c=a(b.relatedTarget);f.keyboardAction&&0===c.parents(".mejs-container").length&&(f.keyboardAction=!1,f.hideControls(!0))}}),setTimeout(function(){f.setPlayerSize(f.width,f.height),f.setControlsSize()},50),f.globalBind("resize",function(){f.isFullScreen||mejs.MediaFeatures.hasTrueNativeFullScreen&&document.webkitIsFullScreen||f.setPlayerSize(f.width,f.height),f.setControlsSize()}),"youtube"==f.media.pluginType&&(g.isiOS||g.isAndroid)&&f.container.find(".mejs-overlay-play").hide()}i&&"native"==b.pluginType&&f.play(),f.options.success&&("string"==typeof f.options.success?window[f.options.success](f.media,f.domNode,f):f.options.success(f.media,f.domNode,f))}},handleError:function(a){var b=this;b.controls.hide(),b.options.error&&b.options.error(a)},setPlayerSize:function(b,c){var d=this;if(!d.options.setDimensions)return!1;if("undefined"!=typeof b&&(d.width=b),"undefined"!=typeof c&&(d.height=c),d.height.toString().indexOf("%")>0||"100%"===d.$node.css("max-width")||d.$node[0].currentStyle&&"100%"===d.$node[0].currentStyle.maxWidth){var e=function(){return d.isVideo?d.media.videoWidth&&d.media.videoWidth>0?d.media.videoWidth:null!==d.media.getAttribute("width")?d.media.getAttribute("width"):d.options.defaultVideoWidth:d.options.defaultAudioWidth}(),f=function(){return d.isVideo?d.media.videoHeight&&d.media.videoHeight>0?d.media.videoHeight:null!==d.media.getAttribute("height")?d.media.getAttribute("height"):d.options.defaultVideoHeight:d.options.defaultAudioHeight}(),g=d.container.parent().closest(":visible").width(),h=d.container.parent().closest(":visible").height(),i=d.isVideo||!d.options.autosizeProgress?parseInt(g*f/e,10):f;isNaN(i)&&(i=h),"body"===d.container.parent()[0].tagName.toLowerCase()&&(g=a(window).width(),i=a(window).height()),i&&g&&(d.container.width(g).height(i),d.$media.add(d.container.find(".mejs-shim")).width("100%").height("100%"),d.isVideo&&d.media.setVideoSize&&d.media.setVideoSize(g,i),d.layers.children(".mejs-layer").width("100%").height("100%"))}else d.container.width(d.width).height(d.height),d.layers.children(".mejs-layer").width(d.width).height(d.height);var j=d.layers.find(".mejs-overlay-play"),k=j.find(".mejs-overlay-button");j.height(d.container.height()-d.controls.height()),k.css("margin-top","-"+(k.height()/2-d.controls.height()/2).toString()+"px")},setControlsSize:function(){var b=this,c=0,d=0,e=b.controls.find(".mejs-time-rail"),f=b.controls.find(".mejs-time-total"),g=(b.controls.find(".mejs-time-current"),b.controls.find(".mejs-time-loaded"),e.siblings()),h=g.last(),i=null;if(b.container.is(":visible")&&e.length&&e.is(":visible")){b.options&&!b.options.autosizeProgress&&(d=parseInt(e.css("width"),10)),0!==d&&d||(g.each(function(){var b=a(this);"absolute"!=b.css("position")&&b.is(":visible")&&(c+=a(this).outerWidth(!0))}),d=b.controls.width()-c-(e.outerWidth(!0)-e.width()));do e.width(d),f.width(d-(f.outerWidth(!0)-f.width())),"absolute"!=h.css("position")&&(i=h.position(),d--);while(null!==i&&i.top>0&&d>0);b.setProgressRail&&b.setProgressRail(),b.setCurrentRail&&b.setCurrentRail()}},buildposter:function(b,c,d,e){var f=this,g=a('
').appendTo(d),h=b.$media.attr("poster");""!==b.options.poster&&(h=b.options.poster),h?f.setPoster(h):g.hide(),e.addEventListener("play",function(){g.hide()},!1),b.options.showPosterWhenEnded&&b.options.autoRewind&&e.addEventListener("ended",function(){g.show()},!1)},setPoster:function(b){var c=this,d=c.container.find(".mejs-poster"),e=d.find("img");0===e.length&&(e=a('').appendTo(d)),e.attr("src",b),d.css({"background-image":"url("+b+")"})},buildoverlays:function(b,c,d,e){var f=this;if(b.isVideo){var g=a('
').hide().appendTo(d),h=a('
').hide().appendTo(d),i=a('
').appendTo(d).bind("click",function(){f.options.clickToPlayPause&&e.paused&&e.play()});e.addEventListener("play",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("playing",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("seeking",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("seeked",function(){g.hide(),c.find(".mejs-time-buffering").hide()},!1),e.addEventListener("pause",function(){mejs.MediaFeatures.isiPhone||i.show()},!1),e.addEventListener("waiting",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("loadeddata",function(){g.show(),c.find(".mejs-time-buffering").show(),mejs.MediaFeatures.isAndroid&&(e.canplayTimeout=window.setTimeout(function(){if(document.createEvent){var a=document.createEvent("HTMLEvents");return a.initEvent("canplay",!0,!0),e.dispatchEvent(a)}},300))},!1),e.addEventListener("canplay",function(){g.hide(),c.find(".mejs-time-buffering").hide(),clearTimeout(e.canplayTimeout)},!1),e.addEventListener("error",function(){g.hide(),c.find(".mejs-time-buffering").hide(),h.show(),h.find("mejs-overlay-error").html("Error loading this resource")},!1),e.addEventListener("keydown",function(a){f.onkeydown(b,e,a)},!1)}},buildkeyboard:function(b,c,d,e){var f=this;f.container.keydown(function(){f.keyboardAction=!0}),f.globalBind("keydown",function(a){return f.onkeydown(b,e,a)}),f.globalBind("click",function(c){b.hasFocus=0!==a(c.target).closest(".mejs-container").length})},onkeydown:function(a,b,c){if(a.hasFocus&&a.options.enableKeyboard)for(var d=0,e=a.options.keyActions.length;e>d;d++)for(var f=a.options.keyActions[d],g=0,h=f.keys.length;h>g;g++)if(c.keyCode==f.keys[g])return"function"==typeof c.preventDefault&&c.preventDefault(),f.action(a,b,c.keyCode),!1;return!0},findTracks:function(){var b=this,c=b.$media.find("track");b.tracks=[],c.each(function(c,d){d=a(d),b.tracks.push({srclang:d.attr("srclang")?d.attr("srclang").toLowerCase():"",src:d.attr("src"),kind:d.attr("kind"),label:d.attr("label")||"",entries:[],isLoaded:!1})})},changeSkin:function(a){this.container[0].className="mejs-container "+a,this.setPlayerSize(this.width,this.height),this.setControlsSize()},play:function(){this.load(),this.media.play()},pause:function(){try{this.media.pause()}catch(a){}},load:function(){this.isLoaded||this.media.load(),this.isLoaded=!0},setMuted:function(a){this.media.setMuted(a)},setCurrentTime:function(a){this.media.setCurrentTime(a)},getCurrentTime:function(){return this.media.currentTime},setVolume:function(a){this.media.setVolume(a)},getVolume:function(){return this.media.volume},setSrc:function(a){this.media.setSrc(a)},remove:function(){var a,b,c=this;for(a in c.options.features)if(b=c.options.features[a],c["clean"+b])try{c["clean"+b](c)}catch(d){}c.isDynamic?c.$node.insertBefore(c.container):(c.$media.prop("controls",!0),c.$node.clone().insertBefore(c.container).show(),c.$node.remove()),"native"!==c.media.pluginType&&c.media.remove(),delete mejs.players[c.id],"object"==typeof c.container&&c.container.remove(),c.globalUnbind(),delete c.node.player},rebuildtracks:function(){var a=this;a.findTracks(),a.buildtracks(a,a.controls,a.layers,a.media)}},function(){function b(b,d){var e={d:[],w:[]};return a.each((b||"").split(" "),function(a,b){var f=b+"."+d;0===f.indexOf(".")?(e.d.push(f),e.w.push(f)):e[c.test(b)?"w":"d"].push(f)}),e.d=e.d.join(" "),e.w=e.w.join(" "),e}var c=/^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;mejs.MediaElementPlayer.prototype.globalBind=function(c,d,e){var f=this;c=b(c,f.id),c.d&&a(document).bind(c.d,d,e),c.w&&a(window).bind(c.w,d,e)},mejs.MediaElementPlayer.prototype.globalUnbind=function(c,d){var e=this;c=b(c,e.id),c.d&&a(document).unbind(c.d,d),c.w&&a(window).unbind(c.w,d)}}(),"undefined"!=typeof a&&(a.fn.mediaelementplayer=function(b){return this.each(b===!1?function(){var b=a(this).data("mediaelementplayer");b&&b.remove(),a(this).removeData("mediaelementplayer")}:function(){a(this).data("mediaelementplayer",new mejs.MediaElementPlayer(this,b))}),this},a(document).ready(function(){a(".mejs-player").mediaelementplayer()})),window.MediaElementPlayer=mejs.MediaElementPlayer}(mejs.$),function(a){a.extend(mejs.MepDefaults,{playText:mejs.i18n.t("Play"),pauseText:mejs.i18n.t("Pause")}),a.extend(MediaElementPlayer.prototype,{buildplaypause:function(b,c,d,e){function f(a){"play"===a?(i.removeClass("mejs-play").addClass("mejs-pause"),j.attr({title:h.pauseText,"aria-label":h.pauseText})):(i.removeClass("mejs-pause").addClass("mejs-play"),j.attr({title:h.playText,"aria-label":h.playText}))}var g=this,h=g.options,i=a('
').appendTo(c).click(function(a){return a.preventDefault(),e.paused?e.play():e.pause(),!1}),j=i.find("button");f("pse"),e.addEventListener("play",function(){f("play")},!1),e.addEventListener("playing",function(){f("play")},!1),e.addEventListener("pause",function(){f("pse")},!1),e.addEventListener("paused",function(){f("pse")},!1)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{stopText:"Stop"}),a.extend(MediaElementPlayer.prototype,{buildstop:function(b,c,d,e){{var f=this;a('
').appendTo(c).click(function(){e.paused||e.pause(),e.currentTime>0&&(e.setCurrentTime(0),e.pause(),c.find(".mejs-time-current").width("0px"),c.find(".mejs-time-handle").css("left","0px"),c.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0)),c.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0)),d.find(".mejs-poster").show())})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{progessHelpText:mejs.i18n.t("Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.")}),a.extend(MediaElementPlayer.prototype,{buildprogress:function(b,c,d,e){a('
00:00
').appendTo(c),c.find(".mejs-time-buffering").hide();var f=this,g=c.find(".mejs-time-total"),h=c.find(".mejs-time-loaded"),i=c.find(".mejs-time-current"),j=c.find(".mejs-time-handle"),k=c.find(".mejs-time-float"),l=c.find(".mejs-time-float-current"),m=c.find(".mejs-time-slider"),n=function(a){var b,c=g.offset(),d=g.outerWidth(!0),f=0,h=0,i=0;b=a.originalEvent.changedTouches?a.originalEvent.changedTouches[0].pageX:a.pageX,e.duration&&(bd+c.left&&(b=d+c.left),i=b-c.left,f=i/d,h=.02>=f?0:f*e.duration,o&&h!==e.currentTime&&e.setCurrentTime(h),mejs.MediaFeatures.hasTouch||(k.css("left",i),l.html(mejs.Utility.secondsToTimeCode(h)),k.show()))},o=!1,p=!1,q=0,r=!1,s=b.options.autoRewind,t=function(){var a=e.currentTime,b=mejs.i18n.t("Time Slider"),c=mejs.Utility.secondsToTimeCode(a),d=e.duration;m.attr({"aria-label":b,"aria-valuemin":0,"aria-valuemax":d,"aria-valuenow":a,"aria-valuetext":c,role:"slider",tabindex:0})},u=function(){var a=new Date;a-q>=1e3&&e.play()};m.bind("focus",function(){b.options.autoRewind=!1}),m.bind("blur",function(){b.options.autoRewind=s}),m.bind("keydown",function(a){new Date-q>=1e3&&(r=e.paused);var b=a.keyCode,c=e.duration,d=e.currentTime;switch(b){case 37:d-=1;break;case 39:d+=1;break;case 38:d+=Math.floor(.1*c);break;case 40:d-=Math.floor(.1*c);break;case 36:d=0;break;case 35:d=c;break;case 10:return void(e.paused?e.play():e.pause());case 13:return void(e.paused?e.play():e.pause());default:return}return d=0>d?0:d>=c?c:Math.floor(d),q=new Date,r||e.pause(),d0&&c.buffered.end&&c.duration?d=c.buffered.end(0)/c.duration:c&&void 0!==c.bytesTotal&&c.bytesTotal>0&&void 0!==c.bufferedBytes?d=c.bufferedBytes/c.bytesTotal:a&&a.lengthComputable&&0!==a.total&&(d=a.loaded/a.total),null!==d&&(d=Math.min(1,Math.max(0,d)),b.loaded&&b.total&&b.loaded.width(b.total.width()*d))},setCurrentRail:function(){var a=this;if(void 0!==a.media.currentTime&&a.media.duration&&a.total&&a.handle){var b=Math.round(a.total.width()*a.media.currentTime/a.media.duration),c=b-Math.round(a.handle.outerWidth(!0)/2);a.current.width(b),a.handle.css("left",c)}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:" | "}),a.extend(MediaElementPlayer.prototype,{buildcurrent:function(b,c,d,e){var f=this;a('
'+(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00")+"
").appendTo(c),f.currenttime=f.controls.find(".mejs-currenttime"),e.addEventListener("timeupdate",function(){b.updateCurrent()},!1)},buildduration:function(b,c,d,e){var f=this;c.children().last().find(".mejs-currenttime").length>0?a(f.options.timeAndDurationSeparator+''+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(c.find(".mejs-time")):(c.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container"),a('
'+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"
").appendTo(c)),f.durationD=f.controls.find(".mejs-duration"),e.addEventListener("timeupdate",function(){b.updateDuration()},!1)},updateCurrent:function(){var a=this;a.currenttime&&a.currenttime.html(mejs.Utility.secondsToTimeCode(a.media.currentTime,a.options.alwaysShowHours||a.media.duration>3600,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))},updateDuration:function(){var a=this;a.container.toggleClass("mejs-long-video",a.media.duration>3600),a.durationD&&(a.options.duration>0||a.media.duration)&&a.durationD.html(mejs.Utility.secondsToTimeCode(a.options.duration>0?a.options.duration:a.media.duration,a.options.alwaysShowHours,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),allyVolumeControlText:mejs.i18n.t("Use Up/Down Arrow keys to increase or decrease volume."),hideVolumeOnTouchDevices:!0,audioVolume:"horizontal",videoVolume:"vertical"}),a.extend(MediaElementPlayer.prototype,{buildvolume:function(b,c,d,e){if(!mejs.MediaFeatures.isAndroid&&!mejs.MediaFeatures.isiOS||!this.options.hideVolumeOnTouchDevices){var f=this,g=f.isVideo?f.options.videoVolume:f.options.audioVolume,h="horizontal"==g?a('
'+f.options.allyVolumeControlText+'
').appendTo(c):a('
'+f.options.allyVolumeControlText+'
').appendTo(c),i=f.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),j=f.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),k=f.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),l=f.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),m=function(a,b){if(!i.is(":visible")&&"undefined"==typeof b)return i.show(),m(a,!0),void i.hide();a=Math.max(0,a),a=Math.min(a,1),0===a?h.removeClass("mejs-mute").addClass("mejs-unmute"):h.removeClass("mejs-unmute").addClass("mejs-mute");var c=j.position();if("vertical"==g){var d=j.height(),e=d-d*a;l.css("top",Math.round(c.top+e-l.height()/2)),k.height(d-e),k.css("top",c.top+e)}else{var f=j.width(),n=f*a;l.css("left",Math.round(c.left+n-l.width()/2)),k.width(Math.round(n))}},n=function(a){var b=null,c=j.offset();if("vertical"===g){var d=j.height(),f=(parseInt(j.css("top").replace(/px/,""),10),a.pageY-c.top);if(b=(d-f)/d,0===c.top||0===c.left)return}else{var h=j.width(),i=a.pageX-c.left;b=i/h}b=Math.max(0,b),b=Math.min(b,1),m(b),e.setMuted(0===b?!0:!1),e.setVolume(b)},o=!1,p=!1;h.hover(function(){i.show(),p=!0},function(){p=!1,o||"vertical"!=g||i.hide()});var q=function(){var a=Math.floor(100*e.volume);i.attr({"aria-label":mejs.i18n.t("volumeSlider"),"aria-valuemin":0,"aria-valuemax":100,"aria-valuenow":a,"aria-valuetext":a+"%",role:"slider",tabindex:0})};i.bind("mouseover",function(){p=!0}).bind("mousedown",function(a){return n(a),f.globalBind("mousemove.vol",function(a){n(a)}),f.globalBind("mouseup.vol",function(){o=!1,f.globalUnbind(".vol"),p||"vertical"!=g||i.hide()}),o=!0,!1}).bind("keydown",function(a){var b=a.keyCode,c=e.volume;switch(b){case 38:c+=.1;break;case 40:c-=.1;break;default:return!0}return o=!1,m(c),e.setVolume(c),!1}).bind("blur",function(){i.hide()}),h.find("button").click(function(){e.setMuted(!e.muted)}),h.find("button").bind("focus",function(){i.show()}),e.addEventListener("volumechange",function(a){o||(e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))),q(a)},!1),f.container.is(":visible")&&(m(b.options.startVolume),0===b.options.startVolume&&e.setMuted(!0),"native"===e.pluginType&&e.setVolume(b.options.startVolume))}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{usePluginFullScreen:!0,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")}),a.extend(MediaElementPlayer.prototype,{isFullScreen:!1,isNativeFullScreen:!1,isInIframe:!1,buildfullscreen:function(b,c,d,e){if(b.isVideo){if(b.isInIframe=window.location!=window.parent.location,mejs.MediaFeatures.hasTrueNativeFullScreen){var f=function(){b.isFullScreen&&(mejs.MediaFeatures.isFullScreen()?(b.isNativeFullScreen=!0,b.setControlsSize()):(b.isNativeFullScreen=!1,b.exitFullScreen()))};b.globalBind(mejs.MediaFeatures.fullScreenEventName,f)}var g=this,h=(b.container,a('
').appendTo(c));if("native"===g.media.pluginType||!g.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)h.click(function(){var a=mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||b.isFullScreen;a?b.exitFullScreen():b.enterFullScreen()});else{var i=null,j=function(){var a,b=document.createElement("x"),c=document.documentElement,d=window.getComputedStyle;return"pointerEvents"in b.style?(b.style.pointerEvents="auto",b.style.pointerEvents="x",c.appendChild(b),a=d&&"auto"===d(b,"").pointerEvents,c.removeChild(b),!!a):!1}();if(j&&!mejs.MediaFeatures.isOpera){var k,l,m=!1,n=function(){if(m){for(var a in o)o[a].hide();h.css("pointer-events",""),g.controls.css("pointer-events",""),g.media.removeEventListener("click",g.clickToPlayPauseCallback),m=!1}},o={},p=["top","left","right","bottom"],q=function(){var a=h.offset().left-g.container.offset().left,b=h.offset().top-g.container.offset().top,c=h.outerWidth(!0),d=h.outerHeight(!0),e=g.container.width(),f=g.container.height();for(k in o)o[k].css({position:"absolute",top:0,left:0});o.top.width(e).height(b),o.left.width(a).height(d).css({top:b}),o.right.width(e-a-c).height(d).css({top:b,left:a+c}),o.bottom.width(e).height(f-d-b).css({top:b+d})};for(g.globalBind("resize",function(){q()}),k=0,l=p.length;l>k;k++)o[p[k]]=a('
').appendTo(g.container).mouseover(n).hide();h.on("mouseover",function(){if(!g.isFullScreen){var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!1),h.css("pointer-events","none"),g.controls.css("pointer-events","none"),g.media.addEventListener("click",g.clickToPlayPauseCallback);for(k in o)o[k].show();q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1) +-}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i='
    ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var j=0,k=f.options.speeds.length;k>j;j++)i+='
    • ";i+="
",g=a(i).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this;if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
').prependTo(d).hide(),b.captions=a('
').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
").appendTo(c);var h=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c
    ').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); +\ Pas de fin de ligne à la fin du fichier ++}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var j=0,k=f.options.speeds.length;k>j;j++)i+='
      • ";i+="
    ",g=a(i).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this;if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var h=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); diff --git a/wordpress-3.9-no_swfupload.patch b/wordpress-4.2-no_swfupload.patch similarity index 94% rename from wordpress-3.9-no_swfupload.patch rename to wordpress-4.2-no_swfupload.patch index 3d1395d..0b826e8 100644 --- a/wordpress-3.9-no_swfupload.patch +++ b/wordpress-4.2-no_swfupload.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php --- wordpress/wp-includes/script-loader.php.orig 2014-05-07 15:55:26.485228222 +0200 +++ wordpress/wp-includes/script-loader.php 2014-05-07 15:55:18.019198073 +0200 -@@ -273,15 +273,6 @@ function wp_default_scripts( &$scripts ) +@@ -280,15 +280,6 @@ $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); @@ -16,4 +16,4 @@ diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/scri - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); - $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23'); + $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23' ); diff --git a/wordpress-4.1-noupdate.patch b/wordpress-4.2-noupdate.patch similarity index 58% rename from wordpress-4.1-noupdate.patch rename to wordpress-4.2-noupdate.patch index 5105c23..2716f3f 100644 --- a/wordpress-4.1-noupdate.patch +++ b/wordpress-4.2-noupdate.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.rpm 2014-12-16 20:54:23.000000000 +0100 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2014-12-22 06:46:28.487097611 +0100 -@@ -2141,6 +2141,9 @@ class Core_Upgrader extends WP_Upgrader +diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp-admin/includes/class-wp-upgrader.php +--- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate 2015-04-03 02:18:27.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-04-24 10:33:31.166724612 +0200 +@@ -2142,6 +2142,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -11,7 +11,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admi // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -2372,7 +2375,7 @@ class WP_Automatic_Updater { +@@ -2373,7 +2376,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -20,9 +20,9 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.rpm wordpress/wp-admi return true; if ( defined( 'WP_INSTALLING' ) ) -diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.rpm 2014-11-30 12:28:24.000000000 +0100 -+++ wordpress/wp-admin/includes/update.php 2014-12-22 06:46:28.487097611 +0100 +diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.noupdate 2015-04-24 10:37:28.288734495 +0200 ++++ wordpress/wp-admin/includes/update.php 2015-04-24 10:37:46.985814124 +0200 @@ -211,8 +211,6 @@ function update_nag() { } echo "
    $msg
    "; @@ -36,15 +36,15 @@ diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/ $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && $cur->response == 'upgrade' ) -- $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; +- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; + $msg .= ''; } - echo "

    $msg

    "; -diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.rpm 2014-12-01 02:34:24.000000000 +0100 -+++ wordpress/wp-includes/capabilities.php 2014-12-22 06:46:28.487097611 +0100 -@@ -1255,7 +1255,7 @@ function map_meta_cap( $cap, $user_id ) + $msg .= sprintf( '' . __( 'WordPress %1$s running %2$s theme.' ) . '', get_bloginfo( 'version', 'display' ), $theme_name ); +diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/capabilities.php +--- wordpress/wp-includes/capabilities.php.noupdate 2015-04-20 09:27:27.000000000 +0200 ++++ wordpress/wp-includes/capabilities.php 2015-04-24 10:33:31.167724617 +0200 +@@ -1281,7 +1281,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -53,7 +53,7 @@ diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabi $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -1273,7 +1273,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -1299,7 +1299,7 @@ function map_meta_cap( $cap, $user_id ) case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. @@ -62,9 +62,9 @@ diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabi $caps[] = 'do_not_allow'; } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; -diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.rpm 2014-12-22 06:48:34.883575009 +0100 -+++ wordpress/wp-includes/update.php 2014-12-22 06:48:44.144609988 +0100 +diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.noupdate 2015-03-18 23:07:28.000000000 +0100 ++++ wordpress/wp-includes/update.php 2015-04-24 10:33:31.167724617 +0200 @@ -624,9 +624,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ @@ -75,7 +75,7 @@ diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -669,8 +666,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -668,8 +665,6 @@ if ( ( ! is_main_site() && ! is_network_ } add_action( 'admin_init', '_maybe_update_core' ); diff --git a/wordpress.spec b/wordpress.spec index 04c4c47..9b1e2b4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.1.2 +Version: 4.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -33,7 +33,7 @@ Patch0: wordpress-debian_patches_hello.patch # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-3.9-no_swfupload.patch +Patch2: wordpress-4.2-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' @@ -41,7 +41,7 @@ Patch3: wordpress-4.0-tinymce_noflash.patch # Adjust mediaelement not to use its SWF and Silverlight plugins. This # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' -Patch4: wordpress-4.1-mediaelement-noflash_silverlight.patch +Patch4: wordpress-4.2-mediaelement-noflash_silverlight.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -50,7 +50,7 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.1-noupdate.patch +Patch6: wordpress-4.2-noupdate.patch # Use system libraries Patch7: wordpress-4.0-systemlibs.patch @@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Apr 24 2015 Remi Collet - 4.2-1 +- WordPress 4.2 “Powell” + * Thu Apr 23 2015 Remi Collet - 4.1.2-1 - WordPress 4.1.2 Security Release From 88d9bfe6a977aee76855b7ba0febb25b931e7afb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Apr 2015 08:41:16 +0200 Subject: [PATCH 028/184] WordPress 4.2.1 Security Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index af2d010..0642600 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /wordpress-4.1.1.tar.gz /wordpress-4.1.2.tar.gz /wordpress-4.2.tar.gz +/wordpress-4.2.1.tar.gz diff --git a/sources b/sources index abb9490..2d0742f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f48458379c82de934bb3e8539e5d9b9e wordpress-4.2.tar.gz +71eef0d7c8b26fc7b65c41449eefbb2a wordpress-4.2.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 9b1e2b4..f6d3ed8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.2 +Version: 4.2.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Apr 28 2015 Remi Collet - 4.2.1-1 +- WordPress 4.2.1 Security Release + * Fri Apr 24 2015 Remi Collet - 4.2-1 - WordPress 4.2 “Powell” From c3247e0fb051f1f0ae1abeb5a21e140d9d266368 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 May 2015 07:07:02 +0200 Subject: [PATCH 029/184] WordPress 4.2.2 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0642600..bfd35d4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /wordpress-4.1.2.tar.gz /wordpress-4.2.tar.gz /wordpress-4.2.1.tar.gz +/wordpress-4.2.2.tar.gz diff --git a/sources b/sources index 2d0742f..21680fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71eef0d7c8b26fc7b65c41449eefbb2a wordpress-4.2.1.tar.gz +c40d56cf85975482d5f5fa8c4b97d1d2 wordpress-4.2.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index f6d3ed8..0442c5d 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.2.1 +Version: 4.2.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu May 7 2015 Remi Collet - 4.2.2-1 +- WordPress 4.2.2 Security and Maintenance Release + * Tue Apr 28 2015 Remi Collet - 4.2.1-1 - WordPress 4.2.1 Security Release From 732da7a8cd0cdf57d670bc67de03c0ae6c5af0ec Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:33:14 +0000 Subject: [PATCH 030/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 0442c5d..2cac44e 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.2.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -281,6 +281,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 4.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu May 7 2015 Remi Collet - 4.2.2-1 - WordPress 4.2.2 Security and Maintenance Release From 4938eb1f28b8b91cd549ffd5b03fb722f8049efb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jul 2015 06:52:45 +0200 Subject: [PATCH 031/184] WordPress 4.2.3 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bfd35d4..f2ae93b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /wordpress-4.2.tar.gz /wordpress-4.2.1.tar.gz /wordpress-4.2.2.tar.gz +/wordpress-4.2.3.tar.gz diff --git a/sources b/sources index 21680fc..0d2a0dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c40d56cf85975482d5f5fa8c4b97d1d2 wordpress-4.2.2.tar.gz +5c15cc9e86616ba5a778f23e2f1997f8 wordpress-4.2.3.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 2cac44e..d6bdc02 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -1,3 +1,10 @@ +# Fedora spec file for wordpress +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content @@ -16,9 +23,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.2.2 +Version: 4.2.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}.tar.gz @@ -281,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jul 24 2015 Remi Collet - 4.2.3-1 +- WordPress 4.2.3 Security and Maintenance Release + * Fri Jun 19 2015 Fedora Release Engineering - 4.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From baf95ff4bff09996959341b003b19b5f7bb686b3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Aug 2015 14:53:16 +0200 Subject: [PATCH 032/184] WordPress 4.2.4 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f2ae93b..68eee6b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /wordpress-4.2.1.tar.gz /wordpress-4.2.2.tar.gz /wordpress-4.2.3.tar.gz +/wordpress-4.2.4.tar.gz diff --git a/sources b/sources index 0d2a0dd..0b81cbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c15cc9e86616ba5a778f23e2f1997f8 wordpress-4.2.3.tar.gz +844f6a90f31dc33b433828f6c23b80b6 wordpress-4.2.4.tar.gz diff --git a/wordpress.spec b/wordpress.spec index d6bdc02..dfbe792 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -23,7 +23,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.2.3 +Version: 4.2.4 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Aug 4 2015 Remi Collet - 4.2.4-1 +- WordPress 4.2.4 Security and Maintenance Release + * Fri Jul 24 2015 Remi Collet - 4.2.3-1 - WordPress 4.2.3 Security and Maintenance Release From 0606c08b0b6cddb44a85c4f5641c74380a52b829 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Aug 2015 10:07:30 +0200 Subject: [PATCH 033/184] =?UTF-8?q?WordPress=204.3=20=E2=80=9CBillie?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- ...4.2-mediaelement-noflash_silverlight.patch | 18 ------ ...4.3-mediaelement-noflash_silverlight.patch | 17 ++++++ ...date.patch => wordpress-4.3-noupdate.patch | 59 +++++++++++-------- wordpress.spec | 11 ++-- 6 files changed, 61 insertions(+), 47 deletions(-) delete mode 100644 wordpress-4.2-mediaelement-noflash_silverlight.patch create mode 100644 wordpress-4.3-mediaelement-noflash_silverlight.patch rename wordpress-4.2-noupdate.patch => wordpress-4.3-noupdate.patch (56%) diff --git a/.gitignore b/.gitignore index 68eee6b..3f9983d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /wordpress-4.2.2.tar.gz /wordpress-4.2.3.tar.gz /wordpress-4.2.4.tar.gz +/wordpress-4.3.tar.gz diff --git a/sources b/sources index 0b81cbe..844ec92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -844f6a90f31dc33b433828f6c23b80b6 wordpress-4.2.4.tar.gz +b11dcf18e512e44de5c48415eac9ae00 wordpress-4.3.tar.gz diff --git a/wordpress-4.2-mediaelement-noflash_silverlight.patch b/wordpress-4.2-mediaelement-noflash_silverlight.patch deleted file mode 100644 index c0b23ee..0000000 --- a/wordpress-4.2-mediaelement-noflash_silverlight.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2014-12-22 06:38:12.716225091 +0100 -+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.min.js 2014-12-22 06:39:30.045517161 +0100 -@@ -12,7 +12,7 @@ - * License: MIT - * - */ --function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.4",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! -+function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.16.4",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! - * - * MediaElementPlayer - * http://mediaelementjs.com/ -@@ -25,4 +25,4 @@ - * - */ - "undefined"!=typeof jQuery?mejs.$=jQuery:"undefined"!=typeof ender&&(mejs.$=ender),function(a){mejs.MepDefaults={poster:"",showPosterWhenEnded:!1,defaultVideoWidth:480,defaultVideoHeight:270,videoWidth:-1,videoHeight:-1,defaultAudioWidth:400,defaultAudioHeight:30,defaultSeekBackwardInterval:function(a){return.05*a.duration},defaultSeekForwardInterval:function(a){return.05*a.duration},setDimensions:!0,audioWidth:-1,audioHeight:-1,startVolume:.8,loop:!1,autoRewind:!0,enableAutosize:!0,alwaysShowHours:!1,showTimecodeFrameCount:!1,framesPerSecond:25,autosizeProgress:!0,alwaysShowControls:!1,hideVideoControlsOnLoad:!1,clickToPlayPause:!0,iPadUseNativeControls:!1,iPhoneUseNativeControls:!1,AndroidUseNativeControls:!1,features:["playpause","current","progress","duration","tracks","volume","fullscreen"],isVideo:!0,enableKeyboard:!0,pauseOtherPlayers:!0,keyActions:[{keys:[32,179],action:function(a,b){b.paused||b.ended?a.play():a.pause()}},{keys:[38],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.volume+.1,1);b.setVolume(c)}},{keys:[40],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.volume-.1,0);b.setVolume(c)}},{keys:[37,227],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.currentTime-a.options.defaultSeekBackwardInterval(b),0);b.setCurrentTime(c)}}},{keys:[39,228],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.currentTime+a.options.defaultSeekForwardInterval(b),b.duration);b.setCurrentTime(c)}}},{keys:[70],action:function(a){"undefined"!=typeof a.enterFullScreen&&(a.isFullScreen?a.exitFullScreen():a.enterFullScreen())}},{keys:[77],action:function(a){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer()),a.setMuted(a.media.muted?!1:!0)}}]},mejs.mepIndex=0,mejs.players={},mejs.MediaElementPlayer=function(b,c){if(!(this instanceof mejs.MediaElementPlayer))return new mejs.MediaElementPlayer(b,c);var d=this;return d.$media=d.$node=a(b),d.node=d.media=d.$media[0],"undefined"!=typeof d.node.player?d.node.player:(d.node.player=d,"undefined"==typeof c&&(c=d.$node.data("mejsoptions")),d.options=a.extend({},mejs.MepDefaults,c),d.id="mep_"+mejs.mepIndex++,mejs.players[d.id]=d,d.init(),d)},mejs.MediaElementPlayer.prototype={hasFocus:!1,controlsAreVisible:!0,init:function(){var b=this,c=mejs.MediaFeatures,d=a.extend(!0,{},b.options,{success:function(a,c){b.meReady(a,c)},error:function(a){b.handleError(a)}}),e=b.media.tagName.toLowerCase();if(b.isDynamic="audio"!==e&&"video"!==e,b.isVideo=b.isDynamic?b.options.isVideo:"audio"!==e&&b.options.isVideo,c.isiPad&&b.options.iPadUseNativeControls||c.isiPhone&&b.options.iPhoneUseNativeControls)b.$media.attr("controls","controls"),c.isiPad&&null!==b.media.getAttribute("autoplay")&&b.play();else if(c.isAndroid&&b.options.AndroidUseNativeControls);else{b.$media.removeAttr("controls");var f=mejs.i18n.t(b.isVideo?"Video Player":"Audio Player");if(a(''+f+"").insertBefore(b.$media),b.container=a('
    ').addClass(b.$media[0].className).insertBefore(b.$media).focus(function(){if(!b.controlsAreVisible){b.showControls(!0);var a=b.container.find(".mejs-playpause-button > button");a.focus()}}),b.container.addClass((c.isAndroid?"mejs-android ":"")+(c.isiOS?"mejs-ios ":"")+(c.isiPad?"mejs-ipad ":"")+(c.isiPhone?"mejs-iphone ":"")+(b.isVideo?"mejs-video ":"mejs-audio ")),c.isiOS){var g=b.$media.clone();b.container.find(".mejs-mediaelement").append(g),b.$media.remove(),b.$node=b.$media=g,b.node=b.media=g[0]}else b.container.find(".mejs-mediaelement").append(b.$media);b.controls=b.container.find(".mejs-controls"),b.layers=b.container.find(".mejs-layers");var h=b.isVideo?"video":"audio",i=h.substring(0,1).toUpperCase()+h.substring(1);b.width=b.options[h+"Width"]>0||b.options[h+"Width"].toString().indexOf("%")>-1?b.options[h+"Width"]:""!==b.media.style.width&&null!==b.media.style.width?b.media.style.width:null!==b.media.getAttribute("width")?b.$media.attr("width"):b.options["default"+i+"Width"],b.height=b.options[h+"Height"]>0||b.options[h+"Height"].toString().indexOf("%")>-1?b.options[h+"Height"]:""!==b.media.style.height&&null!==b.media.style.height?b.media.style.height:null!==b.$media[0].getAttribute("height")?b.$media.attr("height"):b.options["default"+i+"Height"],b.setPlayerSize(b.width,b.height),d.pluginWidth=b.width,d.pluginHeight=b.height}mejs.MediaElement(b.$media[0],d),"undefined"!=typeof b.container&&b.controlsAreVisible&&b.container.trigger("controlsshown")},showControls:function(a){var b=this;a="undefined"==typeof a||a,b.controlsAreVisible||(a?(b.controls.css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0,b.container.trigger("controlsshown")}),b.container.find(".mejs-control").css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0})):(b.controls.css("visibility","visible").css("display","block"),b.container.find(".mejs-control").css("visibility","visible").css("display","block"),b.controlsAreVisible=!0,b.container.trigger("controlsshown")),b.setControlsSize())},hideControls:function(b){var c=this;b="undefined"==typeof b||b,!c.controlsAreVisible||c.options.alwaysShowControls||c.keyboardAction||(b?(c.controls.stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")}),c.container.find(".mejs-control").stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block")})):(c.controls.css("visibility","hidden").css("display","block"),c.container.find(".mejs-control").css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")))},controlsTimer:null,startControlsTimer:function(a){var b=this;a="undefined"!=typeof a?a:1500,b.killControlsTimer("start"),b.controlsTimer=setTimeout(function(){b.hideControls(),b.killControlsTimer("hide")},a)},killControlsTimer:function(){var a=this;null!==a.controlsTimer&&(clearTimeout(a.controlsTimer),delete a.controlsTimer,a.controlsTimer=null)},controlsEnabled:!0,disableControls:function(){var a=this;a.killControlsTimer(),a.hideControls(!1),this.controlsEnabled=!1},enableControls:function(){var a=this;a.showControls(!1),a.controlsEnabled=!0},meReady:function(b,c){var d,e,f=this,g=mejs.MediaFeatures,h=c.getAttribute("autoplay"),i=!("undefined"==typeof h||null===h||"false"===h);if(!f.created){if(f.created=!0,f.media=b,f.domNode=c,!(g.isAndroid&&f.options.AndroidUseNativeControls||g.isiPad&&f.options.iPadUseNativeControls||g.isiPhone&&f.options.iPhoneUseNativeControls)){f.buildposter(f,f.controls,f.layers,f.media),f.buildkeyboard(f,f.controls,f.layers,f.media),f.buildoverlays(f,f.controls,f.layers,f.media),f.findTracks();for(d in f.options.features)if(e=f.options.features[d],f["build"+e])try{f["build"+e](f,f.controls,f.layers,f.media)}catch(j){}f.container.trigger("controlsready"),f.setPlayerSize(f.width,f.height),f.setControlsSize(),f.isVideo&&(mejs.MediaFeatures.hasTouch?f.$media.bind("touchstart",function(){f.controlsAreVisible?f.hideControls(!1):f.controlsEnabled&&f.showControls(!1)}):(f.clickToPlayPauseCallback=function(){f.options.clickToPlayPause&&(f.media.paused?f.play():f.pause())},f.media.addEventListener("click",f.clickToPlayPauseCallback,!1),f.container.bind("mouseenter mouseover",function(){f.controlsEnabled&&(f.options.alwaysShowControls||(f.killControlsTimer("enter"),f.showControls(),f.startControlsTimer(2500)))}).bind("mousemove",function(){f.controlsEnabled&&(f.controlsAreVisible||f.showControls(),f.options.alwaysShowControls||f.startControlsTimer(2500))}).bind("mouseleave",function(){f.controlsEnabled&&(f.media.paused||f.options.alwaysShowControls||f.startControlsTimer(1e3))})),f.options.hideVideoControlsOnLoad&&f.hideControls(!1),i&&!f.options.alwaysShowControls&&f.hideControls(),f.options.enableAutosize&&f.media.addEventListener("loadedmetadata",function(a){f.options.videoHeight<=0&&null===f.domNode.getAttribute("height")&&!isNaN(a.target.videoHeight)&&(f.setPlayerSize(a.target.videoWidth,a.target.videoHeight),f.setControlsSize(),f.media.setVideoSize(a.target.videoWidth,a.target.videoHeight))},!1)),b.addEventListener("play",function(){var a;for(a in mejs.players){var b=mejs.players[a];b.id==f.id||!f.options.pauseOtherPlayers||b.paused||b.ended||b.pause(),b.hasFocus=!1}f.hasFocus=!0},!1),f.media.addEventListener("ended",function(){if(f.options.autoRewind)try{f.media.setCurrentTime(0),window.setTimeout(function(){a(f.container).find(".mejs-overlay-loading").parent().hide()},20)}catch(b){}f.media.pause(),f.setProgressRail&&f.setProgressRail(),f.setCurrentRail&&f.setCurrentRail(),f.options.loop?f.play():!f.options.alwaysShowControls&&f.controlsEnabled&&f.showControls()},!1),f.media.addEventListener("loadedmetadata",function(){f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.isFullScreen||(f.setPlayerSize(f.width,f.height),f.setControlsSize())},!1),f.container.focusout(function(b){if(b.relatedTarget){var c=a(b.relatedTarget);f.keyboardAction&&0===c.parents(".mejs-container").length&&(f.keyboardAction=!1,f.hideControls(!0))}}),setTimeout(function(){f.setPlayerSize(f.width,f.height),f.setControlsSize()},50),f.globalBind("resize",function(){f.isFullScreen||mejs.MediaFeatures.hasTrueNativeFullScreen&&document.webkitIsFullScreen||f.setPlayerSize(f.width,f.height),f.setControlsSize()}),"youtube"==f.media.pluginType&&(g.isiOS||g.isAndroid)&&f.container.find(".mejs-overlay-play").hide()}i&&"native"==b.pluginType&&f.play(),f.options.success&&("string"==typeof f.options.success?window[f.options.success](f.media,f.domNode,f):f.options.success(f.media,f.domNode,f))}},handleError:function(a){var b=this;b.controls.hide(),b.options.error&&b.options.error(a)},setPlayerSize:function(b,c){var d=this;if(!d.options.setDimensions)return!1;if("undefined"!=typeof b&&(d.width=b),"undefined"!=typeof c&&(d.height=c),d.height.toString().indexOf("%")>0||"100%"===d.$node.css("max-width")||d.$node[0].currentStyle&&"100%"===d.$node[0].currentStyle.maxWidth){var e=function(){return d.isVideo?d.media.videoWidth&&d.media.videoWidth>0?d.media.videoWidth:null!==d.media.getAttribute("width")?d.media.getAttribute("width"):d.options.defaultVideoWidth:d.options.defaultAudioWidth}(),f=function(){return d.isVideo?d.media.videoHeight&&d.media.videoHeight>0?d.media.videoHeight:null!==d.media.getAttribute("height")?d.media.getAttribute("height"):d.options.defaultVideoHeight:d.options.defaultAudioHeight}(),g=d.container.parent().closest(":visible").width(),h=d.container.parent().closest(":visible").height(),i=d.isVideo||!d.options.autosizeProgress?parseInt(g*f/e,10):f;isNaN(i)&&(i=h),"body"===d.container.parent()[0].tagName.toLowerCase()&&(g=a(window).width(),i=a(window).height()),i&&g&&(d.container.width(g).height(i),d.$media.add(d.container.find(".mejs-shim")).width("100%").height("100%"),d.isVideo&&d.media.setVideoSize&&d.media.setVideoSize(g,i),d.layers.children(".mejs-layer").width("100%").height("100%"))}else d.container.width(d.width).height(d.height),d.layers.children(".mejs-layer").width(d.width).height(d.height);var j=d.layers.find(".mejs-overlay-play"),k=j.find(".mejs-overlay-button");j.height(d.container.height()-d.controls.height()),k.css("margin-top","-"+(k.height()/2-d.controls.height()/2).toString()+"px")},setControlsSize:function(){var b=this,c=0,d=0,e=b.controls.find(".mejs-time-rail"),f=b.controls.find(".mejs-time-total"),g=(b.controls.find(".mejs-time-current"),b.controls.find(".mejs-time-loaded"),e.siblings()),h=g.last(),i=null;if(b.container.is(":visible")&&e.length&&e.is(":visible")){b.options&&!b.options.autosizeProgress&&(d=parseInt(e.css("width"),10)),0!==d&&d||(g.each(function(){var b=a(this);"absolute"!=b.css("position")&&b.is(":visible")&&(c+=a(this).outerWidth(!0))}),d=b.controls.width()-c-(e.outerWidth(!0)-e.width()));do e.width(d),f.width(d-(f.outerWidth(!0)-f.width())),"absolute"!=h.css("position")&&(i=h.position(),d--);while(null!==i&&i.top>0&&d>0);b.setProgressRail&&b.setProgressRail(),b.setCurrentRail&&b.setCurrentRail()}},buildposter:function(b,c,d,e){var f=this,g=a('
    ').appendTo(d),h=b.$media.attr("poster");""!==b.options.poster&&(h=b.options.poster),h?f.setPoster(h):g.hide(),e.addEventListener("play",function(){g.hide()},!1),b.options.showPosterWhenEnded&&b.options.autoRewind&&e.addEventListener("ended",function(){g.show()},!1)},setPoster:function(b){var c=this,d=c.container.find(".mejs-poster"),e=d.find("img");0===e.length&&(e=a('').appendTo(d)),e.attr("src",b),d.css({"background-image":"url("+b+")"})},buildoverlays:function(b,c,d,e){var f=this;if(b.isVideo){var g=a('
    ').hide().appendTo(d),h=a('
    ').hide().appendTo(d),i=a('
    ').appendTo(d).bind("click",function(){f.options.clickToPlayPause&&e.paused&&e.play()});e.addEventListener("play",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("playing",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("seeking",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("seeked",function(){g.hide(),c.find(".mejs-time-buffering").hide()},!1),e.addEventListener("pause",function(){mejs.MediaFeatures.isiPhone||i.show()},!1),e.addEventListener("waiting",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("loadeddata",function(){g.show(),c.find(".mejs-time-buffering").show(),mejs.MediaFeatures.isAndroid&&(e.canplayTimeout=window.setTimeout(function(){if(document.createEvent){var a=document.createEvent("HTMLEvents");return a.initEvent("canplay",!0,!0),e.dispatchEvent(a)}},300))},!1),e.addEventListener("canplay",function(){g.hide(),c.find(".mejs-time-buffering").hide(),clearTimeout(e.canplayTimeout)},!1),e.addEventListener("error",function(){g.hide(),c.find(".mejs-time-buffering").hide(),h.show(),h.find("mejs-overlay-error").html("Error loading this resource")},!1),e.addEventListener("keydown",function(a){f.onkeydown(b,e,a)},!1)}},buildkeyboard:function(b,c,d,e){var f=this;f.container.keydown(function(){f.keyboardAction=!0}),f.globalBind("keydown",function(a){return f.onkeydown(b,e,a)}),f.globalBind("click",function(c){b.hasFocus=0!==a(c.target).closest(".mejs-container").length})},onkeydown:function(a,b,c){if(a.hasFocus&&a.options.enableKeyboard)for(var d=0,e=a.options.keyActions.length;e>d;d++)for(var f=a.options.keyActions[d],g=0,h=f.keys.length;h>g;g++)if(c.keyCode==f.keys[g])return"function"==typeof c.preventDefault&&c.preventDefault(),f.action(a,b,c.keyCode),!1;return!0},findTracks:function(){var b=this,c=b.$media.find("track");b.tracks=[],c.each(function(c,d){d=a(d),b.tracks.push({srclang:d.attr("srclang")?d.attr("srclang").toLowerCase():"",src:d.attr("src"),kind:d.attr("kind"),label:d.attr("label")||"",entries:[],isLoaded:!1})})},changeSkin:function(a){this.container[0].className="mejs-container "+a,this.setPlayerSize(this.width,this.height),this.setControlsSize()},play:function(){this.load(),this.media.play()},pause:function(){try{this.media.pause()}catch(a){}},load:function(){this.isLoaded||this.media.load(),this.isLoaded=!0},setMuted:function(a){this.media.setMuted(a)},setCurrentTime:function(a){this.media.setCurrentTime(a)},getCurrentTime:function(){return this.media.currentTime},setVolume:function(a){this.media.setVolume(a)},getVolume:function(){return this.media.volume},setSrc:function(a){this.media.setSrc(a)},remove:function(){var a,b,c=this;for(a in c.options.features)if(b=c.options.features[a],c["clean"+b])try{c["clean"+b](c)}catch(d){}c.isDynamic?c.$node.insertBefore(c.container):(c.$media.prop("controls",!0),c.$node.clone().insertBefore(c.container).show(),c.$node.remove()),"native"!==c.media.pluginType&&c.media.remove(),delete mejs.players[c.id],"object"==typeof c.container&&c.container.remove(),c.globalUnbind(),delete c.node.player},rebuildtracks:function(){var a=this;a.findTracks(),a.buildtracks(a,a.controls,a.layers,a.media)}},function(){function b(b,d){var e={d:[],w:[]};return a.each((b||"").split(" "),function(a,b){var f=b+"."+d;0===f.indexOf(".")?(e.d.push(f),e.w.push(f)):e[c.test(b)?"w":"d"].push(f)}),e.d=e.d.join(" "),e.w=e.w.join(" "),e}var c=/^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;mejs.MediaElementPlayer.prototype.globalBind=function(c,d,e){var f=this;c=b(c,f.id),c.d&&a(document).bind(c.d,d,e),c.w&&a(window).bind(c.w,d,e)},mejs.MediaElementPlayer.prototype.globalUnbind=function(c,d){var e=this;c=b(c,e.id),c.d&&a(document).unbind(c.d,d),c.w&&a(window).unbind(c.w,d)}}(),"undefined"!=typeof a&&(a.fn.mediaelementplayer=function(b){return this.each(b===!1?function(){var b=a(this).data("mediaelementplayer");b&&b.remove(),a(this).removeData("mediaelementplayer")}:function(){a(this).data("mediaelementplayer",new mejs.MediaElementPlayer(this,b))}),this},a(document).ready(function(){a(".mejs-player").mediaelementplayer()})),window.MediaElementPlayer=mejs.MediaElementPlayer}(mejs.$),function(a){a.extend(mejs.MepDefaults,{playText:mejs.i18n.t("Play"),pauseText:mejs.i18n.t("Pause")}),a.extend(MediaElementPlayer.prototype,{buildplaypause:function(b,c,d,e){function f(a){"play"===a?(i.removeClass("mejs-play").addClass("mejs-pause"),j.attr({title:h.pauseText,"aria-label":h.pauseText})):(i.removeClass("mejs-pause").addClass("mejs-play"),j.attr({title:h.playText,"aria-label":h.playText}))}var g=this,h=g.options,i=a('
    ').appendTo(c).click(function(a){return a.preventDefault(),e.paused?e.play():e.pause(),!1}),j=i.find("button");f("pse"),e.addEventListener("play",function(){f("play")},!1),e.addEventListener("playing",function(){f("play")},!1),e.addEventListener("pause",function(){f("pse")},!1),e.addEventListener("paused",function(){f("pse")},!1)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{stopText:"Stop"}),a.extend(MediaElementPlayer.prototype,{buildstop:function(b,c,d,e){{var f=this;a('
    ').appendTo(c).click(function(){e.paused||e.pause(),e.currentTime>0&&(e.setCurrentTime(0),e.pause(),c.find(".mejs-time-current").width("0px"),c.find(".mejs-time-handle").css("left","0px"),c.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0)),c.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0)),d.find(".mejs-poster").show())})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{progessHelpText:mejs.i18n.t("Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.")}),a.extend(MediaElementPlayer.prototype,{buildprogress:function(b,c,d,e){a('
    00:00
    ').appendTo(c),c.find(".mejs-time-buffering").hide();var f=this,g=c.find(".mejs-time-total"),h=c.find(".mejs-time-loaded"),i=c.find(".mejs-time-current"),j=c.find(".mejs-time-handle"),k=c.find(".mejs-time-float"),l=c.find(".mejs-time-float-current"),m=c.find(".mejs-time-slider"),n=function(a){var b,c=g.offset(),d=g.outerWidth(!0),f=0,h=0,i=0;b=a.originalEvent.changedTouches?a.originalEvent.changedTouches[0].pageX:a.pageX,e.duration&&(bd+c.left&&(b=d+c.left),i=b-c.left,f=i/d,h=.02>=f?0:f*e.duration,o&&h!==e.currentTime&&e.setCurrentTime(h),mejs.MediaFeatures.hasTouch||(k.css("left",i),l.html(mejs.Utility.secondsToTimeCode(h)),k.show()))},o=!1,p=!1,q=0,r=!1,s=b.options.autoRewind,t=function(){var a=e.currentTime,b=mejs.i18n.t("Time Slider"),c=mejs.Utility.secondsToTimeCode(a),d=e.duration;m.attr({"aria-label":b,"aria-valuemin":0,"aria-valuemax":d,"aria-valuenow":a,"aria-valuetext":c,role:"slider",tabindex:0})},u=function(){var a=new Date;a-q>=1e3&&e.play()};m.bind("focus",function(){b.options.autoRewind=!1}),m.bind("blur",function(){b.options.autoRewind=s}),m.bind("keydown",function(a){new Date-q>=1e3&&(r=e.paused);var b=a.keyCode,c=e.duration,d=e.currentTime;switch(b){case 37:d-=1;break;case 39:d+=1;break;case 38:d+=Math.floor(.1*c);break;case 40:d-=Math.floor(.1*c);break;case 36:d=0;break;case 35:d=c;break;case 10:return void(e.paused?e.play():e.pause());case 13:return void(e.paused?e.play():e.pause());default:return}return d=0>d?0:d>=c?c:Math.floor(d),q=new Date,r||e.pause(),d0&&c.buffered.end&&c.duration?d=c.buffered.end(0)/c.duration:c&&void 0!==c.bytesTotal&&c.bytesTotal>0&&void 0!==c.bufferedBytes?d=c.bufferedBytes/c.bytesTotal:a&&a.lengthComputable&&0!==a.total&&(d=a.loaded/a.total),null!==d&&(d=Math.min(1,Math.max(0,d)),b.loaded&&b.total&&b.loaded.width(b.total.width()*d))},setCurrentRail:function(){var a=this;if(void 0!==a.media.currentTime&&a.media.duration&&a.total&&a.handle){var b=Math.round(a.total.width()*a.media.currentTime/a.media.duration),c=b-Math.round(a.handle.outerWidth(!0)/2);a.current.width(b),a.handle.css("left",c)}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:" | "}),a.extend(MediaElementPlayer.prototype,{buildcurrent:function(b,c,d,e){var f=this;a('
    '+(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00")+"
    ").appendTo(c),f.currenttime=f.controls.find(".mejs-currenttime"),e.addEventListener("timeupdate",function(){b.updateCurrent()},!1)},buildduration:function(b,c,d,e){var f=this;c.children().last().find(".mejs-currenttime").length>0?a(f.options.timeAndDurationSeparator+''+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(c.find(".mejs-time")):(c.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container"),a('
    '+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"
    ").appendTo(c)),f.durationD=f.controls.find(".mejs-duration"),e.addEventListener("timeupdate",function(){b.updateDuration()},!1)},updateCurrent:function(){var a=this;a.currenttime&&a.currenttime.html(mejs.Utility.secondsToTimeCode(a.media.currentTime,a.options.alwaysShowHours||a.media.duration>3600,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))},updateDuration:function(){var a=this;a.container.toggleClass("mejs-long-video",a.media.duration>3600),a.durationD&&(a.options.duration>0||a.media.duration)&&a.durationD.html(mejs.Utility.secondsToTimeCode(a.options.duration>0?a.options.duration:a.media.duration,a.options.alwaysShowHours,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),allyVolumeControlText:mejs.i18n.t("Use Up/Down Arrow keys to increase or decrease volume."),hideVolumeOnTouchDevices:!0,audioVolume:"horizontal",videoVolume:"vertical"}),a.extend(MediaElementPlayer.prototype,{buildvolume:function(b,c,d,e){if(!mejs.MediaFeatures.isAndroid&&!mejs.MediaFeatures.isiOS||!this.options.hideVolumeOnTouchDevices){var f=this,g=f.isVideo?f.options.videoVolume:f.options.audioVolume,h="horizontal"==g?a('
    '+f.options.allyVolumeControlText+'
    ').appendTo(c):a('
    '+f.options.allyVolumeControlText+'
    ').appendTo(c),i=f.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),j=f.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),k=f.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),l=f.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),m=function(a,b){if(!i.is(":visible")&&"undefined"==typeof b)return i.show(),m(a,!0),void i.hide();a=Math.max(0,a),a=Math.min(a,1),0===a?h.removeClass("mejs-mute").addClass("mejs-unmute"):h.removeClass("mejs-unmute").addClass("mejs-mute");var c=j.position();if("vertical"==g){var d=j.height(),e=d-d*a;l.css("top",Math.round(c.top+e-l.height()/2)),k.height(d-e),k.css("top",c.top+e)}else{var f=j.width(),n=f*a;l.css("left",Math.round(c.left+n-l.width()/2)),k.width(Math.round(n))}},n=function(a){var b=null,c=j.offset();if("vertical"===g){var d=j.height(),f=(parseInt(j.css("top").replace(/px/,""),10),a.pageY-c.top);if(b=(d-f)/d,0===c.top||0===c.left)return}else{var h=j.width(),i=a.pageX-c.left;b=i/h}b=Math.max(0,b),b=Math.min(b,1),m(b),e.setMuted(0===b?!0:!1),e.setVolume(b)},o=!1,p=!1;h.hover(function(){i.show(),p=!0},function(){p=!1,o||"vertical"!=g||i.hide()});var q=function(){var a=Math.floor(100*e.volume);i.attr({"aria-label":mejs.i18n.t("volumeSlider"),"aria-valuemin":0,"aria-valuemax":100,"aria-valuenow":a,"aria-valuetext":a+"%",role:"slider",tabindex:0})};i.bind("mouseover",function(){p=!0}).bind("mousedown",function(a){return n(a),f.globalBind("mousemove.vol",function(a){n(a)}),f.globalBind("mouseup.vol",function(){o=!1,f.globalUnbind(".vol"),p||"vertical"!=g||i.hide()}),o=!0,!1}).bind("keydown",function(a){var b=a.keyCode,c=e.volume;switch(b){case 38:c+=.1;break;case 40:c-=.1;break;default:return!0}return o=!1,m(c),e.setVolume(c),!1}).bind("blur",function(){i.hide()}),h.find("button").click(function(){e.setMuted(!e.muted)}),h.find("button").bind("focus",function(){i.show()}),e.addEventListener("volumechange",function(a){o||(e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))),q(a)},!1),f.container.is(":visible")&&(m(b.options.startVolume),0===b.options.startVolume&&e.setMuted(!0),"native"===e.pluginType&&e.setVolume(b.options.startVolume))}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{usePluginFullScreen:!0,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")}),a.extend(MediaElementPlayer.prototype,{isFullScreen:!1,isNativeFullScreen:!1,isInIframe:!1,buildfullscreen:function(b,c,d,e){if(b.isVideo){if(b.isInIframe=window.location!=window.parent.location,mejs.MediaFeatures.hasTrueNativeFullScreen){var f=function(){b.isFullScreen&&(mejs.MediaFeatures.isFullScreen()?(b.isNativeFullScreen=!0,b.setControlsSize()):(b.isNativeFullScreen=!1,b.exitFullScreen()))};b.globalBind(mejs.MediaFeatures.fullScreenEventName,f)}var g=this,h=(b.container,a('
    ').appendTo(c));if("native"===g.media.pluginType||!g.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)h.click(function(){var a=mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||b.isFullScreen;a?b.exitFullScreen():b.enterFullScreen()});else{var i=null,j=function(){var a,b=document.createElement("x"),c=document.documentElement,d=window.getComputedStyle;return"pointerEvents"in b.style?(b.style.pointerEvents="auto",b.style.pointerEvents="x",c.appendChild(b),a=d&&"auto"===d(b,"").pointerEvents,c.removeChild(b),!!a):!1}();if(j&&!mejs.MediaFeatures.isOpera){var k,l,m=!1,n=function(){if(m){for(var a in o)o[a].hide();h.css("pointer-events",""),g.controls.css("pointer-events",""),g.media.removeEventListener("click",g.clickToPlayPauseCallback),m=!1}},o={},p=["top","left","right","bottom"],q=function(){var a=h.offset().left-g.container.offset().left,b=h.offset().top-g.container.offset().top,c=h.outerWidth(!0),d=h.outerHeight(!0),e=g.container.width(),f=g.container.height();for(k in o)o[k].css({position:"absolute",top:0,left:0});o.top.width(e).height(b),o.left.width(a).height(d).css({top:b}),o.right.width(e-a-c).height(d).css({top:b,left:a+c}),o.bottom.width(e).height(f-d-b).css({top:b+d})};for(g.globalBind("resize",function(){q()}),k=0,l=p.length;l>k;k++)o[p[k]]=a('
    ').appendTo(g.container).mouseover(n).hide();h.on("mouseover",function(){if(!g.isFullScreen){var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!1),h.css("pointer-events","none"),g.controls.css("pointer-events","none"),g.media.addEventListener("click",g.clickToPlayPauseCallback);for(k in o)o[k].show();q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1) --}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var j=0,k=f.options.speeds.length;k>j;j++)i+='
      • ";i+="
    ",g=a(i).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this;if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var h=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c
    ').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); -\ Pas de fin de ligne à la fin du fichier -+}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var j=0,k=f.options.speeds.length;k>j;j++)i+='
      • ";i+="
    ",g=a(i).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this;if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var h=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); diff --git a/wordpress-4.3-mediaelement-noflash_silverlight.patch b/wordpress-4.3-mediaelement-noflash_silverlight.patch new file mode 100644 index 0000000..b5165e8 --- /dev/null +++ b/wordpress-4.3-mediaelement-noflash_silverlight.patch @@ -0,0 +1,17 @@ +diff -up wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig wp-includes/js/mediaelement/mediaelement-and-player.min.js +--- wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2015-08-26 09:38:35.867925862 +0200 ++++ wp-includes/js/mediaelement/mediaelement-and-player.min.js 2015-08-26 09:44:23.037702744 +0200 +@@ -12,7 +12,7 @@ + * License: MIT + * + */ +-function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.17.0",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","video/dailymotion","video/x-dailymotion","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! ++function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.17.0",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","video/dailymotion","video/x-dailymotion","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! + * + * MediaElementPlayer + * http://mediaelementjs.com/ + */ + "undefined"!=typeof jQuery?mejs.$=jQuery:"undefined"!=typeof ender&&(mejs.$=ender),function(a){mejs.MepDefaults={poster:"",showPosterWhenEnded:!1,defaultVideoWidth:480,defaultVideoHeight:270,videoWidth:-1,videoHeight:-1,defaultAudioWidth:400,defaultAudioHeight:30,defaultSeekBackwardInterval:function(a){return.05*a.duration},defaultSeekForwardInterval:function(a){return.05*a.duration},setDimensions:!0,audioWidth:-1,audioHeight:-1,startVolume:.8,loop:!1,autoRewind:!0,enableAutosize:!0,alwaysShowHours:!1,showTimecodeFrameCount:!1,framesPerSecond:25,autosizeProgress:!0,alwaysShowControls:!1,hideVideoControlsOnLoad:!1,clickToPlayPause:!0,iPadUseNativeControls:!1,iPhoneUseNativeControls:!1,AndroidUseNativeControls:!1,features:["playpause","current","progress","duration","tracks","volume","fullscreen"],isVideo:!0,enableKeyboard:!0,pauseOtherPlayers:!0,keyActions:[{keys:[32,179],action:function(a,b){b.paused||b.ended?a.play():a.pause()}},{keys:[38],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.volume+.1,1);b.setVolume(c)}},{keys:[40],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.volume-.1,0);b.setVolume(c)}},{keys:[37,227],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.currentTime-a.options.defaultSeekBackwardInterval(b),0);b.setCurrentTime(c)}}},{keys:[39,228],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.currentTime+a.options.defaultSeekForwardInterval(b),b.duration);b.setCurrentTime(c)}}},{keys:[70],action:function(a){"undefined"!=typeof a.enterFullScreen&&(a.isFullScreen?a.exitFullScreen():a.enterFullScreen())}},{keys:[77],action:function(a){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer()),a.setMuted(a.media.muted?!1:!0)}}]},mejs.mepIndex=0,mejs.players={},mejs.MediaElementPlayer=function(b,c){if(!(this instanceof mejs.MediaElementPlayer))return new mejs.MediaElementPlayer(b,c);var d=this;return d.$media=d.$node=a(b),d.node=d.media=d.$media[0],d.node?"undefined"!=typeof d.node.player?d.node.player:(d.node.player=d,"undefined"==typeof c&&(c=d.$node.data("mejsoptions")),d.options=a.extend({},mejs.MepDefaults,c),d.id="mep_"+mejs.mepIndex++,mejs.players[d.id]=d,d.init(),d):void 0},mejs.MediaElementPlayer.prototype={hasFocus:!1,controlsAreVisible:!0,init:function(){var b=this,c=mejs.MediaFeatures,d=a.extend(!0,{},b.options,{success:function(a,c){b.meReady(a,c)},error:function(a){b.handleError(a)}}),e=b.media.tagName.toLowerCase();if(b.isDynamic="audio"!==e&&"video"!==e,b.isVideo=b.isDynamic?b.options.isVideo:"audio"!==e&&b.options.isVideo,c.isiPad&&b.options.iPadUseNativeControls||c.isiPhone&&b.options.iPhoneUseNativeControls)b.$media.attr("controls","controls"),c.isiPad&&null!==b.media.getAttribute("autoplay")&&b.play();else if(c.isAndroid&&b.options.AndroidUseNativeControls);else{b.$media.removeAttr("controls");var f=mejs.i18n.t(b.isVideo?"Video Player":"Audio Player");if(a(''+f+"").insertBefore(b.$media),b.container=a('
    ').addClass(b.$media[0].className).insertBefore(b.$media).focus(function(){if(!b.controlsAreVisible){b.showControls(!0);var a=b.container.find(".mejs-playpause-button > button");a.focus()}}),b.container.addClass((c.isAndroid?"mejs-android ":"")+(c.isiOS?"mejs-ios ":"")+(c.isiPad?"mejs-ipad ":"")+(c.isiPhone?"mejs-iphone ":"")+(b.isVideo?"mejs-video ":"mejs-audio ")),c.isiOS){var g=b.$media.clone();b.container.find(".mejs-mediaelement").append(g),b.$media.remove(),b.$node=b.$media=g,b.node=b.media=g[0]}else b.container.find(".mejs-mediaelement").append(b.$media);b.controls=b.container.find(".mejs-controls"),b.layers=b.container.find(".mejs-layers");var h=b.isVideo?"video":"audio",i=h.substring(0,1).toUpperCase()+h.substring(1);b.width=b.options[h+"Width"]>0||b.options[h+"Width"].toString().indexOf("%")>-1?b.options[h+"Width"]:""!==b.media.style.width&&null!==b.media.style.width?b.media.style.width:null!==b.media.getAttribute("width")?b.$media.attr("width"):b.options["default"+i+"Width"],b.height=b.options[h+"Height"]>0||b.options[h+"Height"].toString().indexOf("%")>-1?b.options[h+"Height"]:""!==b.media.style.height&&null!==b.media.style.height?b.media.style.height:null!==b.$media[0].getAttribute("height")?b.$media.attr("height"):b.options["default"+i+"Height"],b.setPlayerSize(b.width,b.height),d.pluginWidth=b.width,d.pluginHeight=b.height}mejs.MediaElement(b.$media[0],d),"undefined"!=typeof b.container&&b.controlsAreVisible&&b.container.trigger("controlsshown")},showControls:function(a){var b=this;a="undefined"==typeof a||a,b.controlsAreVisible||(a?(b.controls.css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0,b.container.trigger("controlsshown")}),b.container.find(".mejs-control").css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0})):(b.controls.css("visibility","visible").css("display","block"),b.container.find(".mejs-control").css("visibility","visible").css("display","block"),b.controlsAreVisible=!0,b.container.trigger("controlsshown")),b.setControlsSize())},hideControls:function(b){var c=this;b="undefined"==typeof b||b,!c.controlsAreVisible||c.options.alwaysShowControls||c.keyboardAction||(b?(c.controls.stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")}),c.container.find(".mejs-control").stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block")})):(c.controls.css("visibility","hidden").css("display","block"),c.container.find(".mejs-control").css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")))},controlsTimer:null,startControlsTimer:function(a){var b=this;a="undefined"!=typeof a?a:1500,b.killControlsTimer("start"),b.controlsTimer=setTimeout(function(){b.hideControls(),b.killControlsTimer("hide")},a)},killControlsTimer:function(){var a=this;null!==a.controlsTimer&&(clearTimeout(a.controlsTimer),delete a.controlsTimer,a.controlsTimer=null)},controlsEnabled:!0,disableControls:function(){var a=this;a.killControlsTimer(),a.hideControls(!1),this.controlsEnabled=!1},enableControls:function(){var a=this;a.showControls(!1),a.controlsEnabled=!0},meReady:function(b,c){var d,e,f=this,g=mejs.MediaFeatures,h=c.getAttribute("autoplay"),i=!("undefined"==typeof h||null===h||"false"===h);if(!f.created){if(f.created=!0,f.media=b,f.domNode=c,!(g.isAndroid&&f.options.AndroidUseNativeControls||g.isiPad&&f.options.iPadUseNativeControls||g.isiPhone&&f.options.iPhoneUseNativeControls)){f.buildposter(f,f.controls,f.layers,f.media),f.buildkeyboard(f,f.controls,f.layers,f.media),f.buildoverlays(f,f.controls,f.layers,f.media),f.findTracks();for(d in f.options.features)if(e=f.options.features[d],f["build"+e])try{f["build"+e](f,f.controls,f.layers,f.media)}catch(j){}f.container.trigger("controlsready"),f.setPlayerSize(f.width,f.height),f.setControlsSize(),f.isVideo&&(mejs.MediaFeatures.hasTouch?f.$media.bind("touchstart",function(){f.controlsAreVisible?f.hideControls(!1):f.controlsEnabled&&f.showControls(!1)}):(f.clickToPlayPauseCallback=function(){f.options.clickToPlayPause&&(f.media.paused?f.play():f.pause())},f.media.addEventListener("click",f.clickToPlayPauseCallback,!1),f.container.bind("mouseenter mouseover",function(){f.controlsEnabled&&(f.options.alwaysShowControls||(f.killControlsTimer("enter"),f.showControls(),f.startControlsTimer(2500)))}).bind("mousemove",function(){f.controlsEnabled&&(f.controlsAreVisible||f.showControls(),f.options.alwaysShowControls||f.startControlsTimer(2500))}).bind("mouseleave",function(){f.controlsEnabled&&(f.media.paused||f.options.alwaysShowControls||f.startControlsTimer(1e3))})),f.options.hideVideoControlsOnLoad&&f.hideControls(!1),i&&!f.options.alwaysShowControls&&f.hideControls(),f.options.enableAutosize&&f.media.addEventListener("loadedmetadata",function(a){f.options.videoHeight<=0&&null===f.domNode.getAttribute("height")&&!isNaN(a.target.videoHeight)&&(f.setPlayerSize(a.target.videoWidth,a.target.videoHeight),f.setControlsSize(),f.media.setVideoSize(a.target.videoWidth,a.target.videoHeight))},!1)),b.addEventListener("play",function(){var a;for(a in mejs.players){var b=mejs.players[a];b.id==f.id||!f.options.pauseOtherPlayers||b.paused||b.ended||b.pause(),b.hasFocus=!1}f.hasFocus=!0},!1),f.media.addEventListener("ended",function(){if(f.options.autoRewind)try{f.media.setCurrentTime(0),window.setTimeout(function(){a(f.container).find(".mejs-overlay-loading").parent().hide()},20)}catch(b){}f.media.pause(),f.setProgressRail&&f.setProgressRail(),f.setCurrentRail&&f.setCurrentRail(),f.options.loop?f.play():!f.options.alwaysShowControls&&f.controlsEnabled&&f.showControls()},!1),f.media.addEventListener("loadedmetadata",function(){f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.isFullScreen||(f.setPlayerSize(f.width,f.height),f.setControlsSize())},!1),f.container.focusout(function(b){if(b.relatedTarget){var c=a(b.relatedTarget);f.keyboardAction&&0===c.parents(".mejs-container").length&&(f.keyboardAction=!1,f.hideControls(!0))}}),setTimeout(function(){f.setPlayerSize(f.width,f.height),f.setControlsSize()},50),f.globalBind("resize",function(){f.isFullScreen||mejs.MediaFeatures.hasTrueNativeFullScreen&&document.webkitIsFullScreen||f.setPlayerSize(f.width,f.height),f.setControlsSize()}),"youtube"==f.media.pluginType&&(g.isiOS||g.isAndroid)&&f.container.find(".mejs-overlay-play").hide()}i&&"native"==b.pluginType&&f.play(),f.options.success&&("string"==typeof f.options.success?window[f.options.success](f.media,f.domNode,f):f.options.success(f.media,f.domNode,f))}},handleError:function(a){var b=this;b.controls.hide(),b.options.error&&b.options.error(a)},setPlayerSize:function(b,c){var d=this;if(!d.options.setDimensions)return!1;if("undefined"!=typeof b&&(d.width=b),"undefined"!=typeof c&&(d.height=c),d.height.toString().indexOf("%")>0||"none"!==d.$node.css("max-width")&&"t.width"!==d.$node.css("max-width")||d.$node[0].currentStyle&&"100%"===d.$node[0].currentStyle.maxWidth){var e=function(){return d.isVideo?d.media.videoWidth&&d.media.videoWidth>0?d.media.videoWidth:null!==d.media.getAttribute("width")?d.media.getAttribute("width"):d.options.defaultVideoWidth:d.options.defaultAudioWidth}(),f=function(){return d.isVideo?d.media.videoHeight&&d.media.videoHeight>0?d.media.videoHeight:null!==d.media.getAttribute("height")?d.media.getAttribute("height"):d.options.defaultVideoHeight:d.options.defaultAudioHeight}(),g=d.container.parent().closest(":visible").width(),h=d.container.parent().closest(":visible").height(),i=d.isVideo||!d.options.autosizeProgress?parseInt(g*f/e,10):f;isNaN(i)&&(i=h),d.container.parent().length>0&&"body"===d.container.parent()[0].tagName.toLowerCase()&&(g=a(window).width(),i=a(window).height()),i&&g&&(d.container.width(g).height(i),d.$media.add(d.container.find(".mejs-shim")).width("100%").height("100%"),d.isVideo&&d.media.setVideoSize&&d.media.setVideoSize(g,i),d.layers.children(".mejs-layer").width("100%").height("100%"))}else d.container.width(d.width).height(d.height),d.layers.children(".mejs-layer").width(d.width).height(d.height);var j=d.layers.find(".mejs-overlay-play"),k=j.find(".mejs-overlay-button");j.height(d.container.height()-d.controls.height()),k.css("margin-top","-"+(k.height()/2-d.controls.height()/2).toString()+"px")},setControlsSize:function(){var b=this,c=0,d=0,e=b.controls.find(".mejs-time-rail"),f=b.controls.find(".mejs-time-total"),g=(b.controls.find(".mejs-time-current"),b.controls.find(".mejs-time-loaded"),e.siblings()),h=g.last(),i=null;if(b.container.is(":visible")&&e.length&&e.is(":visible")){b.options&&!b.options.autosizeProgress&&(d=parseInt(e.css("width"),10)),0!==d&&d||(g.each(function(){var b=a(this);"absolute"!=b.css("position")&&b.is(":visible")&&(c+=a(this).outerWidth(!0))}),d=b.controls.width()-c-(e.outerWidth(!0)-e.width()));do e.width(d),f.width(d-(f.outerWidth(!0)-f.width())),"absolute"!=h.css("position")&&(i=h.length?h.position():null,d--);while(null!==i&&i.top>0&&d>0);b.setProgressRail&&b.setProgressRail(),b.setCurrentRail&&b.setCurrentRail()}},buildposter:function(b,c,d,e){var f=this,g=a('
    ').appendTo(d),h=b.$media.attr("poster");""!==b.options.poster&&(h=b.options.poster),h?f.setPoster(h):g.hide(),e.addEventListener("play",function(){g.hide()},!1),b.options.showPosterWhenEnded&&b.options.autoRewind&&e.addEventListener("ended",function(){g.show()},!1)},setPoster:function(b){var c=this,d=c.container.find(".mejs-poster"),e=d.find("img");0===e.length&&(e=a('').appendTo(d)),e.attr("src",b),d.css({"background-image":"url("+b+")"})},buildoverlays:function(b,c,d,e){var f=this;if(b.isVideo){var g=a('
    ').hide().appendTo(d),h=a('
    ').hide().appendTo(d),i=a('
    ').appendTo(d).bind("click",function(){f.options.clickToPlayPause&&e.paused&&e.play()});e.addEventListener("play",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("playing",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("seeking",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("seeked",function(){g.hide(),c.find(".mejs-time-buffering").hide()},!1),e.addEventListener("pause",function(){mejs.MediaFeatures.isiPhone||i.show()},!1),e.addEventListener("waiting",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("loadeddata",function(){g.show(),c.find(".mejs-time-buffering").show(),mejs.MediaFeatures.isAndroid&&(e.canplayTimeout=window.setTimeout(function(){if(document.createEvent){var a=document.createEvent("HTMLEvents");return a.initEvent("canplay",!0,!0),e.dispatchEvent(a)}},300))},!1),e.addEventListener("canplay",function(){g.hide(),c.find(".mejs-time-buffering").hide(),clearTimeout(e.canplayTimeout)},!1),e.addEventListener("error",function(){g.hide(),c.find(".mejs-time-buffering").hide(),h.show(),h.find(".mejs-overlay-error").html("Error loading this resource")},!1),e.addEventListener("keydown",function(a){f.onkeydown(b,e,a)},!1)}},buildkeyboard:function(b,c,d,e){var f=this;f.container.keydown(function(){f.keyboardAction=!0}),f.globalBind("keydown",function(a){return f.onkeydown(b,e,a)}),f.globalBind("click",function(c){b.hasFocus=0!==a(c.target).closest(".mejs-container").length})},onkeydown:function(a,b,c){if(a.hasFocus&&a.options.enableKeyboard)for(var d=0,e=a.options.keyActions.length;e>d;d++)for(var f=a.options.keyActions[d],g=0,h=f.keys.length;h>g;g++)if(c.keyCode==f.keys[g])return"function"==typeof c.preventDefault&&c.preventDefault(),f.action(a,b,c.keyCode),!1;return!0},findTracks:function(){var b=this,c=b.$media.find("track");b.tracks=[],c.each(function(c,d){d=a(d),b.tracks.push({srclang:d.attr("srclang")?d.attr("srclang").toLowerCase():"",src:d.attr("src"),kind:d.attr("kind"),label:d.attr("label")||"",entries:[],isLoaded:!1})})},changeSkin:function(a){this.container[0].className="mejs-container "+a,this.setPlayerSize(this.width,this.height),this.setControlsSize()},play:function(){this.load(),this.media.play()},pause:function(){try{this.media.pause()}catch(a){}},load:function(){this.isLoaded||this.media.load(),this.isLoaded=!0},setMuted:function(a){this.media.setMuted(a)},setCurrentTime:function(a){this.media.setCurrentTime(a)},getCurrentTime:function(){return this.media.currentTime},setVolume:function(a){this.media.setVolume(a)},getVolume:function(){return this.media.volume},setSrc:function(a){this.media.setSrc(a)},remove:function(){var a,b,c=this;for(a in c.options.features)if(b=c.options.features[a],c["clean"+b])try{c["clean"+b](c)}catch(d){}c.isDynamic?c.$node.insertBefore(c.container):(c.$media.prop("controls",!0),c.$node.clone().insertBefore(c.container).show(),c.$node.remove()),"native"!==c.media.pluginType&&c.media.remove(),delete mejs.players[c.id],"object"==typeof c.container&&c.container.remove(),c.globalUnbind(),delete c.node.player},rebuildtracks:function(){var a=this;a.findTracks(),a.buildtracks(a,a.controls,a.layers,a.media)},resetSize:function(){var a=this;setTimeout(function(){a.setPlayerSize(a.width,a.height),a.setControlsSize()},50)}},function(){function b(b,d){var e={d:[],w:[]};return a.each((b||"").split(" "),function(a,b){var f=b+"."+d;0===f.indexOf(".")?(e.d.push(f),e.w.push(f)):e[c.test(b)?"w":"d"].push(f)}),e.d=e.d.join(" "),e.w=e.w.join(" "),e}var c=/^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;mejs.MediaElementPlayer.prototype.globalBind=function(c,d,e){var f=this;c=b(c,f.id),c.d&&a(document).bind(c.d,d,e),c.w&&a(window).bind(c.w,d,e)},mejs.MediaElementPlayer.prototype.globalUnbind=function(c,d){var e=this;c=b(c,e.id),c.d&&a(document).unbind(c.d,d),c.w&&a(window).unbind(c.w,d)}}(),"undefined"!=typeof a&&(a.fn.mediaelementplayer=function(b){return this.each(b===!1?function(){var b=a(this).data("mediaelementplayer");b&&b.remove(),a(this).removeData("mediaelementplayer")}:function(){a(this).data("mediaelementplayer",new mejs.MediaElementPlayer(this,b))}),this},a(document).ready(function(){a(".mejs-player").mediaelementplayer()})),window.MediaElementPlayer=mejs.MediaElementPlayer}(mejs.$),function(a){a.extend(mejs.MepDefaults,{playText:mejs.i18n.t("Play"),pauseText:mejs.i18n.t("Pause")}),a.extend(MediaElementPlayer.prototype,{buildplaypause:function(b,c,d,e){function f(a){"play"===a?(i.removeClass("mejs-play").addClass("mejs-pause"),j.attr({title:h.pauseText,"aria-label":h.pauseText})):(i.removeClass("mejs-pause").addClass("mejs-play"),j.attr({title:h.playText,"aria-label":h.playText}))}var g=this,h=g.options,i=a('
    ').appendTo(c).click(function(a){return a.preventDefault(),e.paused?e.play():e.pause(),!1}),j=i.find("button");f("pse"),e.addEventListener("play",function(){f("play")},!1),e.addEventListener("playing",function(){f("play")},!1),e.addEventListener("pause",function(){f("pse")},!1),e.addEventListener("paused",function(){f("pse")},!1)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{stopText:"Stop"}),a.extend(MediaElementPlayer.prototype,{buildstop:function(b,c,d,e){{var f=this;a('
    ').appendTo(c).click(function(){e.paused||e.pause(),e.currentTime>0&&(e.setCurrentTime(0),e.pause(),c.find(".mejs-time-current").width("0px"),c.find(".mejs-time-handle").css("left","0px"),c.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0)),c.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0)),d.find(".mejs-poster").show())})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{progessHelpText:mejs.i18n.t("Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.")}),a.extend(MediaElementPlayer.prototype,{buildprogress:function(b,c,d,e){a('
    00:00
    ').appendTo(c),c.find(".mejs-time-buffering").hide();var f=this,g=c.find(".mejs-time-total"),h=c.find(".mejs-time-loaded"),i=c.find(".mejs-time-current"),j=c.find(".mejs-time-handle"),k=c.find(".mejs-time-float"),l=c.find(".mejs-time-float-current"),m=c.find(".mejs-time-slider"),n=function(a){var b,c=g.offset(),d=g.outerWidth(!0),f=0,h=0,i=0;b=a.originalEvent.changedTouches?a.originalEvent.changedTouches[0].pageX:a.pageX,e.duration&&(bd+c.left&&(b=d+c.left),i=b-c.left,f=i/d,h=.02>=f?0:f*e.duration,o&&h!==e.currentTime&&e.setCurrentTime(h),mejs.MediaFeatures.hasTouch||(k.css("left",i),l.html(mejs.Utility.secondsToTimeCode(h)),k.show()))},o=!1,p=!1,q=0,r=!1,s=b.options.autoRewind,t=function(){var a=e.currentTime,b=mejs.i18n.t("Time Slider"),c=mejs.Utility.secondsToTimeCode(a),d=e.duration;m.attr({"aria-label":b,"aria-valuemin":0,"aria-valuemax":d,"aria-valuenow":a,"aria-valuetext":c,role:"slider",tabindex:0})},u=function(){var a=new Date;a-q>=1e3&&e.play()};m.bind("focus",function(){b.options.autoRewind=!1}),m.bind("blur",function(){b.options.autoRewind=s}),m.bind("keydown",function(a){new Date-q>=1e3&&(r=e.paused);var b=a.keyCode,c=e.duration,d=e.currentTime;switch(b){case 37:d-=1;break;case 39:d+=1;break;case 38:d+=Math.floor(.1*c);break;case 40:d-=Math.floor(.1*c);break;case 36:d=0;break;case 35:d=c;break;case 10:return void(e.paused?e.play():e.pause());case 13:return void(e.paused?e.play():e.pause());default:return}return d=0>d?0:d>=c?c:Math.floor(d),q=new Date,r||e.pause(),d0&&c.buffered.end&&c.duration?d=c.buffered.end(0)/c.duration:c&&void 0!==c.bytesTotal&&c.bytesTotal>0&&void 0!==c.bufferedBytes?d=c.bufferedBytes/c.bytesTotal:a&&a.lengthComputable&&0!==a.total&&(d=a.loaded/a.total),null!==d&&(d=Math.min(1,Math.max(0,d)),b.loaded&&b.total&&b.loaded.width(b.total.width()*d))},setCurrentRail:function(){var a=this;if(void 0!==a.media.currentTime&&a.media.duration&&a.total&&a.handle){var b=Math.round(a.total.width()*a.media.currentTime/a.media.duration),c=b-Math.round(a.handle.outerWidth(!0)/2);a.current.width(b),a.handle.css("left",c)}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:" | "}),a.extend(MediaElementPlayer.prototype,{buildcurrent:function(b,c,d,e){var f=this;a('
    '+(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00")+"
    ").appendTo(c),f.currenttime=f.controls.find(".mejs-currenttime"),e.addEventListener("timeupdate",function(){b.updateCurrent()},!1)},buildduration:function(b,c,d,e){var f=this;c.children().last().find(".mejs-currenttime").length>0?a(f.options.timeAndDurationSeparator+''+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(c.find(".mejs-time")):(c.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container"),a('
    '+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"
    ").appendTo(c)),f.durationD=f.controls.find(".mejs-duration"),e.addEventListener("timeupdate",function(){b.updateDuration()},!1)},updateCurrent:function(){var a=this;a.currenttime&&a.currenttime.html(mejs.Utility.secondsToTimeCode(a.media.currentTime,a.options.alwaysShowHours||a.media.duration>3600,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))},updateDuration:function(){var a=this;a.container.toggleClass("mejs-long-video",a.media.duration>3600),a.durationD&&(a.options.duration>0||a.media.duration)&&a.durationD.html(mejs.Utility.secondsToTimeCode(a.options.duration>0?a.options.duration:a.media.duration,a.options.alwaysShowHours,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),allyVolumeControlText:mejs.i18n.t("Use Up/Down Arrow keys to increase or decrease volume."),hideVolumeOnTouchDevices:!0,audioVolume:"horizontal",videoVolume:"vertical"}),a.extend(MediaElementPlayer.prototype,{buildvolume:function(b,c,d,e){if(!mejs.MediaFeatures.isAndroid&&!mejs.MediaFeatures.isiOS||!this.options.hideVolumeOnTouchDevices){var f=this,g=f.isVideo?f.options.videoVolume:f.options.audioVolume,h="horizontal"==g?a('
    '+f.options.allyVolumeControlText+'
    ').appendTo(c):a('
    '+f.options.allyVolumeControlText+'
    ').appendTo(c),i=f.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),j=f.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),k=f.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),l=f.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),m=function(a,b){if(!i.is(":visible")&&"undefined"==typeof b)return i.show(),m(a,!0),void i.hide();a=Math.max(0,a),a=Math.min(a,1),0===a?(h.removeClass("mejs-mute").addClass("mejs-unmute"),h.children("button").attr("title",mejs.i18n.t("Unmute")).attr("aria-label",mejs.i18n.t("Unmute"))):(h.removeClass("mejs-unmute").addClass("mejs-mute"),h.children("button").attr("title",mejs.i18n.t("Mute")).attr("aria-label",mejs.i18n.t("Mute")));var c=j.position();if("vertical"==g){var d=j.height(),e=d-d*a;l.css("top",Math.round(c.top+e-l.height()/2)),k.height(d-e),k.css("top",c.top+e)}else{var f=j.width(),n=f*a;l.css("left",Math.round(c.left+n-l.width()/2)),k.width(Math.round(n))}},n=function(a){var b=null,c=j.offset();if("vertical"===g){var d=j.height(),f=(parseInt(j.css("top").replace(/px/,""),10),a.pageY-c.top);if(b=(d-f)/d,0===c.top||0===c.left)return}else{var h=j.width(),i=a.pageX-c.left;b=i/h}b=Math.max(0,b),b=Math.min(b,1),m(b),e.setMuted(0===b?!0:!1),e.setVolume(b)},o=!1,p=!1;h.hover(function(){i.show(),p=!0},function(){p=!1,o||"vertical"!=g||i.hide()});var q=function(){var a=Math.floor(100*e.volume);i.attr({"aria-label":mejs.i18n.t("volumeSlider"),"aria-valuemin":0,"aria-valuemax":100,"aria-valuenow":a,"aria-valuetext":a+"%",role:"slider",tabindex:0})};i.bind("mouseover",function(){p=!0}).bind("mousedown",function(a){return n(a),f.globalBind("mousemove.vol",function(a){n(a)}),f.globalBind("mouseup.vol",function(){o=!1,f.globalUnbind(".vol"),p||"vertical"!=g||i.hide()}),o=!0,!1}).bind("keydown",function(a){var b=a.keyCode,c=e.volume;switch(b){case 38:c+=.1;break;case 40:c-=.1;break;default:return!0}return o=!1,m(c),e.setVolume(c),!1}).bind("blur",function(){i.hide()}),h.find("button").click(function(){e.setMuted(!e.muted)}),h.find("button").bind("focus",function(){i.show()}),e.addEventListener("volumechange",function(a){o||(e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))),q(a)},!1),f.container.is(":visible")&&(m(b.options.startVolume),0===b.options.startVolume&&e.setMuted(!0),"native"===e.pluginType&&e.setVolume(b.options.startVolume))}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{usePluginFullScreen:!0,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")}),a.extend(MediaElementPlayer.prototype,{isFullScreen:!1,isNativeFullScreen:!1,isInIframe:!1,buildfullscreen:function(b,c,d,e){if(b.isVideo){if(b.isInIframe=window.location!=window.parent.location,mejs.MediaFeatures.hasTrueNativeFullScreen){var f=function(){b.isFullScreen&&(mejs.MediaFeatures.isFullScreen()?(b.isNativeFullScreen=!0,b.setControlsSize()):(b.isNativeFullScreen=!1,b.exitFullScreen()))};b.globalBind(mejs.MediaFeatures.fullScreenEventName,f)}var g=this,h=(b.container,a('
    ').appendTo(c));if("native"===g.media.pluginType||!g.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)h.click(function(){var a=mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||b.isFullScreen;a?b.exitFullScreen():b.enterFullScreen()});else{var i=null,j=function(){var a,b=document.createElement("x"),c=document.documentElement,d=window.getComputedStyle;return"pointerEvents"in b.style?(b.style.pointerEvents="auto",b.style.pointerEvents="x",c.appendChild(b),a=d&&"auto"===d(b,"").pointerEvents,c.removeChild(b),!!a):!1}();if(j&&!mejs.MediaFeatures.isOpera){var k,l,m=!1,n=function(){if(m){for(var a in o)o[a].hide();h.css("pointer-events",""),g.controls.css("pointer-events",""),g.media.removeEventListener("click",g.clickToPlayPauseCallback),m=!1}},o={},p=["top","left","right","bottom"],q=function(){var a=h.offset().left-g.container.offset().left,b=h.offset().top-g.container.offset().top,c=h.outerWidth(!0),d=h.outerHeight(!0),e=g.container.width(),f=g.container.height();for(k in o)o[k].css({position:"absolute",top:0,left:0});o.top.width(e).height(b),o.left.width(a).height(d).css({top:b}),o.right.width(e-a-c).height(d).css({top:b,left:a+c}),o.bottom.width(e).height(f-d-b).css({top:b+d})};for(g.globalBind("resize",function(){q()}),k=0,l=p.length;l>k;k++)o[p[k]]=a('
    ').appendTo(g.container).mouseover(n).hide();h.on("mouseover",function(){if(!g.isFullScreen){var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!1),h.css("pointer-events","none"),g.controls.css("pointer-events","none"),g.media.addEventListener("click",g.clickToPlayPauseCallback);for(k in o)o[k].show(); +-q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1)}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i=null,j='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var k=0,l=f.options.speeds.length;l>k;k++)i=f.id+"-speed-"+f.options.speeds[k],j+='
      • ";j+="
    ",g=a(j).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),tracksAriaLive:!1,hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this,h=g.options.tracksAriaLive?'role="log" aria-live="assertive" aria-atomic="false"':"";if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var i=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c
    ').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); +\ Pas de fin de ligne à la fin du fichier ++q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1)}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i=null,j='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var k=0,l=f.options.speeds.length;l>k;k++)i=f.id+"-speed-"+f.options.speeds[k],j+='
      • ";j+="
    ",g=a(j).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),tracksAriaLive:!1,hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this,h=g.options.tracksAriaLive?'role="log" aria-live="assertive" aria-atomic="false"':"";if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var i=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); diff --git a/wordpress-4.2-noupdate.patch b/wordpress-4.3-noupdate.patch similarity index 56% rename from wordpress-4.2-noupdate.patch rename to wordpress-4.3-noupdate.patch index 2716f3f..b38f990 100644 --- a/wordpress-4.2-noupdate.patch +++ b/wordpress-4.3-noupdate.patch @@ -1,7 +1,18 @@ +diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.noupdate 2015-08-26 09:56:30.113424058 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2015-08-26 09:56:50.729529575 +0200 +@@ -101,7 +101,6 @@ add_action( 'profile_update', 'default_p + add_action( 'admin_init', 'wp_plugin_update_rows' ); + add_action( 'admin_init', 'wp_theme_update_rows' ); + +-add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'maintenance_nag', 10 ); + + add_filter( 'update_footer', 'core_update_footer' ); diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate 2015-04-03 02:18:27.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-04-24 10:33:31.166724612 +0200 -@@ -2142,6 +2142,9 @@ class Core_Upgrader extends WP_Upgrader +--- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate 2015-07-29 16:57:25.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-08-26 09:55:58.269261073 +0200 +@@ -2276,6 +2276,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -11,7 +22,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -2373,7 +2376,7 @@ class WP_Automatic_Updater { +@@ -2510,7 +2513,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -20,19 +31,19 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp return true; if ( defined( 'WP_INSTALLING' ) ) -diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.noupdate 2015-04-24 10:37:28.288734495 +0200 -+++ wordpress/wp-admin/includes/update.php 2015-04-24 10:37:46.985814124 +0200 -@@ -211,8 +211,6 @@ function update_nag() { - } - echo "
    $msg
    "; - } --add_action( 'admin_notices', 'update_nag', 3 ); --add_action( 'network_admin_notices', 'update_nag', 3 ); +diff -up wordpress/wp-admin/includes/ms-admin-filters.php.noupdate wordpress/wp-admin/includes/ms-admin-filters.php +--- wordpress/wp-admin/includes/ms-admin-filters.php.noupdate 2015-08-26 09:57:03.337594106 +0200 ++++ wordpress/wp-admin/includes/ms-admin-filters.php 2015-08-26 09:57:09.398625127 +0200 +@@ -38,5 +38,4 @@ add_action( 'admin_notices', 'si + add_action( 'network_admin_notices', 'site_admin_notice' ); - // Called directly from dashboard - function update_right_now_message() { -@@ -227,7 +225,7 @@ function update_right_now_message() { + // Update Hooks +-add_action( 'network_admin_notices', 'update_nag', 3 ); + add_action( 'network_admin_notices', 'maintenance_nag', 10 ); +diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.noupdate 2015-07-07 02:02:24.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2015-08-26 09:56:00.298271458 +0200 +@@ -251,7 +251,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && $cur->response == 'upgrade' ) @@ -42,9 +53,9 @@ diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/incl $msg .= sprintf( '' . __( 'WordPress %1$s running %2$s theme.' ) . '', get_bloginfo( 'version', 'display' ), $theme_name ); diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.noupdate 2015-04-20 09:27:27.000000000 +0200 -+++ wordpress/wp-includes/capabilities.php 2015-04-24 10:33:31.167724617 +0200 -@@ -1281,7 +1281,7 @@ function map_meta_cap( $cap, $user_id ) +--- wordpress/wp-includes/capabilities.php.noupdate 2015-08-14 00:31:24.000000000 +0200 ++++ wordpress/wp-includes/capabilities.php 2015-08-26 09:56:00.299271463 +0200 +@@ -1337,7 +1337,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -53,7 +64,7 @@ diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/c $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -1299,7 +1299,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -1355,7 +1355,7 @@ function map_meta_cap( $cap, $user_id ) case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. @@ -63,9 +74,9 @@ diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/c } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { $caps[] = 'do_not_allow'; diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.noupdate 2015-03-18 23:07:28.000000000 +0100 -+++ wordpress/wp-includes/update.php 2015-04-24 10:33:31.167724617 +0200 -@@ -624,9 +624,6 @@ function _maybe_update_themes() { +--- wordpress/wp-includes/update.php.noupdate 2015-05-28 17:29:28.000000000 +0200 ++++ wordpress/wp-includes/update.php 2015-08-26 09:56:00.299271463 +0200 +@@ -636,9 +636,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -75,7 +86,7 @@ diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update. if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -668,8 +665,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -680,8 +677,6 @@ if ( ( ! is_main_site() && ! is_network_ } add_action( 'admin_init', '_maybe_update_core' ); diff --git a/wordpress.spec b/wordpress.spec index dfbe792..ecfe5b2 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -23,7 +23,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.2.4 +Version: 4.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -48,7 +48,7 @@ Patch3: wordpress-4.0-tinymce_noflash.patch # Adjust mediaelement not to use its SWF and Silverlight plugins. This # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' -Patch4: wordpress-4.2-mediaelement-noflash_silverlight.patch +Patch4: wordpress-4.3-mediaelement-noflash_silverlight.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -57,7 +57,7 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.2-noupdate.patch +Patch6: wordpress-4.3-noupdate.patch # Use system libraries Patch7: wordpress-4.0-systemlibs.patch @@ -152,7 +152,7 @@ rm wp-content/plugins/akismet/.htaccess #patch1 -p1 -b .rhbz522897 %patch2 -p1 %patch3 -p1 -%patch4 -p1 +%patch4 -p0 %if %{with_getid3} %patch7 -p1 %endif @@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Aug 26 2015 Remi Collet - 4.3-1 +- WordPress 4.3 “Billie” + * Tue Aug 4 2015 Remi Collet - 4.2.4-1 - WordPress 4.2.4 Security and Maintenance Release From 2edf6e9b3d117153a6e253ed951f84263d95bad0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Sep 2015 08:00:47 +0200 Subject: [PATCH 034/184] WordPress 4.3.1 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f9983d..3dc38ba 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /wordpress-4.2.3.tar.gz /wordpress-4.2.4.tar.gz /wordpress-4.3.tar.gz +/wordpress-4.3.1.tar.gz diff --git a/sources b/sources index 844ec92..a758c07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b11dcf18e512e44de5c48415eac9ae00 wordpress-4.3.tar.gz +de8004fa1035817435eaa780a681aaff wordpress-4.3.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index ecfe5b2..35a61bd 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -23,7 +23,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.3 +Version: 4.3.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Sep 16 2015 Remi Collet - 4.3.1-1 +- WordPress 4.3.1 Security and Maintenance Release + * Wed Aug 26 2015 Remi Collet - 4.3-1 - WordPress 4.3 “Billie” From 5b3b5187e78341efaca100e3adfb6538ea6dd239 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Dec 2015 17:24:26 +0100 Subject: [PATCH 035/184] =?UTF-8?q?WordPress=204.4=20=E2=80=9CClifford?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress-4.0-config.patch | 4 +- wordpress-4.0-systemlibs.patch | 21 ---- wordpress-4.0-tinymce_noflash.patch | 4 +- ...4.3-mediaelement-noflash_silverlight.patch | 17 ---- wordpress-4.3-noupdate.patch | 97 ------------------- ....patch => wordpress-4.4-no_swfupload.patch | 9 +- wordpress-4.4-noupdate.patch | 88 +++++++++++++++++ wordpress-4.4-systemlibs.patch | 20 ++++ wordpress.spec | 20 ++-- 11 files changed, 129 insertions(+), 154 deletions(-) delete mode 100644 wordpress-4.0-systemlibs.patch delete mode 100644 wordpress-4.3-mediaelement-noflash_silverlight.patch delete mode 100644 wordpress-4.3-noupdate.patch rename wordpress-4.2-no_swfupload.patch => wordpress-4.4-no_swfupload.patch (81%) create mode 100644 wordpress-4.4-noupdate.patch create mode 100644 wordpress-4.4-systemlibs.patch diff --git a/.gitignore b/.gitignore index 3dc38ba..3b66a60 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /wordpress-4.2.4.tar.gz /wordpress-4.3.tar.gz /wordpress-4.3.1.tar.gz +/wordpress-4.4.tar.gz diff --git a/sources b/sources index a758c07..ad8907e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de8004fa1035817435eaa780a681aaff wordpress-4.3.1.tar.gz +9b965ba1a1b0e033b4c090dd0b6d6ee7 wordpress-4.4.tar.gz diff --git a/wordpress-4.0-config.patch b/wordpress-4.0-config.patch index c2579b2..0505de0 100644 --- a/wordpress-4.0-config.patch +++ b/wordpress-4.0-config.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php --- wordpress/wp-config.php.orig 2014-09-08 13:12:36.525908423 +0200 +++ wordpress/wp-config.php 2014-09-08 13:14:33.583402525 +0200 -@@ -62,6 +62,19 @@ define('NONCE_SALT', 'put your uni +@@ -66,6 +66,19 @@ define('NONCE_SALT', 'put your uni $table_prefix = 'wp_'; /** @@ -21,7 +21,7 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php * For developers: WordPress debugging mode. * * Change this to true to enable the display of notices during development. -@@ -74,7 +87,7 @@ define('WP_DEBUG', false); +@@ -83,7 +96,7 @@ define('WP_DEBUG', false); /** Absolute path to the WordPress directory. */ if ( !defined('ABSPATH') ) diff --git a/wordpress-4.0-systemlibs.patch b/wordpress-4.0-systemlibs.patch deleted file mode 100644 index 9d16ee6..0000000 --- a/wordpress-4.0-systemlibs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up wordpress/wp-admin/includes/media.php.old wordpress/wp-admin/includes/media.php ---- wordpress/wp-admin/includes/media.php.old 2014-09-30 08:54:21.666519693 +0200 -+++ wordpress/wp-admin/includes/media.php 2014-09-30 08:55:11.247757421 +0200 -@@ -2907,7 +2907,7 @@ function wp_read_video_metadata( $file ) - $metadata = array(); - - if ( ! class_exists( 'getID3' ) ) -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - $id3 = new getID3(); - $data = $id3->analyze( $file ); - -@@ -2962,7 +2962,7 @@ function wp_read_audio_metadata( $file ) - $metadata = array(); - - if ( ! class_exists( 'getID3' ) ) -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - $id3 = new getID3(); - $data = $id3->analyze( $file ); - diff --git a/wordpress-4.0-tinymce_noflash.patch b/wordpress-4.0-tinymce_noflash.patch index 605df1c..217e7f9 100644 --- a/wordpress-4.0-tinymce_noflash.patch +++ b/wordpress-4.0-tinymce_noflash.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm wordpress/wp-includes/js/tinymce/plugins/media/plugin.js --- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm 2014-08-22 01:53:18.000000000 +0200 +++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-09-08 13:10:15.717314458 +0200 -@@ -44,10 +44,6 @@ tinymce.PluginManager.add('media', funct +@@ -46,10 +46,6 @@ tinymce.PluginManager.add('media', funct return 'video/ogg'; } @@ -12,7 +12,7 @@ diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm wordpress/ return ''; } -@@ -239,7 +235,7 @@ tinymce.PluginManager.add('media', funct +@@ -247,7 +243,7 @@ tinymce.PluginManager.add('media', funct data.source1mime = guessMime(data.source1); data.source2mime = guessMime(data.source2); data.poster = editor.convertURL(data.poster, "poster"); diff --git a/wordpress-4.3-mediaelement-noflash_silverlight.patch b/wordpress-4.3-mediaelement-noflash_silverlight.patch deleted file mode 100644 index b5165e8..0000000 --- a/wordpress-4.3-mediaelement-noflash_silverlight.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig wp-includes/js/mediaelement/mediaelement-and-player.min.js ---- wp-includes/js/mediaelement/mediaelement-and-player.min.js.orig 2015-08-26 09:38:35.867925862 +0200 -+++ wp-includes/js/mediaelement/mediaelement-and-player.min.js 2015-08-26 09:44:23.037702744 +0200 -@@ -12,7 +12,7 @@ - * License: MIT - * - */ --function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.17.0",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","video/dailymotion","video/x-dailymotion","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! -+function onYouTubePlayerAPIReady(){mejs.YouTubeApi.iFrameReady()}function onYouTubePlayerReady(a){mejs.YouTubeApi.flashReady(a)}var mejs=mejs||{};mejs.version="2.17.0",mejs.meIndex=0,mejs.plugins={silverlight:[{version:[3,0],types:["video/mp4","video/m4v","video/mov","video/wmv","audio/wma","audio/m4a","audio/mp3","audio/wav","audio/mpeg"]}],flash:[{version:[9,0,124],types:["video/mp4","video/m4v","video/mov","video/flv","video/rtmp","video/x-flv","audio/flv","audio/x-flv","audio/mp3","audio/m4a","audio/mpeg","video/youtube","video/x-youtube","video/dailymotion","video/x-dailymotion","application/x-mpegURL"]}],youtube:[{version:null,types:["video/youtube","video/x-youtube","audio/youtube","audio/x-youtube"]}],vimeo:[{version:null,types:["video/vimeo","video/x-vimeo"]}]},mejs.Utility={encodeUrl:function(a){return encodeURIComponent(a)},escapeHTML:function(a){return a.toString().split("&").join("&").split("<").join("<").split('"').join(""")},absolutizeUrl:function(a){var b=document.createElement("div");return b.innerHTML='x',b.firstChild.href},getScriptPath:function(a){for(var b,c,d,e,f,g,h=0,i="",j="",k=document.getElementsByTagName("script"),l=k.length,m=a.length;l>h;h++){for(e=k[h].src,c=e.lastIndexOf("/"),c>-1?(g=e.substring(c+1),f=e.substring(0,c+1)):(g=e,f=""),b=0;m>b;b++)if(j=a[b],d=g.indexOf(j),d>-1){i=f;break}if(""!==i)break}return i},secondsToTimeCode:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=Math.floor(a/3600)%24,f=Math.floor(a/60)%60,g=Math.floor(a%60),h=Math.floor((a%1*d).toFixed(3)),i=(b||e>0?(10>e?"0"+e:e)+":":"")+(10>f?"0"+f:f)+":"+(10>g?"0"+g:g)+(c?":"+(10>h?"0"+h:h):"");return i},timeCodeToSeconds:function(a,b,c,d){"undefined"==typeof c?c=!1:"undefined"==typeof d&&(d=25);var e=a.split(":"),f=parseInt(e[0],10),g=parseInt(e[1],10),h=parseInt(e[2],10),i=0,j=0;return c&&(i=parseInt(e[3])/d),j=3600*f+60*g+h+i},convertSMPTEtoSeconds:function(a){if("string"!=typeof a)return!1;a=a.replace(",",".");var b=0,c=-1!=a.indexOf(".")?a.split(".")[1].length:0,d=1;a=a.split(":").reverse();for(var e=0;e0&&(d=Math.pow(60,e)),b+=Number(a[e])*d;return Number(b.toFixed(c))},removeSwf:function(a){var b=document.getElementById(a);b&&/object|embed/i.test(b.nodeName)&&(mejs.MediaFeatures.isIE?(b.style.display="none",function(){4==b.readyState?mejs.Utility.removeObjectInIE(a):setTimeout(arguments.callee,10)}()):b.parentNode.removeChild(b))},removeObjectInIE:function(a){var b=document.getElementById(a);if(b){for(var c in b)"function"==typeof b[c]&&(b[c]=null);b.parentNode.removeChild(b)}}},mejs.PluginDetector={hasPluginVersion:function(a,b){var c=this.plugins[a];return b[1]=b[1]||0,b[2]=b[2]||0,c[0]>b[0]||c[0]==b[0]&&c[1]>b[1]||c[0]==b[0]&&c[1]==b[1]&&c[2]>=b[2]?!0:!1},nav:window.navigator,ua:window.navigator.userAgent.toLowerCase(),plugins:[],addPlugin:function(a,b,c,d,e){this.plugins[a]=this.detectPlugin(b,c,d,e)},detectPlugin:function(a,b,c,d){var e,f,g,h=[0,0,0];if("undefined"!=typeof this.nav.plugins&&"object"==typeof this.nav.plugins[a]){if(e=this.nav.plugins[a].description,e&&("undefined"==typeof this.nav.mimeTypes||!this.nav.mimeTypes[b]||this.nav.mimeTypes[b].enabledPlugin))for(h=e.replace(a,"").replace(/^\s+/,"").replace(/\sr/gi,".").split("."),f=0;f0;)this.removeChild(b[0]);if("string"==typeof a)this.src=a;else{var c,d;for(c=0;c0&&null!==q[0].url&&this.getTypeFromFile(q[0].url).indexOf("audio")>-1&&(r.isVideo=!1),mejs.MediaFeatures.isBustedAndroid&&(a.canPlayType=function(a){return null!==a.match(/video\/(mp4|m4v)/gi)?"maybe":""}),!(!c||"auto"!==b.mode&&"auto_plugin"!==b.mode&&"native"!==b.mode||mejs.MediaFeatures.isBustedNativeHTTPS&&b.httpsBasicAuthSite===!0)){for(d||(o=document.createElement(r.isVideo?"video":"audio"),a.parentNode.insertBefore(o,a),a.style.display="none",r.htmlMediaElement=a=o),f=0;f0&&(r.url=q[0].url),r)},formatType:function(a,b){return a&&!b?this.getTypeFromFile(a):b&&~b.indexOf(";")?b.substr(0,b.indexOf(";")):b},getTypeFromFile:function(a){a=a.split("?")[0];var b=a.substring(a.lastIndexOf(".")+1).toLowerCase();return(/(mp4|m4v|ogg|ogv|m3u8|webm|webmv|flv|wmv|mpeg|mov)/gi.test(b)?"video":"audio")+"/"+this.getTypeFromExtension(b)},getTypeFromExtension:function(a){switch(a){case"mp4":case"m4v":case"m4a":return"mp4";case"webm":case"webma":case"webmv":return"webm";case"ogg":case"oga":case"ogv":return"ogg";default:return a}},createErrorMessage:function(a,b,c){var d=a.htmlMediaElement,e=document.createElement("div");e.className="me-cannotplay";try{e.style.width=d.width+"px",e.style.height=d.height+"px"}catch(f){}e.innerHTML=b.customError?b.customError:""!==c?'':''+mejs.i18n.t("Download File")+"",d.parentNode.insertBefore(e,d),d.style.display="none",b.error(d)},createPlugin:function(a,b,c,d,e,f){var g,h,i,j=a.htmlMediaElement,k=1,l=1,m="me_"+a.method+"_"+mejs.meIndex++,n=new mejs.PluginMediaElement(m,a.method,a.url),o=document.createElement("div");n.tagName=j.tagName;for(var p=0;p0?b.pluginWidth:b.videoWidth>0?b.videoWidth:null!==j.getAttribute("width")?j.getAttribute("width"):b.defaultVideoWidth,l=b.pluginHeight>0?b.pluginHeight:b.videoHeight>0?b.videoHeight:null!==j.getAttribute("height")?j.getAttribute("height"):b.defaultVideoHeight,k=mejs.Utility.encodeUrl(k),l=mejs.Utility.encodeUrl(l)):b.enablePluginDebug&&(k=320,l=240),n.success=b.success,mejs.MediaPluginBridge.registerPluginElement(m,n,j),o.className="me-plugin",o.id=m+"_container",a.isVideo?j.parentNode.insertBefore(o,j):document.body.insertBefore(o,document.body.childNodes[0]),i=["id="+m,"jsinitfunction=mejs.MediaPluginBridge.initPlugin","jscallbackfunction=mejs.MediaPluginBridge.fireEvent","isvideo="+(a.isVideo?"true":"false"),"autoplay="+(d?"true":"false"),"preload="+e,"width="+k,"startvolume="+b.startVolume,"timerrate="+b.timerRate,"flashstreamer="+b.flashStreamer,"height="+l,"pseudostreamstart="+b.pseudoStreamingStartQueryParam],null!==a.url&&i.push("flash"==a.method?"file="+mejs.Utility.encodeUrl(a.url):"file="+a.url),b.enablePluginDebug&&i.push("debug=true"),b.enablePluginSmoothing&&i.push("smoothing=true"),b.enablePseudoStreaming&&i.push("pseudostreaming=true"),f&&i.push("controls=true"),b.pluginVars&&(i=i.concat(b.pluginVars)),a.method){case"silverlight":o.innerHTML='';break;case"flash":mejs.MediaFeatures.isIE?(g=document.createElement("div"),o.appendChild(g),g.outerHTML=''):o.innerHTML='';break;case"youtube":var r;-1!=a.url.lastIndexOf("youtu.be")?(r=a.url.substr(a.url.lastIndexOf("/")+1),-1!=r.indexOf("?")&&(r=r.substr(0,r.indexOf("?")))):r=a.url.substr(a.url.lastIndexOf("=")+1),youtubeSettings={container:o,containerId:o.id,pluginMediaElement:n,pluginId:m,videoId:r,height:l,width:k},mejs.PluginDetector.hasPluginVersion("flash",[10,0,0])?mejs.YouTubeApi.createFlash(youtubeSettings):mejs.YouTubeApi.enqueueIframe(youtubeSettings);break;case"vimeo":var s=m+"_player";if(n.vimeoid=a.url.substr(a.url.lastIndexOf("/")+1),o.innerHTML='',"function"==typeof $f){var t=$f(o.childNodes[0]);t.addEvent("ready",function(){function a(a,b,c,d){var e={type:c,target:b};"timeupdate"==c&&(b.currentTime=e.currentTime=d.seconds,b.duration=e.duration=d.duration),b.dispatchEvent(e.type,e)}t.playVideo=function(){t.api("play")},t.stopVideo=function(){t.api("unload")},t.pauseVideo=function(){t.api("pause")},t.seekTo=function(a){t.api("seekTo",a)},t.setVolume=function(a){t.api("setVolume",a)},t.setMuted=function(a){a?(t.lastVolume=t.api("getVolume"),t.api("setVolume",0)):(t.api("setVolume",t.lastVolume),delete t.lastVolume)},t.addEvent("play",function(){a(t,n,"play"),a(t,n,"playing")}),t.addEvent("pause",function(){a(t,n,"pause")}),t.addEvent("finish",function(){a(t,n,"ended")}),t.addEvent("playProgress",function(b){a(t,n,"timeupdate",b)}),n.pluginElement=o,n.pluginApi=t,mejs.MediaPluginBridge.initPlugin(m)})}else console.warn("You need to include froogaloop for vimeo to work")}return j.style.display="none",j.removeAttribute("autoplay"),n},updateNative:function(a,b){var c,d=a.htmlMediaElement;for(c in mejs.HtmlMediaElement)d[c]=mejs.HtmlMediaElement[c];return b.success(d,d),d}},mejs.YouTubeApi={isIframeStarted:!1,isIframeLoaded:!1,loadIframeApi:function(){if(!this.isIframeStarted){var a=document.createElement("script");a.src="//www.youtube.com/player_api";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b),this.isIframeStarted=!0}},iframeQueue:[],enqueueIframe:function(a){this.isLoaded?this.createIframe(a):(this.loadIframeApi(),this.iframeQueue.push(a))},createIframe:function(a){var b=a.pluginMediaElement,c=new YT.Player(a.containerId,{height:a.height,width:a.width,videoId:a.videoId,playerVars:{controls:0},events:{onReady:function(){a.pluginMediaElement.pluginApi=c,mejs.MediaPluginBridge.initPlugin(a.pluginId),setInterval(function(){mejs.YouTubeApi.createEvent(c,b,"timeupdate")},250)},onStateChange:function(a){mejs.YouTubeApi.handleStateChange(a.data,c,b)}}})},createEvent:function(a,b,c){var d={type:c,target:b};if(a&&a.getDuration){b.currentTime=d.currentTime=a.getCurrentTime(),b.duration=d.duration=a.getDuration(),d.paused=b.paused,d.ended=b.ended,d.muted=a.isMuted(),d.volume=a.getVolume()/100,d.bytesTotal=a.getVideoBytesTotal(),d.bufferedBytes=a.getVideoBytesLoaded();var e=d.bufferedBytes/d.bytesTotal*d.duration;d.target.buffered=d.buffered={start:function(){return 0},end:function(){return e},length:1}}b.dispatchEvent(d.type,d)},iFrameReady:function(){for(this.isLoaded=!0,this.isIframeLoaded=!0;this.iframeQueue.length>0;){var a=this.iframeQueue.pop();this.createIframe(a)}},flashPlayers:{},createFlash:function(a){this.flashPlayers[a.pluginId]=a;var b,c="//www.youtube.com/apiplayer?enablejsapi=1&playerapiid="+a.pluginId+"&version=3&autoplay=0&controls=0&modestbranding=1&loop=0";mejs.MediaFeatures.isIE?(b=document.createElement("div"),a.container.appendChild(b),b.outerHTML=''):a.container.innerHTML=''},flashReady:function(a){var b=this.flashPlayers[a],c=document.getElementById(a),d=b.pluginMediaElement;d.pluginApi=d.pluginElement=c,mejs.MediaPluginBridge.initPlugin(a),c.cueVideoById(b.videoId);var e=b.containerId+"_callback";window[e]=function(a){mejs.YouTubeApi.handleStateChange(a,c,d)},c.addEventListener("onStateChange",e),setInterval(function(){mejs.YouTubeApi.createEvent(c,d,"timeupdate")},250),mejs.YouTubeApi.createEvent(c,d,"canplay")},handleStateChange:function(a,b,c){switch(a){case-1:c.paused=!0,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"loadedmetadata");break;case 0:c.paused=!1,c.ended=!0,mejs.YouTubeApi.createEvent(b,c,"ended");break;case 1:c.paused=!1,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"play"),mejs.YouTubeApi.createEvent(b,c,"playing");break;case 2:c.paused=!0,c.ended=!1,mejs.YouTubeApi.createEvent(b,c,"pause");break;case 3:mejs.YouTubeApi.createEvent(b,c,"progress");break;case 5:}}},window.mejs=mejs,window.MediaElement=mejs.MediaElement,function(a,b){"use strict";var c={locale:{language:b.i18n&&b.i18n.locale.language||"",strings:b.i18n&&b.i18n.locale.strings||{}},ietf_lang_regex:/^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/,methods:{}};c.getLanguage=function(){var a=c.locale.language||window.navigator.userLanguage||window.navigator.language;return c.ietf_lang_regex.exec(a)?a:null},"undefined"!=typeof mejsL10n&&(c.locale.language=mejsL10n.language),c.methods.checkPlain=function(a){var b,c,d={"&":"&",'"':""","<":"<",">":">"};a=String(a);for(b in d)d.hasOwnProperty(b)&&(c=new RegExp(b,"g"),a=a.replace(c,d[b]));return a},c.methods.t=function(a,b){return c.locale.strings&&c.locale.strings[b.context]&&c.locale.strings[b.context][a]&&(a=c.locale.strings[b.context][a]),c.methods.checkPlain(a)},c.t=function(a,b){if("string"==typeof a&&a.length>0){var d=c.getLanguage();return b=b||{context:d},c.methods.t(a,b)}throw{name:"InvalidArgumentException",message:"First argument is either not a string or empty."}},b.i18n=c}(document,mejs),function(a){"use strict";"undefined"!=typeof mejsL10n&&(a[mejsL10n.language]=mejsL10n.strings)}(mejs.i18n.locale.strings),/*! - * - * MediaElementPlayer - * http://mediaelementjs.com/ - */ - "undefined"!=typeof jQuery?mejs.$=jQuery:"undefined"!=typeof ender&&(mejs.$=ender),function(a){mejs.MepDefaults={poster:"",showPosterWhenEnded:!1,defaultVideoWidth:480,defaultVideoHeight:270,videoWidth:-1,videoHeight:-1,defaultAudioWidth:400,defaultAudioHeight:30,defaultSeekBackwardInterval:function(a){return.05*a.duration},defaultSeekForwardInterval:function(a){return.05*a.duration},setDimensions:!0,audioWidth:-1,audioHeight:-1,startVolume:.8,loop:!1,autoRewind:!0,enableAutosize:!0,alwaysShowHours:!1,showTimecodeFrameCount:!1,framesPerSecond:25,autosizeProgress:!0,alwaysShowControls:!1,hideVideoControlsOnLoad:!1,clickToPlayPause:!0,iPadUseNativeControls:!1,iPhoneUseNativeControls:!1,AndroidUseNativeControls:!1,features:["playpause","current","progress","duration","tracks","volume","fullscreen"],isVideo:!0,enableKeyboard:!0,pauseOtherPlayers:!0,keyActions:[{keys:[32,179],action:function(a,b){b.paused||b.ended?a.play():a.pause()}},{keys:[38],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.volume+.1,1);b.setVolume(c)}},{keys:[40],action:function(a,b){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.volume-.1,0);b.setVolume(c)}},{keys:[37,227],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.max(b.currentTime-a.options.defaultSeekBackwardInterval(b),0);b.setCurrentTime(c)}}},{keys:[39,228],action:function(a,b){if(!isNaN(b.duration)&&b.duration>0){a.isVideo&&(a.showControls(),a.startControlsTimer());var c=Math.min(b.currentTime+a.options.defaultSeekForwardInterval(b),b.duration);b.setCurrentTime(c)}}},{keys:[70],action:function(a){"undefined"!=typeof a.enterFullScreen&&(a.isFullScreen?a.exitFullScreen():a.enterFullScreen())}},{keys:[77],action:function(a){a.container.find(".mejs-volume-slider").css("display","block"),a.isVideo&&(a.showControls(),a.startControlsTimer()),a.setMuted(a.media.muted?!1:!0)}}]},mejs.mepIndex=0,mejs.players={},mejs.MediaElementPlayer=function(b,c){if(!(this instanceof mejs.MediaElementPlayer))return new mejs.MediaElementPlayer(b,c);var d=this;return d.$media=d.$node=a(b),d.node=d.media=d.$media[0],d.node?"undefined"!=typeof d.node.player?d.node.player:(d.node.player=d,"undefined"==typeof c&&(c=d.$node.data("mejsoptions")),d.options=a.extend({},mejs.MepDefaults,c),d.id="mep_"+mejs.mepIndex++,mejs.players[d.id]=d,d.init(),d):void 0},mejs.MediaElementPlayer.prototype={hasFocus:!1,controlsAreVisible:!0,init:function(){var b=this,c=mejs.MediaFeatures,d=a.extend(!0,{},b.options,{success:function(a,c){b.meReady(a,c)},error:function(a){b.handleError(a)}}),e=b.media.tagName.toLowerCase();if(b.isDynamic="audio"!==e&&"video"!==e,b.isVideo=b.isDynamic?b.options.isVideo:"audio"!==e&&b.options.isVideo,c.isiPad&&b.options.iPadUseNativeControls||c.isiPhone&&b.options.iPhoneUseNativeControls)b.$media.attr("controls","controls"),c.isiPad&&null!==b.media.getAttribute("autoplay")&&b.play();else if(c.isAndroid&&b.options.AndroidUseNativeControls);else{b.$media.removeAttr("controls");var f=mejs.i18n.t(b.isVideo?"Video Player":"Audio Player");if(a(''+f+"").insertBefore(b.$media),b.container=a('
    ').addClass(b.$media[0].className).insertBefore(b.$media).focus(function(){if(!b.controlsAreVisible){b.showControls(!0);var a=b.container.find(".mejs-playpause-button > button");a.focus()}}),b.container.addClass((c.isAndroid?"mejs-android ":"")+(c.isiOS?"mejs-ios ":"")+(c.isiPad?"mejs-ipad ":"")+(c.isiPhone?"mejs-iphone ":"")+(b.isVideo?"mejs-video ":"mejs-audio ")),c.isiOS){var g=b.$media.clone();b.container.find(".mejs-mediaelement").append(g),b.$media.remove(),b.$node=b.$media=g,b.node=b.media=g[0]}else b.container.find(".mejs-mediaelement").append(b.$media);b.controls=b.container.find(".mejs-controls"),b.layers=b.container.find(".mejs-layers");var h=b.isVideo?"video":"audio",i=h.substring(0,1).toUpperCase()+h.substring(1);b.width=b.options[h+"Width"]>0||b.options[h+"Width"].toString().indexOf("%")>-1?b.options[h+"Width"]:""!==b.media.style.width&&null!==b.media.style.width?b.media.style.width:null!==b.media.getAttribute("width")?b.$media.attr("width"):b.options["default"+i+"Width"],b.height=b.options[h+"Height"]>0||b.options[h+"Height"].toString().indexOf("%")>-1?b.options[h+"Height"]:""!==b.media.style.height&&null!==b.media.style.height?b.media.style.height:null!==b.$media[0].getAttribute("height")?b.$media.attr("height"):b.options["default"+i+"Height"],b.setPlayerSize(b.width,b.height),d.pluginWidth=b.width,d.pluginHeight=b.height}mejs.MediaElement(b.$media[0],d),"undefined"!=typeof b.container&&b.controlsAreVisible&&b.container.trigger("controlsshown")},showControls:function(a){var b=this;a="undefined"==typeof a||a,b.controlsAreVisible||(a?(b.controls.css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0,b.container.trigger("controlsshown")}),b.container.find(".mejs-control").css("visibility","visible").stop(!0,!0).fadeIn(200,function(){b.controlsAreVisible=!0})):(b.controls.css("visibility","visible").css("display","block"),b.container.find(".mejs-control").css("visibility","visible").css("display","block"),b.controlsAreVisible=!0,b.container.trigger("controlsshown")),b.setControlsSize())},hideControls:function(b){var c=this;b="undefined"==typeof b||b,!c.controlsAreVisible||c.options.alwaysShowControls||c.keyboardAction||(b?(c.controls.stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")}),c.container.find(".mejs-control").stop(!0,!0).fadeOut(200,function(){a(this).css("visibility","hidden").css("display","block")})):(c.controls.css("visibility","hidden").css("display","block"),c.container.find(".mejs-control").css("visibility","hidden").css("display","block"),c.controlsAreVisible=!1,c.container.trigger("controlshidden")))},controlsTimer:null,startControlsTimer:function(a){var b=this;a="undefined"!=typeof a?a:1500,b.killControlsTimer("start"),b.controlsTimer=setTimeout(function(){b.hideControls(),b.killControlsTimer("hide")},a)},killControlsTimer:function(){var a=this;null!==a.controlsTimer&&(clearTimeout(a.controlsTimer),delete a.controlsTimer,a.controlsTimer=null)},controlsEnabled:!0,disableControls:function(){var a=this;a.killControlsTimer(),a.hideControls(!1),this.controlsEnabled=!1},enableControls:function(){var a=this;a.showControls(!1),a.controlsEnabled=!0},meReady:function(b,c){var d,e,f=this,g=mejs.MediaFeatures,h=c.getAttribute("autoplay"),i=!("undefined"==typeof h||null===h||"false"===h);if(!f.created){if(f.created=!0,f.media=b,f.domNode=c,!(g.isAndroid&&f.options.AndroidUseNativeControls||g.isiPad&&f.options.iPadUseNativeControls||g.isiPhone&&f.options.iPhoneUseNativeControls)){f.buildposter(f,f.controls,f.layers,f.media),f.buildkeyboard(f,f.controls,f.layers,f.media),f.buildoverlays(f,f.controls,f.layers,f.media),f.findTracks();for(d in f.options.features)if(e=f.options.features[d],f["build"+e])try{f["build"+e](f,f.controls,f.layers,f.media)}catch(j){}f.container.trigger("controlsready"),f.setPlayerSize(f.width,f.height),f.setControlsSize(),f.isVideo&&(mejs.MediaFeatures.hasTouch?f.$media.bind("touchstart",function(){f.controlsAreVisible?f.hideControls(!1):f.controlsEnabled&&f.showControls(!1)}):(f.clickToPlayPauseCallback=function(){f.options.clickToPlayPause&&(f.media.paused?f.play():f.pause())},f.media.addEventListener("click",f.clickToPlayPauseCallback,!1),f.container.bind("mouseenter mouseover",function(){f.controlsEnabled&&(f.options.alwaysShowControls||(f.killControlsTimer("enter"),f.showControls(),f.startControlsTimer(2500)))}).bind("mousemove",function(){f.controlsEnabled&&(f.controlsAreVisible||f.showControls(),f.options.alwaysShowControls||f.startControlsTimer(2500))}).bind("mouseleave",function(){f.controlsEnabled&&(f.media.paused||f.options.alwaysShowControls||f.startControlsTimer(1e3))})),f.options.hideVideoControlsOnLoad&&f.hideControls(!1),i&&!f.options.alwaysShowControls&&f.hideControls(),f.options.enableAutosize&&f.media.addEventListener("loadedmetadata",function(a){f.options.videoHeight<=0&&null===f.domNode.getAttribute("height")&&!isNaN(a.target.videoHeight)&&(f.setPlayerSize(a.target.videoWidth,a.target.videoHeight),f.setControlsSize(),f.media.setVideoSize(a.target.videoWidth,a.target.videoHeight))},!1)),b.addEventListener("play",function(){var a;for(a in mejs.players){var b=mejs.players[a];b.id==f.id||!f.options.pauseOtherPlayers||b.paused||b.ended||b.pause(),b.hasFocus=!1}f.hasFocus=!0},!1),f.media.addEventListener("ended",function(){if(f.options.autoRewind)try{f.media.setCurrentTime(0),window.setTimeout(function(){a(f.container).find(".mejs-overlay-loading").parent().hide()},20)}catch(b){}f.media.pause(),f.setProgressRail&&f.setProgressRail(),f.setCurrentRail&&f.setCurrentRail(),f.options.loop?f.play():!f.options.alwaysShowControls&&f.controlsEnabled&&f.showControls()},!1),f.media.addEventListener("loadedmetadata",function(){f.updateDuration&&f.updateDuration(),f.updateCurrent&&f.updateCurrent(),f.isFullScreen||(f.setPlayerSize(f.width,f.height),f.setControlsSize())},!1),f.container.focusout(function(b){if(b.relatedTarget){var c=a(b.relatedTarget);f.keyboardAction&&0===c.parents(".mejs-container").length&&(f.keyboardAction=!1,f.hideControls(!0))}}),setTimeout(function(){f.setPlayerSize(f.width,f.height),f.setControlsSize()},50),f.globalBind("resize",function(){f.isFullScreen||mejs.MediaFeatures.hasTrueNativeFullScreen&&document.webkitIsFullScreen||f.setPlayerSize(f.width,f.height),f.setControlsSize()}),"youtube"==f.media.pluginType&&(g.isiOS||g.isAndroid)&&f.container.find(".mejs-overlay-play").hide()}i&&"native"==b.pluginType&&f.play(),f.options.success&&("string"==typeof f.options.success?window[f.options.success](f.media,f.domNode,f):f.options.success(f.media,f.domNode,f))}},handleError:function(a){var b=this;b.controls.hide(),b.options.error&&b.options.error(a)},setPlayerSize:function(b,c){var d=this;if(!d.options.setDimensions)return!1;if("undefined"!=typeof b&&(d.width=b),"undefined"!=typeof c&&(d.height=c),d.height.toString().indexOf("%")>0||"none"!==d.$node.css("max-width")&&"t.width"!==d.$node.css("max-width")||d.$node[0].currentStyle&&"100%"===d.$node[0].currentStyle.maxWidth){var e=function(){return d.isVideo?d.media.videoWidth&&d.media.videoWidth>0?d.media.videoWidth:null!==d.media.getAttribute("width")?d.media.getAttribute("width"):d.options.defaultVideoWidth:d.options.defaultAudioWidth}(),f=function(){return d.isVideo?d.media.videoHeight&&d.media.videoHeight>0?d.media.videoHeight:null!==d.media.getAttribute("height")?d.media.getAttribute("height"):d.options.defaultVideoHeight:d.options.defaultAudioHeight}(),g=d.container.parent().closest(":visible").width(),h=d.container.parent().closest(":visible").height(),i=d.isVideo||!d.options.autosizeProgress?parseInt(g*f/e,10):f;isNaN(i)&&(i=h),d.container.parent().length>0&&"body"===d.container.parent()[0].tagName.toLowerCase()&&(g=a(window).width(),i=a(window).height()),i&&g&&(d.container.width(g).height(i),d.$media.add(d.container.find(".mejs-shim")).width("100%").height("100%"),d.isVideo&&d.media.setVideoSize&&d.media.setVideoSize(g,i),d.layers.children(".mejs-layer").width("100%").height("100%"))}else d.container.width(d.width).height(d.height),d.layers.children(".mejs-layer").width(d.width).height(d.height);var j=d.layers.find(".mejs-overlay-play"),k=j.find(".mejs-overlay-button");j.height(d.container.height()-d.controls.height()),k.css("margin-top","-"+(k.height()/2-d.controls.height()/2).toString()+"px")},setControlsSize:function(){var b=this,c=0,d=0,e=b.controls.find(".mejs-time-rail"),f=b.controls.find(".mejs-time-total"),g=(b.controls.find(".mejs-time-current"),b.controls.find(".mejs-time-loaded"),e.siblings()),h=g.last(),i=null;if(b.container.is(":visible")&&e.length&&e.is(":visible")){b.options&&!b.options.autosizeProgress&&(d=parseInt(e.css("width"),10)),0!==d&&d||(g.each(function(){var b=a(this);"absolute"!=b.css("position")&&b.is(":visible")&&(c+=a(this).outerWidth(!0))}),d=b.controls.width()-c-(e.outerWidth(!0)-e.width()));do e.width(d),f.width(d-(f.outerWidth(!0)-f.width())),"absolute"!=h.css("position")&&(i=h.length?h.position():null,d--);while(null!==i&&i.top>0&&d>0);b.setProgressRail&&b.setProgressRail(),b.setCurrentRail&&b.setCurrentRail()}},buildposter:function(b,c,d,e){var f=this,g=a('
    ').appendTo(d),h=b.$media.attr("poster");""!==b.options.poster&&(h=b.options.poster),h?f.setPoster(h):g.hide(),e.addEventListener("play",function(){g.hide()},!1),b.options.showPosterWhenEnded&&b.options.autoRewind&&e.addEventListener("ended",function(){g.show()},!1)},setPoster:function(b){var c=this,d=c.container.find(".mejs-poster"),e=d.find("img");0===e.length&&(e=a('').appendTo(d)),e.attr("src",b),d.css({"background-image":"url("+b+")"})},buildoverlays:function(b,c,d,e){var f=this;if(b.isVideo){var g=a('
    ').hide().appendTo(d),h=a('
    ').hide().appendTo(d),i=a('
    ').appendTo(d).bind("click",function(){f.options.clickToPlayPause&&e.paused&&e.play()});e.addEventListener("play",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("playing",function(){i.hide(),g.hide(),c.find(".mejs-time-buffering").hide(),h.hide()},!1),e.addEventListener("seeking",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("seeked",function(){g.hide(),c.find(".mejs-time-buffering").hide()},!1),e.addEventListener("pause",function(){mejs.MediaFeatures.isiPhone||i.show()},!1),e.addEventListener("waiting",function(){g.show(),c.find(".mejs-time-buffering").show()},!1),e.addEventListener("loadeddata",function(){g.show(),c.find(".mejs-time-buffering").show(),mejs.MediaFeatures.isAndroid&&(e.canplayTimeout=window.setTimeout(function(){if(document.createEvent){var a=document.createEvent("HTMLEvents");return a.initEvent("canplay",!0,!0),e.dispatchEvent(a)}},300))},!1),e.addEventListener("canplay",function(){g.hide(),c.find(".mejs-time-buffering").hide(),clearTimeout(e.canplayTimeout)},!1),e.addEventListener("error",function(){g.hide(),c.find(".mejs-time-buffering").hide(),h.show(),h.find(".mejs-overlay-error").html("Error loading this resource")},!1),e.addEventListener("keydown",function(a){f.onkeydown(b,e,a)},!1)}},buildkeyboard:function(b,c,d,e){var f=this;f.container.keydown(function(){f.keyboardAction=!0}),f.globalBind("keydown",function(a){return f.onkeydown(b,e,a)}),f.globalBind("click",function(c){b.hasFocus=0!==a(c.target).closest(".mejs-container").length})},onkeydown:function(a,b,c){if(a.hasFocus&&a.options.enableKeyboard)for(var d=0,e=a.options.keyActions.length;e>d;d++)for(var f=a.options.keyActions[d],g=0,h=f.keys.length;h>g;g++)if(c.keyCode==f.keys[g])return"function"==typeof c.preventDefault&&c.preventDefault(),f.action(a,b,c.keyCode),!1;return!0},findTracks:function(){var b=this,c=b.$media.find("track");b.tracks=[],c.each(function(c,d){d=a(d),b.tracks.push({srclang:d.attr("srclang")?d.attr("srclang").toLowerCase():"",src:d.attr("src"),kind:d.attr("kind"),label:d.attr("label")||"",entries:[],isLoaded:!1})})},changeSkin:function(a){this.container[0].className="mejs-container "+a,this.setPlayerSize(this.width,this.height),this.setControlsSize()},play:function(){this.load(),this.media.play()},pause:function(){try{this.media.pause()}catch(a){}},load:function(){this.isLoaded||this.media.load(),this.isLoaded=!0},setMuted:function(a){this.media.setMuted(a)},setCurrentTime:function(a){this.media.setCurrentTime(a)},getCurrentTime:function(){return this.media.currentTime},setVolume:function(a){this.media.setVolume(a)},getVolume:function(){return this.media.volume},setSrc:function(a){this.media.setSrc(a)},remove:function(){var a,b,c=this;for(a in c.options.features)if(b=c.options.features[a],c["clean"+b])try{c["clean"+b](c)}catch(d){}c.isDynamic?c.$node.insertBefore(c.container):(c.$media.prop("controls",!0),c.$node.clone().insertBefore(c.container).show(),c.$node.remove()),"native"!==c.media.pluginType&&c.media.remove(),delete mejs.players[c.id],"object"==typeof c.container&&c.container.remove(),c.globalUnbind(),delete c.node.player},rebuildtracks:function(){var a=this;a.findTracks(),a.buildtracks(a,a.controls,a.layers,a.media)},resetSize:function(){var a=this;setTimeout(function(){a.setPlayerSize(a.width,a.height),a.setControlsSize()},50)}},function(){function b(b,d){var e={d:[],w:[]};return a.each((b||"").split(" "),function(a,b){var f=b+"."+d;0===f.indexOf(".")?(e.d.push(f),e.w.push(f)):e[c.test(b)?"w":"d"].push(f)}),e.d=e.d.join(" "),e.w=e.w.join(" "),e}var c=/^((after|before)print|(before)?unload|hashchange|message|o(ff|n)line|page(hide|show)|popstate|resize|storage)\b/;mejs.MediaElementPlayer.prototype.globalBind=function(c,d,e){var f=this;c=b(c,f.id),c.d&&a(document).bind(c.d,d,e),c.w&&a(window).bind(c.w,d,e)},mejs.MediaElementPlayer.prototype.globalUnbind=function(c,d){var e=this;c=b(c,e.id),c.d&&a(document).unbind(c.d,d),c.w&&a(window).unbind(c.w,d)}}(),"undefined"!=typeof a&&(a.fn.mediaelementplayer=function(b){return this.each(b===!1?function(){var b=a(this).data("mediaelementplayer");b&&b.remove(),a(this).removeData("mediaelementplayer")}:function(){a(this).data("mediaelementplayer",new mejs.MediaElementPlayer(this,b))}),this},a(document).ready(function(){a(".mejs-player").mediaelementplayer()})),window.MediaElementPlayer=mejs.MediaElementPlayer}(mejs.$),function(a){a.extend(mejs.MepDefaults,{playText:mejs.i18n.t("Play"),pauseText:mejs.i18n.t("Pause")}),a.extend(MediaElementPlayer.prototype,{buildplaypause:function(b,c,d,e){function f(a){"play"===a?(i.removeClass("mejs-play").addClass("mejs-pause"),j.attr({title:h.pauseText,"aria-label":h.pauseText})):(i.removeClass("mejs-pause").addClass("mejs-play"),j.attr({title:h.playText,"aria-label":h.playText}))}var g=this,h=g.options,i=a('
    ').appendTo(c).click(function(a){return a.preventDefault(),e.paused?e.play():e.pause(),!1}),j=i.find("button");f("pse"),e.addEventListener("play",function(){f("play")},!1),e.addEventListener("playing",function(){f("play")},!1),e.addEventListener("pause",function(){f("pse")},!1),e.addEventListener("paused",function(){f("pse")},!1)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{stopText:"Stop"}),a.extend(MediaElementPlayer.prototype,{buildstop:function(b,c,d,e){{var f=this;a('
    ').appendTo(c).click(function(){e.paused||e.pause(),e.currentTime>0&&(e.setCurrentTime(0),e.pause(),c.find(".mejs-time-current").width("0px"),c.find(".mejs-time-handle").css("left","0px"),c.find(".mejs-time-float-current").html(mejs.Utility.secondsToTimeCode(0)),c.find(".mejs-currenttime").html(mejs.Utility.secondsToTimeCode(0)),d.find(".mejs-poster").show())})}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{progessHelpText:mejs.i18n.t("Use Left/Right Arrow keys to advance one second, Up/Down arrows to advance ten seconds.")}),a.extend(MediaElementPlayer.prototype,{buildprogress:function(b,c,d,e){a('
    00:00
    ').appendTo(c),c.find(".mejs-time-buffering").hide();var f=this,g=c.find(".mejs-time-total"),h=c.find(".mejs-time-loaded"),i=c.find(".mejs-time-current"),j=c.find(".mejs-time-handle"),k=c.find(".mejs-time-float"),l=c.find(".mejs-time-float-current"),m=c.find(".mejs-time-slider"),n=function(a){var b,c=g.offset(),d=g.outerWidth(!0),f=0,h=0,i=0;b=a.originalEvent.changedTouches?a.originalEvent.changedTouches[0].pageX:a.pageX,e.duration&&(bd+c.left&&(b=d+c.left),i=b-c.left,f=i/d,h=.02>=f?0:f*e.duration,o&&h!==e.currentTime&&e.setCurrentTime(h),mejs.MediaFeatures.hasTouch||(k.css("left",i),l.html(mejs.Utility.secondsToTimeCode(h)),k.show()))},o=!1,p=!1,q=0,r=!1,s=b.options.autoRewind,t=function(){var a=e.currentTime,b=mejs.i18n.t("Time Slider"),c=mejs.Utility.secondsToTimeCode(a),d=e.duration;m.attr({"aria-label":b,"aria-valuemin":0,"aria-valuemax":d,"aria-valuenow":a,"aria-valuetext":c,role:"slider",tabindex:0})},u=function(){var a=new Date;a-q>=1e3&&e.play()};m.bind("focus",function(){b.options.autoRewind=!1}),m.bind("blur",function(){b.options.autoRewind=s}),m.bind("keydown",function(a){new Date-q>=1e3&&(r=e.paused);var b=a.keyCode,c=e.duration,d=e.currentTime;switch(b){case 37:d-=1;break;case 39:d+=1;break;case 38:d+=Math.floor(.1*c);break;case 40:d-=Math.floor(.1*c);break;case 36:d=0;break;case 35:d=c;break;case 10:return void(e.paused?e.play():e.pause());case 13:return void(e.paused?e.play():e.pause());default:return}return d=0>d?0:d>=c?c:Math.floor(d),q=new Date,r||e.pause(),d0&&c.buffered.end&&c.duration?d=c.buffered.end(0)/c.duration:c&&void 0!==c.bytesTotal&&c.bytesTotal>0&&void 0!==c.bufferedBytes?d=c.bufferedBytes/c.bytesTotal:a&&a.lengthComputable&&0!==a.total&&(d=a.loaded/a.total),null!==d&&(d=Math.min(1,Math.max(0,d)),b.loaded&&b.total&&b.loaded.width(b.total.width()*d))},setCurrentRail:function(){var a=this;if(void 0!==a.media.currentTime&&a.media.duration&&a.total&&a.handle){var b=Math.round(a.total.width()*a.media.currentTime/a.media.duration),c=b-Math.round(a.handle.outerWidth(!0)/2);a.current.width(b),a.handle.css("left",c)}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{duration:-1,timeAndDurationSeparator:" | "}),a.extend(MediaElementPlayer.prototype,{buildcurrent:function(b,c,d,e){var f=this;a('
    '+(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00")+"
    ").appendTo(c),f.currenttime=f.controls.find(".mejs-currenttime"),e.addEventListener("timeupdate",function(){b.updateCurrent()},!1)},buildduration:function(b,c,d,e){var f=this;c.children().last().find(".mejs-currenttime").length>0?a(f.options.timeAndDurationSeparator+''+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"").appendTo(c.find(".mejs-time")):(c.find(".mejs-currenttime").parent().addClass("mejs-currenttime-container"),a('
    '+(f.options.duration>0?mejs.Utility.secondsToTimeCode(f.options.duration,f.options.alwaysShowHours||f.media.duration>3600,f.options.showTimecodeFrameCount,f.options.framesPerSecond||25):(b.options.alwaysShowHours?"00:":"")+(b.options.showTimecodeFrameCount?"00:00:00":"00:00"))+"
    ").appendTo(c)),f.durationD=f.controls.find(".mejs-duration"),e.addEventListener("timeupdate",function(){b.updateDuration()},!1)},updateCurrent:function(){var a=this;a.currenttime&&a.currenttime.html(mejs.Utility.secondsToTimeCode(a.media.currentTime,a.options.alwaysShowHours||a.media.duration>3600,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))},updateDuration:function(){var a=this;a.container.toggleClass("mejs-long-video",a.media.duration>3600),a.durationD&&(a.options.duration>0||a.media.duration)&&a.durationD.html(mejs.Utility.secondsToTimeCode(a.options.duration>0?a.options.duration:a.media.duration,a.options.alwaysShowHours,a.options.showTimecodeFrameCount,a.options.framesPerSecond||25))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{muteText:mejs.i18n.t("Mute Toggle"),allyVolumeControlText:mejs.i18n.t("Use Up/Down Arrow keys to increase or decrease volume."),hideVolumeOnTouchDevices:!0,audioVolume:"horizontal",videoVolume:"vertical"}),a.extend(MediaElementPlayer.prototype,{buildvolume:function(b,c,d,e){if(!mejs.MediaFeatures.isAndroid&&!mejs.MediaFeatures.isiOS||!this.options.hideVolumeOnTouchDevices){var f=this,g=f.isVideo?f.options.videoVolume:f.options.audioVolume,h="horizontal"==g?a('
    '+f.options.allyVolumeControlText+'
    ').appendTo(c):a('
    '+f.options.allyVolumeControlText+'
    ').appendTo(c),i=f.container.find(".mejs-volume-slider, .mejs-horizontal-volume-slider"),j=f.container.find(".mejs-volume-total, .mejs-horizontal-volume-total"),k=f.container.find(".mejs-volume-current, .mejs-horizontal-volume-current"),l=f.container.find(".mejs-volume-handle, .mejs-horizontal-volume-handle"),m=function(a,b){if(!i.is(":visible")&&"undefined"==typeof b)return i.show(),m(a,!0),void i.hide();a=Math.max(0,a),a=Math.min(a,1),0===a?(h.removeClass("mejs-mute").addClass("mejs-unmute"),h.children("button").attr("title",mejs.i18n.t("Unmute")).attr("aria-label",mejs.i18n.t("Unmute"))):(h.removeClass("mejs-unmute").addClass("mejs-mute"),h.children("button").attr("title",mejs.i18n.t("Mute")).attr("aria-label",mejs.i18n.t("Mute")));var c=j.position();if("vertical"==g){var d=j.height(),e=d-d*a;l.css("top",Math.round(c.top+e-l.height()/2)),k.height(d-e),k.css("top",c.top+e)}else{var f=j.width(),n=f*a;l.css("left",Math.round(c.left+n-l.width()/2)),k.width(Math.round(n))}},n=function(a){var b=null,c=j.offset();if("vertical"===g){var d=j.height(),f=(parseInt(j.css("top").replace(/px/,""),10),a.pageY-c.top);if(b=(d-f)/d,0===c.top||0===c.left)return}else{var h=j.width(),i=a.pageX-c.left;b=i/h}b=Math.max(0,b),b=Math.min(b,1),m(b),e.setMuted(0===b?!0:!1),e.setVolume(b)},o=!1,p=!1;h.hover(function(){i.show(),p=!0},function(){p=!1,o||"vertical"!=g||i.hide()});var q=function(){var a=Math.floor(100*e.volume);i.attr({"aria-label":mejs.i18n.t("volumeSlider"),"aria-valuemin":0,"aria-valuemax":100,"aria-valuenow":a,"aria-valuetext":a+"%",role:"slider",tabindex:0})};i.bind("mouseover",function(){p=!0}).bind("mousedown",function(a){return n(a),f.globalBind("mousemove.vol",function(a){n(a)}),f.globalBind("mouseup.vol",function(){o=!1,f.globalUnbind(".vol"),p||"vertical"!=g||i.hide()}),o=!0,!1}).bind("keydown",function(a){var b=a.keyCode,c=e.volume;switch(b){case 38:c+=.1;break;case 40:c-=.1;break;default:return!0}return o=!1,m(c),e.setVolume(c),!1}).bind("blur",function(){i.hide()}),h.find("button").click(function(){e.setMuted(!e.muted)}),h.find("button").bind("focus",function(){i.show()}),e.addEventListener("volumechange",function(a){o||(e.muted?(m(0),h.removeClass("mejs-mute").addClass("mejs-unmute")):(m(e.volume),h.removeClass("mejs-unmute").addClass("mejs-mute"))),q(a)},!1),f.container.is(":visible")&&(m(b.options.startVolume),0===b.options.startVolume&&e.setMuted(!0),"native"===e.pluginType&&e.setVolume(b.options.startVolume))}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{usePluginFullScreen:!0,newWindowCallback:function(){return""},fullscreenText:mejs.i18n.t("Fullscreen")}),a.extend(MediaElementPlayer.prototype,{isFullScreen:!1,isNativeFullScreen:!1,isInIframe:!1,buildfullscreen:function(b,c,d,e){if(b.isVideo){if(b.isInIframe=window.location!=window.parent.location,mejs.MediaFeatures.hasTrueNativeFullScreen){var f=function(){b.isFullScreen&&(mejs.MediaFeatures.isFullScreen()?(b.isNativeFullScreen=!0,b.setControlsSize()):(b.isNativeFullScreen=!1,b.exitFullScreen()))};b.globalBind(mejs.MediaFeatures.fullScreenEventName,f)}var g=this,h=(b.container,a('
    ').appendTo(c));if("native"===g.media.pluginType||!g.options.usePluginFullScreen&&!mejs.MediaFeatures.isFirefox)h.click(function(){var a=mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||b.isFullScreen;a?b.exitFullScreen():b.enterFullScreen()});else{var i=null,j=function(){var a,b=document.createElement("x"),c=document.documentElement,d=window.getComputedStyle;return"pointerEvents"in b.style?(b.style.pointerEvents="auto",b.style.pointerEvents="x",c.appendChild(b),a=d&&"auto"===d(b,"").pointerEvents,c.removeChild(b),!!a):!1}();if(j&&!mejs.MediaFeatures.isOpera){var k,l,m=!1,n=function(){if(m){for(var a in o)o[a].hide();h.css("pointer-events",""),g.controls.css("pointer-events",""),g.media.removeEventListener("click",g.clickToPlayPauseCallback),m=!1}},o={},p=["top","left","right","bottom"],q=function(){var a=h.offset().left-g.container.offset().left,b=h.offset().top-g.container.offset().top,c=h.outerWidth(!0),d=h.outerHeight(!0),e=g.container.width(),f=g.container.height();for(k in o)o[k].css({position:"absolute",top:0,left:0});o.top.width(e).height(b),o.left.width(a).height(d).css({top:b}),o.right.width(e-a-c).height(d).css({top:b,left:a+c}),o.bottom.width(e).height(f-d-b).css({top:b+d})};for(g.globalBind("resize",function(){q()}),k=0,l=p.length;l>k;k++)o[p[k]]=a('
    ').appendTo(g.container).mouseover(n).hide();h.on("mouseover",function(){if(!g.isFullScreen){var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!1),h.css("pointer-events","none"),g.controls.css("pointer-events","none"),g.media.addEventListener("click",g.clickToPlayPauseCallback);for(k in o)o[k].show(); --q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1)}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i=null,j='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var k=0,l=f.options.speeds.length;l>k;k++)i=f.id+"-speed-"+f.options.speeds[k],j+='
      • ";j+="
    ",g=a(j).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),tracksAriaLive:!1,hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this,h=g.options.tracksAriaLive?'role="log" aria-live="assertive" aria-atomic="false"':"";if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var i=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c
    ').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); -\ Pas de fin de ligne à la fin du fichier -+q(),m=!0}}),e.addEventListener("fullscreenchange",function(){g.isFullScreen=!g.isFullScreen,g.isFullScreen?g.media.removeEventListener("click",g.clickToPlayPauseCallback):g.media.addEventListener("click",g.clickToPlayPauseCallback),n()}),g.globalBind("mousemove",function(a){if(m){var b=h.offset();(a.pageYb.top+h.outerHeight(!0)||a.pageXb.left+h.outerWidth(!0))&&(h.css("pointer-events",""),g.controls.css("pointer-events",""),m=!1)}})}else h.on("mouseover",function(){null!==i&&(clearTimeout(i),delete i);var a=h.offset(),c=b.container.offset();e.positionFullscreenButton(a.left-c.left,a.top-c.top,!0)}).on("mouseout",function(){null!==i&&(clearTimeout(i),delete i),i=setTimeout(function(){e.hideFullscreenButton()},1500)})}b.fullscreenBtn=h,g.globalBind("keydown",function(a){(mejs.MediaFeatures.hasTrueNativeFullScreen&&mejs.MediaFeatures.isFullScreen()||g.isFullScreen)&&27==a.keyCode&&b.exitFullScreen()})}},cleanfullscreen:function(a){a.exitFullScreen()},containerSizeTimeout:null,enterFullScreen:function(){var b=this;if("native"===b.media.pluginType||!mejs.MediaFeatures.isFirefox&&!b.options.usePluginFullScreen){if(a(document.documentElement).addClass("mejs-fullscreen"),normalHeight=b.container.height(),normalWidth=b.container.width(),"native"===b.media.pluginType)if(mejs.MediaFeatures.hasTrueNativeFullScreen)mejs.MediaFeatures.requestFullScreen(b.container[0]),b.isInIframe&&setTimeout(function d(){if(b.isNativeFullScreen){var c=window.devicePixelRatio||1,e=.002,f=c*a(window).width(),g=screen.width,h=Math.abs(g-f),i=g*e;h>i?b.exitFullScreen():setTimeout(d,500)}},500);else if(mejs.MediaFeatures.hasSemiNativeFullScreen)return void b.media.webkitEnterFullscreen();if(b.isInIframe){var c=b.options.newWindowCallback(this);if(""!==c){if(!mejs.MediaFeatures.hasTrueNativeFullScreen)return b.pause(),void window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no");setTimeout(function(){b.isNativeFullScreen||(b.pause(),window.open(c,b.id,"top=0,left=0,width="+screen.availWidth+",height="+screen.availHeight+",resizable=yes,scrollbars=no,status=no,toolbar=no"))},250)}}b.container.addClass("mejs-container-fullscreen").width("100%").height("100%"),b.containerSizeTimeout=setTimeout(function(){b.container.css({width:"100%",height:"100%"}),b.setControlsSize()},500),"native"===b.media.pluginType?b.$media.width("100%").height("100%"):(b.container.find(".mejs-shim").width("100%").height("100%"),b.media.setVideoSize(a(window).width(),a(window).height())),b.layers.children("div").width("100%").height("100%"),b.fullscreenBtn&&b.fullscreenBtn.removeClass("mejs-fullscreen").addClass("mejs-unfullscreen"),b.setControlsSize(),b.isFullScreen=!0,b.container.find(".mejs-captions-text").css("font-size",screen.width/b.width*1*100+"%"),b.container.find(".mejs-captions-position").css("bottom","45px")}},exitFullScreen:function(){var b=this;return clearTimeout(b.containerSizeTimeout),"native"!==b.media.pluginType&&mejs.MediaFeatures.isFirefox?void b.media.setFullscreen(!1):(mejs.MediaFeatures.hasTrueNativeFullScreen&&(mejs.MediaFeatures.isFullScreen()||b.isFullScreen)&&mejs.MediaFeatures.cancelFullScreen(),a(document.documentElement).removeClass("mejs-fullscreen"),b.container.removeClass("mejs-container-fullscreen").width(normalWidth).height(normalHeight),"native"===b.media.pluginType?b.$media.width(normalWidth).height(normalHeight):(b.container.find(".mejs-shim").width(normalWidth).height(normalHeight),b.media.setVideoSize(normalWidth,normalHeight)),b.layers.children("div").width(normalWidth).height(normalHeight),b.fullscreenBtn.removeClass("mejs-unfullscreen").addClass("mejs-fullscreen"),b.setControlsSize(),b.isFullScreen=!1,b.container.find(".mejs-captions-text").css("font-size",""),void b.container.find(".mejs-captions-position").css("bottom",""))}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{speeds:["2.00","1.50","1.25","1.00","0.75"],defaultSpeed:"1.00",speedChar:"x"}),a.extend(MediaElementPlayer.prototype,{buildspeed:function(b,c,d,e){var f=this;if("native"==f.media.pluginType){var g=null,h=null,i=null,j='
      ';-1===a.inArray(f.options.defaultSpeed,f.options.speeds)&&f.options.speeds.push(f.options.defaultSpeed),f.options.speeds.sort(function(a,b){return parseFloat(b)-parseFloat(a)});for(var k=0,l=f.options.speeds.length;l>k;k++)i=f.id+"-speed-"+f.options.speeds[k],j+='
      • ";j+="
    ",g=a(j).appendTo(c),h=g.find(".mejs-speed-selector"),playbackspeed=f.options.defaultSpeed,h.on("click",'input[type="radio"]',function(){var b=a(this).attr("value");playbackspeed=b,e.playbackRate=parseFloat(b),g.find("button").html(b+f.options.speedChar),g.find(".mejs-speed-selected").removeClass("mejs-speed-selected"),g.find('input[type="radio"]:checked').next().addClass("mejs-speed-selected")}),h.height(g.find(".mejs-speed-selector ul").outerHeight(!0)+g.find(".mejs-speed-translations").outerHeight(!0)).css("top",-1*h.height()+"px")}}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{startLanguage:"",tracksText:mejs.i18n.t("Captions/Subtitles"),tracksAriaLive:!1,hideCaptionsButtonWhenEmpty:!0,toggleCaptionsButtonWhenOnlyOne:!1,slidesSelector:""}),a.extend(MediaElementPlayer.prototype,{hasChapters:!1,cleartracks:function(a){a&&(a.captions&&a.captions.remove(),a.chapters&&a.chapters.remove(),a.captionsText&&a.captionsText.remove(),a.captionsButton&&a.captionsButton.remove())},buildtracks:function(b,c,d,e){if(0!==b.tracks.length){var f,g=this,h=g.options.tracksAriaLive?'role="log" aria-live="assertive" aria-atomic="false"':"";if(g.domNode.textTracks)for(f=g.domNode.textTracks.length-1;f>=0;f--)g.domNode.textTracks[f].mode="hidden";g.cleartracks(b,c,d,e),b.chapters=a('
    ').prependTo(d).hide(),b.captions=a('
    ').prependTo(d).hide(),b.captionsText=b.captions.find(".mejs-captions-text"),b.captionsButton=a('
    ").appendTo(c);var i=0;for(f=0;f0&&c.displayChapters(d)},!1),"slides"==d.kind&&c.setupSlides(d)},error:function(){c.loadNextTrack()}})},enableTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("input[value="+b+"]").prop("disabled",!1).siblings("label").html(c),d.options.startLanguage==b&&a("#"+d.id+"_captions_"+b).prop("checked",!0).trigger("click"),d.adjustLanguageBox()},addTrackButton:function(b,c){var d=this;""===c&&(c=mejs.language.codes[b]||b),d.captionsButton.find("ul").append(a('
    • ")),d.adjustLanguageBox(),d.container.find(".mejs-captions-translations option[value="+b+"]").remove()},adjustLanguageBox:function(){var a=this;a.captionsButton.find(".mejs-captions-selector").height(a.captionsButton.find(".mejs-captions-selector ul").outerHeight(!0)+a.captionsButton.find(".mejs-captions-translations").outerHeight(!0))},checkForTracks:function(){var a=this,b=!1;if(a.options.hideCaptionsButtonWhenEmpty){for(i=0;i=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return b.captionsText.html(c.entries.text[a]).attr("class","mejs-captions-text "+(c.entries.times[a].identifier||"")),void b.captions.show().height(0);b.captions.hide()}else b.captions.hide()}},setupSlides:function(a){var b=this;b.slides=a,b.slides.entries.imgs=[b.slides.entries.text.length],b.showSlide(0)},showSlide:function(b){if("undefined"!=typeof this.tracks&&"undefined"!=typeof this.slidesContainer){var c=this,d=c.slides.entries.text[b],e=c.slides.entries.imgs[b];"undefined"==typeof e||"undefined"==typeof e.fadeIn?c.slides.entries.imgs[b]=e=a('').on("load",function(){e.appendTo(c.slidesContainer).hide().fadeIn().siblings(":visible").fadeOut()}):e.is(":visible")||e.is(":animated")||e.fadeIn().siblings(":visible").fadeOut()}},displaySlides:function(){if("undefined"!=typeof this.slides){var a,b=this,c=b.slides;for(a=0;a=c.entries.times[a].start&&b.media.currentTime<=c.entries.times[a].stop)return void b.showSlide(a)}},displayChapters:function(){var a,b=this;for(a=0;a100||c==b.entries.times.length-1&&100>f+g)&&(f=100-g),e.chapters.append(a('
    '+b.entries.text[c]+''+mejs.Utility.secondsToTimeCode(b.entries.times[c].start)+"–"+mejs.Utility.secondsToTimeCode(b.entries.times[c].stop)+"
    ")),g+=f;e.chapters.find("div.mejs-chapter").click(function(){e.media.setCurrentTime(parseFloat(a(this).attr("rel"))),e.media.paused&&e.media.play()}),e.chapters.show()}}),mejs.language={codes:{af:"Afrikaans",sq:"Albanian",ar:"Arabic",be:"Belarusian",bg:"Bulgarian",ca:"Catalan",zh:"Chinese","zh-cn":"Chinese Simplified","zh-tw":"Chinese Traditional",hr:"Croatian",cs:"Czech",da:"Danish",nl:"Dutch",en:"English",et:"Estonian",fl:"Filipino",fi:"Finnish",fr:"French",gl:"Galician",de:"German",el:"Greek",ht:"Haitian Creole",iw:"Hebrew",hi:"Hindi",hu:"Hungarian",is:"Icelandic",id:"Indonesian",ga:"Irish",it:"Italian",ja:"Japanese",ko:"Korean",lv:"Latvian",lt:"Lithuanian",mk:"Macedonian",ms:"Malay",mt:"Maltese",no:"Norwegian",fa:"Persian",pl:"Polish",pt:"Portuguese",ro:"Romanian",ru:"Russian",sr:"Serbian",sk:"Slovak",sl:"Slovenian",es:"Spanish",sw:"Swahili",sv:"Swedish",tl:"Tagalog",th:"Thai",tr:"Turkish",uk:"Ukrainian",vi:"Vietnamese",cy:"Welsh",yi:"Yiddish"}},mejs.TrackFormatParser={webvtt:{pattern_timecode:/^((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{1,3})?) --\> ((?:[0-9]{1,2}:)?[0-9]{2}:[0-9]{2}([,.][0-9]{3})?)(.*)$/,parse:function(b){for(var c,d,e,f=0,g=mejs.TrackFormatParser.split2(b,/\r?\n/),h={text:[],times:[]};f=0&&""!==g[f-1]&&(e=g[f-1]),f++,d=g[f],f++;""!==g[f]&&f$1"),h.text.push(d),h.times.push({identifier:e,start:0===mejs.Utility.convertSMPTEtoSeconds(c[1])?.2:mejs.Utility.convertSMPTEtoSeconds(c[1]),stop:mejs.Utility.convertSMPTEtoSeconds(c[3]),settings:c[5]})}e=""}return h}},dfxp:{parse:function(b){b=a(b).filter("tt");var c,d,e=0,f=b.children("div").eq(0),g=f.find("p"),h=b.find("#"+f.attr("style")),i={text:[],times:[]};if(h.length){var j=h.removeAttr("id").get(0).attributes;if(j.length)for(c={},e=0;e$1"),i.text.push(d),0===i.times.start&&(i.times.start=2)}return i}},split2:function(a,b){return a.split(b)}},3!="x\n\ny".split(/\n/gi).length&&(mejs.TrackFormatParser.split2=function(a,b){var c,d=[],e="";for(c=0;c').appendTo(a("body")).hide(),b.container.bind("contextmenu",function(a){return b.isContextMenuEnabled?(a.preventDefault(),b.renderContextMenu(a.clientX-1,a.clientY-1),!1):void 0}),b.container.bind("click",function(){b.contextMenu.hide()}),b.contextMenu.bind("mouseleave",function(){b.startContextMenuTimer()})},cleancontextmenu:function(a){a.contextMenu.remove()},isContextMenuEnabled:!0,enableContextMenu:function(){this.isContextMenuEnabled=!0},disableContextMenu:function(){this.isContextMenuEnabled=!1},contextMenuTimeout:null,startContextMenuTimer:function(){var a=this;a.killContextMenuTimer(),a.contextMenuTimer=setTimeout(function(){a.hideContextMenu(),a.killContextMenuTimer()},750)},killContextMenuTimer:function(){var a=this.contextMenuTimer;null!=a&&(clearTimeout(a),delete a,a=null)},hideContextMenu:function(){this.contextMenu.hide()},renderContextMenu:function(b,c){for(var d=this,e="",f=d.options.contextMenuItems,g=0,h=f.length;h>g;g++)if(f[g].isSeparator)e+='
    ';else{var i=f[g].render(d);null!=i&&(e+='
    '+i+"
    ")}d.contextMenu.empty().append(a(e)).css({top:c,left:b}).show(),d.contextMenu.find(".mejs-contextmenu-item").each(function(){var b=a(this),c=parseInt(b.data("itemindex"),10),e=d.options.contextMenuItems[c];"undefined"!=typeof e.show&&e.show(b,d),b.click(function(){"undefined"!=typeof e.click&&e.click(d),d.contextMenu.hide()})}),setTimeout(function(){d.killControlsTimer("rev3")},100)}})}(mejs.$),function(a){a.extend(mejs.MepDefaults,{postrollCloseText:mejs.i18n.t("Close")}),a.extend(MediaElementPlayer.prototype,{buildpostroll:function(b,c,d){var e=this,f=e.container.find('link[rel="postroll"]').attr("href");"undefined"!=typeof f&&(b.postroll=a('
    '+e.options.postrollCloseText+'
    ').prependTo(d).hide(),e.media.addEventListener("ended",function(){a.ajax({dataType:"html",url:f,success:function(a){d.find(".mejs-postroll-layer-content").html(a)}}),b.postroll.show()},!1))}})}(mejs.$); diff --git a/wordpress-4.3-noupdate.patch b/wordpress-4.3-noupdate.patch deleted file mode 100644 index b38f990..0000000 --- a/wordpress-4.3-noupdate.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.noupdate 2015-08-26 09:56:30.113424058 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2015-08-26 09:56:50.729529575 +0200 -@@ -101,7 +101,6 @@ add_action( 'profile_update', 'default_p - add_action( 'admin_init', 'wp_plugin_update_rows' ); - add_action( 'admin_init', 'wp_theme_update_rows' ); - --add_action( 'admin_notices', 'update_nag', 3 ); - add_action( 'admin_notices', 'maintenance_nag', 10 ); - - add_filter( 'update_footer', 'core_update_footer' ); -diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate 2015-07-29 16:57:25.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-08-26 09:55:58.269261073 +0200 -@@ -2276,6 +2276,9 @@ class Core_Upgrader extends WP_Upgrader - } - } - -+ // RPM: nether allow core update -+ return false; -+ - // 1: If we're already on that version, not much point in updating? - if ( $offered_ver == $wp_version ) - return false; -@@ -2510,7 +2513,7 @@ class WP_Automatic_Updater { - */ - public function is_disabled() { - // Background updates are disabled if you don't want file changes. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) - return true; - - if ( defined( 'WP_INSTALLING' ) ) -diff -up wordpress/wp-admin/includes/ms-admin-filters.php.noupdate wordpress/wp-admin/includes/ms-admin-filters.php ---- wordpress/wp-admin/includes/ms-admin-filters.php.noupdate 2015-08-26 09:57:03.337594106 +0200 -+++ wordpress/wp-admin/includes/ms-admin-filters.php 2015-08-26 09:57:09.398625127 +0200 -@@ -38,5 +38,4 @@ add_action( 'admin_notices', 'si - add_action( 'network_admin_notices', 'site_admin_notice' ); - - // Update Hooks --add_action( 'network_admin_notices', 'update_nag', 3 ); - add_action( 'network_admin_notices', 'maintenance_nag', 10 ); -diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.noupdate 2015-07-07 02:02:24.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2015-08-26 09:56:00.298271458 +0200 -@@ -251,7 +251,7 @@ function update_right_now_message() { - $cur = get_preferred_from_update_core(); - - if ( isset( $cur->response ) && $cur->response == 'upgrade' ) -- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; -+ $msg .= ''; - } - - $msg .= sprintf( '' . __( 'WordPress %1$s running %2$s theme.' ) . '', get_bloginfo( 'version', 'display' ), $theme_name ); -diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.noupdate 2015-08-14 00:31:24.000000000 +0200 -+++ wordpress/wp-includes/capabilities.php 2015-08-26 09:56:00.299271463 +0200 -@@ -1337,7 +1337,7 @@ function map_meta_cap( $cap, $user_id ) - // Disallow the file editors. - if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) - $caps[] = 'do_not_allow'; -- elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) - $caps[] = 'do_not_allow'; - elseif ( is_multisite() && ! is_super_admin( $user_id ) ) - $caps[] = 'do_not_allow'; -@@ -1355,7 +1355,7 @@ function map_meta_cap( $cap, $user_id ) - case 'update_core': - // Disallow anything that creates, deletes, or updates core, plugin, or theme files. - // Files in uploads are excepted. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - $caps[] = 'do_not_allow'; - } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { - $caps[] = 'do_not_allow'; -diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.noupdate 2015-05-28 17:29:28.000000000 +0200 -+++ wordpress/wp-includes/update.php 2015-08-26 09:56:00.299271463 +0200 -@@ -636,9 +636,6 @@ function _maybe_update_themes() { - * @since 3.1.0 - */ - function wp_schedule_update_checks() { -- if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') ) -- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); -- - if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') ) - wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); - -@@ -680,8 +677,6 @@ if ( ( ! is_main_site() && ! is_network_ - } - - add_action( 'admin_init', '_maybe_update_core' ); --add_action( 'wp_version_check', 'wp_version_check' ); --add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 ); - - add_action( 'load-plugins.php', 'wp_update_plugins' ); - add_action( 'load-update.php', 'wp_update_plugins' ); diff --git a/wordpress-4.2-no_swfupload.patch b/wordpress-4.4-no_swfupload.patch similarity index 81% rename from wordpress-4.2-no_swfupload.patch rename to wordpress-4.4-no_swfupload.patch index 0b826e8..c0bba8d 100644 --- a/wordpress-4.2-no_swfupload.patch +++ b/wordpress-4.4-no_swfupload.patch @@ -1,7 +1,6 @@ -diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.orig 2014-05-07 15:55:26.485228222 +0200 -+++ wordpress/wp-includes/script-loader.php 2014-05-07 15:55:18.019198073 +0200 -@@ -280,15 +280,6 @@ +--- wordpress/wp-includes/script-loader.php.orig 2015-12-09 16:51:44.740328793 +0100 ++++ wordpress/wp-includes/script-loader.php 2015-12-09 16:53:00.870701835 +0100 +@@ -300,15 +300,6 @@ function wp_default_scripts( &$scripts ) $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); @@ -16,4 +15,4 @@ diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/scri - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); - $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2011-02-23' ); + $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' ); diff --git a/wordpress-4.4-noupdate.patch b/wordpress-4.4-noupdate.patch new file mode 100644 index 0000000..d02cf71 --- /dev/null +++ b/wordpress-4.4-noupdate.patch @@ -0,0 +1,88 @@ +diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.orig 2015-10-15 00:35:24.000000000 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2015-12-09 17:08:00.945112230 +0100 +@@ -100,7 +100,6 @@ add_action( 'profile_update', 'default_p + add_action( 'admin_init', 'wp_plugin_update_rows' ); + add_action( 'admin_init', 'wp_theme_update_rows' ); + +-add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'maintenance_nag', 10 ); + + add_filter( 'update_footer', 'core_update_footer' ); +diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.orig wordpress/wp-admin/includes/class-wp-upgrader.php +--- wordpress/wp-admin/includes/class-wp-upgrader.php.orig 2015-11-16 03:47:25.000000000 +0100 ++++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-12-09 17:09:34.735571806 +0100 +@@ -2386,6 +2386,9 @@ class Core_Upgrader extends WP_Upgrader + } + } + ++ // RPM: nether allow core update ++ return false; ++ + // 1: If we're already on that version, not much point in updating? + if ( $offered_ver == $wp_version ) + return false; +@@ -2627,7 +2630,7 @@ class WP_Automatic_Updater { + */ + public function is_disabled() { + // Background updates are disabled if you don't want file changes. +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + return true; + + if ( wp_installing() ) +diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.orig 2015-12-09 17:08:00.946112235 +0100 ++++ wordpress/wp-admin/includes/update.php 2015-12-09 17:10:27.642831054 +0100 +@@ -251,7 +251,7 @@ function update_right_now_message() { + $cur = get_preferred_from_update_core(); + + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) +- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; ++ $msg .= ''; + } + + /* translators: 1: version number, 2: theme name */ +diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capabilities.php +--- wordpress/wp-includes/capabilities.php.orig 2015-11-29 03:27:18.000000000 +0100 ++++ wordpress/wp-includes/capabilities.php 2015-12-09 17:08:00.946112235 +0100 +@@ -308,7 +308,7 @@ function map_meta_cap( $cap, $user_id ) + // Disallow the file editors. + if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) + $caps[] = 'do_not_allow'; +- elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + $caps[] = 'do_not_allow'; + elseif ( is_multisite() && ! is_super_admin( $user_id ) ) + $caps[] = 'do_not_allow'; +@@ -326,7 +326,7 @@ function map_meta_cap( $cap, $user_id ) + case 'update_core': + // Disallow anything that creates, deletes, or updates core, plugin, or theme files. + // Files in uploads are excepted. +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + $caps[] = 'do_not_allow'; + } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { + $caps[] = 'do_not_allow'; +diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.orig 2015-12-06 16:44:27.000000000 +0100 ++++ wordpress/wp-includes/update.php 2015-12-09 17:12:09.038327895 +0100 +@@ -637,9 +637,6 @@ function _maybe_update_themes() { + * @since 3.1.0 + */ + function wp_schedule_update_checks() { +- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) +- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); +- + if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) + wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); + +@@ -681,8 +678,6 @@ if ( ( ! is_main_site() && ! is_network_ + } + + add_action( 'admin_init', '_maybe_update_core' ); +-add_action( 'wp_version_check', 'wp_version_check' ); +-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 ); + + add_action( 'load-plugins.php', 'wp_update_plugins' ); + add_action( 'load-update.php', 'wp_update_plugins' ); diff --git a/wordpress-4.4-systemlibs.patch b/wordpress-4.4-systemlibs.patch new file mode 100644 index 0000000..13d36b5 --- /dev/null +++ b/wordpress-4.4-systemlibs.patch @@ -0,0 +1,20 @@ +--- wordpress/wp-admin/includes/media.php.orig 2015-12-09 17:01:52.453306607 +0100 ++++ wordpress/wp-admin/includes/media.php 2015-12-09 17:05:31.477379833 +0100 +@@ -2989,7 +2989,7 @@ function wp_read_video_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + } + $id3 = new getID3(); + $data = $id3->analyze( $file ); +@@ -3050,7 +3050,7 @@ function wp_read_audio_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + } + $id3 = new getID3(); + $data = $id3->analyze( $file ); diff --git a/wordpress.spec b/wordpress.spec index 35a61bd..41eda7b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -23,7 +23,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.3.1 +Version: 4.4 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -40,15 +40,11 @@ Patch0: wordpress-debian_patches_hello.patch # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-4.2-no_swfupload.patch +Patch2: wordpress-4.4-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.0-tinymce_noflash.patch -# Adjust mediaelement not to use its SWF and Silverlight plugins. This -# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to -# 'plugins:["youtube","vimeo"]' -Patch4: wordpress-4.3-mediaelement-noflash_silverlight.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -57,9 +53,9 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.3-noupdate.patch +Patch6: wordpress-4.4-noupdate.patch # Use system libraries -Patch7: wordpress-4.0-systemlibs.patch +Patch7: wordpress-4.4-systemlibs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -152,7 +148,10 @@ rm wp-content/plugins/akismet/.htaccess #patch1 -p1 -b .rhbz522897 %patch2 -p1 %patch3 -p1 -%patch4 -p0 +# Adjust mediaelement not to use its SWF and Silverlight plugins. This +# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to +# 'plugins:["youtube","vimeo"]' +sed -s 's/"flash","silverlight",//' -i wp-includes/js/mediaelement/mediaelement-and-player.min.js %if %{with_getid3} %patch7 -p1 %endif @@ -288,6 +287,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Dec 9 2015 Remi Collet - 4.4-1 +- WordPress 4.4 “Clifford” + * Wed Sep 16 2015 Remi Collet - 4.3.1-1 - WordPress 4.3.1 Security and Maintenance Release From aaa9b6d56fc04c19aca00d8f8bbf9d418e2028a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Jan 2016 11:23:56 +0100 Subject: [PATCH 036/184] WordPress 4.4.1 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3b66a60..bb10e95 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /wordpress-4.3.tar.gz /wordpress-4.3.1.tar.gz /wordpress-4.4.tar.gz +/wordpress-4.4.1.tar.gz diff --git a/sources b/sources index ad8907e..bf48b7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b965ba1a1b0e033b4c090dd0b6d6ee7 wordpress-4.4.tar.gz +1907d1dbdac7a009d89224a516496b8d wordpress-4.4.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 41eda7b..94136b0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -23,7 +23,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.4 +Version: 4.4.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -176,7 +176,7 @@ gzip --force $arc ls -l $arc.gz # Create RPM configuration -cp wp-config-sample.php wp-config.php +sed -e 's/\r//' wp-config-sample.php >wp-config.php %patch5 -p1 %patch6 -p1 @@ -287,6 +287,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Jan 7 2016 Remi Collet - 4.4.1-1 +- WordPress 4.4.1 Security and Maintenance Release + * Wed Dec 9 2015 Remi Collet - 4.4-1 - WordPress 4.4 “Clifford” From ca28ae363f126aaaee4025901791406d0192c73b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Feb 2016 14:28:49 +0100 Subject: [PATCH 037/184] WordPress 4.4.2 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bb10e95..470921f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /wordpress-4.3.1.tar.gz /wordpress-4.4.tar.gz /wordpress-4.4.1.tar.gz +/wordpress-4.4.2.tar.gz diff --git a/sources b/sources index bf48b7e..5452e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1907d1dbdac7a009d89224a516496b8d wordpress-4.4.1.tar.gz +65d89263dad6154fdc8b747e9ef4e357 wordpress-4.4.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 94136b0..7c42dd9 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -23,7 +23,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.4.1 +Version: 4.4.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -287,6 +287,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Feb 3 2016 Remi Collet - 4.4.2-1 +- WordPress 4.4.2 Security and Maintenance Release + * Thu Jan 7 2016 Remi Collet - 4.4.1-1 - WordPress 4.4.1 Security and Maintenance Release From 7f7bae9ea49e174b5b618a6e5f28e1729e06bf99 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Mar 2016 14:59:17 +0100 Subject: [PATCH 038/184] WordPress 4.5 Release Candidate --- ...date.patch => wordpress-4.5-noupdate.patch | 32 +++++++++++++++---- wordpress.spec | 12 ++++--- 2 files changed, 34 insertions(+), 10 deletions(-) rename wordpress-4.4-noupdate.patch => wordpress-4.5-noupdate.patch (78%) diff --git a/wordpress-4.4-noupdate.patch b/wordpress-4.5-noupdate.patch similarity index 78% rename from wordpress-4.4-noupdate.patch rename to wordpress-4.5-noupdate.patch index d02cf71..f4a64c5 100644 --- a/wordpress-4.4-noupdate.patch +++ b/wordpress-4.5-noupdate.patch @@ -12,7 +12,7 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/i diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.orig wordpress/wp-admin/includes/class-wp-upgrader.php --- wordpress/wp-admin/includes/class-wp-upgrader.php.orig 2015-11-16 03:47:25.000000000 +0100 +++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-12-09 17:09:34.735571806 +0100 -@@ -2386,6 +2386,9 @@ class Core_Upgrader extends WP_Upgrader +@@ -2465,6 +2465,9 @@ class Core_Upgrader extends WP_Upgrader } } @@ -22,7 +22,7 @@ diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.orig wordpress/wp-adm // 1: If we're already on that version, not much point in updating? if ( $offered_ver == $wp_version ) return false; -@@ -2627,7 +2630,7 @@ class WP_Automatic_Updater { +@@ -2706,7 +2709,7 @@ class WP_Automatic_Updater { */ public function is_disabled() { // Background updates are disabled if you don't want file changes. @@ -46,7 +46,7 @@ diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capabilities.php --- wordpress/wp-includes/capabilities.php.orig 2015-11-29 03:27:18.000000000 +0100 +++ wordpress/wp-includes/capabilities.php 2015-12-09 17:08:00.946112235 +0100 -@@ -308,7 +308,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -310,7 +310,7 @@ function map_meta_cap( $cap, $user_id ) // Disallow the file editors. if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) $caps[] = 'do_not_allow'; @@ -55,7 +55,7 @@ diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capab $caps[] = 'do_not_allow'; elseif ( is_multisite() && ! is_super_admin( $user_id ) ) $caps[] = 'do_not_allow'; -@@ -326,7 +326,7 @@ function map_meta_cap( $cap, $user_id ) +@@ -328,7 +328,7 @@ function map_meta_cap( $cap, $user_id ) case 'update_core': // Disallow anything that creates, deletes, or updates core, plugin, or theme files. // Files in uploads are excepted. @@ -67,7 +67,7 @@ diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capab diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php --- wordpress/wp-includes/update.php.orig 2015-12-06 16:44:27.000000000 +0100 +++ wordpress/wp-includes/update.php 2015-12-09 17:12:09.038327895 +0100 -@@ -637,9 +637,6 @@ function _maybe_update_themes() { +@@ -653,9 +653,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { @@ -77,7 +77,7 @@ diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); -@@ -681,8 +678,6 @@ if ( ( ! is_main_site() && ! is_network_ +@@ -683,8 +680,6 @@ if ( ( ! is_main_site() && ! is_network_ } add_action( 'admin_init', '_maybe_update_core' ); @@ -86,3 +86,23 @@ diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php add_action( 'load-plugins.php', 'wp_update_plugins' ); add_action( 'load-update.php', 'wp_update_plugins' ); +--- wordpress/wp-admin/includes/translation-install.php.orig 2016-03-25 14:48:58.616147092 +0100 ++++ wordpress/wp-admin/includes/translation-install.php 2016-03-25 14:50:43.841612441 +0100 +@@ -181,7 +181,7 @@ function wp_download_language_pack( $dow + return $download; + } + +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + return false; + } + +@@ -224,7 +224,7 @@ function wp_download_language_pack( $dow + * @return bool Returns true on success, false on failure. + */ + function wp_can_install_language_pack() { +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + return false; + } + diff --git a/wordpress.spec b/wordpress.spec index 7c42dd9..2a8efae 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,16 +19,17 @@ %else %global with_getid3 0 %endif +%global prever RC1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.4.2 +Version: 4.5 Group: Applications/Publishing -Release: 1%{?dist} +Release: 0.1.%{prever}%{?dist} License: GPLv2 -Source0: http://wordpress.org/%{name}-%{version}.tar.gz +Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu @@ -53,7 +54,7 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.4-noupdate.patch +Patch6: wordpress-4.5-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch @@ -287,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Mar 25 2016 Remi Collet - 4.5-0.1.RC1 +- WordPress 4.5 Release Candidate + * Wed Feb 3 2016 Remi Collet - 4.4.2-1 - WordPress 4.4.2 Security and Maintenance Release From 5d1682cb5e7d0528398f4d9f9ba663b989627ae5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Mar 2016 15:03:55 +0100 Subject: [PATCH 039/184] 4.5RC1 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 470921f..6631081 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /wordpress-4.4.tar.gz /wordpress-4.4.1.tar.gz /wordpress-4.4.2.tar.gz +/wordpress-4.5-RC1.tar.gz diff --git a/sources b/sources index 5452e24..4f8ed1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65d89263dad6154fdc8b747e9ef4e357 wordpress-4.4.2.tar.gz +bebca5aab54fac11646c3da3416b1ca5 wordpress-4.5-RC1.tar.gz From a8b552e3effecb85828279da27936896e1c979da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Apr 2016 08:32:05 +0200 Subject: [PATCH 040/184] =?UTF-8?q?WordPress=204.5=20=E2=80=9CColeman?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6631081..f562157 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /wordpress-4.4.1.tar.gz /wordpress-4.4.2.tar.gz /wordpress-4.5-RC1.tar.gz +/wordpress-4.5.tar.gz diff --git a/sources b/sources index 4f8ed1d..d1991bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bebca5aab54fac11646c3da3416b1ca5 wordpress-4.5-RC1.tar.gz +6beda5bee679ddff61cb8e2e163f23bf wordpress-4.5.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 2a8efae..5fe0d34 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,14 +19,14 @@ %else %global with_getid3 0 %endif -%global prever RC1 +#global prever RC1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 4.5 Group: Applications/Publishing -Release: 0.1.%{prever}%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Apr 13 2016 Remi Collet - 4.5-1 +- WordPress 4.5 “Coleman” + * Fri Mar 25 2016 Remi Collet - 4.5-0.1.RC1 - WordPress 4.5 Release Candidate From f295541234a01891f3dc8c072ac2fa8868b3b119 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 27 Apr 2016 06:57:51 +0200 Subject: [PATCH 041/184] WordPress 4.5.1 Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f562157..83607f2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /wordpress-4.4.2.tar.gz /wordpress-4.5-RC1.tar.gz /wordpress-4.5.tar.gz +/wordpress-4.5.1.tar.gz diff --git a/sources b/sources index d1991bb..7ba038d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6beda5bee679ddff61cb8e2e163f23bf wordpress-4.5.tar.gz +203dded9c917a541c5b5b63e611fc51f wordpress-4.5.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 5fe0d34..e833739 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -24,7 +24,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.5 +Version: 4.5.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Apr 27 2016 Remi Collet - 4.5.1-1 +- WordPress 4.5.1 Maintenance Release + * Wed Apr 13 2016 Remi Collet - 4.5-1 - WordPress 4.5 “Coleman” From 22f8927f3aa3d0967546d6d01261d8977c96d46e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 May 2016 07:17:38 +0200 Subject: [PATCH 042/184] WordPress 4.5.2 Security Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 83607f2..193f109 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /wordpress-4.5-RC1.tar.gz /wordpress-4.5.tar.gz /wordpress-4.5.1.tar.gz +/wordpress-4.5.2.tar.gz diff --git a/sources b/sources index 7ba038d..7c020d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -203dded9c917a541c5b5b63e611fc51f wordpress-4.5.1.tar.gz +056da124260ed5b4465ec1fb2f9b7155 wordpress-4.5.2.tar.gz diff --git a/wordpress.spec b/wordpress.spec index e833739..e2c32c5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -24,7 +24,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.5.1 +Version: 4.5.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -288,6 +288,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue May 10 2016 Remi Collet - 4.5.2-1 +- WordPress 4.5.2 Security Release + * Wed Apr 27 2016 Remi Collet - 4.5.1-1 - WordPress 4.5.1 Maintenance Release From 3b6aed19c34d55189c1971b24dcaabae3632f083 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 14 May 2016 08:27:29 +0200 Subject: [PATCH 043/184] - never bundle ca-bundle.crt (EL-5) - provide nginx configuration (fedora) - drop mandatory dependency on httpd (suggested) #1336091 - protect php files in uploads directory --- wordpress-httpd-conf | 12 ++++++++++++ wordpress-nginx-conf | 35 +++++++++++++++++++++++++++++++++++ wordpress.spec | 41 +++++++++++++++++++++++++++++++---------- 3 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 wordpress-nginx-conf diff --git a/wordpress-httpd-conf b/wordpress-httpd-conf index c4266b4..68ca0a3 100644 --- a/wordpress-httpd-conf +++ b/wordpress-httpd-conf @@ -1,5 +1,8 @@ Alias /wordpress /usr/share/wordpress +# Access is only allowed via local access +# Change this once configured + AllowOverride Options @@ -15,7 +18,16 @@ Alias /wordpress /usr/share/wordpress + + # Deny access to any php file in the uploads directory + + Order Deny,Allow + Deny from all + + + + # Deny access to any php file in the akismet directory Order Deny,Allow Deny from all diff --git a/wordpress-nginx-conf b/wordpress-nginx-conf new file mode 100644 index 0000000..e41cc6a --- /dev/null +++ b/wordpress-nginx-conf @@ -0,0 +1,35 @@ +# Wordpress + +location = /wordpress { + alias /usr/share/wordpress/; +} + +location /wordpress/ { + root /usr/share; + index index.php; + + location ~ ^/wordpress/wp-content/uploads/(.+)\.php$ { + # Deny access to any php file in the uploads directory + deny all; + } + location ~ ^/wordpress/wp-content/plugins/akismet/(.+)\.php$ { + # Deny access to any php file in the akismet directory + deny all; + } + + # Access is only allowed via local access + # Change this once configured + location ~ ^/wordpress/(.+\.php)$ { + allow 127.0.0.1; + allow ::1; + deny all; + + try_files $uri =404; + fastcgi_intercept_errors on; + include fastcgi_params; + fastcgi_param SERVER_NAME $host; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_pass php-fpm; + } +} + diff --git a/wordpress.spec b/wordpress.spec index e2c32c5..ac90bf3 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -8,11 +8,12 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%if 0%{?rhel} == 5 -%global with_cacert 0 +%if 0%{?fedora} >= 21 +%global with_nginx 1 %else -%global with_cacert 1 +%global with_nginx 0 %endif + # https://bugzilla.redhat.com/1147817 php53-getid3 review %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %global with_getid3 1 @@ -26,13 +27,14 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.5.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu +Source4: wordpress-nginx-conf # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) @@ -68,7 +70,16 @@ Requires: php53-simplepie >= 1.3.1 Requires: php53-getid3 %endif %else +%if %{with_nginx} +Requires: webserver +Requires: php(httpd) +Suggests: httpd +# For directory ownership +Requires: httpd-filesystem +Requires: nginx-filesystem +%else Requires: php >= 5.2.4 +%endif Requires: php-simplepie >= 1.3.1 %if %{with_getid3} Requires: php-getid3 @@ -104,9 +115,8 @@ Requires: php-zlib # Unbundled libraries Requires: php-PHPMailer Requires: httpd -%if %{with_cacert} -Requires: ca-certificates -%endif +# ca-certificates (excepted on EL-5) +Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -191,6 +201,10 @@ sed -i -e 's/\r//' license.txt # Apache configuration install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf +%if %{with_nginx} +install -m 0644 -D -p %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/nginx/default.d/wordpress.conf +%endif + # Application mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress cp -pr * ${RPM_BUILD_ROOT}%{_datadir}/wordpress @@ -234,11 +248,9 @@ rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 %endif # Remove bundled ca-bundle.crt -%if %{with_cacert} rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt -ln -s /etc/pki/tls/certs/ca-bundle.crt \ +ln -s %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt -%endif # Remove backup copies of patches find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \ @@ -264,6 +276,9 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf +%if %{with_nginx} +%config(noreplace) %{_sysconfdir}/nginx/default.d/wordpress.conf +%endif %dir %{_datadir}/wordpress %{_datadir}/wordpress/wp-admin %{_datadir}/wordpress/wp-includes @@ -288,6 +303,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sat May 14 2016 Remi Collet - 4.5.2-2 +- never bundle ca-bundle.crt (EL-5) +- provide nginx configuration (fedora) +- drop mandatory dependency on httpd (suggested) #1336091 +- protect php files in uploads directory + * Tue May 10 2016 Remi Collet - 4.5.2-1 - WordPress 4.5.2 Security Release From e9da65200493cd17636a288c976d178421a0bef8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Jun 2016 10:35:45 +0200 Subject: [PATCH 044/184] WordPress 4.5.3 Maintenance and Security Release --- wordpress.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index ac90bf3..3eb0fc7 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,9 +25,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.5.2 +Version: 4.5.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -303,6 +303,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Jun 22 2016 Remi Collet - 4.5.3-1 +- WordPress 4.5.3 Maintenance and Security Release + * Sat May 14 2016 Remi Collet - 4.5.2-2 - never bundle ca-bundle.crt (EL-5) - provide nginx configuration (fedora) From 287ce09d3c83d9b70b01b1ad30fc04b8f2f68284 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Jun 2016 10:38:34 +0200 Subject: [PATCH 045/184] 4.5.3 sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 193f109..a86355c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /wordpress-4.5.tar.gz /wordpress-4.5.1.tar.gz /wordpress-4.5.2.tar.gz +/wordpress-4.5.3.tar.gz diff --git a/sources b/sources index 7c020d2..6f22991 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -056da124260ed5b4465ec1fb2f9b7155 wordpress-4.5.2.tar.gz +6cd70fcceb7050bfe22fc03e801e0305 wordpress-4.5.3.tar.gz From 7f1973e1766a58cbc722ee1e495491f496f94835 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Jun 2016 06:59:11 +0200 Subject: [PATCH 046/184] add patch to drop ereg dependency, see https://core.trac.wordpress.org/ticket/37194 --- ...lean-split-usage-and-ereg-dependency.patch | 61 +++++++++++++++++++ wordpress.spec | 17 ++++-- 2 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 0001-clean-split-usage-and-ereg-dependency.patch diff --git a/0001-clean-split-usage-and-ereg-dependency.patch b/0001-clean-split-usage-and-ereg-dependency.patch new file mode 100644 index 0000000..55f2cc9 --- /dev/null +++ b/0001-clean-split-usage-and-ereg-dependency.patch @@ -0,0 +1,61 @@ +From 777aa69bd4689ea9d31d944acde2d5bd06a2ec88 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 27 Jun 2016 06:49:31 +0200 +Subject: [PATCH] clean split usage and ereg dependency + +--- + wp-includes/atomlib.php | 10 ++++++---- + wp-includes/rss.php | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php +index 271635f..f9862f9 100644 +--- a/wp-includes/atomlib.php ++++ b/wp-includes/atomlib.php +@@ -159,7 +159,8 @@ class AtomParser { + + function start_element($parser, $name, $attrs) { + +- $tag = array_pop(split(":", $name)); ++ $tag = explode(":", $name); ++ $tag = array_pop($tag); + + switch($name) { + case $this->NS . ':feed': +@@ -238,7 +239,8 @@ class AtomParser { + + function end_element($parser, $name) { + +- $tag = array_pop(split(":", $name)); ++ $tag = explode(":", $name); ++ $tag = array_pop($tag); + + $ccount = count($this->in_content); + +@@ -312,8 +314,8 @@ class AtomParser { + + + function ns_to_prefix($qname, $attr=false) { +- # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div') +- $components = split(":", $qname); ++ # explode 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div') ++ $components = explode(":", $qname); + + # grab the last one (e.g 'div') + $name = array_pop($components); +diff --git a/wp-includes/rss.php b/wp-includes/rss.php +index 548ccf2..71146ed 100644 +--- a/wp-includes/rss.php ++++ b/wp-includes/rss.php +@@ -114,7 +114,7 @@ class MagpieRSS { + // check for a namespace, and split if found + $ns = false; + if ( strpos( $element, ':' ) ) { +- list($ns, $el) = split( ':', $element, 2); ++ list($ns, $el) = explode( ':', $element, 2); + } + if ( $ns and $ns != 'rdf' ) { + $this->current_namespace = $ns; +-- +2.5.5 + diff --git a/wordpress.spec b/wordpress.spec index 3eb0fc7..c6026ed 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -27,7 +27,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.5.3 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -59,6 +59,8 @@ Patch5: wordpress-4.0-config.patch Patch6: wordpress-4.5-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch +# Drop ereg, see https://core.trac.wordpress.org/ticket/37194 +Patch8: 0001-clean-split-usage-and-ereg-dependency.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -85,14 +87,14 @@ Requires: php-simplepie >= 1.3.1 Requires: php-getid3 %endif %endif -# From phpcompatinfo report for version 3.8 +# From phpcompatinfo report for version 4.5.3 +Requires: php-ctype Requires: php-curl Requires: php-date Requires: php-dom -Requires: php-enchant -Requires: php-ereg Requires: php-exif Requires: php-fileinfo +Requires: php-filter Requires: php-ftp Requires: php-gd Requires: php-gettext @@ -101,7 +103,7 @@ Requires: php-iconv Requires: php-json Requires: php-libxml Requires: php-mbstring -Requires: php-mysql +Requires: php-mysqli Requires: php-openssl Requires: php-pcre Requires: php-posix @@ -166,6 +168,7 @@ sed -s 's/"flash","silverlight",//' -i wp-includes/js/mediaelement/mediaelement- %if %{with_getid3} %patch7 -p1 %endif +%patch8 -p1 # We patch a .js file, used patched file instead of unpatch minified one ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js @@ -303,6 +306,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Mon Jun 27 2016 Remi Collet - 4.5.3-2 +- add patch to drop ereg dependency, see + https://core.trac.wordpress.org/ticket/37194 + * Wed Jun 22 2016 Remi Collet - 4.5.3-1 - WordPress 4.5.3 Maintenance and Security Release From 1566c78f9273145f89c8c5aebcfa45ff21a7c76c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 3 Sep 2016 08:13:27 +0200 Subject: [PATCH 047/184] =?UTF-8?q?WordPress=204.6=20=E2=80=9CPepper?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ...lean-split-usage-and-ereg-dependency.patch | 61 ---------- sources | 2 +- wordpress-4.5-noupdate.patch | 108 ------------------ wordpress-4.6-noupdate.patch | 103 +++++++++++++++++ wordpress.spec | 12 +- 6 files changed, 111 insertions(+), 176 deletions(-) delete mode 100644 0001-clean-split-usage-and-ereg-dependency.patch delete mode 100644 wordpress-4.5-noupdate.patch create mode 100644 wordpress-4.6-noupdate.patch diff --git a/.gitignore b/.gitignore index a86355c..c793acd 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ clog /wordpress-4.5.1.tar.gz /wordpress-4.5.2.tar.gz /wordpress-4.5.3.tar.gz +/wordpress-debian_patches_hello.patch diff --git a/0001-clean-split-usage-and-ereg-dependency.patch b/0001-clean-split-usage-and-ereg-dependency.patch deleted file mode 100644 index 55f2cc9..0000000 --- a/0001-clean-split-usage-and-ereg-dependency.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 777aa69bd4689ea9d31d944acde2d5bd06a2ec88 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 27 Jun 2016 06:49:31 +0200 -Subject: [PATCH] clean split usage and ereg dependency - ---- - wp-includes/atomlib.php | 10 ++++++---- - wp-includes/rss.php | 2 +- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php -index 271635f..f9862f9 100644 ---- a/wp-includes/atomlib.php -+++ b/wp-includes/atomlib.php -@@ -159,7 +159,8 @@ class AtomParser { - - function start_element($parser, $name, $attrs) { - -- $tag = array_pop(split(":", $name)); -+ $tag = explode(":", $name); -+ $tag = array_pop($tag); - - switch($name) { - case $this->NS . ':feed': -@@ -238,7 +239,8 @@ class AtomParser { - - function end_element($parser, $name) { - -- $tag = array_pop(split(":", $name)); -+ $tag = explode(":", $name); -+ $tag = array_pop($tag); - - $ccount = count($this->in_content); - -@@ -312,8 +314,8 @@ class AtomParser { - - - function ns_to_prefix($qname, $attr=false) { -- # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div') -- $components = split(":", $qname); -+ # explode 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div') -+ $components = explode(":", $qname); - - # grab the last one (e.g 'div') - $name = array_pop($components); -diff --git a/wp-includes/rss.php b/wp-includes/rss.php -index 548ccf2..71146ed 100644 ---- a/wp-includes/rss.php -+++ b/wp-includes/rss.php -@@ -114,7 +114,7 @@ class MagpieRSS { - // check for a namespace, and split if found - $ns = false; - if ( strpos( $element, ':' ) ) { -- list($ns, $el) = split( ':', $element, 2); -+ list($ns, $el) = explode( ':', $element, 2); - } - if ( $ns and $ns != 'rdf' ) { - $this->current_namespace = $ns; --- -2.5.5 - diff --git a/sources b/sources index 6f22991..c52ffff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6cd70fcceb7050bfe22fc03e801e0305 wordpress-4.5.3.tar.gz +550ed1b2b5c8bd585e7bb1b548cb6215 wordpress-debian_patches_hello.patch diff --git a/wordpress-4.5-noupdate.patch b/wordpress-4.5-noupdate.patch deleted file mode 100644 index f4a64c5..0000000 --- a/wordpress-4.5-noupdate.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.orig 2015-10-15 00:35:24.000000000 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2015-12-09 17:08:00.945112230 +0100 -@@ -100,7 +100,6 @@ add_action( 'profile_update', 'default_p - add_action( 'admin_init', 'wp_plugin_update_rows' ); - add_action( 'admin_init', 'wp_theme_update_rows' ); - --add_action( 'admin_notices', 'update_nag', 3 ); - add_action( 'admin_notices', 'maintenance_nag', 10 ); - - add_filter( 'update_footer', 'core_update_footer' ); -diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.orig wordpress/wp-admin/includes/class-wp-upgrader.php ---- wordpress/wp-admin/includes/class-wp-upgrader.php.orig 2015-11-16 03:47:25.000000000 +0100 -+++ wordpress/wp-admin/includes/class-wp-upgrader.php 2015-12-09 17:09:34.735571806 +0100 -@@ -2465,6 +2465,9 @@ class Core_Upgrader extends WP_Upgrader - } - } - -+ // RPM: nether allow core update -+ return false; -+ - // 1: If we're already on that version, not much point in updating? - if ( $offered_ver == $wp_version ) - return false; -@@ -2706,7 +2709,7 @@ class WP_Automatic_Updater { - */ - public function is_disabled() { - // Background updates are disabled if you don't want file changes. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) - return true; - - if ( wp_installing() ) -diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.orig 2015-12-09 17:08:00.946112235 +0100 -+++ wordpress/wp-admin/includes/update.php 2015-12-09 17:10:27.642831054 +0100 -@@ -251,7 +251,7 @@ function update_right_now_message() { - $cur = get_preferred_from_update_core(); - - if ( isset( $cur->response ) && $cur->response == 'upgrade' ) -- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; -+ $msg .= ''; - } - - /* translators: 1: version number, 2: theme name */ -diff -up wordpress/wp-includes/capabilities.php.orig wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.orig 2015-11-29 03:27:18.000000000 +0100 -+++ wordpress/wp-includes/capabilities.php 2015-12-09 17:08:00.946112235 +0100 -@@ -310,7 +310,7 @@ function map_meta_cap( $cap, $user_id ) - // Disallow the file editors. - if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) - $caps[] = 'do_not_allow'; -- elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) - $caps[] = 'do_not_allow'; - elseif ( is_multisite() && ! is_super_admin( $user_id ) ) - $caps[] = 'do_not_allow'; -@@ -328,7 +328,7 @@ function map_meta_cap( $cap, $user_id ) - case 'update_core': - // Disallow anything that creates, deletes, or updates core, plugin, or theme files. - // Files in uploads are excepted. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - $caps[] = 'do_not_allow'; - } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { - $caps[] = 'do_not_allow'; -diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.orig 2015-12-06 16:44:27.000000000 +0100 -+++ wordpress/wp-includes/update.php 2015-12-09 17:12:09.038327895 +0100 -@@ -653,9 +653,6 @@ function _maybe_update_themes() { - * @since 3.1.0 - */ - function wp_schedule_update_checks() { -- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) -- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); -- - if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) - wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); - -@@ -683,8 +680,6 @@ if ( ( ! is_main_site() && ! is_network_ - } - - add_action( 'admin_init', '_maybe_update_core' ); --add_action( 'wp_version_check', 'wp_version_check' ); --add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 ); - - add_action( 'load-plugins.php', 'wp_update_plugins' ); - add_action( 'load-update.php', 'wp_update_plugins' ); ---- wordpress/wp-admin/includes/translation-install.php.orig 2016-03-25 14:48:58.616147092 +0100 -+++ wordpress/wp-admin/includes/translation-install.php 2016-03-25 14:50:43.841612441 +0100 -@@ -181,7 +181,7 @@ function wp_download_language_pack( $dow - return $download; - } - -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - return false; - } - -@@ -224,7 +224,7 @@ function wp_download_language_pack( $dow - * @return bool Returns true on success, false on failure. - */ - function wp_can_install_language_pack() { -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - return false; - } - diff --git a/wordpress-4.6-noupdate.patch b/wordpress-4.6-noupdate.patch new file mode 100644 index 0000000..0038d1e --- /dev/null +++ b/wordpress-4.6-noupdate.patch @@ -0,0 +1,103 @@ +diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.rpm 2016-09-03 07:50:51.812312381 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2016-09-03 07:51:39.070577518 +0200 +@@ -106,7 +106,6 @@ add_action( 'profile_update', 'default_p + add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. + add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. + +-add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'maintenance_nag', 10 ); + + add_filter( 'update_footer', 'core_update_footer' ); +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2016-09-03 07:59:45.832367671 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2016-09-03 07:59:50.160392833 +0200 +@@ -236,6 +236,9 @@ class Core_Upgrader extends WP_Upgrader + * @return bool True if we should update to the offered version, otherwise false. + */ + public static function should_update_to_version( $offered_ver ) { ++ // RPM: nether allow core update ++ return false; ++ + include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z + + $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2016-09-03 08:00:15.810540773 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2016-09-03 08:00:28.915616106 +0200 +@@ -31,7 +31,7 @@ class WP_Automatic_Updater { + */ + public function is_disabled() { + // Background updates are disabled if you don't want file changes. +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + return true; + + if ( wp_installing() ) +diff -up wordpress/wp-admin/includes/translation-install.php.rpm wordpress/wp-admin/includes/translation-install.php +--- wordpress/wp-admin/includes/translation-install.php.rpm 2016-05-22 20:01:30.000000000 +0200 ++++ wordpress/wp-admin/includes/translation-install.php 2016-09-03 07:50:51.813312387 +0200 +@@ -181,7 +181,7 @@ function wp_download_language_pack( $dow + return $download; + } + +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + return false; + } + +@@ -224,7 +224,7 @@ function wp_download_language_pack( $dow + * @return bool Returns true on success, false on failure. + */ + function wp_can_install_language_pack() { +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + return false; + } + +diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.rpm 2016-08-10 21:06:31.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2016-09-03 07:50:51.812312381 +0200 +@@ -271,7 +271,7 @@ function update_right_now_message() { + $cur = get_preferred_from_update_core(); + + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) +- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; ++ $msg .= ''; + } + + /* translators: 1: version number, 2: theme name */ +diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabilities.php +--- wordpress/wp-includes/capabilities.php.rpm 2016-06-30 03:02:29.000000000 +0200 ++++ wordpress/wp-includes/capabilities.php 2016-09-03 07:50:51.812312381 +0200 +@@ -330,7 +330,7 @@ function map_meta_cap( $cap, $user_id ) + // Disallow the file editors. + if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) + $caps[] = 'do_not_allow'; +- elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) ++ elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) + $caps[] = 'do_not_allow'; + elseif ( is_multisite() && ! is_super_admin( $user_id ) ) + $caps[] = 'do_not_allow'; +@@ -348,7 +348,7 @@ function map_meta_cap( $cap, $user_id ) + case 'update_core': + // Disallow anything that creates, deletes, or updates core, plugin, or theme files. + // Files in uploads are excepted. +- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { ++ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { + $caps[] = 'do_not_allow'; + } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { + $caps[] = 'do_not_allow'; +diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.rpm 2016-05-25 21:36:28.000000000 +0200 ++++ wordpress/wp-includes/update.php 2016-09-03 07:50:51.813312387 +0200 +@@ -653,9 +653,6 @@ function _maybe_update_themes() { + * @since 3.1.0 + */ + function wp_schedule_update_checks() { +- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) +- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); +- + if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) + wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); + diff --git a/wordpress.spec b/wordpress.spec index c6026ed..eeb71d8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,9 +25,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.5.3 +Version: 4.6 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -56,11 +56,9 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.5-noupdate.patch +Patch6: wordpress-4.6-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch -# Drop ereg, see https://core.trac.wordpress.org/ticket/37194 -Patch8: 0001-clean-split-usage-and-ereg-dependency.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -168,7 +166,6 @@ sed -s 's/"flash","silverlight",//' -i wp-includes/js/mediaelement/mediaelement- %if %{with_getid3} %patch7 -p1 %endif -%patch8 -p1 # We patch a .js file, used patched file instead of unpatch minified one ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js @@ -306,6 +303,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sat Sep 3 2016 Remi Collet - 4.6-1 +- WordPress 4.6 “Pepper” + * Mon Jun 27 2016 Remi Collet - 4.5.3-2 - add patch to drop ereg dependency, see https://core.trac.wordpress.org/ticket/37194 From c6b51849a14bd32bb78dfee6c88fb7a6fcaeb2b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 3 Sep 2016 08:16:49 +0200 Subject: [PATCH 048/184] =?UTF-8?q?WordPress=204.6=20=E2=80=9CPepper?= =?UTF-8?q?=E2=80=9D=20(sources)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c793acd..7ab8d07 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /wordpress-4.5.2.tar.gz /wordpress-4.5.3.tar.gz /wordpress-debian_patches_hello.patch +/wordpress-4.6.tar.gz diff --git a/sources b/sources index c52ffff..e275cdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -550ed1b2b5c8bd585e7bb1b548cb6215 wordpress-debian_patches_hello.patch +b07bb75bb0f85fd6e1a65ad3d0b876d8 wordpress-4.6.tar.gz From a6ed36f3d841e8550c0e4f1bc9b834e663f674f0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 3 Sep 2016 08:39:51 +0200 Subject: [PATCH 049/184] fix direftory permissions #1305687 --- wordpress.spec | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index eeb71d8..1fe920c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -27,7 +27,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.6 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -69,6 +69,8 @@ Requires: php53-simplepie >= 1.3.1 %if %{with_getid3} Requires: php53-getid3 %endif +Requires: php53-mysql + %else %if %{with_nginx} Requires: webserver @@ -77,6 +79,7 @@ Suggests: httpd # For directory ownership Requires: httpd-filesystem Requires: nginx-filesystem + %else Requires: php >= 5.2.4 %endif @@ -84,15 +87,17 @@ Requires: php-simplepie >= 1.3.1 %if %{with_getid3} Requires: php-getid3 %endif -%endif -# From phpcompatinfo report for version 4.5.3 Requires: php-ctype +Requires: php-filter +Requires: php-mysqli +%endif + +# From phpcompatinfo report for version 4.5.3 Requires: php-curl Requires: php-date Requires: php-dom Requires: php-exif Requires: php-fileinfo -Requires: php-filter Requires: php-ftp Requires: php-gd Requires: php-gettext @@ -101,7 +106,6 @@ Requires: php-iconv Requires: php-json Requires: php-libxml Requires: php-mbstring -Requires: php-mysqli Requires: php-openssl Requires: php-pcre Requires: php-posix @@ -285,10 +289,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_datadir}/wordpress/index.php %dir %{wp_content}/ %{wp_content}/index.php -%dir %attr(0775,apache,ftp) %{wp_content}/plugins -%dir %attr(0775,apache,ftp) %{wp_content}/themes -%dir %attr(0775,apache,ftp) %{wp_content}/upgrade -%dir %attr(0775,apache,ftp) %{wp_content}/uploads +%dir %attr(2775,apache,ftp) %{wp_content}/plugins +%dir %attr(2775,apache,ftp) %{wp_content}/themes +%dir %attr(2775,apache,ftp) %{wp_content}/upgrade +%dir %attr(2775,apache,ftp) %{wp_content}/uploads %{wp_content}/plugins/* %{wp_content}/themes/* %{!?_licensedir:%global license %%doc} @@ -303,8 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog -* Sat Sep 3 2016 Remi Collet - 4.6-1 +* Sat Sep 3 2016 Remi Collet - 4.6-2 - WordPress 4.6 “Pepper” +- fix direftory permissions #1305687 * Mon Jun 27 2016 Remi Collet - 4.5.3-2 - add patch to drop ereg dependency, see From b2e1003fecedab032434c32b5a1ee710fd8a1e63 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2016 08:44:09 +0200 Subject: [PATCH 050/184] WordPress 4.6.1 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7ab8d07..a4d5620 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /wordpress-4.5.3.tar.gz /wordpress-debian_patches_hello.patch /wordpress-4.6.tar.gz +/wordpress-4.6.1.tar.gz diff --git a/sources b/sources index e275cdf..cde0dc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b07bb75bb0f85fd6e1a65ad3d0b876d8 wordpress-4.6.tar.gz +ca0b978fd702eac033830ca2d0784b79 wordpress-4.6.1.tar.gz diff --git a/wordpress.spec b/wordpress.spec index 1fe920c..f5a7686 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,9 +25,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.6 +Version: 4.6.1 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -307,9 +307,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Sep 8 2016 Remi Collet - 4.6.1-1 +- WordPress 4.6.1 Security and Maintenance Release + * Sat Sep 3 2016 Remi Collet - 4.6-2 - WordPress 4.6 “Pepper” -- fix direftory permissions #1305687 +- fix directory permissions #1305687 * Mon Jun 27 2016 Remi Collet - 4.5.3-2 - add patch to drop ereg dependency, see From 0f6aae9a625bf5562bb259e405470c035b441757 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Dec 2016 14:38:14 +0100 Subject: [PATCH 051/184] =?UTF-8?q?WordPress=204.7=20=E2=80=9CVaughan?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a4d5620..27a8fea 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /wordpress-debian_patches_hello.patch /wordpress-4.6.tar.gz /wordpress-4.6.1.tar.gz +/wordpress-4.7.tar.gz diff --git a/sources b/sources index cde0dc9..230dbc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca0b978fd702eac033830ca2d0784b79 wordpress-4.6.1.tar.gz +474c022ef8e5371a8fc756dbfeb96d1b wordpress-4.7.tar.gz diff --git a/wordpress.spec b/wordpress.spec index f5a7686..90189ec 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,7 +25,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.6.1 +Version: 4.7 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Dec 7 2016 Remi Collet - 4.7.0-1 +- WordPress 4.7 “Vaughan” + * Thu Sep 8 2016 Remi Collet - 4.6.1-1 - WordPress 4.6.1 Security and Maintenance Release From 06ad60dce17167a1c99218e627c9f6c7b4175014 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Jan 2017 08:28:59 +0100 Subject: [PATCH 052/184] WordPress 4.7.1 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 27a8fea..f1ffd8a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /wordpress-4.6.tar.gz /wordpress-4.6.1.tar.gz /wordpress-4.7.tar.gz +/wordpress-4.7.1.tar.gz diff --git a/sources b/sources index 230dbc1..25c194e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -474c022ef8e5371a8fc756dbfeb96d1b wordpress-4.7.tar.gz +SHA512 (wordpress-4.7.1.tar.gz) = ccb2d36e0192ceeb02e4391a3bd6fb100558c3013c1e10a91465c9b7d83e294a51c35ee60637f01838131e2a3c99266320fe0e90d51979c566a53fffed19dc4c diff --git a/wordpress.spec b/wordpress.spec index 90189ec..bf0c800 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,7 +25,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7 +Version: 4.7.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Thu Jan 12 2017 Remi Collet - 4.7.1-1 +- WordPress 4.7.1 Security and Maintenance Release + * Wed Dec 7 2016 Remi Collet - 4.7.0-1 - WordPress 4.7 “Vaughan” From 8007b8d8efde768dc6866245008927954fcc4445 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 27 Jan 2017 10:40:42 +0100 Subject: [PATCH 053/184] WordPress 4.7.2 Security Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f1ffd8a..182111d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /wordpress-4.6.1.tar.gz /wordpress-4.7.tar.gz /wordpress-4.7.1.tar.gz +/wordpress-4.7.2.tar.gz diff --git a/sources b/sources index 25c194e..ae02007 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.1.tar.gz) = ccb2d36e0192ceeb02e4391a3bd6fb100558c3013c1e10a91465c9b7d83e294a51c35ee60637f01838131e2a3c99266320fe0e90d51979c566a53fffed19dc4c +SHA512 (wordpress-4.7.2.tar.gz) = 610a820cf2eea39a60100515f68e95a7194a4e20df9c8158111b1978d5bc7c606dd2b7adf2f4019e9108a136e12eb2db7ae5ed75681cec23ffb901f8cc7fb83a diff --git a/wordpress.spec b/wordpress.spec index bf0c800..049f8d8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,7 +25,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7.1 +Version: 4.7.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2017 Remi Collet - 4.7.2-1 +- WordPress 4.7.2 Security Release + * Thu Jan 12 2017 Remi Collet - 4.7.1-1 - WordPress 4.7.1 Security and Maintenance Release From d5e780c454452d9ff9175c1b0443f526e1cc848b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:30:51 +0000 Subject: [PATCH 054/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 049f8d8..43594fe 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -27,7 +27,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.7.2 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 4.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 27 2017 Remi Collet - 4.7.2-1 - WordPress 4.7.2 Security Release From 093664f07691cae6506dcf9b4f5997fbde3d171f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Mar 2017 06:31:54 +0100 Subject: [PATCH 055/184] WordPress 4.7.3 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 182111d..db8025a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /wordpress-4.7.tar.gz /wordpress-4.7.1.tar.gz /wordpress-4.7.2.tar.gz +/wordpress-4.7.3.tar.gz diff --git a/sources b/sources index ae02007..474cc26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.2.tar.gz) = 610a820cf2eea39a60100515f68e95a7194a4e20df9c8158111b1978d5bc7c606dd2b7adf2f4019e9108a136e12eb2db7ae5ed75681cec23ffb901f8cc7fb83a +SHA512 (wordpress-4.7.3.tar.gz) = 071df65c3a43557faf351838a661a83e26d8de37c8633dc17a59d773cc91caef640a625b0719606df1fc563fd18af71ba1da22a5b6f345339e73761754484dc5 diff --git a/wordpress.spec b/wordpress.spec index 43594fe..d1b688c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,9 +25,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7.2 +Version: 4.7.3 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Mar 7 2017 Remi Collet - 4.7.3-1 +- WordPress 4.7.3 Security and Maintenance Release + * Sat Feb 11 2017 Fedora Release Engineering - 4.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 22cff6edbb735b34013b37105bb96755aa1f5bcc Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 22 Apr 2017 12:37:59 -0600 Subject: [PATCH 056/184] Update to 4.7.4. Maintenance Release. --- .gitignore | 1 + sources | 2 +- wordpress-4.0-tinymce_noflash.patch | 51 ++++++++++++++++------------- wordpress.spec | 5 ++- 4 files changed, 35 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index db8025a..ad4dbd7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /wordpress-4.7.1.tar.gz /wordpress-4.7.2.tar.gz /wordpress-4.7.3.tar.gz +/wordpress-4.7.4.tar.gz diff --git a/sources b/sources index 474cc26..78b310c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.3.tar.gz) = 071df65c3a43557faf351838a661a83e26d8de37c8633dc17a59d773cc91caef640a625b0719606df1fc563fd18af71ba1da22a5b6f345339e73761754484dc5 +SHA512 (wordpress-4.7.4.tar.gz) = 9d1b7fa2688e80d8e8409bd9f7fa61007b266de70a11eaa592fc737c501906e9c14b20eab63542077acb8dd65f5491f481b0945f5ed9e98d8b5207a47c3ec950 diff --git a/wordpress-4.0-tinymce_noflash.patch b/wordpress-4.0-tinymce_noflash.patch index 217e7f9..76f1bb9 100644 --- a/wordpress-4.0-tinymce_noflash.patch +++ b/wordpress-4.0-tinymce_noflash.patch @@ -1,23 +1,30 @@ -diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm wordpress/wp-includes/js/tinymce/plugins/media/plugin.js ---- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.rpm 2014-08-22 01:53:18.000000000 +0200 -+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2014-09-08 13:10:15.717314458 +0200 -@@ -46,10 +46,6 @@ tinymce.PluginManager.add('media', funct - return 'video/ogg'; - } - -- if (url.indexOf('.swf') != -1) { -- return 'application/x-shockwave-flash'; -- } +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 2017-04-12 19:52:38.000000000 -0600 ++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2017-04-22 11:28:42.415026834 -0600 +@@ -438,7 +438,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]; +@@ -583,18 +582,6 @@ + '" width="' + data.width + + '" height="' + data.height + + '"' + allowFullscreen + '>'; +- } else if (data.source1mime === "application/x-shockwave-flash") { +- html += +- ''; - - return ''; - } - -@@ -247,7 +243,7 @@ tinymce.PluginManager.add('media', funct - data.source1mime = guessMime(data.source1); - data.source2mime = guessMime(data.source2); - data.poster = editor.convertURL(data.poster, "poster"); -- data.flashPlayerUrl = editor.convertURL(url + '/moxieplayer.swf', "movie"); -+ data.flashPlayerUrl = false; - - tinymce.each(urlPatterns, function(pattern) { - var match, i, url; +- if (data.poster) { +- html += ''; +- } +- +- html += ''; + } else if (data.source1mime.indexOf('audio') !== -1) { + if (editor.settings.audio_template_callback) { + html = editor.settings.audio_template_callback(data); diff --git a/wordpress.spec b/wordpress.spec index d1b688c..d6733de 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -25,7 +25,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7.3 +Version: 4.7.4 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Sat Apr 22 2017 Kevin Fenzi - 4.7.4-1 +- Update to 4.7.4. Maintenance Release. + * Tue Mar 7 2017 Remi Collet - 4.7.3-1 - WordPress 4.7.3 Security and Maintenance Release From 3784ddd0733d8c71259dfa0966605b71b2772113 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 May 2017 17:27:39 +0200 Subject: [PATCH 057/184] protect .phar from being executed from uploads directory --- wordpress-httpd-conf | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wordpress-httpd-conf b/wordpress-httpd-conf index 68ca0a3..3692823 100644 --- a/wordpress-httpd-conf +++ b/wordpress-httpd-conf @@ -20,7 +20,7 @@ Alias /wordpress /usr/share/wordpress # Deny access to any php file in the uploads directory - + Order Deny,Allow Deny from all diff --git a/wordpress.spec b/wordpress.spec index d6733de..c33c873 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -27,7 +27,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.7.4 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -307,6 +307,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Tue Mar 7 2017 Remi Collet - 4.7.4-2 +- protect .phar from being executed from uploads directory + * Sat Apr 22 2017 Kevin Fenzi - 4.7.4-1 - Update to 4.7.4. Maintenance Release. From cb4d926f8c23df855f2b9307719c4d67942ed6fc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 May 2017 17:28:34 +0200 Subject: [PATCH 058/184] fix date --- wordpress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index c33c873..7d512e1 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -307,7 +307,7 @@ rm -rf ${RPM_BUILD_ROOT} %changelog -* Tue Mar 7 2017 Remi Collet - 4.7.4-2 +* Wed May 10 2017 Remi Collet - 4.7.4-2 - protect .phar from being executed from uploads directory * Sat Apr 22 2017 Kevin Fenzi - 4.7.4-1 From ee90367b3ee9655b9c003da4ea53981e41db2d07 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 May 2017 06:42:18 +0200 Subject: [PATCH 059/184] WordPress 4.7.5 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 38 +++++--------------------------------- 3 files changed, 7 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index ad4dbd7..cf51623 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /wordpress-4.7.2.tar.gz /wordpress-4.7.3.tar.gz /wordpress-4.7.4.tar.gz +/wordpress-4.7.5.tar.gz diff --git a/sources b/sources index 78b310c..c840d3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.4.tar.gz) = 9d1b7fa2688e80d8e8409bd9f7fa61007b266de70a11eaa592fc737c501906e9c14b20eab63542077acb8dd65f5491f481b0945f5ed9e98d8b5207a47c3ec950 +SHA512 (wordpress-4.7.5.tar.gz) = 7d6e4feaf95c49ec7e68068687a399145613d90b5867616ac7a324c60f9107f2453c9f745a455b94e84ef12b191cb2ac67e6b4dd3b8f669e344ea63afc6988ca diff --git a/wordpress.spec b/wordpress.spec index 7d512e1..cfc5dbb 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -14,20 +14,14 @@ %global with_nginx 0 %endif -# https://bugzilla.redhat.com/1147817 php53-getid3 review -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 -%global with_getid3 1 -%else -%global with_getid3 0 -%endif #global prever RC1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.7.4 +Version: 4.7.5 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -60,18 +54,8 @@ Patch6: wordpress-4.6-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%if 0%{?rhel} == 5 -Requires: php53 >= 5.2.4 -Requires: php53-simplepie >= 1.3.1 -%if %{with_getid3} -Requires: php53-getid3 -%endif -Requires: php53-mysql - -%else %if %{with_nginx} Requires: webserver Requires: php(httpd) @@ -84,13 +68,10 @@ Requires: nginx-filesystem Requires: php >= 5.2.4 %endif Requires: php-simplepie >= 1.3.1 -%if %{with_getid3} Requires: php-getid3 -%endif Requires: php-ctype Requires: php-filter Requires: php-mysqli -%endif # From phpcompatinfo report for version 4.5.3 Requires: php-curl @@ -167,9 +148,7 @@ rm wp-content/plugins/akismet/.htaccess # changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to # 'plugins:["youtube","vimeo"]' sed -s 's/"flash","silverlight",//' -i wp-includes/js/mediaelement/mediaelement-and-player.min.js -%if %{with_getid3} %patch7 -p1 -%endif # We patch a .js file, used patched file instead of unpatch minified one ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js @@ -231,11 +210,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} # Remove bundled php-simplepie and link to system copy rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie -%if 0%{?rhel} == 5 -ln -s /usr/share/php/php53-simplepie/autoloader.php \ -%else ln -s /usr/share/php/php-simplepie/autoloader.php \ -%endif ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php # Remove bundled PHPMailer and link to system one @@ -246,10 +221,8 @@ for fic in phpmailer smtp; do ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php done -%if %{with_getid3} # Remove bundled php-getid3 rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 -%endif # Remove bundled ca-bundle.crt rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt @@ -274,11 +247,7 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig #fi -%clean -rm -rf ${RPM_BUILD_ROOT} - %files -%defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf %if %{with_nginx} %config(noreplace) %{_sysconfdir}/nginx/default.d/wordpress.conf @@ -307,6 +276,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed May 17 2017 Remi Collet - 4.7.5-1 +- WordPress 4.7.5 Security and Maintenance Release + * Wed May 10 2017 Remi Collet - 4.7.4-2 - protect .phar from being executed from uploads directory From 64ad28aeee49fc904cd43d768bb226c5463be5a8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Jun 2017 13:43:56 +0200 Subject: [PATCH 060/184] =?UTF-8?q?WordPress=204.8=20=E2=80=9CEvans?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress-4.0-tinymce_noflash.patch | 30 -------- wordpress-4.6-noupdate.patch | 103 ---------------------------- wordpress-4.8-noupdate.patch | 71 +++++++++++++++++++ wordpress-4.8-tinymce_noflash.patch | 31 +++++++++ wordpress.spec | 10 +-- 7 files changed, 110 insertions(+), 138 deletions(-) delete mode 100644 wordpress-4.0-tinymce_noflash.patch delete mode 100644 wordpress-4.6-noupdate.patch create mode 100644 wordpress-4.8-noupdate.patch create mode 100644 wordpress-4.8-tinymce_noflash.patch diff --git a/.gitignore b/.gitignore index cf51623..eee2c6e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /wordpress-4.7.3.tar.gz /wordpress-4.7.4.tar.gz /wordpress-4.7.5.tar.gz +/wordpress-4.8.tar.gz diff --git a/sources b/sources index c840d3e..de99ee2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.7.5.tar.gz) = 7d6e4feaf95c49ec7e68068687a399145613d90b5867616ac7a324c60f9107f2453c9f745a455b94e84ef12b191cb2ac67e6b4dd3b8f669e344ea63afc6988ca +SHA512 (wordpress-4.8.tar.gz) = 20249cf13dbcec198df3ec1feb3a7381c194c7c9f832262e40449f90c5e5b5d3f4b63b6021e78c65cc615e059b1b601881d33ce03e1e4618231329b680511467 diff --git a/wordpress-4.0-tinymce_noflash.patch b/wordpress-4.0-tinymce_noflash.patch deleted file mode 100644 index 76f1bb9..0000000 --- a/wordpress-4.0-tinymce_noflash.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 2017-04-12 19:52:38.000000000 -0600 -+++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2017-04-22 11:28:42.415026834 -0600 -@@ -438,7 +438,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]; -@@ -583,18 +582,6 @@ - '" width="' + data.width + - '" height="' + data.height + - '"' + allowFullscreen + '>'; -- } else if (data.source1mime === "application/x-shockwave-flash") { -- html += -- ''; -- -- if (data.poster) { -- html += ''; -- } -- -- html += ''; - } 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.6-noupdate.patch b/wordpress-4.6-noupdate.patch deleted file mode 100644 index 0038d1e..0000000 --- a/wordpress-4.6-noupdate.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.rpm 2016-09-03 07:50:51.812312381 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2016-09-03 07:51:39.070577518 +0200 -@@ -106,7 +106,6 @@ add_action( 'profile_update', 'default_p - add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. - add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. - --add_action( 'admin_notices', 'update_nag', 3 ); - add_action( 'admin_notices', 'maintenance_nag', 10 ); - - add_filter( 'update_footer', 'core_update_footer' ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2016-09-03 07:59:45.832367671 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2016-09-03 07:59:50.160392833 +0200 -@@ -236,6 +236,9 @@ class Core_Upgrader extends WP_Upgrader - * @return bool True if we should update to the offered version, otherwise false. - */ - public static function should_update_to_version( $offered_ver ) { -+ // RPM: nether allow core update -+ return false; -+ - include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z - - $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y -diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2016-09-03 08:00:15.810540773 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2016-09-03 08:00:28.915616106 +0200 -@@ -31,7 +31,7 @@ class WP_Automatic_Updater { - */ - public function is_disabled() { - // Background updates are disabled if you don't want file changes. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) - return true; - - if ( wp_installing() ) -diff -up wordpress/wp-admin/includes/translation-install.php.rpm wordpress/wp-admin/includes/translation-install.php ---- wordpress/wp-admin/includes/translation-install.php.rpm 2016-05-22 20:01:30.000000000 +0200 -+++ wordpress/wp-admin/includes/translation-install.php 2016-09-03 07:50:51.813312387 +0200 -@@ -181,7 +181,7 @@ function wp_download_language_pack( $dow - return $download; - } - -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - return false; - } - -@@ -224,7 +224,7 @@ function wp_download_language_pack( $dow - * @return bool Returns true on success, false on failure. - */ - function wp_can_install_language_pack() { -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - return false; - } - -diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.rpm 2016-08-10 21:06:31.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2016-09-03 07:50:51.812312381 +0200 -@@ -271,7 +271,7 @@ function update_right_now_message() { - $cur = get_preferred_from_update_core(); - - if ( isset( $cur->response ) && $cur->response == 'upgrade' ) -- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; -+ $msg .= ''; - } - - /* translators: 1: version number, 2: theme name */ -diff -up wordpress/wp-includes/capabilities.php.rpm wordpress/wp-includes/capabilities.php ---- wordpress/wp-includes/capabilities.php.rpm 2016-06-30 03:02:29.000000000 +0200 -+++ wordpress/wp-includes/capabilities.php 2016-09-03 07:50:51.812312381 +0200 -@@ -330,7 +330,7 @@ function map_meta_cap( $cap, $user_id ) - // Disallow the file editors. - if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) - $caps[] = 'do_not_allow'; -- elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) -+ elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) - $caps[] = 'do_not_allow'; - elseif ( is_multisite() && ! is_super_admin( $user_id ) ) - $caps[] = 'do_not_allow'; -@@ -348,7 +348,7 @@ function map_meta_cap( $cap, $user_id ) - case 'update_core': - // Disallow anything that creates, deletes, or updates core, plugin, or theme files. - // Files in uploads are excepted. -- if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) { -+ if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) { - $caps[] = 'do_not_allow'; - } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) { - $caps[] = 'do_not_allow'; -diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.rpm 2016-05-25 21:36:28.000000000 +0200 -+++ wordpress/wp-includes/update.php 2016-09-03 07:50:51.813312387 +0200 -@@ -653,9 +653,6 @@ function _maybe_update_themes() { - * @since 3.1.0 - */ - function wp_schedule_update_checks() { -- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) -- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); -- - if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) - wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); - diff --git a/wordpress-4.8-noupdate.patch b/wordpress-4.8-noupdate.patch new file mode 100644 index 0000000..b2e2f37 --- /dev/null +++ b/wordpress-4.8-noupdate.patch @@ -0,0 +1,71 @@ +diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.rpm 2016-07-31 20:11:29.000000000 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2017-06-09 13:27:51.184747881 +0200 +@@ -106,7 +106,6 @@ add_action( 'profile_update', 'default_p + add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. + add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. + +-add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'maintenance_nag', 10 ); + + add_filter( 'update_footer', 'core_update_footer' ); +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2016-07-08 15:19:30.000000000 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2017-06-09 13:27:51.184747881 +0200 +@@ -236,6 +236,9 @@ class Core_Upgrader extends WP_Upgrader + * @return bool True if we should update to the offered version, otherwise false. + */ + public static function should_update_to_version( $offered_ver ) { ++ // RPM: nether allow core update ++ return false; ++ + include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z + + $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2017-06-09 13:27:51.184747881 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2017-06-09 13:30:18.175525864 +0200 +@@ -38,7 +38,7 @@ class WP_Automatic_Updater { + return true; + + // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters. +- $disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED; ++ $disabled = !defined( 'AUTOMATIC_UPDATER_DISABLED' ) || AUTOMATIC_UPDATER_DISABLED; + + /** + * Filters whether to entirely disable background updates. +diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.rpm 2017-05-06 16:30:40.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2017-06-09 13:27:51.185747886 +0200 +@@ -279,7 +279,7 @@ function update_right_now_message() { + $cur = get_preferred_from_update_core(); + + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) +- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; ++ $msg .= ''; + } + + /* translators: 1: version number, 2: theme name */ +diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.rpm 2017-06-09 13:33:24.946514394 +0200 ++++ wordpress/wp-includes/load.php 2017-06-09 13:33:35.654571069 +0200 +@@ -1108,5 +1108,5 @@ function wp_is_file_mod_allowed( $contex + * @param bool $file_mod_allowed Whether file modifications are allowed. + * @param string $context The usage context. + */ +- return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context ); ++ return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context ); + } +diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.rpm 2017-05-06 16:30:40.000000000 +0200 ++++ wordpress/wp-includes/update.php 2017-06-09 13:27:51.185747886 +0200 +@@ -683,9 +683,6 @@ function _maybe_update_themes() { + * @since 3.1.0 + */ + function wp_schedule_update_checks() { +- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) +- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); +- + if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) + wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); + diff --git a/wordpress-4.8-tinymce_noflash.patch b/wordpress-4.8-tinymce_noflash.patch new file mode 100644 index 0000000..f2a5cde --- /dev/null +++ b/wordpress-4.8-tinymce_noflash.patch @@ -0,0 +1,31 @@ +--- ./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 + '>'; +- } else if (data.source1mime === "application/x-shockwave-flash") { +- html += +- ''; +- +- if (data.poster) { +- html += ''; +- } +- +- html += ''; + } else if (data.source1mime.indexOf('audio') !== -1) { + if (editor.settings.audio_template_callback) { + html = editor.settings.audio_template_callback(data); diff --git a/wordpress.spec b/wordpress.spec index cfc5dbb..85edb3c 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.7.5 +Version: 4.8 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -41,7 +41,7 @@ Patch2: wordpress-4.4-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.0-tinymce_noflash.patch +Patch3: wordpress-4.8-tinymce_noflash.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -50,7 +50,7 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.6-noupdate.patch +Patch6: wordpress-4.8-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch @@ -130,7 +130,6 @@ Important information in %{_pkgdocdir}/README.fedora rm wp-includes/js/mediaelement/silverlightmediaelement.xap rm wp-includes/js/mediaelement/flashmediaelement.swf -rm wp-includes/js/tinymce/plugins/media/moxieplayer.swf rm wp-includes/js/plupload/plupload.silverlight.xap rm wp-includes/js/plupload/plupload.flash.swf @@ -276,6 +275,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Jun 9 2017 Remi Collet - 4.8-1 +- WordPress 4.8 “Evans” + * Wed May 17 2017 Remi Collet - 4.7.5-1 - WordPress 4.7.5 Security and Maintenance Release From ad160ccc19abb6a8298e2872fe84a238202bb9cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:44:19 +0000 Subject: [PATCH 061/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 85edb3c..a708b15 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.8 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -275,6 +275,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jun 9 2017 Remi Collet - 4.8-1 - WordPress 4.8 “Evans” From 719c484c1c64f943614081aad445b0a27c97a370 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 3 Aug 2017 09:52:04 +0200 Subject: [PATCH 062/184] Update to 4.8.1 Maintenance Release. --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eee2c6e..3d89b2e 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ clog /wordpress-4.7.4.tar.gz /wordpress-4.7.5.tar.gz /wordpress-4.8.tar.gz +/wordpress-4.8.1.tar.gz diff --git a/sources b/sources index de99ee2..e549066 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.8.tar.gz) = 20249cf13dbcec198df3ec1feb3a7381c194c7c9f832262e40449f90c5e5b5d3f4b63b6021e78c65cc615e059b1b601881d33ce03e1e4618231329b680511467 +SHA512 (wordpress-4.8.1.tar.gz) = dfc166a48cd3542e277a74c6b6f551af7043fee45ac62ca764077e1a73fb487da62e57f1a60f60348d8bfe6ee4199c3ce261c042e20cf652f1b0233bd97d6b5c diff --git a/wordpress.spec b/wordpress.spec index a708b15..531ee9a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,9 +19,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.8 +Version: 4.8.1 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz @@ -275,6 +275,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Aug 3 2017 Remi Collet - 4.8.1-1 +- Update to 4.8.1 Maintenance Release. + * Thu Jul 27 2017 Fedora Release Engineering - 4.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 2dc3758a31834db114b003d8cd73b4430c156723 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Sep 2017 08:38:20 +0200 Subject: [PATCH 063/184] Update to 4.8.2 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3d89b2e..16d5595 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ clog /wordpress-4.7.5.tar.gz /wordpress-4.8.tar.gz /wordpress-4.8.1.tar.gz +/wordpress-4.8.2.tar.gz diff --git a/sources b/sources index e549066..50a2a94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.8.1.tar.gz) = dfc166a48cd3542e277a74c6b6f551af7043fee45ac62ca764077e1a73fb487da62e57f1a60f60348d8bfe6ee4199c3ce261c042e20cf652f1b0233bd97d6b5c +SHA512 (wordpress-4.8.2.tar.gz) = e6b9dd7a3f9b510b1c85b0f9963d9303c9111f1d6ad471c5be076c5b9cf44ade5d1c761c336f44276ab88f69d6c842e6f33d637c7d76532ab88f12f49c385ca6 diff --git a/wordpress.spec b/wordpress.spec index 531ee9a..e053f4f 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.8.1 +Version: 4.8.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -275,6 +275,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Sep 20 2017 Remi Collet - 4.8.2-1 +- Update to 4.8.2 Security and Maintenance Release + * Thu Aug 3 2017 Remi Collet - 4.8.1-1 - Update to 4.8.1 Maintenance Release. From bcd3da5c6ddb5a285b7925f31858fbf63602d321 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 31 Oct 2017 22:38:36 -0700 Subject: [PATCH 064/184] Update to 4.8.3. Security release. Fixes bug #1508255 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 16d5595..4c06100 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ clog /wordpress-4.8.tar.gz /wordpress-4.8.1.tar.gz /wordpress-4.8.2.tar.gz +/wordpress-4.8.3.tar.gz diff --git a/sources b/sources index 50a2a94..3a7c8e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.8.2.tar.gz) = e6b9dd7a3f9b510b1c85b0f9963d9303c9111f1d6ad471c5be076c5b9cf44ade5d1c761c336f44276ab88f69d6c842e6f33d637c7d76532ab88f12f49c385ca6 +SHA512 (wordpress-4.8.3.tar.gz) = 696be1c24dec869d896e22b408b17009e8c482545237156f17d4b5f2d726876a17c3cc5c3de632126229747589d74f7b188c06d2a79878efc800bd6db273d709 diff --git a/wordpress.spec b/wordpress.spec index e053f4f..4d22e44 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.8.2 +Version: 4.8.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -275,6 +275,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Oct 31 2017 Kevin Fenzi - 4.8.3-1 +- Update to 4.8.3. Security release. Fixes bug #1508255 + * Wed Sep 20 2017 Remi Collet - 4.8.2-1 - Update to 4.8.2 Security and Maintenance Release From 5efb676b1eb02b52401c89dacef3c725d92c3d70 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 16 Nov 2017 10:06:40 +0100 Subject: [PATCH 065/184] =?UTF-8?q?WordPress=204.9=20=E2=80=9CTipton?= =?UTF-8?q?=E2=80=9D=20minify=20patched=20JS=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- wordpress-4.9-mediaelement_no_swf.patch | 38 +++++++++++++ ....patch => wordpress-4.9-no_swfupload.patch | 12 ++--- ...date.patch => wordpress-4.9-noupdate.patch | 36 +++++++------ wordpress-minify.php | 16 ++++++ wordpress.spec | 53 +++++++++---------- 7 files changed, 106 insertions(+), 52 deletions(-) create mode 100644 wordpress-4.9-mediaelement_no_swf.patch rename wordpress-4.4-no_swfupload.patch => wordpress-4.9-no_swfupload.patch (52%) rename wordpress-4.8-noupdate.patch => wordpress-4.9-noupdate.patch (72%) create mode 100644 wordpress-minify.php diff --git a/.gitignore b/.gitignore index 4c06100..6423555 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ clog /wordpress-4.8.1.tar.gz /wordpress-4.8.2.tar.gz /wordpress-4.8.3.tar.gz +/wordpress-4.9.tar.gz diff --git a/sources b/sources index 3a7c8e7..c058987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.8.3.tar.gz) = 696be1c24dec869d896e22b408b17009e8c482545237156f17d4b5f2d726876a17c3cc5c3de632126229747589d74f7b188c06d2a79878efc800bd6db273d709 +SHA512 (wordpress-4.9.tar.gz) = b7898730d42839406b9270b945c687e80bc1025dcf23dfa1455576f0fc9dffb3b8c082b6fc6d1b6915791ce33c7327c8ce28bbf2beafdc7154ab0e29660c4cc7 diff --git a/wordpress-4.9-mediaelement_no_swf.patch b/wordpress-4.9-mediaelement_no_swf.patch new file mode 100644 index 0000000..afe3527 --- /dev/null +++ b/wordpress-4.9-mediaelement_no_swf.patch @@ -0,0 +1,38 @@ +diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js +--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old 2017-11-16 09:22:17.148277728 +0100 ++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2017-11-16 09:23:42.056696625 +0100 +@@ -6121,6 +6121,7 @@ if (hasFlash) { + } + }); + ++/* swf files removed from RPM + var FlashMediaElementVideoRenderer = { + name: 'flash_video', + options: { +@@ -6205,6 +6206,7 @@ if (hasFlash) { + create: FlashMediaElementRenderer.create + }; + _renderer.renderer.add(FlashMediaElementAudioOggRenderer); ++*/ + } + + },{"2":2,"25":25,"27":27,"28":28,"3":3,"5":5,"7":7,"8":8}],21:[function(_dereq_,module,exports){ +diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.old wordpress/wp-includes/js/mediaelement/mediaelement.js +--- wordpress/wp-includes/js/mediaelement/mediaelement.js.old 2017-11-16 09:24:44.984007081 +0100 ++++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2017-11-16 09:24:49.655030123 +0100 +@@ -1839,6 +1839,7 @@ if (hasFlash) { + } + }); + ++/* swf files removed from RPM + var FlashMediaElementVideoRenderer = { + name: 'flash_video', + options: { +@@ -1923,6 +1924,7 @@ if (hasFlash) { + create: FlashMediaElementRenderer.create + }; + _renderer.renderer.add(FlashMediaElementAudioOggRenderer); ++*/ + } + + },{"16":16,"18":18,"19":19,"2":2,"3":3,"5":5,"7":7,"8":8}],12:[function(_dereq_,module,exports){ diff --git a/wordpress-4.4-no_swfupload.patch b/wordpress-4.9-no_swfupload.patch similarity index 52% rename from wordpress-4.4-no_swfupload.patch rename to wordpress-4.9-no_swfupload.patch index c0bba8d..f3c68d8 100644 --- a/wordpress-4.4-no_swfupload.patch +++ b/wordpress-4.9-no_swfupload.patch @@ -1,15 +1,13 @@ ---- wordpress/wp-includes/script-loader.php.orig 2015-12-09 16:51:44.740328793 +0100 -+++ wordpress/wp-includes/script-loader.php 2015-12-09 16:53:00.870701835 +0100 -@@ -300,15 +300,6 @@ function wp_default_scripts( &$scripts ) +diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.orig 2017-11-16 08:43:42.069856252 +0100 ++++ wordpress/wp-includes/script-loader.php 2017-11-16 08:44:03.872963818 +0100 +@@ -323,12 +323,6 @@ function wp_default_scripts( &$scripts ) $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); - // keep 'swfupload' for back-compat. - $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113'); -- $scripts->add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a'); -- $scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201'); -- $scripts->add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201'); -- $scripts->add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201'); +- $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' ); - $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524'); - did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n ); - diff --git a/wordpress-4.8-noupdate.patch b/wordpress-4.9-noupdate.patch similarity index 72% rename from wordpress-4.8-noupdate.patch rename to wordpress-4.9-noupdate.patch index b2e2f37..40e3678 100644 --- a/wordpress-4.8-noupdate.patch +++ b/wordpress-4.9-noupdate.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.rpm 2016-07-31 20:11:29.000000000 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2017-06-09 13:27:51.184747881 +0200 -@@ -106,7 +106,6 @@ add_action( 'profile_update', 'default_p +--- wordpress/wp-admin/includes/admin-filters.php.rpm 2017-10-04 20:25:46.000000000 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2017-11-16 08:46:52.340794957 +0100 +@@ -115,7 +115,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. @@ -10,9 +10,9 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/in add_filter( 'update_footer', 'core_update_footer' ); diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2016-07-08 15:19:30.000000000 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2017-06-09 13:27:51.184747881 +0200 -@@ -236,6 +236,9 @@ class Core_Upgrader extends WP_Upgrader +--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2017-10-18 19:15:47.000000000 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2017-11-16 08:46:52.340794957 +0100 +@@ -234,6 +234,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { @@ -23,9 +23,9 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-ad $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2017-06-09 13:27:51.184747881 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2017-06-09 13:30:18.175525864 +0200 -@@ -38,7 +38,7 @@ class WP_Automatic_Updater { +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2017-10-18 19:48:49.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2017-11-16 08:46:52.340794957 +0100 +@@ -36,7 +36,7 @@ class WP_Automatic_Updater { return true; // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters. @@ -35,8 +35,8 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpres /** * Filters whether to entirely disable background updates. diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.rpm 2017-05-06 16:30:40.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2017-06-09 13:27:51.185747886 +0200 +--- wordpress/wp-admin/includes/update.php.rpm 2017-08-22 13:52:48.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2017-11-16 08:46:52.340794957 +0100 @@ -279,7 +279,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); @@ -47,19 +47,21 @@ diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/ /* translators: 1: version number, 2: theme name */ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.rpm 2017-06-09 13:33:24.946514394 +0200 -+++ wordpress/wp-includes/load.php 2017-06-09 13:33:35.654571069 +0200 -@@ -1108,5 +1108,5 @@ function wp_is_file_mod_allowed( $contex +--- wordpress/wp-includes/load.php.rpm 2017-11-16 08:46:52.340794957 +0100 ++++ wordpress/wp-includes/load.php 2017-11-16 08:47:47.535067259 +0100 +@@ -1112,7 +1112,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ - return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context ); + return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context ); } + + /** diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.rpm 2017-05-06 16:30:40.000000000 +0200 -+++ wordpress/wp-includes/update.php 2017-06-09 13:27:51.185747886 +0200 -@@ -683,9 +683,6 @@ function _maybe_update_themes() { +--- wordpress/wp-includes/update.php.rpm 2017-10-22 00:42:51.000000000 +0200 ++++ wordpress/wp-includes/update.php 2017-11-16 08:46:52.340794957 +0100 +@@ -707,9 +707,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress-minify.php b/wordpress-minify.php new file mode 100644 index 0000000..d8e18c4 --- /dev/null +++ b/wordpress-minify.php @@ -0,0 +1,16 @@ +squeeze($in); +if ($out) { + printf("+ minify from %s to %s: %2d%% of %6d\n", + basename($_SERVER['argv'][1]), basename($_SERVER['argv'][2]), + round(strlen($out)*100/strlen($in)), strlen($in)); + file_put_contents($_SERVER['argv'][2], $out); +} else { + exit(2); +} + diff --git a/wordpress.spec b/wordpress.spec index 4d22e44..0dfce29 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.8.3 +Version: 4.9 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -29,6 +29,8 @@ Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu Source4: wordpress-nginx-conf +# To minify JS assets +Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) @@ -37,11 +39,13 @@ Patch0: wordpress-debian_patches_hello.patch # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-4.4-no_swfupload.patch +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 +# We drop the SWF files from mediaelement +Patch4: wordpress-4.9-mediaelement_no_swf.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -50,11 +54,13 @@ Patch5: wordpress-4.0-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.8-noupdate.patch +Patch6: wordpress-4.9-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch BuildArch: noarch +BuildRequires: php-cli +BuildRequires: php-patchwork-jsqueeze %if %{with_nginx} Requires: webserver @@ -115,24 +121,6 @@ Important information in %{_pkgdocdir}/README.fedora %prep %setup -q -n wordpress -# Drop pre-compiled binary lumps: Flash and Silverlight -# This means that Flash video fallbacks in Wordpress' media support -# and the tinymce plugin, the plupload Flash and Silverlight -# uploaders, and swfupload are not available. -# To re-introduce these they would have to be built from the -# ActionScript source as part of this package build, they cannot be -# shipped pre-compiled. Removing plupload.flash.js and -# plupload.silverlight.js causes plupload only to try and use the html4 -# or html5 uploaders; if you just wipe the binaries but leave the -# .js files, it will try and use the Flash or Silverlight uploaders -# and draw a non-functional button. - AdamW, 2013/08 -# https://fedoraproject.org/wiki/Packaging:Guidelines#No_inclusion_of_pre-built_binaries_or_libraries - -rm wp-includes/js/mediaelement/silverlightmediaelement.xap -rm wp-includes/js/mediaelement/flashmediaelement.swf -rm wp-includes/js/plupload/plupload.silverlight.xap -rm wp-includes/js/plupload/plupload.flash.swf - # swfupload can just die in its entirety rm -rf wp-includes/js/swfupload @@ -143,14 +131,21 @@ rm wp-content/plugins/akismet/.htaccess #patch1 -p1 -b .rhbz522897 %patch2 -p1 %patch3 -p1 -# Adjust mediaelement not to use its SWF and Silverlight plugins. This -# changes 'plugins:["flash,"silverlight","youtube","vimeo"]' to -# 'plugins:["youtube","vimeo"]' -sed -s 's/"flash","silverlight",//' -i wp-includes/js/mediaelement/mediaelement-and-player.min.js +# Adjust mediaelement not to use its SWF +%patch4 -p1 +rm wp-includes/js/mediaelement/media*swf %patch7 -p1 -# We patch a .js file, used patched file instead of unpatch minified one -ln -sf plugin.js wp-includes/js/tinymce/plugins/media/plugin.min.js +# We patch .js files, so minify them +php %{SOURCE5} \ + wp-includes/js/tinymce/plugins/media/plugin.js \ + wp-includes/js/tinymce/plugins/media/plugin.min.js +php %{SOURCE5} \ + wp-includes/js/mediaelement/mediaelement-and-player.js \ + wp-includes/js/mediaelement/mediaelement-and-player.min.js +php %{SOURCE5} \ + wp-includes/js/mediaelement/mediaelement.js \ + wp-includes/js/mediaelement/mediaelement.min.js # Re-Generated the archive arc=wp-includes/js/tinymce/wp-tinymce.js @@ -275,6 +270,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Nov 16 2017 Remi Collet - 4.9-1 +- WordPress 4.9 “Tipton” +- minify patched JS files + * Tue Oct 31 2017 Kevin Fenzi - 4.8.3-1 - Update to 4.8.3. Security release. Fixes bug #1508255 From a2888b541e65fb0960c65e247867949cc13a7edc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Nov 2017 13:59:45 +0100 Subject: [PATCH 066/184] WordPress 4.9.1 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6423555..b59ef8a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ clog /wordpress-4.8.2.tar.gz /wordpress-4.8.3.tar.gz /wordpress-4.9.tar.gz +/wordpress-4.9.1.tar.gz diff --git a/sources b/sources index c058987..02914ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.tar.gz) = b7898730d42839406b9270b945c687e80bc1025dcf23dfa1455576f0fc9dffb3b8c082b6fc6d1b6915791ce33c7327c8ce28bbf2beafdc7154ab0e29660c4cc7 +SHA512 (wordpress-4.9.1.tar.gz) = 1835d8fd0df9931487489d2e67285e7c73ec1783df39621cfbfe52aa8a0b3cba05fd3b842c7fd67ab2b76009f33337dae650f22dd6a3c4aa71eae100541b8a58 diff --git a/wordpress.spec b/wordpress.spec index 0dfce29..a4afb2d 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 +Version: 4.9.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -270,6 +270,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Nov 30 2017 Remi Collet - 4.9.1-1 +- WordPress 4.9.1 Security and Maintenance Release + * Thu Nov 16 2017 Remi Collet - 4.9-1 - WordPress 4.9 “Tipton” - minify patched JS files From c1566a4be417d124d4afe1681bdd9e740d7be18e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Jan 2018 10:07:14 +0100 Subject: [PATCH 067/184] WordPress 4.9.2 Security and Maintenance Release drop non-free jshint.js file #1528765 --- .gitignore | 47 ++------------------------ sources | 2 +- strip.sh | 33 ++++++++++++++++++ wordpress-4.9-remove-jshint-refs.patch | 19 +++++++++++ wordpress.spec | 16 +++++++-- 5 files changed, 68 insertions(+), 49 deletions(-) create mode 100755 strip.sh create mode 100644 wordpress-4.9-remove-jshint-refs.patch diff --git a/.gitignore b/.gitignore index b59ef8a..2aa2f42 100644 --- a/.gitignore +++ b/.gitignore @@ -1,46 +1,3 @@ -*spec~ clog -/wordpress-3.7.tar.gz -/wordpress-3.7.1.tar.gz -/wordpress-3.8.tar.gz -/wordpress-3.8.1.tar.gz -/wordpress-3.8.2.tar.gz -/wordpress-3.8.3.tar.gz -/wordpress-3.9.tar.gz -/wordpress-3.9.1.tar.gz -/wordpress-3.9.2.tar.gz -/wordpress-4.0.tar.gz -/wordpress-4.0.1.tar.gz -/wordpress-4.1.tar.gz -/wordpress-4.1.1.tar.gz -/wordpress-4.1.2.tar.gz -/wordpress-4.2.tar.gz -/wordpress-4.2.1.tar.gz -/wordpress-4.2.2.tar.gz -/wordpress-4.2.3.tar.gz -/wordpress-4.2.4.tar.gz -/wordpress-4.3.tar.gz -/wordpress-4.3.1.tar.gz -/wordpress-4.4.tar.gz -/wordpress-4.4.1.tar.gz -/wordpress-4.4.2.tar.gz -/wordpress-4.5-RC1.tar.gz -/wordpress-4.5.tar.gz -/wordpress-4.5.1.tar.gz -/wordpress-4.5.2.tar.gz -/wordpress-4.5.3.tar.gz -/wordpress-debian_patches_hello.patch -/wordpress-4.6.tar.gz -/wordpress-4.6.1.tar.gz -/wordpress-4.7.tar.gz -/wordpress-4.7.1.tar.gz -/wordpress-4.7.2.tar.gz -/wordpress-4.7.3.tar.gz -/wordpress-4.7.4.tar.gz -/wordpress-4.7.5.tar.gz -/wordpress-4.8.tar.gz -/wordpress-4.8.1.tar.gz -/wordpress-4.8.2.tar.gz -/wordpress-4.8.3.tar.gz -/wordpress-4.9.tar.gz -/wordpress-4.9.1.tar.gz +/wordpress-*.tar.gz +/wordpress-4.9.2-strip.tar.xz diff --git a/sources b/sources index 02914ed..211a927 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.1.tar.gz) = 1835d8fd0df9931487489d2e67285e7c73ec1783df39621cfbfe52aa8a0b3cba05fd3b842c7fd67ab2b76009f33337dae650f22dd6a3c4aa71eae100541b8a58 +SHA512 (wordpress-4.9.2-strip.tar.xz) = a61f292f1721a7fbf78d510b75831a2e842c67600b2625b8ef6bf1b282efecabb8615175a67b71af9636a778515c3c48b521096a3e962fef11e71b1a1d4d6a7b diff --git a/strip.sh b/strip.sh new file mode 100755 index 0000000..d69d371 --- /dev/null +++ b/strip.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +if [ -z "$1" ]; then + echo usage $0 version + exit 1 +fi + +srce=wordpress-$1.tar.gz +dest=wordpress-$1-strip.tar.xz + +if [ ! -f $srce ]; then + echo Download... + wget http://wordpress.org/$srce || exit 1 +fi + +if [ ! -f $dest ]; then + echo Cleanup... + [ -d wordpress ] && rm -r wordpress + + echo Unpack... + tar xf $srce + + echo Strip non free file + rm wordpress/wp-includes/js/codemirror/jshint.js + + echo Pack... + tar cJf $dest wordpress + + echo Cleanup... + rm -r wordpress + + echo Done. +fi diff --git a/wordpress-4.9-remove-jshint-refs.patch b/wordpress-4.9-remove-jshint-refs.patch new file mode 100644 index 0000000..245039b --- /dev/null +++ b/wordpress-4.9-remove-jshint-refs.patch @@ -0,0 +1,19 @@ +Description: Remove references to jshint + The file jshint.js uses a non-free license. It is removed as part of the upstream + tarball rebuild but this patch removes the things that reference it. Luckily the + script handler does a NOP for a non-existent script +Author: Craig Small +Origin: Debian +Bug: https://core.trac.wordpress.org/ticket/42850 +Reviewed-by: Craig Small +Last-Update: 2017-12-09 +--- a/wp-includes/script-loader.php ++++ b/wp-includes/script-loader.php +@@ -467,7 +467,6 @@ + + $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); + $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); +- $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5' ); + $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); + $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); + $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index a4afb2d..1905de6 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,18 +19,20 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.9.1 +Version: 4.9.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 -Source0: http://wordpress.org/%{name}-%{version}%{?prever:-%{prever}}.tar.gz +Source0: %{name}-%{version}%{?prever:-%{prever}}-strip.tar.xz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu Source4: wordpress-nginx-conf # To minify JS assets Source5: wordpress-minify.php +# To generate the tarball without non-free files +Source6: strip.sh # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) @@ -57,6 +59,9 @@ Patch5: wordpress-4.0-config.patch Patch6: wordpress-4.9-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch +# Debian patch for jshint +Patch8: wordpress-4.9-remove-jshint-refs.patch + BuildArch: noarch BuildRequires: php-cli @@ -133,8 +138,9 @@ rm wp-content/plugins/akismet/.htaccess %patch3 -p1 # Adjust mediaelement not to use its SWF %patch4 -p1 -rm wp-includes/js/mediaelement/media*swf +#rm wp-includes/js/mediaelement/media*swf %patch7 -p1 +%patch8 -p1 # We patch .js files, so minify them php %{SOURCE5} \ @@ -270,6 +276,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Jan 17 2018 Remi Collet - 4.9.2-1 +- WordPress 4.9.2 Security and Maintenance Release +- drop non-free jshint.js file #1528765 + * Thu Nov 30 2017 Remi Collet - 4.9.1-1 - WordPress 4.9.1 Security and Maintenance Release From 74877a4e71ab6c4a885e27978ff955afadf2b0ab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 7 Feb 2018 06:52:12 +0100 Subject: [PATCH 068/184] WordPress 4.9.4 Maintenance Release --- .gitignore | 1 + sources | 2 +- ...-refs.patch => wordpress-4.9.4-remove-jshint-refs.patch | 4 ++-- wordpress.spec | 7 +++++-- 4 files changed, 9 insertions(+), 5 deletions(-) rename wordpress-4.9-remove-jshint-refs.patch => wordpress-4.9.4-remove-jshint-refs.patch (95%) diff --git a/.gitignore b/.gitignore index 2aa2f42..c88f993 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /wordpress-*.tar.gz /wordpress-4.9.2-strip.tar.xz +/wordpress-4.9.4-strip.tar.xz diff --git a/sources b/sources index 211a927..ca33443 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.2-strip.tar.xz) = a61f292f1721a7fbf78d510b75831a2e842c67600b2625b8ef6bf1b282efecabb8615175a67b71af9636a778515c3c48b521096a3e962fef11e71b1a1d4d6a7b +SHA512 (wordpress-4.9.4-strip.tar.xz) = 11be065f84087a41303fc4afa77426fc722a4baba3099b7d2c4998476c64bc9d6c5142a1143f75051f36b55f884fc30a8bc71135afab67dc38a7dcc845d5cf68 diff --git a/wordpress-4.9-remove-jshint-refs.patch b/wordpress-4.9.4-remove-jshint-refs.patch similarity index 95% rename from wordpress-4.9-remove-jshint-refs.patch rename to wordpress-4.9.4-remove-jshint-refs.patch index 245039b..41b59ae 100644 --- a/wordpress-4.9-remove-jshint-refs.patch +++ b/wordpress-4.9.4-remove-jshint-refs.patch @@ -9,11 +9,11 @@ Reviewed-by: Craig Small Last-Update: 2017-12-09 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php -@@ -467,7 +467,6 @@ +@@ -461,7 +461,6 @@ $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); -- $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5' ); +- $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5.999' ); $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index 1905de6..fe0ba5f 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.2 +Version: 4.9.4 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -60,7 +60,7 @@ Patch6: wordpress-4.9-noupdate.patch # Use system libraries Patch7: wordpress-4.4-systemlibs.patch # Debian patch for jshint -Patch8: wordpress-4.9-remove-jshint-refs.patch +Patch8: wordpress-4.9.4-remove-jshint-refs.patch BuildArch: noarch @@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Feb 7 2018 Remi Collet - 4.9.4-1 +- WordPress 4.9.4 Maintenance Release + * Wed Jan 17 2018 Remi Collet - 4.9.2-1 - WordPress 4.9.2 Security and Maintenance Release - drop non-free jshint.js file #1528765 From f7f9218272572db97cd626e558b7c7dddbf802fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Apr 2018 08:24:33 +0200 Subject: [PATCH 069/184] WordPress 4.9.5 Security and Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress-debian_patches_hello.patch | 30 ++++++++++++++-------------- wordpress.spec | 19 ++++++++++-------- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index c88f993..caa1e80 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /wordpress-*.tar.gz /wordpress-4.9.2-strip.tar.xz /wordpress-4.9.4-strip.tar.xz +/wordpress-4.9.5-strip.tar.xz diff --git a/sources b/sources index ca33443..f6747ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.4-strip.tar.xz) = 11be065f84087a41303fc4afa77426fc722a4baba3099b7d2c4998476c64bc9d6c5142a1143f75051f36b55f884fc30a8bc71135afab67dc38a7dcc845d5cf68 +SHA512 (wordpress-4.9.5-strip.tar.xz) = 5b763b833c9e6758a86b2eecd0cd74e5a7671851351eb7bb56454b15611f9b12bfda6181e2df09cad485611ce5f32e61dcd9b86906e32afe95b86b0077876a4a diff --git a/wordpress-debian_patches_hello.patch b/wordpress-debian_patches_hello.patch index 8555d70..7dd9faa 100644 --- a/wordpress-debian_patches_hello.patch +++ b/wordpress-debian_patches_hello.patch @@ -1,13 +1,14 @@ ---- wordpress/wp-content/plugins/hello.php 2013-05-22 14:08:40.000000000 -0700 -+++ wordpress/wp-content/plugins/hello.php.new 2013-08-22 23:46:04.594788007 -0700 -@@ -6,42 +6,26 @@ +diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php +--- wordpress/wp-content/plugins/hello.php.dolly 2018-04-04 08:17:16.113486189 +0200 ++++ wordpress/wp-content/plugins/hello.php 2018-04-04 08:17:34.599563913 +0200 +@@ -6,41 +6,26 @@ /* Plugin Name: Hello Dolly Plugin URI: http://wordpress.org/plugins/hello-dolly/ -Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. +Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the Free Software Song in the upper right of your admin screen on every page. Author: Matt Mullenweg - Version: 1.6 + Version: 1.7 Author URI: http://ma.tt/ */ @@ -20,12 +21,11 @@ -I can tell, Dolly -You're still glowin', you're still crowin' -You're still goin' strong --We feel the room swayin' +-I feel the room swayin' -While the band's playin' --One of your old favourite songs from way back when +-One of our old favorite songs from way back when -So, take her wrap, fellas --Find her an empty lap, fellas --Dolly'll never go away again +-Dolly, never go away again -Hello, Dolly -Well, hello, Dolly -It's so nice to have you back where you belong @@ -33,16 +33,16 @@ -I can tell, Dolly -You're still glowin', you're still crowin' -You're still goin' strong --We feel the room swayin' +-I feel the room swayin' -While the band's playin' --One of your old favourite songs from way back when --Golly, gee, fellas --Find her a vacant knee, fellas --Dolly'll never go away --Dolly'll never go away +-One of our old favorite songs from way back when +-So, golly, gee, fellas +-Have a little faith in me, fellas +-Dolly, never go away +-Promise, you'll never go away -Dolly'll never go away again"; + // These are the lyrics to the Free Software Song -+$lyrics = "Join us now and share the software; ++ $lyrics = "Join us now and share the software; +You'll be free, hackers, you'll be free. +Hoarders may get piles of money, +That is true, hackers, that is true. diff --git a/wordpress.spec b/wordpress.spec index fe0ba5f..fb5613a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -8,7 +8,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 %global with_nginx 1 %else %global with_nginx 0 @@ -19,7 +19,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.9.4 +Version: 4.9.5 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -234,16 +234,16 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig -print -delete ## Move wp-content directory to /var/www location -#mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress -#mv -v ${RPM_BUILD_ROOT}%{wp_content}/ \ -# ${RPM_BUILD_ROOT}%{_localstatedir}/www/wordpress +#mkdir -p ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress +#mv -v ${RPM_BUILD_ROOT}%%{wp_content}/ \ +# ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress -#%post +#%%post #if [ $1 -eq 2 ] ; then ## In case user has old wp-content from previous version, move it to ## the new location. -#mv -uf %{wp_content}/* %{_localstatedir}/www/wordpress/ -#/sbin/restorecon -R %{_localstatedir}/www/wordpress/ +#mv -uf %%{wp_content}/* %%{_localstatedir}/www/wordpress/ +#/sbin/restorecon -R %%{_localstatedir}/www/wordpress/ #fi @@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Apr 4 2018 Remi Collet - 4.9.5-1 +- WordPress 4.9.5 Security and Maintenance Release + * Wed Feb 7 2018 Remi Collet - 4.9.4-1 - WordPress 4.9.4 Maintenance Release From 330c382d3d032d696ad7505f98c8f3d9fa943517 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 18 May 2018 11:26:29 -0700 Subject: [PATCH 070/184] 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 + '>'; -- } else if (data.source1mime === "application/x-shockwave-flash") { -- html += -- ''; -- -- if (data.poster) { -- html += ''; -- } -- -- html += ''; - } 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 ''; + }; +- var getFlashHtml = function (data) { +- var html = ''; +- if (data.poster) { +- html += ''; +- } +- html += ''; +- 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 fb5613a..7885fff 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 - 4.9.6-1 +- Update to 4.9.6. Fixes bug #1579584 + * Wed Apr 4 2018 Remi Collet - 4.9.5-1 - WordPress 4.9.5 Security and Maintenance Release From 5db84d7b882b834c5315a3b06a072a44f0081096 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 5 Jul 2018 20:05:22 -0700 Subject: [PATCH 071/184] Update to 4.9.7 security update. Fixes bug #1598612 Fixes CVE-2018-12895 bugs #1595584 and #1595585 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 740bd79..2f3b2ed 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /wordpress-4.9.4-strip.tar.xz /wordpress-4.9.5-strip.tar.xz /wordpress-4.9.6-strip.tar.xz +/wordpress-4.9.7-strip.tar.xz diff --git a/sources b/sources index 386fadf..80c0c84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.6-strip.tar.xz) = 9364c6b9fa4a8872bdb1bd2fba7185d6253d83b61aa7665ab94fd0016f5c1059ab41af3001fe54ce7d7354f0ac49d79b3278bad3c2f54fb7d52543cb07c18538 +SHA512 (wordpress-4.9.7-strip.tar.xz) = e46e300649c4d633d9d12d45a4c1d7d634d1f17f38c11084953464040427adcce6ced0aa2062da060f6033ce8b0c34db2698ebc910fe6191b6992ef46767d8c1 diff --git a/wordpress.spec b/wordpress.spec index 7885fff..4e3ba55 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.6 +Version: 4.9.7 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -276,6 +276,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Jul 05 2018 Kevin Fenzi - 4.9.7-1 +- Update to 4.9.7 security update. Fixes bug #1598612 +- Fixes CVE-2018-12895 bugs #1595584 and #1595585 + * Fri May 18 2018 Kevin Fenzi - 4.9.6-1 - Update to 4.9.6. Fixes bug #1579584 From ce378a302c73bc47ab6689ecfaa57b2bf520db62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:58:19 +0000 Subject: [PATCH 072/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 4e3ba55..948f7d5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ URL: http://www.wordpress.org Name: wordpress Version: 4.9.7 Group: Applications/Publishing -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: %{name}-%{version}%{?prever:-%{prever}}-strip.tar.xz @@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.9.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jul 05 2018 Kevin Fenzi - 4.9.7-1 - Update to 4.9.7 security update. Fixes bug #1598612 - Fixes CVE-2018-12895 bugs #1595584 and #1595585 From f4908bc51201e5186a342f1abd00c9c602242062 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 3 Aug 2018 11:26:05 -0700 Subject: [PATCH 073/184] Update to 4.9.8. Fixes bug #1611877 --- .gitignore | 1 + sources | 2 +- wordpress.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f3b2ed..1dbfb52 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /wordpress-4.9.5-strip.tar.xz /wordpress-4.9.6-strip.tar.xz /wordpress-4.9.7-strip.tar.xz +/wordpress-4.9.8-strip.tar.xz diff --git a/sources b/sources index 80c0c84..58335c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.7-strip.tar.xz) = e46e300649c4d633d9d12d45a4c1d7d634d1f17f38c11084953464040427adcce6ced0aa2062da060f6033ce8b0c34db2698ebc910fe6191b6992ef46767d8c1 +SHA512 (wordpress-4.9.8-strip.tar.xz) = 33d2def5b02f56ebed873d99887d6d0185421ac64b6fc25dd2cd2f8671fb182c982a63f4c8701e8f8a9952370b58f622325eaf7ec33611bd1c5d959762a28ca9 diff --git a/wordpress.spec b/wordpress.spec index 948f7d5..e79a85f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,9 +19,9 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 4.9.7 +Version: 4.9.8 Group: Applications/Publishing -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: %{name}-%{version}%{?prever:-%{prever}}-strip.tar.xz @@ -276,6 +276,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Aug 03 2018 Kevin Fenzi - 4.9.8-1 +- Update to 4.9.8. Fixes bug #1611877 + * Sat Jul 14 2018 Fedora Release Engineering - 4.9.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From eb44a44fecae61fe07d87978c521196af5b98b8b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Dec 2018 14:14:59 +0100 Subject: [PATCH 074/184] =?UTF-8?q?WordPress=205.0=20=E2=80=9CBebo?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + sources | 2 +- strip.sh | 2 +- wordpress-debian_patches_hello.patch | 8 ++++---- wordpress.spec | 14 +++++++------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 1dbfb52..cafd8f5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /wordpress-4.9.6-strip.tar.xz /wordpress-4.9.7-strip.tar.xz /wordpress-4.9.8-strip.tar.xz +/wordpress-5.0-strip.tar.xz diff --git a/sources b/sources index 58335c6..eef75a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-4.9.8-strip.tar.xz) = 33d2def5b02f56ebed873d99887d6d0185421ac64b6fc25dd2cd2f8671fb182c982a63f4c8701e8f8a9952370b58f622325eaf7ec33611bd1c5d959762a28ca9 +SHA512 (wordpress-5.0-strip.tar.xz) = ca9e61767893bb8e11969afc9da9ec37a22d1361af9eaa00ad3a33060b8beccde5393e399fca4e641f2fbd209d458777857f413505d8d36f0501ac41484e182c diff --git a/strip.sh b/strip.sh index d69d371..443e973 100755 --- a/strip.sh +++ b/strip.sh @@ -10,7 +10,7 @@ dest=wordpress-$1-strip.tar.xz if [ ! -f $srce ]; then echo Download... - wget http://wordpress.org/$srce || exit 1 + wget https://wordpress.org/$srce || exit 1 fi if [ ! -f $dest ]; then diff --git a/wordpress-debian_patches_hello.patch b/wordpress-debian_patches_hello.patch index 7dd9faa..65fd0d3 100644 --- a/wordpress-debian_patches_hello.patch +++ b/wordpress-debian_patches_hello.patch @@ -1,6 +1,6 @@ -diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php ---- wordpress/wp-content/plugins/hello.php.dolly 2018-04-04 08:17:16.113486189 +0200 -+++ wordpress/wp-content/plugins/hello.php 2018-04-04 08:17:34.599563913 +0200 +diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php +--- ./wp-content/plugins/hello.php.dolly 2018-11-16 00:38:48.000000000 +0100 ++++ ./wp-content/plugins/hello.php 2018-12-12 13:54:41.867980830 +0100 @@ -6,41 +6,26 @@ /* Plugin Name: Hello Dolly @@ -8,7 +8,7 @@ diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugi -Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. +Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the Free Software Song in the upper right of your admin screen on every page. Author: Matt Mullenweg - Version: 1.7 + Version: 1.7.1 Author URI: http://ma.tt/ */ diff --git a/wordpress.spec b/wordpress.spec index e79a85f..31314f0 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.8 +Version: 5.0 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -90,29 +90,26 @@ Requires: php-date Requires: php-dom Requires: php-exif Requires: php-fileinfo -Requires: php-ftp Requires: php-gd Requires: php-gettext Requires: php-hash Requires: php-iconv +Requires: php-intl Requires: php-json Requires: php-libxml Requires: php-mbstring Requires: php-openssl Requires: php-pcre -Requires: php-posix Requires: php-simplexml -Requires: php-sockets Requires: php-spl -Requires: php-tokenizer Requires: php-xml +Requires: php-xmlreader Requires: php-zip Requires: php-zlib # Unbundled libraries Requires: php-PHPMailer Requires: httpd -# ca-certificates (excepted on EL-5) -Requires: %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +Requires: ca-certificates Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -276,6 +273,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Dec 12 2018 Remi Collet - 5.0-1 +- WordPress 5.0 “Bebo” + * Fri Aug 03 2018 Kevin Fenzi - 4.9.8-1 - Update to 4.9.8. Fixes bug #1611877 From 714c519e55b53f47ea43de8d3581b4d54790afb5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Dec 2018 09:55:21 +0100 Subject: [PATCH 075/184] WordPress 5.0.1 Security Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cafd8f5..674a714 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /wordpress-4.9.7-strip.tar.xz /wordpress-4.9.8-strip.tar.xz /wordpress-5.0-strip.tar.xz +/wordpress-5.0.1-strip.tar.xz diff --git a/sources b/sources index eef75a9..c5343b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.0-strip.tar.xz) = ca9e61767893bb8e11969afc9da9ec37a22d1361af9eaa00ad3a33060b8beccde5393e399fca4e641f2fbd209d458777857f413505d8d36f0501ac41484e182c +SHA512 (wordpress-5.0.1-strip.tar.xz) = b52a27265b8c421c1a9f23fa42dc89c24f62761921c8a2b8076d0770c09c0f496b3b0ee5bfc2c467200e82e32b7a6dfe21606dccf2d3714d13cf5d41d19cb010 diff --git a/wordpress.spec b/wordpress.spec index 31314f0..44b3760 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: 5.0 +Version: 5.0.1 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -273,6 +273,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Dec 13 2018 Remi Collet - 5.0.1-1 +- WordPress 5.0.1 Security Release + * Wed Dec 12 2018 Remi Collet - 5.0-1 - WordPress 5.0 “Bebo” From a1497a8ce22b8e384e5d4dca1e7f20ae9acc4fcf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Dec 2018 10:21:56 +0100 Subject: [PATCH 076/184] WordPress 5.0.2 Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 674a714..495a5c2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /wordpress-4.9.8-strip.tar.xz /wordpress-5.0-strip.tar.xz /wordpress-5.0.1-strip.tar.xz +/wordpress-5.0.2-strip.tar.xz diff --git a/sources b/sources index c5343b2..08cc1b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.0.1-strip.tar.xz) = b52a27265b8c421c1a9f23fa42dc89c24f62761921c8a2b8076d0770c09c0f496b3b0ee5bfc2c467200e82e32b7a6dfe21606dccf2d3714d13cf5d41d19cb010 +SHA512 (wordpress-5.0.2-strip.tar.xz) = 0c6b3e4fd9f58085e4b260addabf8ad2d8074bcc6e5a180247a1dd4eed71220403ab7ba65a64658cb77df886a886448ca58481d55dcb8292f2e9d1f3d66202cc diff --git a/wordpress.spec b/wordpress.spec index 44b3760..c618228 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: 5.0.1 +Version: 5.0.2 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -273,6 +273,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Dec 20 2018 Remi Collet - 5.0.2-1 +- WordPress 5.0.2 Maintenance Release + * Thu Dec 13 2018 Remi Collet - 5.0.1-1 - WordPress 5.0.1 Security Release From fa0b96edeb38f6468560f3e345747adf709864e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Jan 2019 09:22:47 +0100 Subject: [PATCH 077/184] WordPress 5.0.3 Maintenance Release --- .gitignore | 1 + sources | 2 +- wordpress.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 495a5c2..563cf68 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /wordpress-5.0-strip.tar.xz /wordpress-5.0.1-strip.tar.xz /wordpress-5.0.2-strip.tar.xz +/wordpress-5.0.3-strip.tar.xz diff --git a/sources b/sources index 08cc1b9..94297ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.0.2-strip.tar.xz) = 0c6b3e4fd9f58085e4b260addabf8ad2d8074bcc6e5a180247a1dd4eed71220403ab7ba65a64658cb77df886a886448ca58481d55dcb8292f2e9d1f3d66202cc +SHA512 (wordpress-5.0.3-strip.tar.xz) = 1091f6607ca1eb93873b918ff0212824174330bd4d775f2a34480a79dc5cd3e7788f245e9fc27f365f6e54b48255e97c66463bd7589608edcae61e2eb85fbe6f diff --git a/wordpress.spec b/wordpress.spec index c618228..eb0649b 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: 5.0.2 +Version: 5.0.3 Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 @@ -273,6 +273,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Jan 11 2019 Remi Collet - 5.0.3-1 +- WordPress 5.0.3 Maintenance Release + * Thu Dec 20 2018 Remi Collet - 5.0.2-1 - WordPress 5.0.2 Maintenance Release From 08a88460bbb31a9f7c324eeec2454cf4f956e5d2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 078/184] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- wordpress.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index eb0649b..7afbb3d 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -20,7 +20,6 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 5.0.3 -Group: Applications/Publishing Release: 1%{?dist} License: GPLv2 From 8e8c25e2e10f52f7cf4435e3b99d8707e7704383 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:54:03 +0000 Subject: [PATCH 079/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 7afbb3d..3ecdb90 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -20,7 +20,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: %{name}-%{version}%{?prever:-%{prever}}-strip.tar.xz @@ -272,6 +272,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jan 11 2019 Remi Collet - 5.0.3-1 - WordPress 5.0.3 Maintenance Release From 8fc7e1341214f574f13cd85342a608e662dcbf31 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Feb 2019 15:22:08 +0100 Subject: [PATCH 080/184] v5.1-RC2 --- sources | 2 +- strip.sh | 33 ----------- wordpress-4.4-systemlibs.patch | 20 ------- wordpress-4.9-tinymce_noflash.patch | 36 ------------ ...config.patch => wordpress-5.1-config.patch | 16 +++--- ....patch => wordpress-5.1-no_swfupload.patch | 10 ++-- ...date.patch => wordpress-5.1-noupdate.patch | 57 ++++++++++--------- wordpress-5.1-systemlibs.patch | 21 +++++++ wordpress-5.1-tinymce_noflash.patch | 35 ++++++++++++ wordpress.spec | 24 ++++---- 10 files changed, 112 insertions(+), 142 deletions(-) delete mode 100755 strip.sh delete mode 100644 wordpress-4.4-systemlibs.patch delete mode 100644 wordpress-4.9-tinymce_noflash.patch rename wordpress-4.0-config.patch => wordpress-5.1-config.patch (68%) rename wordpress-4.9-no_swfupload.patch => wordpress-5.1-no_swfupload.patch (71%) rename wordpress-4.9-noupdate.patch => wordpress-5.1-noupdate.patch (61%) create mode 100644 wordpress-5.1-systemlibs.patch create mode 100644 wordpress-5.1-tinymce_noflash.patch diff --git a/sources b/sources index 94297ed..901e8fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.0.3-strip.tar.xz) = 1091f6607ca1eb93873b918ff0212824174330bd4d775f2a34480a79dc5cd3e7788f245e9fc27f365f6e54b48255e97c66463bd7589608edcae61e2eb85fbe6f +SHA512 (wordpress-5.1-RC2.tar.gz) = 3d217de62a70d3f0783803c09f088c3f830938a87a039adcbf432575cccea9791250d033e11d9f3849e6130de014399b77ac5a5badda756313afafbabfd5b0fd diff --git a/strip.sh b/strip.sh deleted file mode 100755 index 443e973..0000000 --- a/strip.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -if [ -z "$1" ]; then - echo usage $0 version - exit 1 -fi - -srce=wordpress-$1.tar.gz -dest=wordpress-$1-strip.tar.xz - -if [ ! -f $srce ]; then - echo Download... - wget https://wordpress.org/$srce || exit 1 -fi - -if [ ! -f $dest ]; then - echo Cleanup... - [ -d wordpress ] && rm -r wordpress - - echo Unpack... - tar xf $srce - - echo Strip non free file - rm wordpress/wp-includes/js/codemirror/jshint.js - - echo Pack... - tar cJf $dest wordpress - - echo Cleanup... - rm -r wordpress - - echo Done. -fi diff --git a/wordpress-4.4-systemlibs.patch b/wordpress-4.4-systemlibs.patch deleted file mode 100644 index 13d36b5..0000000 --- a/wordpress-4.4-systemlibs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- wordpress/wp-admin/includes/media.php.orig 2015-12-09 17:01:52.453306607 +0100 -+++ wordpress/wp-admin/includes/media.php 2015-12-09 17:05:31.477379833 +0100 -@@ -2989,7 +2989,7 @@ function wp_read_video_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - } - $id3 = new getID3(); - $data = $id3->analyze( $file ); -@@ -3050,7 +3050,7 @@ function wp_read_audio_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - } - $id3 = new getID3(); - $data = $id3->analyze( $file ); diff --git a/wordpress-4.9-tinymce_noflash.patch b/wordpress-4.9-tinymce_noflash.patch deleted file mode 100644 index 6dee5ae..0000000 --- a/wordpress-4.9-tinymce_noflash.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 ''; - }; -- var getFlashHtml = function (data) { -- var html = ''; -- if (data.poster) { -- html += ''; -- } -- html += ''; -- 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-4.0-config.patch b/wordpress-5.1-config.patch similarity index 68% rename from wordpress-4.0-config.patch rename to wordpress-5.1-config.patch index 0505de0..a10109e 100644 --- a/wordpress-4.0-config.patch +++ b/wordpress-5.1-config.patch @@ -1,8 +1,8 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php ---- wordpress/wp-config.php.orig 2014-09-08 13:12:36.525908423 +0200 -+++ wordpress/wp-config.php 2014-09-08 13:14:33.583402525 +0200 -@@ -66,6 +66,19 @@ define('NONCE_SALT', 'put your uni - $table_prefix = 'wp_'; +--- wordpress/wp-config.php.orig 2019-02-21 15:07:29.558863904 +0100 ++++ wordpress/wp-config.php 2019-02-21 15:07:37.024901925 +0100 +@@ -66,6 +66,19 @@ define( 'NONCE_SALT', 'put your un + $table_prefix = 'wp_'; /** + * See http://make.wordpress.org/core/2013/10/25/the-definitive-guide-to-disabling-auto-updates-in-wordpress-3-7 @@ -21,12 +21,12 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php * For developers: WordPress debugging mode. * * Change this to true to enable the display of notices during development. -@@ -83,7 +96,7 @@ define('WP_DEBUG', false); +@@ -83,7 +96,7 @@ define( 'WP_DEBUG', false ); /** Absolute path to the WordPress directory. */ - if ( !defined('ABSPATH') ) -- define('ABSPATH', dirname(__FILE__) . '/'); + if ( ! defined( 'ABSPATH' ) ) { +- define( 'ABSPATH', dirname( __FILE__ ) . '/' ); + define('ABSPATH', '/usr/share/wordpress'); + } /** Sets up WordPress vars and included files. */ - require_once(ABSPATH . 'wp-settings.php'); diff --git a/wordpress-4.9-no_swfupload.patch b/wordpress-5.1-no_swfupload.patch similarity index 71% rename from wordpress-4.9-no_swfupload.patch rename to wordpress-5.1-no_swfupload.patch index f3c68d8..932ddee 100644 --- a/wordpress-4.9-no_swfupload.patch +++ b/wordpress-5.1-no_swfupload.patch @@ -1,14 +1,14 @@ diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.orig 2017-11-16 08:43:42.069856252 +0100 -+++ wordpress/wp-includes/script-loader.php 2017-11-16 08:44:03.872963818 +0100 -@@ -323,12 +323,6 @@ function wp_default_scripts( &$scripts ) +--- wordpress/wp-includes/script-loader.php.orig 2019-02-21 14:57:23.338776485 +0100 ++++ wordpress/wp-includes/script-loader.php 2019-02-21 14:57:25.832789185 +0100 +@@ -1098,12 +1098,6 @@ function wp_default_scripts( &$scripts ) $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); - // keep 'swfupload' for back-compat. -- $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113'); +- $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' ); - $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' ); -- $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array('swfupload-all', 'jquery'), '2201-20110524'); +- $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' ); - did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n ); - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); diff --git a/wordpress-4.9-noupdate.patch b/wordpress-5.1-noupdate.patch similarity index 61% rename from wordpress-4.9-noupdate.patch rename to wordpress-5.1-noupdate.patch index 40e3678..70350e7 100644 --- a/wordpress-4.9-noupdate.patch +++ b/wordpress-5.1-noupdate.patch @@ -1,18 +1,18 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.rpm 2017-10-04 20:25:46.000000000 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2017-11-16 08:46:52.340794957 +0100 -@@ -115,7 +115,6 @@ add_action( 'personal_options_update', ' +--- wordpress/wp-admin/includes/admin-filters.php.rpm 2019-02-21 15:14:36.864022775 +0100 ++++ wordpress/wp-admin/includes/admin-filters.php 2019-02-21 15:14:46.729070707 +0100 +@@ -116,7 +116,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. --add_action( 'admin_notices', 'update_nag', 3 ); +-add_action( 'admin_notices', 'update_nag', 3 ); add_action( 'admin_notices', 'maintenance_nag', 10 ); add_filter( 'update_footer', 'core_update_footer' ); diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2017-10-18 19:15:47.000000000 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2017-11-16 08:46:52.340794957 +0100 -@@ -234,6 +234,9 @@ class Core_Upgrader extends WP_Upgrader +--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2019-02-21 15:14:36.864022775 +0100 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-02-21 15:14:46.729070707 +0100 +@@ -250,6 +250,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { @@ -21,12 +21,12 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-ad + include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z - $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y + $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2017-10-18 19:48:49.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2017-11-16 08:46:52.340794957 +0100 -@@ -36,7 +36,7 @@ class WP_Automatic_Updater { - return true; +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2019-02-21 15:14:36.864022775 +0100 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-02-21 15:14:46.729070707 +0100 +@@ -38,7 +38,7 @@ class WP_Automatic_Updater { + } // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters. - $disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED; @@ -35,21 +35,21 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpres /** * Filters whether to entirely disable background updates. diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.rpm 2017-08-22 13:52:48.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2017-11-16 08:46:52.340794957 +0100 -@@ -279,7 +279,7 @@ function update_right_now_message() { +--- wordpress/wp-admin/includes/update.php.rpm 2019-02-21 15:14:36.865022780 +0100 ++++ wordpress/wp-admin/includes/update.php 2019-02-21 15:14:46.729070707 +0100 +@@ -301,7 +301,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); - if ( isset( $cur->response ) && $cur->response == 'upgrade' ) + if ( isset( $cur->response ) && $cur->response == 'upgrade' ) { - $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; + $msg .= ''; + } } - /* translators: 1: version number, 2: theme name */ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.rpm 2017-11-16 08:46:52.340794957 +0100 -+++ wordpress/wp-includes/load.php 2017-11-16 08:47:47.535067259 +0100 -@@ -1112,7 +1112,7 @@ function wp_is_file_mod_allowed( $contex +--- wordpress/wp-includes/load.php.rpm 2019-01-30 12:01:52.000000000 +0100 ++++ wordpress/wp-includes/load.php 2019-02-21 15:14:36.865022780 +0100 +@@ -1259,7 +1259,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -59,15 +59,16 @@ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php /** diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.rpm 2017-10-22 00:42:51.000000000 +0200 -+++ wordpress/wp-includes/update.php 2017-11-16 08:46:52.340794957 +0100 -@@ -707,9 +707,6 @@ function _maybe_update_themes() { +--- wordpress/wp-includes/update.php.rpm 2019-02-21 15:14:36.865022780 +0100 ++++ wordpress/wp-includes/update.php 2019-02-21 15:16:50.428671765 +0100 +@@ -770,10 +770,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { -- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) -- wp_schedule_event(time(), 'twicedaily', 'wp_version_check'); +- if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() ) { +- wp_schedule_event( time(), 'twicedaily', 'wp_version_check' ); +- } - - if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) - wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins'); - + if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() ) { + wp_schedule_event( time(), 'twicedaily', 'wp_update_plugins' ); + } diff --git a/wordpress-5.1-systemlibs.patch b/wordpress-5.1-systemlibs.patch new file mode 100644 index 0000000..6819e34 --- /dev/null +++ b/wordpress-5.1-systemlibs.patch @@ -0,0 +1,21 @@ +diff -up wordpress/wp-admin/includes/media.php.orig wordpress/wp-admin/includes/media.php +--- wordpress/wp-admin/includes/media.php.orig 2019-02-21 15:01:56.055165397 +0100 ++++ wordpress/wp-admin/includes/media.php 2019-02-21 15:02:41.288395787 +0100 +@@ -3261,7 +3261,7 @@ function wp_read_video_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + } + $id3 = new getID3(); + $data = $id3->analyze( $file ); +@@ -3358,7 +3358,7 @@ function wp_read_audio_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + } + $id3 = new getID3(); + $data = $id3->analyze( $file ); diff --git a/wordpress-5.1-tinymce_noflash.patch b/wordpress-5.1-tinymce_noflash.patch new file mode 100644 index 0000000..0d0e79c --- /dev/null +++ b/wordpress-5.1-tinymce_noflash.patch @@ -0,0 +1,35 @@ +diff -up wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.orig wordpress/wp-includes/js/tinymce/plugins/media/plugin.js +--- wordpress/wp-includes/js/tinymce/plugins/media/plugin.js.orig 2019-02-21 14:59:28.793415420 +0100 ++++ wordpress/wp-includes/js/tinymce/plugins/media/plugin.js 2019-02-21 15:00:14.319647286 +0100 +@@ -166,7 +166,6 @@ var media = (function () { + 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 media = (function () { + var allowFullscreen = data.allowFullscreen ? ' allowFullscreen="1"' : ''; + return ''; + }; +- var getFlashHtml = function (data) { +- var html = ''; +- if (data.poster) { +- html += ''; +- } +- html += ''; +- return html; +- }; + var getAudioHtml = function (data, audioTemplateCallback) { + if (audioTemplateCallback) { + return audioTemplateCallback(data); +@@ -494,8 +485,6 @@ var media = (function () { + }); + 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') { diff --git a/wordpress.spec b/wordpress.spec index 3ecdb90..bb93cf3 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -14,24 +14,23 @@ %global with_nginx 0 %endif -#global prever RC1 +%global upstream_version 5.1 +%global upstream_prever RC2 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: 5.0.3 -Release: 2%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} +Release: 1%{?dist} License: GPLv2 -Source0: %{name}-%{version}%{?prever:-%{prever}}-strip.tar.xz +Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz Source1: wordpress-httpd-conf Source2: README.fedora.wordpress Source3: README.fedora.wordpress-mu Source4: wordpress-nginx-conf # To minify JS assets Source5: wordpress-minify.php -# To generate the tarball without non-free files -Source6: strip.sh # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) @@ -40,24 +39,24 @@ Patch0: wordpress-debian_patches_hello.patch # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-4.9-no_swfupload.patch +Patch2: wordpress-5.1-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.9-tinymce_noflash.patch +Patch3: wordpress-5.1-tinymce_noflash.patch # We drop the SWF files from mediaelement Patch4: wordpress-4.9-mediaelement_no_swf.patch # RPM configuration: # Path to installation # Disable auto-updater -Patch5: wordpress-4.0-config.patch +Patch5: wordpress-5.1-config.patch # RPM are readonly # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-4.9-noupdate.patch +Patch6: wordpress-5.1-noupdate.patch # Use system libraries -Patch7: wordpress-4.4-systemlibs.patch +Patch7: wordpress-5.1-systemlibs.patch # Debian patch for jshint Patch8: wordpress-4.9.4-remove-jshint-refs.patch @@ -272,6 +271,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Feb 21 2019 Remi Collet - 5.1~RC2-1 +- WordPress 5.1-RC2 + * Sun Feb 03 2019 Fedora Release Engineering - 5.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 62699a60863ab3f2287312aac6f9bd915c452ed5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Feb 2019 11:01:39 +0100 Subject: [PATCH 081/184] =?UTF-8?q?WordPress=205.1=20=E2=80=9CBetty?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 10 ---------- sources | 2 +- wordpress-4.9.4-remove-jshint-refs.patch | 19 ------------------- wordpress-5.1-remove-jshint-refs.patch | 11 +++++++++++ wordpress.spec | 7 +++++-- 5 files changed, 17 insertions(+), 32 deletions(-) delete mode 100644 wordpress-4.9.4-remove-jshint-refs.patch create mode 100644 wordpress-5.1-remove-jshint-refs.patch diff --git a/.gitignore b/.gitignore index 563cf68..75c7dfd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ clog /wordpress-*.tar.gz -/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 -/wordpress-4.9.7-strip.tar.xz -/wordpress-4.9.8-strip.tar.xz -/wordpress-5.0-strip.tar.xz -/wordpress-5.0.1-strip.tar.xz -/wordpress-5.0.2-strip.tar.xz -/wordpress-5.0.3-strip.tar.xz diff --git a/sources b/sources index 901e8fa..8312a1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.1-RC2.tar.gz) = 3d217de62a70d3f0783803c09f088c3f830938a87a039adcbf432575cccea9791250d033e11d9f3849e6130de014399b77ac5a5badda756313afafbabfd5b0fd +SHA512 (wordpress-5.1.tar.gz) = e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99 diff --git a/wordpress-4.9.4-remove-jshint-refs.patch b/wordpress-4.9.4-remove-jshint-refs.patch deleted file mode 100644 index 41b59ae..0000000 --- a/wordpress-4.9.4-remove-jshint-refs.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Remove references to jshint - The file jshint.js uses a non-free license. It is removed as part of the upstream - tarball rebuild but this patch removes the things that reference it. Luckily the - script handler does a NOP for a non-existent script -Author: Craig Small -Origin: Debian -Bug: https://core.trac.wordpress.org/ticket/42850 -Reviewed-by: Craig Small -Last-Update: 2017-12-09 ---- a/wp-includes/script-loader.php -+++ b/wp-includes/script-loader.php -@@ -461,7 +461,6 @@ - - $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); - $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); -- $scripts->add( 'jshint', '/wp-includes/js/codemirror/jshint.js', array(), '2.9.5.999' ); - $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); - $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); - $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress-5.1-remove-jshint-refs.patch b/wordpress-5.1-remove-jshint-refs.patch new file mode 100644 index 0000000..fff7368 --- /dev/null +++ b/wordpress-5.1-remove-jshint-refs.patch @@ -0,0 +1,11 @@ +diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.orig 2019-02-22 10:52:01.902006889 +0100 ++++ wordpress/wp-includes/script-loader.php 2019-02-22 10:52:04.560023086 +0100 +@@ -1251,7 +1251,6 @@ function wp_default_scripts( &$scripts ) + $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); + $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); + $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.0' ); +- $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); + $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); + $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); + $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index bb93cf3..6b0614e 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -15,7 +15,7 @@ %endif %global upstream_version 5.1 -%global upstream_prever RC2 +#global upstream_prever RC2 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -58,7 +58,7 @@ Patch6: wordpress-5.1-noupdate.patch # Use system libraries Patch7: wordpress-5.1-systemlibs.patch # Debian patch for jshint -Patch8: wordpress-4.9.4-remove-jshint-refs.patch +Patch8: wordpress-5.1-remove-jshint-refs.patch BuildArch: noarch @@ -271,6 +271,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Feb 22 2019 Remi Collet - 5.1-1 +- WordPress 5.1 “Betty” + * Thu Feb 21 2019 Remi Collet - 5.1~RC2-1 - WordPress 5.1-RC2 From 6c6cc5b0b5b9e467b73939c210c985ac4833eb7f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2019 07:07:17 +0100 Subject: [PATCH 082/184] WordPress 5.1.1 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8312a1b..fd32428 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.1.tar.gz) = e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99 +SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9 diff --git a/wordpress.spec b/wordpress.spec index 6b0614e..1efe528 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -14,7 +14,7 @@ %global with_nginx 0 %endif -%global upstream_version 5.1 +%global upstream_version 5.1.1 #global upstream_prever RC2 Summary: Blog tool and publishing platform @@ -271,6 +271,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Mar 13 2019 Remi Collet - 5.1.1-1 +- WordPress 5.1.1 Security and Maintenance Release + * Fri Feb 22 2019 Remi Collet - 5.1-1 - WordPress 5.1 “Betty” From a036eddc5f684fcd9481aaffcac531f87f37c141 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 09:23:40 +0100 Subject: [PATCH 083/184] fix wp-tinymce.js.gz is empty #1691524 --- wordpress.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 1efe528..f8ba33a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -148,22 +148,6 @@ php %{SOURCE5} \ wp-includes/js/mediaelement/mediaelement.js \ wp-includes/js/mediaelement/mediaelement.min.js -# Re-Generated the archive -arc=wp-includes/js/tinymce/wp-tinymce.js -gunzip -dc $arc.gz | \ - grep "^// Source" | \ - while read a b c -do - if [ -f $c ]; then - echo -e "\n$a $b $c" - cat $c - else - exit 1 - fi -done >$arc -gzip --force $arc -ls -l $arc.gz - # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php %patch5 -p1 @@ -271,6 +255,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Mar 22 2019 Remi Collet - 5.1.1-2 +- fix wp-tinymce.js.gz is empty #1691524 + * Wed Mar 13 2019 Remi Collet - 5.1.1-1 - WordPress 5.1.1 Security and Maintenance Release From 56508b8b2164d451e77216c9f3df6e3dedf29ff8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 09:55:59 +0100 Subject: [PATCH 084/184] fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 --- wordpress.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index f8ba33a..095201f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -148,6 +148,24 @@ php %{SOURCE5} \ wp-includes/js/mediaelement/mediaelement.js \ wp-includes/js/mediaelement/mediaelement.min.js +# Re-Generated the archive +arc=wp-includes/js/tinymce/wp-tinymce.js +grep "^// Source" $arc | while read a b c +do + if [ -f $c ]; then + echo -e "\n$a $b $c" + cat $c + else + exit 1 + fi +done >$arc.tmp +if [ -s $arc.tmp ]; then + ls -l $arc* + mv $arc.tmp $arc +else + exit 1 +fi + # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php %patch5 -p1 @@ -255,8 +273,8 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog -* Fri Mar 22 2019 Remi Collet - 5.1.1-2 -- fix wp-tinymce.js.gz is empty #1691524 +* Fri Mar 22 2019 Remi Collet - 5.1.1-3 +- fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 * Wed Mar 13 2019 Remi Collet - 5.1.1-1 - WordPress 5.1.1 Security and Maintenance Release From b91aee8a754f3e1f3a203a83912511196bf5202f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 10:03:35 +0100 Subject: [PATCH 085/184] also add wp-tinymce.js.gz (cherry picked from commit dec03d96ab4c62b9ce5e0ef8f988560e0c571328) --- wordpress.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.spec b/wordpress.spec index 095201f..1ced21f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -160,6 +160,7 @@ do fi done >$arc.tmp if [ -s $arc.tmp ]; then + gzip -c $arc > $arc.gz ls -l $arc* mv $arc.tmp $arc else From 6005fbcc0c00bf44e541381f9c8d369cb9fce540 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 10:06:22 +0100 Subject: [PATCH 086/184] bump release --- wordpress.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 1ced21f..2858235 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -274,7 +274,7 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog -* Fri Mar 22 2019 Remi Collet - 5.1.1-3 +* Fri Mar 22 2019 Remi Collet - 5.1.1-4 - fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 * Wed Mar 13 2019 Remi Collet - 5.1.1-1 From 7fdeb1ba1d372b07c6f2f0be0aef5ce3b7ed3569 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Mar 2019 15:25:28 +0100 Subject: [PATCH 087/184] WordPress 5.2 Beta 1 raise dependency on PHP 7.2 --- sources | 1 + ...s_hello.patch => wordpress-5.2-hello.patch | 12 +++--- ...date.patch => wordpress-5.2-noupdate.patch | 32 +++++++-------- wordpress.spec | 41 +++++++++++++++---- 4 files changed, 56 insertions(+), 30 deletions(-) rename wordpress-debian_patches_hello.patch => wordpress-5.2-hello.patch (86%) rename wordpress-5.1-noupdate.patch => wordpress-5.2-noupdate.patch (75%) diff --git a/sources b/sources index fd32428..3276186 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9 +SHA512 (wordpress-5.2-beta1.tar.gz) = 58f76bddcb600f0dcc0cccbd52e799581614d88c8aae76e441fc9fe512a1a591a4b62b2f88a5b0023985ce3b26b7d6f3b22de86f308fa6a62c884a0c6478d2e4 diff --git a/wordpress-debian_patches_hello.patch b/wordpress-5.2-hello.patch similarity index 86% rename from wordpress-debian_patches_hello.patch rename to wordpress-5.2-hello.patch index 65fd0d3..5ccc2f5 100644 --- a/wordpress-debian_patches_hello.patch +++ b/wordpress-5.2-hello.patch @@ -1,6 +1,6 @@ -diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php ---- ./wp-content/plugins/hello.php.dolly 2018-11-16 00:38:48.000000000 +0100 -+++ ./wp-content/plugins/hello.php 2018-12-12 13:54:41.867980830 +0100 +diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php +--- wordpress/wp-content/plugins/hello.php.dolly 2019-03-28 15:09:05.874797878 +0100 ++++ wordpress/wp-content/plugins/hello.php 2019-03-28 15:10:15.892164549 +0100 @@ -6,41 +6,26 @@ /* Plugin Name: Hello Dolly @@ -8,7 +8,7 @@ diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php -Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. +Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Richard M. Stallman: Free Software. When activated you will randomly see a lyric from the Free Software Song in the upper right of your admin screen on every page. Author: Matt Mullenweg - Version: 1.7.1 + Version: 1.7.2 Author URI: http://ma.tt/ */ @@ -25,7 +25,7 @@ diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php -While the band's playin' -One of our old favorite songs from way back when -So, take her wrap, fellas --Dolly, never go away again +-Dolly, never go away again -Hello, Dolly -Well, hello, Dolly -It's so nice to have you back where you belong @@ -55,5 +55,5 @@ diff -up ./wp-content/plugins/hello.php.dolly ./wp-content/plugins/hello.php +Join us now and share the software; +You'll be free, hackers, you'll be free."; - // Here we split it into lines + // Here we split it into lines. $lyrics = explode( "\n", $lyrics ); diff --git a/wordpress-5.1-noupdate.patch b/wordpress-5.2-noupdate.patch similarity index 75% rename from wordpress-5.1-noupdate.patch rename to wordpress-5.2-noupdate.patch index 70350e7..68f6fb7 100644 --- a/wordpress-5.1-noupdate.patch +++ b/wordpress-5.2-noupdate.patch @@ -1,18 +1,18 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.rpm 2019-02-21 15:14:36.864022775 +0100 -+++ wordpress/wp-admin/includes/admin-filters.php 2019-02-21 15:14:46.729070707 +0100 +--- wordpress/wp-admin/includes/admin-filters.php.rpm 2019-03-28 15:12:21.157820497 +0100 ++++ wordpress/wp-admin/includes/admin-filters.php 2019-03-28 15:12:41.792928559 +0100 @@ -116,7 +116,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. -add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'paused_plugins_notice', 5 ); + add_action( 'admin_notices', 'paused_themes_notice', 5 ); add_action( 'admin_notices', 'maintenance_nag', 10 ); - - add_filter( 'update_footer', 'core_update_footer' ); diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2019-02-21 15:14:36.864022775 +0100 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-02-21 15:14:46.729070707 +0100 -@@ -250,6 +250,9 @@ class Core_Upgrader extends WP_Upgrader +--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2019-03-28 00:05:54.000000000 +0100 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-03-28 15:12:21.157820497 +0100 +@@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { @@ -23,8 +23,8 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-ad $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2019-02-21 15:14:36.864022775 +0100 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-02-21 15:14:46.729070707 +0100 +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2018-08-30 15:36:25.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-03-28 15:12:21.158820502 +0100 @@ -38,7 +38,7 @@ class WP_Automatic_Updater { } @@ -35,8 +35,8 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpres /** * Filters whether to entirely disable background updates. diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.rpm 2019-02-21 15:14:36.865022780 +0100 -+++ wordpress/wp-admin/includes/update.php 2019-02-21 15:14:46.729070707 +0100 +--- wordpress/wp-admin/includes/update.php.rpm 2019-03-22 02:08:51.000000000 +0100 ++++ wordpress/wp-admin/includes/update.php 2019-03-28 15:12:21.158820502 +0100 @@ -301,7 +301,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); @@ -47,9 +47,9 @@ diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/ } diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.rpm 2019-01-30 12:01:52.000000000 +0100 -+++ wordpress/wp-includes/load.php 2019-02-21 15:14:36.865022780 +0100 -@@ -1259,7 +1259,7 @@ function wp_is_file_mod_allowed( $contex +--- wordpress/wp-includes/load.php.rpm 2019-03-27 01:03:51.000000000 +0100 ++++ wordpress/wp-includes/load.php 2019-03-28 15:12:21.158820502 +0100 +@@ -1418,7 +1418,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -59,8 +59,8 @@ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php /** diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.rpm 2019-02-21 15:14:36.865022780 +0100 -+++ wordpress/wp-includes/update.php 2019-02-21 15:16:50.428671765 +0100 +--- wordpress/wp-includes/update.php.rpm 2019-01-16 04:38:49.000000000 +0100 ++++ wordpress/wp-includes/update.php 2019-03-28 15:12:21.158820502 +0100 @@ -770,10 +770,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ diff --git a/wordpress.spec b/wordpress.spec index 2858235..510e955 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,15 +13,19 @@ %else %global with_nginx 0 %endif - -%global upstream_version 5.1.1 -#global upstream_prever RC2 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 +%global clean_compat 1 +%else +%global clean_compat 0 +%endif +%global upstream_version 5.2 +%global upstream_prever beta1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -34,7 +38,7 @@ Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) -Patch0: wordpress-debian_patches_hello.patch +Patch0: wordpress-5.2-hello.patch # Move wp-content to /var/www/wordpress/ # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch @@ -54,7 +58,7 @@ Patch5: wordpress-5.1-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-5.1-noupdate.patch +Patch6: wordpress-5.2-noupdate.patch # Use system libraries Patch7: wordpress-5.1-systemlibs.patch # Debian patch for jshint @@ -64,6 +68,11 @@ Patch8: wordpress-5.1-remove-jshint-refs.patch BuildArch: noarch BuildRequires: php-cli BuildRequires: php-patchwork-jsqueeze +%if %{clean_compat} +BuildRequires: php(language) >= 7.2 +%else +BuildRequires: php(language) >= 5.6 +%endif %if %{with_nginx} Requires: webserver @@ -72,9 +81,14 @@ Suggests: httpd # For directory ownership Requires: httpd-filesystem Requires: nginx-filesystem - %else -Requires: php >= 5.2.4 +Requires: php +%endif +%if %{clean_compat} +Requires: php(language) >= 7.2 +Requires: php-sodium +%else +Requires: php(language) >= 5.6 %endif Requires: php-simplepie >= 1.3.1 Requires: php-getid3 @@ -127,6 +141,13 @@ rm -rf wp-includes/js/swfupload # remove .htaccess, protected by httpd config file rm wp-content/plugins/akismet/.htaccess +%if %{clean_compat} +# only for PHP < 7.0 without random_int +rm -rf wp-includes/random_compat +# only for PHP < 7.2 without sodium_crypto_box +rm -rf wp-includes/sodium_compat +%endif + %patch0 -p1 -b .dolly #patch1 -p1 -b .rhbz522897 %patch2 -p1 @@ -274,6 +295,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Mar 28 2019 Remi Collet - 5.2.0~beta1-1 +- WordPress 5.2 Beta 1 +- raise dependency on PHP 7.2 + * Fri Mar 22 2019 Remi Collet - 5.1.1-4 - fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 From 997262dc34a39d29803fabc927c4824f28c9719c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 Apr 2019 11:38:24 +0200 Subject: [PATCH 088/184] WordPress 5.2 Beta 2 --- sources | 3 +-- wordpress.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 3276186..134ce84 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9 -SHA512 (wordpress-5.2-beta1.tar.gz) = 58f76bddcb600f0dcc0cccbd52e799581614d88c8aae76e441fc9fe512a1a591a4b62b2f88a5b0023985ce3b26b7d6f3b22de86f308fa6a62c884a0c6478d2e4 +SHA512 (wordpress-5.2-beta2.tar.gz) = e41be5f91fa0c722a66d74b1f71155522c0ab10792c86109bd6362f1a306b61f2ac62565b2979bd68a413ce11aec07292239f139e9dc5516f1adcb3df365612f diff --git a/wordpress.spec b/wordpress.spec index 510e955..c28d43f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,7 +19,7 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever beta1 +%global upstream_prever beta2 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -71,7 +71,7 @@ BuildRequires: php-patchwork-jsqueeze %if %{clean_compat} BuildRequires: php(language) >= 7.2 %else -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 5.6.20 %endif %if %{with_nginx} @@ -88,7 +88,7 @@ Requires: php Requires: php(language) >= 7.2 Requires: php-sodium %else -Requires: php(language) >= 5.6 +Requires: php(language) >= 5.6.20 %endif Requires: php-simplepie >= 1.3.1 Requires: php-getid3 @@ -295,6 +295,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Apr 9 2019 Remi Collet - 5.2.0~beta2-1 +- WordPress 5.2 Beta 2 + * Thu Mar 28 2019 Remi Collet - 5.2.0~beta1-1 - WordPress 5.2 Beta 1 - raise dependency on PHP 7.2 From 6d87ba89c33d458214cf2aa6843bce326f15720f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Apr 2019 10:31:29 +0200 Subject: [PATCH 089/184] WordPress 5.2 Beta 3 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 134ce84..98919df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2-beta2.tar.gz) = e41be5f91fa0c722a66d74b1f71155522c0ab10792c86109bd6362f1a306b61f2ac62565b2979bd68a413ce11aec07292239f139e9dc5516f1adcb3df365612f +SHA512 (wordpress-5.2-beta3.tar.gz) = afca3568d30ec8ab4f2e1390f561b7050497749e37a3ba4f4dc9e6653d2c2f013a701004b01e5079a47edbab66f9e6bb6eb9aeebc719cace6f95c0ad42579f52 diff --git a/wordpress.spec b/wordpress.spec index c28d43f..5ae829c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,7 +19,7 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever beta2 +%global upstream_prever beta3 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -295,6 +295,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Apr 17 2019 Remi Collet - 5.2.0~beta3-1 +- WordPress 5.2 Beta 3 + * Tue Apr 9 2019 Remi Collet - 5.2.0~beta2-1 - WordPress 5.2 Beta 2 From bf063620ff588303485dfd4fdf8766fd02cd1bcb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Apr 2019 10:12:58 +0200 Subject: [PATCH 090/184] WordPress 5.2 RC 1 --- sources | 2 +- wordpress.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 98919df..8b0920f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2-beta3.tar.gz) = afca3568d30ec8ab4f2e1390f561b7050497749e37a3ba4f4dc9e6653d2c2f013a701004b01e5079a47edbab66f9e6bb6eb9aeebc719cace6f95c0ad42579f52 +SHA512 (wordpress-5.2-RC1.tar.gz) = 909b4a815ba6a241ab806165b91abb413801e84aa25bd26e655e525d4d78bc48f8a98153957088e8c606f2e8351cee07a17bdec7efad9d23222b2271440ae907 diff --git a/wordpress.spec b/wordpress.spec index 5ae829c..2a4da82 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,12 +19,13 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever beta3 +%global upstream_prever RC1 +%global upstream_lower rc1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress -Version: %{upstream_version}%{?upstream_prever:~%upstream_prever} +Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} Release: 1%{?dist} License: GPLv2 @@ -295,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Apr 26 2019 Remi Collet - 5.2.0~rc1-1 +- WordPress 5.2 RC 1 + * Wed Apr 17 2019 Remi Collet - 5.2.0~beta3-1 - WordPress 5.2 Beta 3 From 916ff3a68e8fcedee677ee0796ec4114f487c102 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 May 2019 07:54:33 +0200 Subject: [PATCH 091/184] =?UTF-8?q?WordPress=205.2=20=E2=80=9CJaco?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 8b0920f..86563e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2-RC1.tar.gz) = 909b4a815ba6a241ab806165b91abb413801e84aa25bd26e655e525d4d78bc48f8a98153957088e8c606f2e8351cee07a17bdec7efad9d23222b2271440ae907 +SHA512 (wordpress-5.2.tar.gz) = 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824 diff --git a/wordpress.spec b/wordpress.spec index 2a4da82..010ba93 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,8 +19,8 @@ %global clean_compat 0 %endif %global upstream_version 5.2 -%global upstream_prever RC1 -%global upstream_lower rc1 +#global upstream_prever RC1 +#global upstream_lower rc1 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed May 8 2019 Remi Collet - 5.2.0-1 +- WordPress 5.2 “Jaco” + * Fri Apr 26 2019 Remi Collet - 5.2.0~rc1-1 - WordPress 5.2 RC 1 From a0e7b400871d5534742b739022623de1c1d0589f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 May 2019 07:08:21 +0200 Subject: [PATCH 092/184] WordPress 5.2.1 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 86563e7..df665d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2.tar.gz) = 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824 +SHA512 (wordpress-5.2.1.tar.gz) = b49368ba7a3f0cf101b2ad2c78d609050f371a4c7f6dca7d5966cc167ae20ca78df9a3144e1b91c4044d0a9a12163911d66c8faedc9c4a1e2978d2b54ef54855 diff --git a/wordpress.spec b/wordpress.spec index 010ba93..cd03b4e 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.2 +%global upstream_version 5.2.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed May 22 2019 Remi Collet - 5.2.1-1 +- WordPress 5.2.1 Maintenance Release + * Wed May 8 2019 Remi Collet - 5.2.0-1 - WordPress 5.2 “Jaco” From 2a36e4d145dcd76a019416839c6b2f01e1e7d967 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Jun 2019 07:31:16 +0200 Subject: [PATCH 093/184] WordPress 5.2.2 Maintenance Release --- sources | 2 +- wordpress.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index df665d4..51c80ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2.1.tar.gz) = b49368ba7a3f0cf101b2ad2c78d609050f371a4c7f6dca7d5966cc167ae20ca78df9a3144e1b91c4044d0a9a12163911d66c8faedc9c4a1e2978d2b54ef54855 +SHA512 (wordpress-5.2.2.tar.gz) = 4aac96d9ec0f6d3ae0d6b2438599e5e76442580e56d56c1e10d199435336bbc5f0869db2f742ead55815abf1f6428f4f325946d30b2a93ca39ded8d27024f38a diff --git a/wordpress.spec b/wordpress.spec index cd03b4e..fe37fc3 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.2.1 +%global upstream_version 5.2.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -296,10 +296,13 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog -* Wed May 22 2019 Remi Collet - 5.2.1-1 +* Wed Jun 19 2019 Remi Collet - 5.2.2-1 +- WordPress 5.2.2 Maintenance Release + +* Wed May 22 2019 Remi Collet - 5.2.1-1 - WordPress 5.2.1 Maintenance Release -* Wed May 8 2019 Remi Collet - 5.2.0-1 +* Wed May 8 2019 Remi Collet - 5.2.0-1 - WordPress 5.2 “Jaco” * Fri Apr 26 2019 Remi Collet - 5.2.0~rc1-1 From 76e39619576d560fa432034bce7bb126cbbcd3de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:40:27 +0000 Subject: [PATCH 094/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index fe37fc3..81521ac 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -26,7 +26,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 5.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jun 19 2019 Remi Collet - 5.2.2-1 - WordPress 5.2.2 Maintenance Release From f98a471d2b00cbfa4c9d35d9bcd7b4ed32be772a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Sep 2019 07:53:49 +0200 Subject: [PATCH 095/184] WordPress 5.2.3 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 51c80ae..b2a0b3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2.2.tar.gz) = 4aac96d9ec0f6d3ae0d6b2438599e5e76442580e56d56c1e10d199435336bbc5f0869db2f742ead55815abf1f6428f4f325946d30b2a93ca39ded8d27024f38a +SHA512 (wordpress-5.2.3.tar.gz) = 4fb37cb5b5bafbbb556910a69bbe3c83163c660e0186b1a30e095c1fc5950b8474592f17b743f0fb8a4f23f0f0080d3c92f0c45a2a1388911e69994d9c8a2194 diff --git a/wordpress.spec b/wordpress.spec index 81521ac..2a89f26 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.2.2 +%global upstream_version 5.2.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -26,7 +26,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Sep 5 2019 Remi Collet - 5.2.3-1 +- WordPress 5.2.3 Security and Maintenance Release + * Sat Jul 27 2019 Fedora Release Engineering - 5.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From dce3e0cbdce3abc5127b5bf9cac5bc57f49940b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Oct 2019 08:00:07 +0200 Subject: [PATCH 096/184] WordPress 5.2.4 Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b2a0b3a..7778840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2.3.tar.gz) = 4fb37cb5b5bafbbb556910a69bbe3c83163c660e0186b1a30e095c1fc5950b8474592f17b743f0fb8a4f23f0f0080d3c92f0c45a2a1388911e69994d9c8a2194 +SHA512 (wordpress-5.2.4.tar.gz) = eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0 diff --git a/wordpress.spec b/wordpress.spec index 2a89f26..4f6561a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.2.3 +%global upstream_version 5.2.4 #global upstream_prever RC1 #global upstream_lower rc1 @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Oct 15 2019 Remi Collet - 5.2.4-1 +- WordPress 5.2.4 Security Release + * Thu Sep 5 2019 Remi Collet - 5.2.3-1 - WordPress 5.2.3 Security and Maintenance Release From 21ec765605e3ccd6f0914bb0de648a8147c1ee9c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Nov 2019 08:14:19 +0100 Subject: [PATCH 097/184] =?UTF-8?q?WordPress=205.3=20=E2=80=9CKirk?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress-4.9-mediaelement_no_swf.patch | 38 -------------- wordpress-5.1-systemlibs.patch | 21 -------- wordpress-5.3-mediaelement_no_swf.patch | 38 ++++++++++++++ ...date.patch => wordpress-5.3-noupdate.patch | 51 ++++++++++--------- wordpress-5.3-systemlibs.patch | 21 ++++++++ wordpress.spec | 11 ++-- 7 files changed, 95 insertions(+), 87 deletions(-) delete mode 100644 wordpress-4.9-mediaelement_no_swf.patch delete mode 100644 wordpress-5.1-systemlibs.patch create mode 100644 wordpress-5.3-mediaelement_no_swf.patch rename wordpress-5.2-noupdate.patch => wordpress-5.3-noupdate.patch (53%) create mode 100644 wordpress-5.3-systemlibs.patch diff --git a/sources b/sources index 7778840..b036caa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.2.4.tar.gz) = eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0 +SHA512 (wordpress-5.3.tar.gz) = 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07 diff --git a/wordpress-4.9-mediaelement_no_swf.patch b/wordpress-4.9-mediaelement_no_swf.patch deleted file mode 100644 index afe3527..0000000 --- a/wordpress-4.9-mediaelement_no_swf.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js ---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.old 2017-11-16 09:22:17.148277728 +0100 -+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2017-11-16 09:23:42.056696625 +0100 -@@ -6121,6 +6121,7 @@ if (hasFlash) { - } - }); - -+/* swf files removed from RPM - var FlashMediaElementVideoRenderer = { - name: 'flash_video', - options: { -@@ -6205,6 +6206,7 @@ if (hasFlash) { - create: FlashMediaElementRenderer.create - }; - _renderer.renderer.add(FlashMediaElementAudioOggRenderer); -+*/ - } - - },{"2":2,"25":25,"27":27,"28":28,"3":3,"5":5,"7":7,"8":8}],21:[function(_dereq_,module,exports){ -diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.old wordpress/wp-includes/js/mediaelement/mediaelement.js ---- wordpress/wp-includes/js/mediaelement/mediaelement.js.old 2017-11-16 09:24:44.984007081 +0100 -+++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2017-11-16 09:24:49.655030123 +0100 -@@ -1839,6 +1839,7 @@ if (hasFlash) { - } - }); - -+/* swf files removed from RPM - var FlashMediaElementVideoRenderer = { - name: 'flash_video', - options: { -@@ -1923,6 +1924,7 @@ if (hasFlash) { - create: FlashMediaElementRenderer.create - }; - _renderer.renderer.add(FlashMediaElementAudioOggRenderer); -+*/ - } - - },{"16":16,"18":18,"19":19,"2":2,"3":3,"5":5,"7":7,"8":8}],12:[function(_dereq_,module,exports){ diff --git a/wordpress-5.1-systemlibs.patch b/wordpress-5.1-systemlibs.patch deleted file mode 100644 index 6819e34..0000000 --- a/wordpress-5.1-systemlibs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up wordpress/wp-admin/includes/media.php.orig wordpress/wp-admin/includes/media.php ---- wordpress/wp-admin/includes/media.php.orig 2019-02-21 15:01:56.055165397 +0100 -+++ wordpress/wp-admin/includes/media.php 2019-02-21 15:02:41.288395787 +0100 -@@ -3261,7 +3261,7 @@ function wp_read_video_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - } - $id3 = new getID3(); - $data = $id3->analyze( $file ); -@@ -3358,7 +3358,7 @@ function wp_read_audio_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - } - $id3 = new getID3(); - $data = $id3->analyze( $file ); diff --git a/wordpress-5.3-mediaelement_no_swf.patch b/wordpress-5.3-mediaelement_no_swf.patch new file mode 100644 index 0000000..9442ddf --- /dev/null +++ b/wordpress-5.3-mediaelement_no_swf.patch @@ -0,0 +1,38 @@ +diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js +--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no 2019-10-08 18:06:02.000000000 +0200 ++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2019-11-13 07:59:39.418787150 +0100 +@@ -6410,6 +6410,7 @@ if (hasFlash) { + } + }); + ++/* swf files removed from RPM + var FlashMediaElementVideoRenderer = { + name: 'flash_video', + options: { +@@ -6494,6 +6495,7 @@ if (hasFlash) { + create: FlashMediaElementRenderer.create + }; + _renderer.renderer.add(FlashMediaElementAudioOggRenderer); ++*/ + } + + },{"10":10,"2":2,"27":27,"29":29,"3":3,"30":30,"7":7,"9":9}],23:[function(_dereq_,module,exports){ +diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.no wordpress/wp-includes/js/mediaelement/mediaelement.js +--- wordpress/wp-includes/js/mediaelement/mediaelement.js.no 2019-10-08 18:06:02.000000000 +0200 ++++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2019-11-13 07:59:45.601728069 +0100 +@@ -2108,6 +2108,7 @@ if (hasFlash) { + } + }); + ++/* swf files removed from RPM + var FlashMediaElementVideoRenderer = { + name: 'flash_video', + options: { +@@ -2192,6 +2193,7 @@ if (hasFlash) { + create: FlashMediaElementRenderer.create + }; + _renderer.renderer.add(FlashMediaElementAudioOggRenderer); ++*/ + } + + },{"10":10,"18":18,"2":2,"20":20,"21":21,"3":3,"7":7,"9":9}],14:[function(_dereq_,module,exports){ diff --git a/wordpress-5.2-noupdate.patch b/wordpress-5.3-noupdate.patch similarity index 53% rename from wordpress-5.2-noupdate.patch rename to wordpress-5.3-noupdate.patch index 68f6fb7..f59cfdb 100644 --- a/wordpress-5.2-noupdate.patch +++ b/wordpress-5.3-noupdate.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.rpm 2019-03-28 15:12:21.157820497 +0100 -+++ wordpress/wp-admin/includes/admin-filters.php 2019-03-28 15:12:41.792928559 +0100 -@@ -116,7 +116,6 @@ add_action( 'personal_options_update', ' +diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.no 2019-05-26 22:50:53.000000000 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2019-11-13 08:04:53.832484254 +0100 +@@ -111,7 +111,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. @@ -9,9 +9,9 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/in add_action( 'admin_notices', 'paused_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_themes_notice', 5 ); add_action( 'admin_notices', 'maintenance_nag', 10 ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.rpm 2019-03-28 00:05:54.000000000 +0100 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-03-28 15:12:21.157820497 +0100 +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.no wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.no 2019-09-03 02:41:05.000000000 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-11-13 08:04:53.832484254 +0100 @@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ @@ -22,9 +22,9 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.rpm wordpress/wp-ad include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y -diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm 2018-08-30 15:36:25.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-03-28 15:12:21.158820502 +0100 +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.no 2019-09-03 02:41:05.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-11-13 08:04:53.832484254 +0100 @@ -38,7 +38,7 @@ class WP_Automatic_Updater { } @@ -34,22 +34,27 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpres /** * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.rpm 2019-03-22 02:08:51.000000000 +0100 -+++ wordpress/wp-admin/includes/update.php 2019-03-28 15:12:21.158820502 +0100 -@@ -301,7 +301,7 @@ function update_right_now_message() { +diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.no 2019-11-13 08:04:53.833484244 +0100 ++++ wordpress/wp-admin/includes/update.php 2019-11-13 08:06:54.383296231 +0100 +@@ -314,12 +314,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && $cur->response == 'upgrade' ) { -- $msg .= '' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . ' '; +- $msg .= sprintf( +- '%s ', +- network_admin_url( 'update-core.php' ), +- /* translators: %s: WordPress version number, or 'Latest' string. */ +- sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) +- ); + $msg .= ''; } } -diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.rpm 2019-03-27 01:03:51.000000000 +0100 -+++ wordpress/wp-includes/load.php 2019-03-28 15:12:21.158820502 +0100 -@@ -1418,7 +1418,7 @@ function wp_is_file_mod_allowed( $contex +diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.no 2019-09-19 14:02:58.000000000 +0200 ++++ wordpress/wp-includes/load.php 2019-11-13 08:04:53.833484244 +0100 +@@ -1422,7 +1422,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -58,10 +63,10 @@ diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php } /** -diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.rpm 2019-01-16 04:38:49.000000000 +0100 -+++ wordpress/wp-includes/update.php 2019-03-28 15:12:21.158820502 +0100 -@@ -770,10 +770,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.no wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.no 2019-09-03 02:41:05.000000000 +0200 ++++ wordpress/wp-includes/update.php 2019-11-13 08:04:53.833484244 +0100 +@@ -781,10 +781,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress-5.3-systemlibs.patch b/wordpress-5.3-systemlibs.patch new file mode 100644 index 0000000..41fca12 --- /dev/null +++ b/wordpress-5.3-systemlibs.patch @@ -0,0 +1,21 @@ +diff -up wordpress/wp-admin/includes/media.php.no wordpress/wp-admin/includes/media.php +--- wordpress/wp-admin/includes/media.php.no 2019-11-13 08:01:19.298917453 +0100 ++++ wordpress/wp-admin/includes/media.php 2019-11-13 08:02:18.118385610 +0100 +@@ -3447,7 +3447,7 @@ function wp_read_video_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + } + + $id3 = new getID3(); +@@ -3558,7 +3558,7 @@ function wp_read_audio_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require( ABSPATH . WPINC . '/ID3/getid3.php' ); ++ require( '/usr/share/php/getid3/getid3.php' ); + } + + $id3 = new getID3(); diff --git a/wordpress.spec b/wordpress.spec index 4f6561a..9b9de1f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.2.4 +%global upstream_version 5.3 #global upstream_prever RC1 #global upstream_lower rc1 @@ -50,7 +50,7 @@ Patch2: wordpress-5.1-no_swfupload.patch # to 'false' Patch3: wordpress-5.1-tinymce_noflash.patch # We drop the SWF files from mediaelement -Patch4: wordpress-4.9-mediaelement_no_swf.patch +Patch4: wordpress-5.3-mediaelement_no_swf.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -59,9 +59,9 @@ Patch5: wordpress-5.1-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-5.2-noupdate.patch +Patch6: wordpress-5.3-noupdate.patch # Use system libraries -Patch7: wordpress-5.1-systemlibs.patch +Patch7: wordpress-5.3-systemlibs.patch # Debian patch for jshint Patch8: wordpress-5.1-remove-jshint-refs.patch @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Nov 13 2019 Remi Collet - 5.3-1 +- WordPress 5.3 “Kirk” + * Tue Oct 15 2019 Remi Collet - 5.2.4-1 - WordPress 5.2.4 Security Release From b26e7ca65485badddc4010af7b44b92400129237 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Dec 2019 08:27:19 +0100 Subject: [PATCH 098/184] WordPress 5.3.1 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b036caa..6e35b57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.3.tar.gz) = 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07 +SHA512 (wordpress-5.3.1.tar.gz) = 97a3297305ae23bf0d1d295a3df1516dcafc1486a63974357bfc46963cecf0bfd982edc68efd60a0ceb4014fdcdde9fc71e7257a5f5d011922d8dfce280e1a9a diff --git a/wordpress.spec b/wordpress.spec index 9b9de1f..abe13fc 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.3 +%global upstream_version 5.3.1 #global upstream_prever RC1 #global upstream_lower rc1 @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Dec 13 2019 Remi Collet - 5.3.1-1 +- WordPress 5.3.1 Security and Maintenance Release + * Wed Nov 13 2019 Remi Collet - 5.3-1 - WordPress 5.3 “Kirk” From 6937d88230770ac567eecb9cd62a55c6e3a1c861 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Dec 2019 07:27:07 +0100 Subject: [PATCH 099/184] WordPress 5.3.2 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6e35b57..f41f92b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.3.1.tar.gz) = 97a3297305ae23bf0d1d295a3df1516dcafc1486a63974357bfc46963cecf0bfd982edc68efd60a0ceb4014fdcdde9fc71e7257a5f5d011922d8dfce280e1a9a +SHA512 (wordpress-5.3.2.tar.gz) = d766d485d9a6a6efb2b92ffaec2ba1f773e55a6e018759bb6b196469b73db2857c34a3dfca1ac406e2b7066072a35c070c99f24b285a47b050e3d21317785198 diff --git a/wordpress.spec b/wordpress.spec index abe13fc..01d9f12 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.3.1 +%global upstream_version 5.3.2 #global upstream_prever RC1 #global upstream_lower rc1 @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Dec 19 2019 Remi Collet - 5.3.2-1 +- WordPress 5.3.2 Maintenance Release + * Fri Dec 13 2019 Remi Collet - 5.3.1-1 - WordPress 5.3.1 Security and Maintenance Release From f3f0405406b7eca204cb55668da6570eae317dff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:54:14 +0000 Subject: [PATCH 100/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 01d9f12..99c171a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -26,7 +26,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 5.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 19 2019 Remi Collet - 5.3.2-1 - WordPress 5.3.2 Maintenance Release From 45b4eb5a10adef819be5b45b03304e0883749ad9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Mar 2020 08:09:43 +0100 Subject: [PATCH 101/184] v5.4-RC4 --- sources | 2 +- wordpress-5.3-systemlibs.patch | 21 -------- ...config.patch => wordpress-5.4-config.patch | 8 +-- ....patch => wordpress-5.4-no_swfupload.patch | 10 ++-- ...date.patch => wordpress-5.4-noupdate.patch | 50 +++++++++---------- wordpress-5.4-systemlibs.patch | 21 ++++++++ wordpress.spec | 19 ++++--- 7 files changed, 67 insertions(+), 64 deletions(-) delete mode 100644 wordpress-5.3-systemlibs.patch rename wordpress-5.1-config.patch => wordpress-5.4-config.patch (78%) rename wordpress-5.1-no_swfupload.patch => wordpress-5.4-no_swfupload.patch (70%) rename wordpress-5.3-noupdate.patch => wordpress-5.4-noupdate.patch (54%) create mode 100644 wordpress-5.4-systemlibs.patch diff --git a/sources b/sources index f41f92b..2b8f555 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.3.2.tar.gz) = d766d485d9a6a6efb2b92ffaec2ba1f773e55a6e018759bb6b196469b73db2857c34a3dfca1ac406e2b7066072a35c070c99f24b285a47b050e3d21317785198 +SHA512 (wordpress-5.4-RC4.tar.gz) = 365867bd80fb37ad958960586355eb07aa1265c510ff3957d4cc3cb280e613028928c4527dcebcb8c7124ecbb1356cd6033877438da5d3ec29ca1562a8e7c949 diff --git a/wordpress-5.3-systemlibs.patch b/wordpress-5.3-systemlibs.patch deleted file mode 100644 index 41fca12..0000000 --- a/wordpress-5.3-systemlibs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up wordpress/wp-admin/includes/media.php.no wordpress/wp-admin/includes/media.php ---- wordpress/wp-admin/includes/media.php.no 2019-11-13 08:01:19.298917453 +0100 -+++ wordpress/wp-admin/includes/media.php 2019-11-13 08:02:18.118385610 +0100 -@@ -3447,7 +3447,7 @@ function wp_read_video_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - } - - $id3 = new getID3(); -@@ -3558,7 +3558,7 @@ function wp_read_audio_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require( ABSPATH . WPINC . '/ID3/getid3.php' ); -+ require( '/usr/share/php/getid3/getid3.php' ); - } - - $id3 = new getID3(); diff --git a/wordpress-5.1-config.patch b/wordpress-5.4-config.patch similarity index 78% rename from wordpress-5.1-config.patch rename to wordpress-5.4-config.patch index a10109e..2c458f4 100644 --- a/wordpress-5.1-config.patch +++ b/wordpress-5.4-config.patch @@ -1,6 +1,6 @@ -diff -up wordpress/wp-config.php.orig wordpress/wp-config.php ---- wordpress/wp-config.php.orig 2019-02-21 15:07:29.558863904 +0100 -+++ wordpress/wp-config.php 2019-02-21 15:07:37.024901925 +0100 +diff -up wordpress/wp-config.php.old wordpress/wp-config.php +--- wordpress/wp-config.php.old 2020-03-25 16:41:04.241482906 +0100 ++++ wordpress/wp-config.php 2020-03-25 16:42:03.677209804 +0100 @@ -66,6 +66,19 @@ define( 'NONCE_SALT', 'put your un $table_prefix = 'wp_'; @@ -25,7 +25,7 @@ diff -up wordpress/wp-config.php.orig wordpress/wp-config.php /** Absolute path to the WordPress directory. */ if ( ! defined( 'ABSPATH' ) ) { -- define( 'ABSPATH', dirname( __FILE__ ) . '/' ); +- define( 'ABSPATH', __DIR__ . '/' ); + define('ABSPATH', '/usr/share/wordpress'); } diff --git a/wordpress-5.1-no_swfupload.patch b/wordpress-5.4-no_swfupload.patch similarity index 70% rename from wordpress-5.1-no_swfupload.patch rename to wordpress-5.4-no_swfupload.patch index 932ddee..3683cb7 100644 --- a/wordpress-5.1-no_swfupload.patch +++ b/wordpress-5.4-no_swfupload.patch @@ -1,11 +1,11 @@ -diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.orig 2019-02-21 14:57:23.338776485 +0100 -+++ wordpress/wp-includes/script-loader.php 2019-02-21 14:57:25.832789185 +0100 -@@ -1098,12 +1098,6 @@ function wp_default_scripts( &$scripts ) +diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.old 2020-03-25 16:34:50.606199762 +0100 ++++ wordpress/wp-includes/script-loader.php 2020-03-25 16:35:59.409883628 +0100 +@@ -892,12 +892,6 @@ function wp_default_scripts( $scripts ) $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); -- // keep 'swfupload' for back-compat. +- // Keep 'swfupload' for back-compat. - $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' ); - $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' ); - $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' ); diff --git a/wordpress-5.3-noupdate.patch b/wordpress-5.4-noupdate.patch similarity index 54% rename from wordpress-5.3-noupdate.patch rename to wordpress-5.4-noupdate.patch index f59cfdb..a996046 100644 --- a/wordpress-5.3-noupdate.patch +++ b/wordpress-5.4-noupdate.patch @@ -1,6 +1,6 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.no 2019-05-26 22:50:53.000000000 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2019-11-13 08:04:53.832484254 +0100 +diff -up wordpress/wp-admin/includes/admin-filters.php.old wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.old 2020-01-29 01:45:18.000000000 +0100 ++++ wordpress/wp-admin/includes/admin-filters.php 2020-03-25 16:44:02.126665533 +0100 @@ -111,7 +111,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. @@ -9,22 +9,22 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.no wordpress/wp-admin/inc add_action( 'admin_notices', 'paused_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_themes_notice', 5 ); add_action( 'admin_notices', 'maintenance_nag', 10 ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.no wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.no 2019-09-03 02:41:05.000000000 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-11-13 08:04:53.832484254 +0100 -@@ -269,6 +269,9 @@ class Core_Upgrader extends WP_Upgrader +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.old wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.old 2020-03-25 16:44:02.126665533 +0100 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-03-25 16:44:38.649497710 +0100 +@@ -270,6 +270,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { + // RPM: nether allow core update + return false; + - include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z + require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z - $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y -diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.no 2019-09-03 02:41:05.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-11-13 08:04:53.832484254 +0100 + $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.old wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.old 2020-02-09 17:55:09.000000000 +0100 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-03-25 16:44:02.126665533 +0100 @@ -38,7 +38,7 @@ class WP_Automatic_Updater { } @@ -34,13 +34,13 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.no wordpress /** * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.no 2019-11-13 08:04:53.833484244 +0100 -+++ wordpress/wp-admin/includes/update.php 2019-11-13 08:06:54.383296231 +0100 -@@ -314,12 +314,7 @@ function update_right_now_message() { +diff -up wordpress/wp-admin/includes/update.php.old wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.old 2020-03-25 16:44:02.127665528 +0100 ++++ wordpress/wp-admin/includes/update.php 2020-03-25 16:45:28.396269123 +0100 +@@ -338,12 +338,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); - if ( isset( $cur->response ) && $cur->response == 'upgrade' ) { + if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { - $msg .= sprintf( - '%s ', - network_admin_url( 'update-core.php' ), @@ -51,10 +51,10 @@ diff -up wordpress/wp-admin/includes/update.php.no wordpress/wp-admin/includes/u } } -diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.no 2019-09-19 14:02:58.000000000 +0200 -+++ wordpress/wp-includes/load.php 2019-11-13 08:04:53.833484244 +0100 -@@ -1422,7 +1422,7 @@ function wp_is_file_mod_allowed( $contex +diff -up wordpress/wp-includes/load.php.old wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.old 2020-02-25 19:33:06.000000000 +0100 ++++ wordpress/wp-includes/load.php 2020-03-25 16:44:02.127665528 +0100 +@@ -1435,7 +1435,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -63,10 +63,10 @@ diff -up wordpress/wp-includes/load.php.no wordpress/wp-includes/load.php } /** -diff -up wordpress/wp-includes/update.php.no wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.no 2019-09-03 02:41:05.000000000 +0200 -+++ wordpress/wp-includes/update.php 2019-11-13 08:04:53.833484244 +0100 -@@ -781,10 +781,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.old wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.old 2020-02-10 04:30:06.000000000 +0100 ++++ wordpress/wp-includes/update.php 2020-03-25 16:44:02.127665528 +0100 +@@ -782,10 +782,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress-5.4-systemlibs.patch b/wordpress-5.4-systemlibs.patch new file mode 100644 index 0000000..6cbe5b1 --- /dev/null +++ b/wordpress-5.4-systemlibs.patch @@ -0,0 +1,21 @@ +diff -up wordpress/wp-admin/includes/media.php.old wordpress/wp-admin/includes/media.php +--- wordpress/wp-admin/includes/media.php.old 2020-03-25 16:39:05.484028608 +0100 ++++ wordpress/wp-admin/includes/media.php 2020-02-11 00:47:04.000000000 +0100 +@@ -3477,7 +3477,7 @@ function wp_read_video_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require ABSPATH . WPINC . '/ID3/getid3.php'; ++ require '/usr/share/php/getid3/getid3.php'; + } + + $id3 = new getID3(); +@@ -3588,7 +3588,7 @@ function wp_read_audio_metadata( $file ) + } + + if ( ! class_exists( 'getID3', false ) ) { +- require ABSPATH . WPINC . '/ID3/getid3.php'; ++ require '/usr/share/php/getid3/getid3.php'; + } + + $id3 = new getID3(); diff --git a/wordpress.spec b/wordpress.spec index 99c171a..8b280e4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,15 +18,15 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.3.2 -#global upstream_prever RC1 -#global upstream_lower rc1 +%global upstream_version 5.4 +%global upstream_prever RC4 +%global upstream_lower rc4 Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -44,7 +44,7 @@ Patch0: wordpress-5.2-hello.patch # This patch doesn’t work well, see bugzilla.redhat.com/522897 Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-5.1-no_swfupload.patch +Patch2: wordpress-5.4-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' @@ -54,14 +54,14 @@ Patch4: wordpress-5.3-mediaelement_no_swf.patch # RPM configuration: # Path to installation # Disable auto-updater -Patch5: wordpress-5.1-config.patch +Patch5: wordpress-5.4-config.patch # RPM are readonly # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-5.3-noupdate.patch +Patch6: wordpress-5.4-noupdate.patch # Use system libraries -Patch7: wordpress-5.3-systemlibs.patch +Patch7: wordpress-5.4-systemlibs.patch # Debian patch for jshint Patch8: wordpress-5.1-remove-jshint-refs.patch @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Mar 25 2020 Remi Collet - 5.4~rc4-1 +- WordPress 5.4 RC 4 + * Fri Jan 31 2020 Fedora Release Engineering - 5.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 53d8d72cebe569ee1600218f86ecf8b283c3c49b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 30 Mar 2020 10:36:46 +0200 Subject: [PATCH 102/184] WordPress 5.4 RC 5 --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2b8f555..381a80b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.4-RC4.tar.gz) = 365867bd80fb37ad958960586355eb07aa1265c510ff3957d4cc3cb280e613028928c4527dcebcb8c7124ecbb1356cd6033877438da5d3ec29ca1562a8e7c949 +SHA512 (wordpress-5.4-RC5.tar.gz) = 9b84b35c9b7cf90032ed40b3fd7460d0af5161217a109cd6536efe4a7f8ac77d7d8141b9317ae6b6a4ec6765536cb90080f78b98a4122577eb583e3b2d315a31 diff --git a/wordpress.spec b/wordpress.spec index 8b280e4..6655ed6 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,8 +19,8 @@ %global clean_compat 0 %endif %global upstream_version 5.4 -%global upstream_prever RC4 -%global upstream_lower rc4 +%global upstream_prever RC5 +%global upstream_lower rc5 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Mon Mar 30 2020 Remi Collet - 5.4~rc5-1 +- WordPress 5.4 RC 5 + * Wed Mar 25 2020 Remi Collet - 5.4~rc4-1 - WordPress 5.4 RC 4 From 1210b95c264a251f091d29ec074219218855c1d7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Apr 2020 08:53:20 +0200 Subject: [PATCH 103/184] =?UTF-8?q?WordPress=205.4=20=E2=80=9CAdderley?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 381a80b..13ccea3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.4-RC5.tar.gz) = 9b84b35c9b7cf90032ed40b3fd7460d0af5161217a109cd6536efe4a7f8ac77d7d8141b9317ae6b6a4ec6765536cb90080f78b98a4122577eb583e3b2d315a31 +SHA512 (wordpress-5.4.tar.gz) = 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8 diff --git a/wordpress.spec b/wordpress.spec index 6655ed6..35d7581 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -19,8 +19,8 @@ %global clean_compat 0 %endif %global upstream_version 5.4 -%global upstream_prever RC5 -%global upstream_lower rc5 +#global upstream_prever RC5 +#global upstream_lower rc5 Summary: Blog tool and publishing platform URL: http://www.wordpress.org @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Apr 1 2020 Remi Collet - 5.4-1 +- WordPress 5.4 “Adderley” + * Mon Mar 30 2020 Remi Collet - 5.4~rc5-1 - WordPress 5.4 RC 5 From f072d1eb172450953cd2733e5ef26f18eed4308c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Apr 2020 07:58:01 +0200 Subject: [PATCH 104/184] v5.4.1 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 13ccea3..b570e35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.4.tar.gz) = 0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8 +SHA512 (wordpress-5.4.1.tar.gz) = 5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd diff --git a/wordpress.spec b/wordpress.spec index 35d7581..bbbba36 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.4 +%global upstream_version 5.4.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Apr 30 2020 Remi Collet - 5.4.1-1 +- WordPress 5.4.1 Security and Maintenance Release + * Wed Apr 1 2020 Remi Collet - 5.4-1 - WordPress 5.4 “Adderley” From b559bfa93be366b90a1c6f7434bdc04f43327f31 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Jun 2020 07:00:37 +0200 Subject: [PATCH 105/184] WordPress 5.4.2 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b570e35..afbed23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.4.1.tar.gz) = 5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd +SHA512 (wordpress-5.4.2.tar.gz) = d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219 diff --git a/wordpress.spec b/wordpress.spec index bbbba36..7971f88 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.4.1 +%global upstream_version 5.4.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Jun 11 2020 Remi Collet - 5.4.2-1 +- WordPress 5.4.2 Security and Maintenance Release + * Thu Apr 30 2020 Remi Collet - 5.4.1-1 - WordPress 5.4.1 Security and Maintenance Release From ba8432d47cb5c1645324583c170ca861c4c6910d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:18:06 +0000 Subject: [PATCH 106/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 7971f88..49e6421 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -26,7 +26,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -296,6 +296,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 5.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 11 2020 Remi Collet - 5.4.2-1 - WordPress 5.4.2 Security and Maintenance Release From 8fc4eba2f3c4bf10dfa91bffb5711f3cc24e4407 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Aug 2020 09:40:40 +0200 Subject: [PATCH 107/184] =?UTF-8?q?WordPress=205.5=20=E2=80=9CEckstine?= =?UTF-8?q?=E2=80=9D=20requires=20php-phpmailer6=20instead=20of=20old=20ph?= =?UTF-8?q?p-PHPMailer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/sources b/sources index afbed23..efbd492 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.4.2.tar.gz) = d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219 +SHA512 (wordpress-5.5.tar.gz) = 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865 diff --git a/wordpress.spec b/wordpress.spec index 49e6421..c4b38d6 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -18,7 +18,7 @@ %else %global clean_compat 0 %endif -%global upstream_version 5.4.2 +%global upstream_version 5.5 #global upstream_prever RC5 #global upstream_lower rc5 @@ -26,7 +26,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -120,7 +120,7 @@ Requires: php-xmlreader Requires: php-zip Requires: php-zlib # Unbundled libraries -Requires: php-PHPMailer +Requires: php-phpmailer6 Requires: httpd Requires: ca-certificates Provides: wordpress-mu = %{version}-%{release} @@ -234,12 +234,9 @@ ln -s /usr/share/php/php-simplepie/autoloader.php \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php # Remove bundled PHPMailer and link to system one -# Note POP3 is not from PHPMailer but from SquirrelMail -for fic in phpmailer smtp; do - rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php - ln -sf /usr/share/php/PHPMailer/class.$fic.php \ - ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-$fic.php -done +rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer +ln -s /usr/share/php/PHPMailer/PHPMailer6 \ + ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer # Remove bundled php-getid3 rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 @@ -296,6 +293,10 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Aug 12 2020 Remi Collet - 5.5-1 +- WordPress 5.5 “Eckstine” +- requires php-phpmailer6 instead of old php-PHPMailer + * Wed Jul 29 2020 Fedora Release Engineering - 5.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5cfa3510923dc0cd136b09965d419dc2c27af2fc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Sep 2020 12:34:15 +0200 Subject: [PATCH 108/184] WordPress 5.5.1 Maintenance Release --- sources | 2 +- wordpress.spec | 20 ++++---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/sources b/sources index efbd492..ab1bf0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.5.tar.gz) = 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865 +SHA512 (wordpress-5.5.1.tar.gz) = 11285e6e776756185814cde905986ce01f586d159fb06de5d16463cec544c8b3b85a695af51e9de71cbcd79f039ed8f6da233a8e82f5ee797d5124983b6ff0d3 diff --git a/wordpress.spec b/wordpress.spec index c4b38d6..e439cab 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,12 +13,7 @@ %else %global with_nginx 0 %endif -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 -%global clean_compat 1 -%else -%global clean_compat 0 -%endif -%global upstream_version 5.5 +%global upstream_version 5.5.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -69,11 +64,7 @@ Patch8: wordpress-5.1-remove-jshint-refs.patch BuildArch: noarch BuildRequires: php-cli BuildRequires: php-patchwork-jsqueeze -%if %{clean_compat} BuildRequires: php(language) >= 7.2 -%else -BuildRequires: php(language) >= 5.6.20 -%endif %if %{with_nginx} Requires: webserver @@ -85,12 +76,8 @@ Requires: nginx-filesystem %else Requires: php %endif -%if %{clean_compat} Requires: php(language) >= 7.2 Requires: php-sodium -%else -Requires: php(language) >= 5.6.20 -%endif Requires: php-simplepie >= 1.3.1 Requires: php-getid3 Requires: php-ctype @@ -142,12 +129,10 @@ rm -rf wp-includes/js/swfupload # remove .htaccess, protected by httpd config file rm wp-content/plugins/akismet/.htaccess -%if %{clean_compat} # only for PHP < 7.0 without random_int rm -rf wp-includes/random_compat # only for PHP < 7.2 without sodium_crypto_box rm -rf wp-includes/sodium_compat -%endif %patch0 -p1 -b .dolly #patch1 -p1 -b .rhbz522897 @@ -293,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Sep 2 2020 Remi Collet - 5.5.1-1 +- WordPress 5.5.1 Maintenance Release + * Wed Aug 12 2020 Remi Collet - 5.5-1 - WordPress 5.5 “Eckstine” - requires php-phpmailer6 instead of old php-PHPMailer From e2320b2e466a021186211df1645538dd97318fe4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Oct 2020 15:12:45 +0200 Subject: [PATCH 109/184] Change FS_METHOD default to 'direct' to allow enabling FILE_MODS #1889644 --- wordpress-5.4-config.patch | 13 ++++---- wordpress-5.4-noupdate.patch | 58 ++++++++++++++++++++++-------------- wordpress.spec | 5 +++- 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/wordpress-5.4-config.patch b/wordpress-5.4-config.patch index 2c458f4..4f94404 100644 --- a/wordpress-5.4-config.patch +++ b/wordpress-5.4-config.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-config.php.old wordpress/wp-config.php ---- wordpress/wp-config.php.old 2020-03-25 16:41:04.241482906 +0100 -+++ wordpress/wp-config.php 2020-03-25 16:42:03.677209804 +0100 -@@ -66,6 +66,19 @@ define( 'NONCE_SALT', 'put your un +diff -up wordpress/wp-config.php.rpm wordpress/wp-config.php +--- wordpress/wp-config.php.rpm 2020-10-20 15:05:26.351765085 +0200 ++++ wordpress/wp-config.php 2020-10-20 15:05:48.663684089 +0200 +@@ -66,6 +66,22 @@ define( 'NONCE_SALT', 'put your un $table_prefix = 'wp_'; /** @@ -11,6 +11,9 @@ diff -up wordpress/wp-config.php.old wordpress/wp-config.php +/* Disable all file change, as RPM base installation are read-only */ +define('DISALLOW_FILE_MODS', true); + ++/* Please ensure that this is either 'direct', 'ssh2', 'ftpext', 'ftpsockets' or false */ ++define('FS_METHOD', 'direct'); ++ +/* Disable automatic updater, in case you want to allow + above FILE_MODS for plugins, themes, ... */ +define('AUTOMATIC_UPDATER_DISABLED', true); @@ -21,7 +24,7 @@ diff -up wordpress/wp-config.php.old wordpress/wp-config.php * For developers: WordPress debugging mode. * * Change this to true to enable the display of notices during development. -@@ -83,7 +96,7 @@ define( 'WP_DEBUG', false ); +@@ -83,7 +99,7 @@ define( 'WP_DEBUG', false ); /** Absolute path to the WordPress directory. */ if ( ! defined( 'ABSPATH' ) ) { diff --git a/wordpress-5.4-noupdate.patch b/wordpress-5.4-noupdate.patch index a996046..3195c5b 100644 --- a/wordpress-5.4-noupdate.patch +++ b/wordpress-5.4-noupdate.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.old wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.old 2020-01-29 01:45:18.000000000 +0100 -+++ wordpress/wp-admin/includes/admin-filters.php 2020-03-25 16:44:02.126665533 +0100 -@@ -111,7 +111,6 @@ add_action( 'personal_options_update', ' +diff -up wordpress/wp-admin/includes/admin-filters.php.noup wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.noup 2020-07-10 01:29:08.000000000 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2020-10-20 14:12:55.970194210 +0200 +@@ -113,7 +113,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. @@ -9,10 +9,10 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.old wordpress/wp-admin/in add_action( 'admin_notices', 'paused_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_themes_notice', 5 ); add_action( 'admin_notices', 'maintenance_nag', 10 ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.old wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.old 2020-03-25 16:44:02.126665533 +0100 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-03-25 16:44:38.649497710 +0100 -@@ -270,6 +270,9 @@ class Core_Upgrader extends WP_Upgrader +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noup wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.noup 2020-06-25 09:15:12.000000000 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-10-20 14:12:55.970194210 +0200 +@@ -271,6 +271,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { @@ -22,9 +22,9 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.old wordpress/wp-ad require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y -diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.old wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.old 2020-02-09 17:55:09.000000000 +0100 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-03-25 16:44:02.126665533 +0100 +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup 2020-08-31 20:02:04.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-10-20 14:12:55.970194210 +0200 @@ -38,7 +38,7 @@ class WP_Automatic_Updater { } @@ -34,10 +34,22 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.old wordpres /** * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/update.php.old wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.old 2020-03-25 16:44:02.127665528 +0100 -+++ wordpress/wp-admin/includes/update.php 2020-03-25 16:45:28.396269123 +0100 -@@ -338,12 +338,7 @@ function update_right_now_message() { +diff -up wordpress/wp-admin/includes/file.php.noup wordpress/wp-admin/includes/file.php +--- wordpress/wp-admin/includes/file.php.noup 2020-10-20 14:13:30.079070699 +0200 ++++ wordpress/wp-admin/includes/file.php 2020-10-20 14:13:46.240012179 +0200 +@@ -1901,7 +1901,7 @@ function WP_Filesystem( $args = false, $ + */ + function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) { + // Please ensure that this is either 'direct', 'ssh2', 'ftpext', or 'ftpsockets'. +- $method = defined( 'FS_METHOD' ) ? FS_METHOD : false; ++ $method = defined( 'FS_METHOD' ) ? FS_METHOD : 'direct'; + + if ( ! $context ) { + $context = WP_CONTENT_DIR; +diff -up wordpress/wp-admin/includes/update.php.noup wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.noup 2020-07-30 13:46:05.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2020-10-20 14:12:55.970194210 +0200 +@@ -339,12 +339,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { @@ -51,10 +63,10 @@ diff -up wordpress/wp-admin/includes/update.php.old wordpress/wp-admin/includes/ } } -diff -up wordpress/wp-includes/load.php.old wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.old 2020-02-25 19:33:06.000000000 +0100 -+++ wordpress/wp-includes/load.php 2020-03-25 16:44:02.127665528 +0100 -@@ -1435,7 +1435,7 @@ function wp_is_file_mod_allowed( $contex +diff -up wordpress/wp-includes/load.php.noup wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.noup 2020-08-27 23:46:05.000000000 +0200 ++++ wordpress/wp-includes/load.php 2020-10-20 14:12:55.970194210 +0200 +@@ -1476,7 +1476,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -63,10 +75,10 @@ diff -up wordpress/wp-includes/load.php.old wordpress/wp-includes/load.php } /** -diff -up wordpress/wp-includes/update.php.old wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.old 2020-02-10 04:30:06.000000000 +0100 -+++ wordpress/wp-includes/update.php 2020-03-25 16:44:02.127665528 +0100 -@@ -782,10 +782,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.noup wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.noup 2020-07-31 00:04:05.000000000 +0200 ++++ wordpress/wp-includes/update.php 2020-10-20 14:12:55.970194210 +0200 +@@ -840,10 +840,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress.spec b/wordpress.spec index e439cab..3f59c63 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Oct 20 2020 Remi Collet - 5.5.1-2 +- Change FS_METHOD default to 'direct' to allow enabling FILE_MODS #1889644 + * Wed Sep 2 2020 Remi Collet - 5.5.1-1 - WordPress 5.5.1 Maintenance Release From fee741ab9f23f895faac4d99381533cf6a4439dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 30 Oct 2020 07:31:46 +0100 Subject: [PATCH 110/184] WordPress 5.5.2 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index ab1bf0f..9090b07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.5.1.tar.gz) = 11285e6e776756185814cde905986ce01f586d159fb06de5d16463cec544c8b3b85a695af51e9de71cbcd79f039ed8f6da233a8e82f5ee797d5124983b6ff0d3 +SHA512 (wordpress-5.5.2.tar.gz) = cfbae0e04f6c1a22bbeb94a0cb1617d586516806cda111005fc5a098a8b568b5904118414a40252c6cd73f995c22adbeaa30d4159156ccdebda04f61d08d3913 diff --git a/wordpress.spec b/wordpress.spec index 3f59c63..085177a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.5.1 +%global upstream_version 5.5.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Oct 30 2020 Remi Collet - 5.5.2-1 +- WordPress 5.5.2 Security and Maintenance Release + * Tue Oct 20 2020 Remi Collet - 5.5.1-2 - Change FS_METHOD default to 'direct' to allow enabling FILE_MODS #1889644 From 5105b4124cf9bac96faf281c119f4563124dc54a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Nov 2020 07:27:13 +0100 Subject: [PATCH 111/184] WordPress 5.5.3 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9090b07..db145d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.5.2.tar.gz) = cfbae0e04f6c1a22bbeb94a0cb1617d586516806cda111005fc5a098a8b568b5904118414a40252c6cd73f995c22adbeaa30d4159156ccdebda04f61d08d3913 +SHA512 (wordpress-5.5.3.tar.gz) = acc96987e792c85f1a1e4fbc434dc10e6c648ba51d0239354d8ee398604db90c6dfa075b565ddb4ab15cb36d9e06095c93ce30027b3cb61b04ffe5986069da03 diff --git a/wordpress.spec b/wordpress.spec index 085177a..c99e72c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.5.2 +%global upstream_version 5.5.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Sat Oct 31 2020 Remi Collet - 5.5.3-1 +- WordPress 5.5.3 Maintenance Release + * Fri Oct 30 2020 Remi Collet - 5.5.2-1 - WordPress 5.5.2 Security and Maintenance Release From 73cf3e6e15fc815d833dc622e99c2a2482d7d42e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Dec 2020 09:51:01 +0100 Subject: [PATCH 112/184] =?UTF-8?q?WordPress=205.6=20=E2=80=9CSimone?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- ...=> wordpress-5.6-mediaelement_no_swf.patch | 20 +++++++++---------- wordpress.spec | 7 +++++-- 3 files changed, 16 insertions(+), 13 deletions(-) rename wordpress-5.3-mediaelement_no_swf.patch => wordpress-5.6-mediaelement_no_swf.patch (58%) diff --git a/sources b/sources index db145d4..70ca596 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.5.3.tar.gz) = acc96987e792c85f1a1e4fbc434dc10e6c648ba51d0239354d8ee398604db90c6dfa075b565ddb4ab15cb36d9e06095c93ce30027b3cb61b04ffe5986069da03 +SHA512 (wordpress-5.6.tar.gz) = c62041463ad2f47069b2b78381166eb68cf2ce12e16f623bd14b3321a16b4a647650dd4fc680780d4ce55dbd8b858745150320fa5e38fb0f7ad45c68cdda2dec diff --git a/wordpress-5.3-mediaelement_no_swf.patch b/wordpress-5.6-mediaelement_no_swf.patch similarity index 58% rename from wordpress-5.3-mediaelement_no_swf.patch rename to wordpress-5.6-mediaelement_no_swf.patch index 9442ddf..4ee0eec 100644 --- a/wordpress-5.3-mediaelement_no_swf.patch +++ b/wordpress-5.6-mediaelement_no_swf.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js ---- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no 2019-10-08 18:06:02.000000000 +0200 -+++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2019-11-13 07:59:39.418787150 +0100 -@@ -6410,6 +6410,7 @@ if (hasFlash) { +--- wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no 2020-09-29 17:53:06.000000000 +0200 ++++ wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js 2020-12-09 09:44:27.954254919 +0100 +@@ -6135,6 +6135,7 @@ if (hasFlash) { } }); @@ -9,18 +9,18 @@ diff -up wordpress/wp-includes/js/mediaelement/mediaelement-and-player.js.no wor var FlashMediaElementVideoRenderer = { name: 'flash_video', options: { -@@ -6494,6 +6495,7 @@ if (hasFlash) { +@@ -6219,6 +6220,7 @@ if (hasFlash) { create: FlashMediaElementRenderer.create }; _renderer.renderer.add(FlashMediaElementAudioOggRenderer); +*/ } - },{"10":10,"2":2,"27":27,"29":29,"3":3,"30":30,"7":7,"9":9}],23:[function(_dereq_,module,exports){ + },{"2":2,"25":25,"27":27,"28":28,"3":3,"5":5,"7":7,"8":8}],21:[function(_dereq_,module,exports){ diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.no wordpress/wp-includes/js/mediaelement/mediaelement.js ---- wordpress/wp-includes/js/mediaelement/mediaelement.js.no 2019-10-08 18:06:02.000000000 +0200 -+++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2019-11-13 07:59:45.601728069 +0100 -@@ -2108,6 +2108,7 @@ if (hasFlash) { +--- wordpress/wp-includes/js/mediaelement/mediaelement.js.no 2020-09-29 17:53:06.000000000 +0200 ++++ wordpress/wp-includes/js/mediaelement/mediaelement.js 2020-12-09 09:44:38.532227178 +0100 +@@ -1842,6 +1842,7 @@ if (hasFlash) { } }); @@ -28,11 +28,11 @@ diff -up wordpress/wp-includes/js/mediaelement/mediaelement.js.no wordpress/wp-i var FlashMediaElementVideoRenderer = { name: 'flash_video', options: { -@@ -2192,6 +2193,7 @@ if (hasFlash) { +@@ -1926,6 +1927,7 @@ if (hasFlash) { create: FlashMediaElementRenderer.create }; _renderer.renderer.add(FlashMediaElementAudioOggRenderer); +*/ } - },{"10":10,"18":18,"2":2,"20":20,"21":21,"3":3,"7":7,"9":9}],14:[function(_dereq_,module,exports){ + },{"16":16,"18":18,"19":19,"2":2,"3":3,"5":5,"7":7,"8":8}],12:[function(_dereq_,module,exports){ diff --git a/wordpress.spec b/wordpress.spec index c99e72c..ea19df0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.5.3 +%global upstream_version 5.6 #global upstream_prever RC5 #global upstream_lower rc5 @@ -45,7 +45,7 @@ Patch2: wordpress-5.4-no_swfupload.patch # to 'false' Patch3: wordpress-5.1-tinymce_noflash.patch # We drop the SWF files from mediaelement -Patch4: wordpress-5.3-mediaelement_no_swf.patch +Patch4: wordpress-5.6-mediaelement_no_swf.patch # RPM configuration: # Path to installation # Disable auto-updater @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Dec 9 2020 Remi Collet - 5.6-1 +- WordPress 5.6 “Simone” + * Sat Oct 31 2020 Remi Collet - 5.5.3-1 - WordPress 5.5.3 Maintenance Release From 360106d2c66e64f809a7552c2c18651a75b1d96c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:38:53 +0000 Subject: [PATCH 113/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index ea19df0..7c0109f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 9 2020 Remi Collet - 5.6-1 - WordPress 5.6 “Simone” From c7fee329b54103bd29939d627a1e6081b4cafc34 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Feb 2021 11:03:15 +0100 Subject: [PATCH 114/184] v5.6.1 --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 70ca596..4c4b8f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.6.tar.gz) = c62041463ad2f47069b2b78381166eb68cf2ce12e16f623bd14b3321a16b4a647650dd4fc680780d4ce55dbd8b858745150320fa5e38fb0f7ad45c68cdda2dec +SHA512 (wordpress-5.6.1.tar.gz) = c6ede085a3b9fc66e5b9d685bfb0f82c5c69fda92a5184baf2ed0e9ae375e1b122628fd3d59cad88f67ea5f8d069fe84ca736be6f183ff539fd575889699b286 diff --git a/wordpress.spec b/wordpress.spec index 7c0109f..e5c3068 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.6 +%global upstream_version 5.6.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Feb 5 2021 Remi Collet - 5.6.1-1 +- WordPress 5.6.1 Maintenance Release + * Wed Jan 27 2021 Fedora Release Engineering - 5.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8281850818216371f0ccee09aadc2d1ebb817421 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Feb 2021 10:01:09 +0100 Subject: [PATCH 115/184] WordPress 5.6.2 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4c4b8f0..d6c4e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.6.1.tar.gz) = c6ede085a3b9fc66e5b9d685bfb0f82c5c69fda92a5184baf2ed0e9ae375e1b122628fd3d59cad88f67ea5f8d069fe84ca736be6f183ff539fd575889699b286 +SHA512 (wordpress-5.6.2.tar.gz) = 5602104cdaaaf354f0b24782ceb0b32b8a8af5e4a9d698376a9ac263bc77f0c5d461d40587e0010e63e97c3d415db6ad3aead6069bba5ebcba03e783fbacbb69 diff --git a/wordpress.spec b/wordpress.spec index e5c3068..549dd60 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.6.1 +%global upstream_version 5.6.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Feb 23 2021 Remi Collet - 5.6.2-1 +- WordPress 5.6.2 Maintenance Release + * Fri Feb 5 2021 Remi Collet - 5.6.1-1 - WordPress 5.6.1 Maintenance Release From 53dd7b266105e03476cb11c0d4f80c9f3df7f006 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Mar 2021 06:49:20 +0100 Subject: [PATCH 116/184] =?UTF-8?q?WordPress=205.7=20=E2=80=9CEsperanza?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d6c4e33..b43bd93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.6.2.tar.gz) = 5602104cdaaaf354f0b24782ceb0b32b8a8af5e4a9d698376a9ac263bc77f0c5d461d40587e0010e63e97c3d415db6ad3aead6069bba5ebcba03e783fbacbb69 +SHA512 (wordpress-5.7.tar.gz) = 84516473add8624cd7e318af98d257f5f113fcc98cd9f5c0a0d7c1a8060f9f5dd5989d995259d3920b89f71f3391fc8b28b520f7d8aae7511cc1e26e90116567 diff --git a/wordpress.spec b/wordpress.spec index 549dd60..bfc5e73 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.6.2 +%global upstream_version 5.7 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Mar 10 2021 Remi Collet - 5.7-1 +- WordPress 5.7 “Esperanza” + * Tue Feb 23 2021 Remi Collet - 5.6.2-1 - WordPress 5.6.2 Maintenance Release From 16946d865d4aff8f7449f5c052f7dd3681b20fb4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Apr 2021 08:34:18 +0200 Subject: [PATCH 117/184] WordPress 5.7.1 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b43bd93..5b0e584 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.7.tar.gz) = 84516473add8624cd7e318af98d257f5f113fcc98cd9f5c0a0d7c1a8060f9f5dd5989d995259d3920b89f71f3391fc8b28b520f7d8aae7511cc1e26e90116567 +SHA512 (wordpress-5.7.1.tar.gz) = 9144a2269efc4ee24a732bacf8f25d7c02136db546c6cf86890b2690f001acfafb9ece1dde7dd7d557b5eb9f3e01a829aab1c7ae80384d4e9389155bdbc3df86 diff --git a/wordpress.spec b/wordpress.spec index bfc5e73..75c8cc7 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.7 +%global upstream_version 5.7.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Apr 15 2021 Remi Collet - 5.7.1-1 +- WordPress 5.7.1 Security and Maintenance Release + * Wed Mar 10 2021 Remi Collet - 5.7-1 - WordPress 5.7 “Esperanza” From 4ea211141f7e435ead4d99e56098e8fd43300795 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 17 May 2021 07:31:01 +0200 Subject: [PATCH 118/184] WordPress 5.7.2 Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5b0e584..e9ac861 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.7.1.tar.gz) = 9144a2269efc4ee24a732bacf8f25d7c02136db546c6cf86890b2690f001acfafb9ece1dde7dd7d557b5eb9f3e01a829aab1c7ae80384d4e9389155bdbc3df86 +SHA512 (wordpress-5.7.2.tar.gz) = 84d41dddba5c4c59a0ceb3ef2e04760c27ae811e9db5cb43484f91973dd9c5acfb66affd8f76db06dfefd77e1bd90acad1eba7ba176a5f43b28ec806f3861edb diff --git a/wordpress.spec b/wordpress.spec index 75c8cc7..c0a782b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.7.1 +%global upstream_version 5.7.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu May 13 2021 Remi Collet - 5.7.2-1 +- WordPress 5.7.2 Security Release + * Thu Apr 15 2021 Remi Collet - 5.7.1-1 - WordPress 5.7.1 Security and Maintenance Release From 7c95aa67127e2fdb60f571bc222eea3cce9664e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Jul 2021 14:01:05 +0200 Subject: [PATCH 119/184] WordPress 5.8 Tatum --- sources | 2 +- ...date.patch => wordpress-5.8-noupdate.patch | 52 +++++++++---------- wordpress.spec | 7 ++- 3 files changed, 32 insertions(+), 29 deletions(-) rename wordpress-5.4-noupdate.patch => wordpress-5.8-noupdate.patch (60%) diff --git a/sources b/sources index e9ac861..5d62e89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.7.2.tar.gz) = 84d41dddba5c4c59a0ceb3ef2e04760c27ae811e9db5cb43484f91973dd9c5acfb66affd8f76db06dfefd77e1bd90acad1eba7ba176a5f43b28ec806f3861edb +SHA512 (wordpress-5.8.tar.gz) = 6f3c2f2e2d3d3ac57798533d062f12d1d751dc8c2fd30fb6448d60d50d74b416ecc32f1b3c54efd6a3edfcc227f29b14706e8ffadaf7d9710ab345ee47b88629 diff --git a/wordpress-5.4-noupdate.patch b/wordpress-5.8-noupdate.patch similarity index 60% rename from wordpress-5.4-noupdate.patch rename to wordpress-5.8-noupdate.patch index 3195c5b..39dbb92 100644 --- a/wordpress-5.4-noupdate.patch +++ b/wordpress-5.8-noupdate.patch @@ -1,17 +1,17 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.noup wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.noup 2020-07-10 01:29:08.000000000 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2020-10-20 14:12:55.970194210 +0200 +diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.noupdate 2021-07-21 13:55:03.381224813 +0200 ++++ wordpress/wp-admin/includes/admin-filters.php 2021-07-21 13:55:11.920208285 +0200 @@ -113,7 +113,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. -add_action( 'admin_notices', 'update_nag', 3 ); + add_action( 'admin_notices', 'deactivated_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_themes_notice', 5 ); - add_action( 'admin_notices', 'maintenance_nag', 10 ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noup wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.noup 2020-06-25 09:15:12.000000000 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2020-10-20 14:12:55.970194210 +0200 +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noupdate wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.noupdate 2021-06-19 23:37:57.000000000 +0200 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2021-07-21 13:55:03.381224813 +0200 @@ -271,6 +271,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ @@ -22,9 +22,9 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noup wordpress/wp-a require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y -diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup 2020-08-31 20:02:04.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2020-10-20 14:12:55.970194210 +0200 +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate 2021-04-16 14:01:15.000000000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2021-07-21 13:55:03.381224813 +0200 @@ -38,7 +38,7 @@ class WP_Automatic_Updater { } @@ -34,10 +34,10 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noup wordpre /** * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/file.php.noup wordpress/wp-admin/includes/file.php ---- wordpress/wp-admin/includes/file.php.noup 2020-10-20 14:13:30.079070699 +0200 -+++ wordpress/wp-admin/includes/file.php 2020-10-20 14:13:46.240012179 +0200 -@@ -1901,7 +1901,7 @@ function WP_Filesystem( $args = false, $ +diff -up wordpress/wp-admin/includes/file.php.noupdate wordpress/wp-admin/includes/file.php +--- wordpress/wp-admin/includes/file.php.noupdate 2021-05-24 21:24:57.000000000 +0200 ++++ wordpress/wp-admin/includes/file.php 2021-07-21 13:55:03.381224813 +0200 +@@ -1992,7 +1992,7 @@ function WP_Filesystem( $args = false, $ */ function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) { // Please ensure that this is either 'direct', 'ssh2', 'ftpext', or 'ftpsockets'. @@ -46,10 +46,10 @@ diff -up wordpress/wp-admin/includes/file.php.noup wordpress/wp-admin/includes/f if ( ! $context ) { $context = WP_CONTENT_DIR; -diff -up wordpress/wp-admin/includes/update.php.noup wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.noup 2020-07-30 13:46:05.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2020-10-20 14:12:55.970194210 +0200 -@@ -339,12 +339,7 @@ function update_right_now_message() { +diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.noupdate 2021-05-17 19:04:01.000000000 +0200 ++++ wordpress/wp-admin/includes/update.php 2021-07-21 13:55:03.381224813 +0200 +@@ -341,12 +341,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { @@ -63,10 +63,10 @@ diff -up wordpress/wp-admin/includes/update.php.noup wordpress/wp-admin/includes } } -diff -up wordpress/wp-includes/load.php.noup wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.noup 2020-08-27 23:46:05.000000000 +0200 -+++ wordpress/wp-includes/load.php 2020-10-20 14:12:55.970194210 +0200 -@@ -1476,7 +1476,7 @@ function wp_is_file_mod_allowed( $contex +diff -up wordpress/wp-includes/load.php.noupdate wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.noupdate 2021-06-23 21:05:57.000000000 +0200 ++++ wordpress/wp-includes/load.php 2021-07-21 13:55:03.381224813 +0200 +@@ -1579,7 +1579,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -75,10 +75,10 @@ diff -up wordpress/wp-includes/load.php.noup wordpress/wp-includes/load.php } /** -diff -up wordpress/wp-includes/update.php.noup wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.noup 2020-07-31 00:04:05.000000000 +0200 -+++ wordpress/wp-includes/update.php 2020-10-20 14:12:55.970194210 +0200 -@@ -840,10 +840,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.noupdate 2021-05-17 19:04:01.000000000 +0200 ++++ wordpress/wp-includes/update.php 2021-07-21 13:55:03.381224813 +0200 +@@ -926,10 +926,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress.spec b/wordpress.spec index c0a782b..0906dea 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.7.2 +%global upstream_version 5.8 #global upstream_prever RC5 #global upstream_lower rc5 @@ -54,7 +54,7 @@ Patch5: wordpress-5.4-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-5.4-noupdate.patch +Patch6: wordpress-5.8-noupdate.patch # Use system libraries Patch7: wordpress-5.4-systemlibs.patch # Debian patch for jshint @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Wed Jul 21 2021 Remi Collet - 5.8-1 +- WordPress 5.8 Tatum + * Thu May 13 2021 Remi Collet - 5.7.2-1 - WordPress 5.7.2 Security Release From d2374cf1074bdc08d5a9af6e66acf1793ee42ec8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:06:56 +0000 Subject: [PATCH 120/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 0906dea..9da1e5f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jul 21 2021 Remi Collet - 5.8-1 - WordPress 5.8 Tatum From 9ee2734f6bdcb540d668f60933edf16f3dc7dc33 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Sep 2021 09:03:16 +0200 Subject: [PATCH 121/184] WordPress 5.8.1 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5d62e89..9a85b1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.tar.gz) = 6f3c2f2e2d3d3ac57798533d062f12d1d751dc8c2fd30fb6448d60d50d74b416ecc32f1b3c54efd6a3edfcc227f29b14706e8ffadaf7d9710ab345ee47b88629 +SHA512 (wordpress-5.8.1.tar.gz) = f1eb56832ca5204b34fa67dd58d2e37eb0f794472407859e21eeaa427b1683ca9b94551303271cfe84a0aa65d04928f2a2d5d47b641d9b5fd9dae5c18ce101af diff --git a/wordpress.spec b/wordpress.spec index 9da1e5f..bab79c0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8 +%global upstream_version 5.8.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Sep 9 2021 Remi Collet - 5.8.1-1 +- WordPress 5.8.1 Security and Maintenance Release + * Fri Jul 23 2021 Fedora Release Engineering - 5.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From a18a4f7675ccfdd6448d92b09c3b2432531b14dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Nov 2021 07:49:47 +0100 Subject: [PATCH 122/184] WordPress 5.8.2 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9a85b1f..10c6c02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.1.tar.gz) = f1eb56832ca5204b34fa67dd58d2e37eb0f794472407859e21eeaa427b1683ca9b94551303271cfe84a0aa65d04928f2a2d5d47b641d9b5fd9dae5c18ce101af +SHA512 (wordpress-5.8.2.tar.gz) = 84f33132fb453de437f17b09abd2acf97aaea0ab30ae781204abee2c900beb2629db465d3fabdd29011d98e7fc998a0d559ddc836ce3492381565ac3304fa0d3 diff --git a/wordpress.spec b/wordpress.spec index bab79c0..c6227c0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8.1 +%global upstream_version 5.8.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -278,6 +278,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Thu Nov 11 2021 Remi Collet - 5.8.2-1 +- WordPress 5.8.2 Security and Maintenance Release + * Thu Sep 9 2021 Remi Collet - 5.8.1-1 - WordPress 5.8.1 Security and Maintenance Release From f5806fdacea4b3f35eb049db0ac33ff6ed5d96b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 7 Dec 2021 10:49:22 +0100 Subject: [PATCH 123/184] use bundled libraries --- wordpress.spec | 55 +++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index c6227c0..a59fe5b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -78,8 +78,6 @@ Requires: php %endif Requires: php(language) >= 7.2 Requires: php-sodium -Requires: php-simplepie >= 1.3.1 -Requires: php-getid3 Requires: php-ctype Requires: php-filter Requires: php-mysqli @@ -106,13 +104,20 @@ Requires: php-xml Requires: php-xmlreader Requires: php-zip Requires: php-zlib -# Unbundled libraries -Requires: php-phpmailer6 Requires: httpd +# Unbundled Requires: ca-certificates +# Bundled +# grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php +Provides: bundled(php-simplepie) = 1.5.6 +# grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php +Provides: bundled(php-getid3) = 1.9.20 +# grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php +Provides: bundled(php-phpmailer) = 6.5.0 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 + %description Wordpress is an online publishing / weblog package that makes it very easy, almost trivial, to get information out to people on the web. @@ -182,6 +187,11 @@ sed -e 's/\r//' wp-config-sample.php >wp-config.php # fix file encoding sed -i -e 's/\r//' license.txt +: Bundled library versions +grep "SIMPLEPIE_VERSION'" wp-includes/class-simplepie.php +grep ' VERSION ' wp-includes/ID3/getid3.php +grep ' VERSION ' wp-includes/PHPMailer/PHPMailer.php + %build @@ -212,20 +222,6 @@ find ${RPM_BUILD_ROOT} -type f -empty -exec rm -vf {} \; # These are docs, remove them from here, docify them later rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} -# Remove bundled php-simplepie and link to system copy -rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php -rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/SimplePie -ln -s /usr/share/php/php-simplepie/autoloader.php \ - ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/class-simplepie.php - -# Remove bundled PHPMailer and link to system one -rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer -ln -s /usr/share/php/PHPMailer/PHPMailer6 \ - ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/PHPMailer - -# Remove bundled php-getid3 -rm -r ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/ID3 - # Remove bundled ca-bundle.crt rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt ln -s %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ @@ -235,18 +231,14 @@ ln -s %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig \) \ -print -delete -## Move wp-content directory to /var/www location -#mkdir -p ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress -#mv -v ${RPM_BUILD_ROOT}%%{wp_content}/ \ -# ${RPM_BUILD_ROOT}%%{_localstatedir}/www/wordpress -#%%post -#if [ $1 -eq 2 ] ; then -## In case user has old wp-content from previous version, move it to -## the new location. -#mv -uf %%{wp_content}/* %%{_localstatedir}/www/wordpress/ -#/sbin/restorecon -R %%{_localstatedir}/www/wordpress/ -#fi +%pretrans -p +-- Remove link to system library +path = "%{_datadir}/wordpress/wp-includes/PHPMailer" +st = posix.stat(path) +if st and st.type == "link" then + os.remove(path) +end %files @@ -278,6 +270,9 @@ find ${RPM_BUILD_ROOT} \( -name \*.dolly -o -name \*.rhbz522897 -o -name \*.orig %changelog +* Tue Dec 7 2021 Remi Collet - 5.8.2-2 +- use bundled libraries + * Thu Nov 11 2021 Remi Collet - 5.8.2-1 - WordPress 5.8.2 Security and Maintenance Release From 3a13552e9d437f248ead4d5142c9a0044999164a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Jan 2022 08:35:05 +0100 Subject: [PATCH 124/184] WordPress 5.8.3 Security Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 10c6c02..9dac3f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.2.tar.gz) = 84f33132fb453de437f17b09abd2acf97aaea0ab30ae781204abee2c900beb2629db465d3fabdd29011d98e7fc998a0d559ddc836ce3492381565ac3304fa0d3 +SHA512 (wordpress-5.8.3.tar.gz) = 08ebf959d9ae8ca33bee86fec222fb0266dc10bf6db4ed1ebeb7886a422abd838cbcc4d004002dea2c923c7a0822a1f410881b01f2e234560836b1635d98718b diff --git a/wordpress.spec b/wordpress.spec index a59fe5b..e5a347a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8.2 +%global upstream_version 5.8.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -270,6 +270,9 @@ end %changelog +* Fri Jan 7 2022 Remi Collet - 5.8.3-1 +- WordPress 5.8.3 Security Release + * Tue Dec 7 2021 Remi Collet - 5.8.2-2 - use bundled libraries From f9d508de32505c2d267051e6561bc3d2a0aa94f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:38:43 +0000 Subject: [PATCH 125/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index e5a347a..85018ed 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -270,6 +270,9 @@ end %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 5.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 7 2022 Remi Collet - 5.8.3-1 - WordPress 5.8.3 Security Release From fa826e94113d6f5ede1f3fb0bb7f919487f8e927 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 26 Jan 2022 09:47:27 +0100 Subject: [PATCH 126/184] WordPress 5.9 Josephine --- sources | 2 +- wordpress-5.4-systemlibs.patch | 21 --------------------- wordpress-move-wp-content.patch | 30 ------------------------------ wordpress.spec | 21 ++++++++------------- 4 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 wordpress-5.4-systemlibs.patch delete mode 100644 wordpress-move-wp-content.patch diff --git a/sources b/sources index 9dac3f0..63d0ba9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.8.3.tar.gz) = 08ebf959d9ae8ca33bee86fec222fb0266dc10bf6db4ed1ebeb7886a422abd838cbcc4d004002dea2c923c7a0822a1f410881b01f2e234560836b1635d98718b +SHA512 (wordpress-5.9.tar.gz) = 10530ecc073b6793f1e3c3711160af0e45868a2a84585b1dcb4b643bd1346648c7ed53774f805841c49bf806986ab5db4b244f72688fc6c55a9f9d2f2ab60571 diff --git a/wordpress-5.4-systemlibs.patch b/wordpress-5.4-systemlibs.patch deleted file mode 100644 index 6cbe5b1..0000000 --- a/wordpress-5.4-systemlibs.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up wordpress/wp-admin/includes/media.php.old wordpress/wp-admin/includes/media.php ---- wordpress/wp-admin/includes/media.php.old 2020-03-25 16:39:05.484028608 +0100 -+++ wordpress/wp-admin/includes/media.php 2020-02-11 00:47:04.000000000 +0100 -@@ -3477,7 +3477,7 @@ function wp_read_video_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require ABSPATH . WPINC . '/ID3/getid3.php'; -+ require '/usr/share/php/getid3/getid3.php'; - } - - $id3 = new getID3(); -@@ -3588,7 +3588,7 @@ function wp_read_audio_metadata( $file ) - } - - if ( ! class_exists( 'getID3', false ) ) { -- require ABSPATH . WPINC . '/ID3/getid3.php'; -+ require '/usr/share/php/getid3/getid3.php'; - } - - $id3 = new getID3(); diff --git a/wordpress-move-wp-content.patch b/wordpress-move-wp-content.patch deleted file mode 100644 index 54eb921..0000000 --- a/wordpress-move-wp-content.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up wordpress/wp-includes/default-constants.php.rhbz522897 wordpress/wp-includes/default-constants.php ---- wordpress/wp-includes/default-constants.php.rhbz522897 2010-05-26 04:42:15.000000000 +0200 -+++ wordpress/wp-includes/default-constants.php 2011-06-02 12:29:57.919714584 +0200 -@@ -39,7 +39,7 @@ function wp_initial_constants( ) { - @ini_set('memory_limit', WP_MEMORY_LIMIT); - - if ( !defined('WP_CONTENT_DIR') ) -- define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down -+ define( 'WP_CONTENT_DIR', '/var/www/wordpress/wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down - - // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development. - if ( !defined('WP_DEBUG') ) -@@ -75,7 +75,7 @@ function wp_initial_constants( ) { - */ - function wp_plugin_directory_constants( ) { - if ( !defined('WP_CONTENT_URL') ) -- define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up -+ define( 'WP_CONTENT_URL', get_option('siteurl')); // full url - WP_CONTENT_DIR is defined further up - - /** - * Allows for the plugins directory to be moved from the default location. -@@ -100,7 +100,7 @@ function wp_plugin_directory_constants( - * @deprecated - */ - if ( !defined('PLUGINDIR') ) -- define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. -+ define( 'PLUGINDIR', WP_CONTENT_DIR . 'plugins' ); // Relative to ABSPATH. For back compat. - - /** - * Allows for the mu-plugins directory to be moved from the default location. diff --git a/wordpress.spec b/wordpress.spec index 85018ed..767da7d 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.8.3 +%global upstream_version 5.9 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -35,9 +35,6 @@ Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) Patch0: wordpress-5.2-hello.patch -# Move wp-content to /var/www/wordpress/ -# This patch doesn’t work well, see bugzilla.redhat.com/522897 -Patch1: wordpress-move-wp-content.patch # Drop swfupload: not built from source, not reasonably possible to do Patch2: wordpress-5.4-no_swfupload.patch # Adjust tinymce's media plugin not to use its SWF plugin. This changes @@ -55,8 +52,6 @@ Patch5: wordpress-5.4-config.patch # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) Patch6: wordpress-5.8-noupdate.patch -# Use system libraries -Patch7: wordpress-5.4-systemlibs.patch # Debian patch for jshint Patch8: wordpress-5.1-remove-jshint-refs.patch @@ -109,11 +104,11 @@ Requires: httpd Requires: ca-certificates # Bundled # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php -Provides: bundled(php-simplepie) = 1.5.6 +Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.20 +Provides: bundled(php-getid3) = 1.9.21 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.5.0 +Provides: bundled(php-phpmailer) = 6.5.3 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -140,13 +135,10 @@ rm -rf wp-includes/random_compat rm -rf wp-includes/sodium_compat %patch0 -p1 -b .dolly -#patch1 -p1 -b .rhbz522897 %patch2 -p1 %patch3 -p1 # Adjust mediaelement not to use its SWF %patch4 -p1 -#rm wp-includes/js/mediaelement/media*swf -%patch7 -p1 %patch8 -p1 # We patch .js files, so minify them @@ -270,6 +262,9 @@ end %changelog +* Wed Jan 26 2022 Remi Collet - 5.9-1 +- WordPress 5.9 Josephine + * Sat Jan 22 2022 Fedora Release Engineering - 5.8.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 743be8c81c8da107195ddf93529a0ba566f7db59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Feb 2022 08:07:53 +0100 Subject: [PATCH 127/184] WordPress 5.9.1 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 63d0ba9..415c641 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.9.tar.gz) = 10530ecc073b6793f1e3c3711160af0e45868a2a84585b1dcb4b643bd1346648c7ed53774f805841c49bf806986ab5db4b244f72688fc6c55a9f9d2f2ab60571 +SHA512 (wordpress-5.9.1.tar.gz) = bef81308a1ac5797db71eb28d0f242dadd01edeb1db949ad2b619a2df23828fdde05befffe15c5948d0e864a6b1dbd09fff0296daccc6739b75f525d1fe21c0e diff --git a/wordpress.spec b/wordpress.spec index 767da7d..fde2234 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.9 +%global upstream_version 5.9.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -262,6 +262,9 @@ end %changelog +* Wed Feb 23 2022 Remi Collet - 5.9.1-1 +- WordPress 5.9.1 Maintenance Release + * Wed Jan 26 2022 Remi Collet - 5.9-1 - WordPress 5.9 Josephine From 07fe7c3d0e76ecf4588eb1984c8c6e02d778fb23 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Mar 2022 07:41:50 +0100 Subject: [PATCH 128/184] WordPress 5.9.2 Security & Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 415c641..5fa9a52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.9.1.tar.gz) = bef81308a1ac5797db71eb28d0f242dadd01edeb1db949ad2b619a2df23828fdde05befffe15c5948d0e864a6b1dbd09fff0296daccc6739b75f525d1fe21c0e +SHA512 (wordpress-5.9.2.tar.gz) = d2a93d753fcc63f7361c8faea694fba265045db8728fd903417fca1a41362b0a5bf1d75e606a35f95cedcb4951c3392d0e37c266f5b26f627602450b8537df62 diff --git a/wordpress.spec b/wordpress.spec index fde2234..fe8e9b8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.9.1 +%global upstream_version 5.9.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -262,6 +262,9 @@ end %changelog +* Fri Mar 11 2022 Remi Collet - 5.9.2-1 +- WordPress 5.9.2 Security & Maintenance Release + * Wed Feb 23 2022 Remi Collet - 5.9.1-1 - WordPress 5.9.1 Maintenance Release From dcf7d42aae35d1748be46ba8cd28c76f0ac1afe8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Mar 2022 11:52:25 +0100 Subject: [PATCH 129/184] simplify httpd config --- wordpress-httpd-conf | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/wordpress-httpd-conf b/wordpress-httpd-conf index 3692823..dbefe97 100644 --- a/wordpress-httpd-conf +++ b/wordpress-httpd-conf @@ -5,31 +5,19 @@ Alias /wordpress /usr/share/wordpress AllowOverride Options - - # Apache 2.4 Require local - - - # Apache 2.2 - Order Deny,Allow - Deny from All - Allow from 127.0.0.1 - Allow from ::1 - # Deny access to any php file in the uploads directory - Order Deny,Allow - Deny from all + Require all denied # Deny access to any php file in the akismet directory - Order Deny,Allow - Deny from all + Require all denied From 3469ae9ebb304cc72601d14288a219700fbc127d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Apr 2022 11:20:10 +0200 Subject: [PATCH 130/184] WordPress 5.9.3 Maintenance Release --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index fe8e9b8..2ef8c11 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.9.2 +%global upstream_version 5.9.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -262,6 +262,9 @@ end %changelog +* Wed Apr 6 2022 Remi Collet - 5.9.3-1 +- WordPress 5.9.3 Maintenance Release + * Fri Mar 11 2022 Remi Collet - 5.9.2-1 - WordPress 5.9.2 Security & Maintenance Release From 6b9f7178f9f5464af9932632a6bc2062b29ec911 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Apr 2022 11:25:23 +0200 Subject: [PATCH 131/184] 5.9.3 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 5fa9a52..2155d04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.9.2.tar.gz) = d2a93d753fcc63f7361c8faea694fba265045db8728fd903417fca1a41362b0a5bf1d75e606a35f95cedcb4951c3392d0e37c266f5b26f627602450b8537df62 +SHA512 (wordpress-5.9.3.tar.gz) = 9d44d95c6f046558783c7de22cbe7eb912e21234b549b324ec43ab6013ba3f4990a3478e40c8cf399dbbdf00598dcf30423f9d1f74da83e63ee920de457b6637 From ada80a0aa07b22f786bc0adeaba49122a7b4c0f5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 May 2022 14:01:51 +0200 Subject: [PATCH 132/184] =?UTF-8?q?WordPress=206.0=20=E2=80=9CArturo?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 2155d04..8d9bf5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.9.3.tar.gz) = 9d44d95c6f046558783c7de22cbe7eb912e21234b549b324ec43ab6013ba3f4990a3478e40c8cf399dbbdf00598dcf30423f9d1f74da83e63ee920de457b6637 +SHA512 (wordpress-6.0.tar.gz) = 5449129b21cb3c5093c73b7f712e91c05db27f60d3797b0697c3dd2929b6996b2ebf41a0e827b72a110625654acd2e336a73f76fba144d30e56586ac3ba2ca34 diff --git a/wordpress.spec b/wordpress.spec index 2ef8c11..a347385 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 5.9.3 +%global upstream_version 6.0 #global upstream_prever RC5 #global upstream_lower rc5 @@ -108,7 +108,7 @@ Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.21 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.5.3 +Provides: bundled(php-phpmailer) = 6.6.0 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -262,6 +262,9 @@ end %changelog +* Wed May 25 2022 Remi Collet - 6.0-1 +- WordPress 6.0 “Arturo” + * Wed Apr 6 2022 Remi Collet - 5.9.3-1 - WordPress 5.9.3 Maintenance Release From 1189f1a8a1b34c0a3049d03934e3783284c7dac2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Jul 2022 11:04:41 +0200 Subject: [PATCH 133/184] WordPress 6.0.1 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 8d9bf5a..e81f470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.0.tar.gz) = 5449129b21cb3c5093c73b7f712e91c05db27f60d3797b0697c3dd2929b6996b2ebf41a0e827b72a110625654acd2e336a73f76fba144d30e56586ac3ba2ca34 +SHA512 (wordpress-6.0.1.tar.gz) = 686d03212cd635e343e2d2d468aabb9c4499f87a1db123943ef65547dfbd826c233777a3b7cb53e3838d08f51f3d4cdfeee53f49ad7408921d52315aad65187a diff --git a/wordpress.spec b/wordpress.spec index a347385..dac76d4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.0 +%global upstream_version 6.0.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -262,6 +262,9 @@ end %changelog +* Wed Jul 13 2022 Remi Collet - 6.0.1-1 +- WordPress 6.0.1 Maintenance Release + * Wed May 25 2022 Remi Collet - 6.0-1 - WordPress 6.0 “Arturo” From c3181fc64ac983b90ed91051c489bf6123690ffb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:36:13 +0000 Subject: [PATCH 134/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index dac76d4..6497d61 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -262,6 +262,9 @@ end %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 6.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 13 2022 Remi Collet - 6.0.1-1 - WordPress 6.0.1 Maintenance Release From 06b04541492a770ef8ed190bdaf0f66e33bc4c52 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2022 10:11:51 +0200 Subject: [PATCH 135/184] WordPress 6.0.2 Security and Maintenance Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index e81f470..0e59441 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.0.1.tar.gz) = 686d03212cd635e343e2d2d468aabb9c4499f87a1db123943ef65547dfbd826c233777a3b7cb53e3838d08f51f3d4cdfeee53f49ad7408921d52315aad65187a +SHA512 (wordpress-6.0.2.tar.gz) = 4a7c9c64e154a804c3dd0a308c3b8d9ef62918656f7f324bc329fd7cf4b340abd2252495f15869aece4f0649d18bd0f43955e6b343a4b68ec2746d07b077a1d8 diff --git a/wordpress.spec b/wordpress.spec index 6497d61..9cf6e0c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.0.1 +%global upstream_version 6.0.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -262,6 +262,9 @@ end %changelog +* Thu Sep 8 2022 Remi Collet - 6.0.2-1 +- WordPress 6.0.2 Security and Maintenance Release + * Sat Jul 23 2022 Fedora Release Engineering - 6.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 567f0a1a874d11fe1ddbcec0da915aad21ce90ed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Oct 2022 07:37:45 +0200 Subject: [PATCH 136/184] WordPress 6.0.3 Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 0e59441..2251e71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.0.2.tar.gz) = 4a7c9c64e154a804c3dd0a308c3b8d9ef62918656f7f324bc329fd7cf4b340abd2252495f15869aece4f0649d18bd0f43955e6b343a4b68ec2746d07b077a1d8 +SHA512 (wordpress-6.0.3.tar.gz) = febe05152b6a184add4e41a79d6a8747393a1b8cb4f2b45b30be4001f4ea81a04a042e978dd3a89789ed0bfd90b7cbb1e2ef9f82969a25b300746d59d4cf8427 diff --git a/wordpress.spec b/wordpress.spec index 9cf6e0c..36b5361 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.0.2 +%global upstream_version 6.0.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -262,6 +262,9 @@ end %changelog +* Tue Oct 18 2022 Remi Collet - 6.0.3-1 +- WordPress 6.0.3 Security Release + * Thu Sep 8 2022 Remi Collet - 6.0.2-1 - WordPress 6.0.2 Security and Maintenance Release From 672de89e39f4d16968e9e0b7f1fda5a10256f3c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 2 Nov 2022 14:41:11 +0100 Subject: [PATCH 137/184] =?UTF-8?q?WordPress=206.1=20=E2=80=9CMisha?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 2251e71..bc9d56b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.0.3.tar.gz) = febe05152b6a184add4e41a79d6a8747393a1b8cb4f2b45b30be4001f4ea81a04a042e978dd3a89789ed0bfd90b7cbb1e2ef9f82969a25b300746d59d4cf8427 +SHA512 (wordpress-6.1.tar.gz) = 383d486de1e3bc5d041690bf54f77e51af2c6cd099aa1f7d2ced8a897a332833906edb3a9460a86fe7b74daa7f92190789d5a087b785ba93e1aff646890c4726 diff --git a/wordpress.spec b/wordpress.spec index 36b5361..5ca56d0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.0.3 +%global upstream_version 6.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -106,9 +106,9 @@ Requires: ca-certificates # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.21 +Provides: bundled(php-getid3) = 1.9.22 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.6.0 +Provides: bundled(php-phpmailer) = 6.6.5 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -262,6 +262,9 @@ end %changelog +* Wed Nov 2 2022 Remi Collet - 6.1-1 +- WordPress 6.1 “Misha” + * Tue Oct 18 2022 Remi Collet - 6.0.3-1 - WordPress 6.0.3 Security Release From 55b253733297cc6ebc758da8dae08a918b13c664 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Nov 2022 11:33:31 +0100 Subject: [PATCH 138/184] WordPress 6.1.1 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index bc9d56b..1827ffd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.1.tar.gz) = 383d486de1e3bc5d041690bf54f77e51af2c6cd099aa1f7d2ced8a897a332833906edb3a9460a86fe7b74daa7f92190789d5a087b785ba93e1aff646890c4726 +SHA512 (wordpress-6.1.1.tar.gz) = b50dd9b5e1628a0285d3f0121d6b4cb3617fb696907ef06c935b40d0a46c9853ce12200e011a58675830602aa6d5b6470a98e8cefeec0f7464145bdc344780bb diff --git a/wordpress.spec b/wordpress.spec index 5ca56d0..27f0f9f 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.1 +%global upstream_version 6.1.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -262,6 +262,9 @@ end %changelog +* Wed Nov 16 2022 Remi Collet - 6.1.1-1 +- WordPress 6.1.1 Maintenance Release + * Wed Nov 2 2022 Remi Collet - 6.1-1 - WordPress 6.1 “Misha” From 04af93e518648b7ca902504f68cb5d9321de50b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:58:20 +0000 Subject: [PATCH 139/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 27f0f9f..6298916 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -262,6 +262,9 @@ end %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 16 2022 Remi Collet - 6.1.1-1 - WordPress 6.1.1 Maintenance Release From aa32e253fdbabb483633c1958af87e898d73bcaa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Mar 2023 11:09:16 +0200 Subject: [PATCH 140/184] =?UTF-8?q?WordPress=206.2=20=E2=80=9CDolphy?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use SPDX license IDs --- wordpress.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 6298916..2c2b3cf 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.1.1 +%global upstream_version 6.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,8 +21,12 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} -License: GPLv2 +Release: 1%{?dist} +# Wordpress is GPL-2.0-or-later +# php-simplepie is BSD-3-Clause +# php-getid3 is LGPL-3.0-or-later (or some others) +# php-mailer is LGPL-2.1-only +License: GPL-2.0-or-later AND BSD-3-Clause AND LGPL-3.0-or-later AND LGPL-2.1-only Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz Source1: wordpress-httpd-conf @@ -108,7 +112,7 @@ Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.22 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.6.5 +Provides: bundled(php-phpmailer) = 6.7 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -262,6 +266,10 @@ end %changelog +* Thu Mar 30 2023 Remi Collet - 6.2-1 +- WordPress 6.2 “Dolphy” +- use SPDX license IDs + * Sat Jan 21 2023 Fedora Release Engineering - 6.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From afe38c7fe04229a67bcbf80d55fc22a01666a04b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Mar 2023 11:10:14 +0200 Subject: [PATCH 141/184] v6.2 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 1827ffd..d15fe73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.1.1.tar.gz) = b50dd9b5e1628a0285d3f0121d6b4cb3617fb696907ef06c935b40d0a46c9853ce12200e011a58675830602aa6d5b6470a98e8cefeec0f7464145bdc344780bb +SHA512 (wordpress-6.2.tar.gz) = 207e2d7aad658772f33c91ed37440b06029de7977847efde5ccd6b4687e7430f3f1a6d9e6d40d1b09d0565ed12adc1e25dc4f34a0102aae2899ef9a8ef8b3baf From 438c995a4eff06c51733d3562ce4ac2b298e5d22 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 May 2023 07:08:38 +0200 Subject: [PATCH 142/184] WordPress 6.2.1 Maintenance & Security Release --- sources | 2 +- wordpress.spec | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sources b/sources index d15fe73..7d8d271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.tar.gz) = 207e2d7aad658772f33c91ed37440b06029de7977847efde5ccd6b4687e7430f3f1a6d9e6d40d1b09d0565ed12adc1e25dc4f34a0102aae2899ef9a8ef8b3baf +SHA512 (wordpress-6.2.1.tar.gz) = 88e97a9c6d05ec18ac761ae247659febd19e60a10d80a09cdc70e284fbd4f91ac72c0f852d5482cc5dd7330eb85370c93fd644317d7a0f1b1156fa64b87f556f diff --git a/wordpress.spec b/wordpress.spec index 2c2b3cf..3a165c6 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.2 +%global upstream_version 6.2.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -138,12 +138,12 @@ rm -rf wp-includes/random_compat # only for PHP < 7.2 without sodium_crypto_box rm -rf wp-includes/sodium_compat -%patch0 -p1 -b .dolly -%patch2 -p1 -%patch3 -p1 +%patch -P0 -p1 -b .dolly +%patch -P2 -p1 +%patch -P3 -p1 # Adjust mediaelement not to use its SWF -%patch4 -p1 -%patch8 -p1 +%patch -P4 -p1 +%patch -P8 -p1 # We patch .js files, so minify them php %{SOURCE5} \ @@ -177,8 +177,8 @@ fi # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php -%patch5 -p1 -%patch6 -p1 +%patch -P5 -p1 +%patch -P6 -p1 # fix file encoding sed -i -e 's/\r//' license.txt @@ -266,6 +266,9 @@ end %changelog +* Wed May 17 2023 Remi Collet - 6.2.1-1 +- WordPress 6.2.1 Maintenance & Security Release + * Thu Mar 30 2023 Remi Collet - 6.2-1 - WordPress 6.2 “Dolphy” - use SPDX license IDs From cd7785a711e95ce6f98740b87a983b2f38bfb1c4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 May 2023 10:54:14 +0200 Subject: [PATCH 143/184] WordPress 6.2.1 Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7d8d271..a9a7d70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.1.tar.gz) = 88e97a9c6d05ec18ac761ae247659febd19e60a10d80a09cdc70e284fbd4f91ac72c0f852d5482cc5dd7330eb85370c93fd644317d7a0f1b1156fa64b87f556f +SHA512 (wordpress-6.2.2.tar.gz) = 346c8c38e139b4a1de491a767fe34d1ff63b9ce4fbe62d2d5957c5b57704c47bed12c34e753324e018297a95a2e82e9d393e6255b540e22e0cecc74d4f557264 diff --git a/wordpress.spec b/wordpress.spec index 3a165c6..347a665 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.2.1 +%global upstream_version 6.2.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Sun May 21 2023 Remi Collet - 6.2.2-1 +- WordPress 6.2.1 Security Release + * Wed May 17 2023 Remi Collet - 6.2.1-1 - WordPress 6.2.1 Maintenance & Security Release From 0e30b8645f8ff51ce7e32fa6ec83b919d36204fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 May 2023 10:55:38 +0200 Subject: [PATCH 144/184] typo --- wordpress.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 347a665..61eb709 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -267,7 +267,7 @@ end %changelog * Sun May 21 2023 Remi Collet - 6.2.2-1 -- WordPress 6.2.1 Security Release +- WordPress 6.2.2 Security Release * Wed May 17 2023 Remi Collet - 6.2.1-1 - WordPress 6.2.1 Maintenance & Security Release From e162697e1bfc9251b55841aabdf2ef0115e13a81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:21:13 +0000 Subject: [PATCH 145/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 61eb709..c86acb2 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -266,6 +266,9 @@ end %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun May 21 2023 Remi Collet - 6.2.2-1 - WordPress 6.2.2 Security Release From 5d372d92f91ba53555d9ea546084b31410e74729 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Aug 2023 09:08:57 +0200 Subject: [PATCH 146/184] =?UTF-8?q?WordPress=206.3=20=E2=80=9CLionel?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index a9a7d70..67f43cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.2.2.tar.gz) = 346c8c38e139b4a1de491a767fe34d1ff63b9ce4fbe62d2d5957c5b57704c47bed12c34e753324e018297a95a2e82e9d393e6255b540e22e0cecc74d4f557264 +SHA512 (wordpress-6.3.tar.gz) = b9b2fa19efb8a352cd53a16de6baa492e201d8607d4a07758146d9b40b09dd40172d7292cd6ca21be92799e2b40763a537f63c8506da7b99acc5d144196b0566 diff --git a/wordpress.spec b/wordpress.spec index c86acb2..2c590ce 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.2.2 +%global upstream_version 6.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -266,6 +266,9 @@ end %changelog +* Sun Aug 20 2023 Remi Collet - 6.3-1 +- WordPress 6.3 “Lionel” + * Sat Jul 22 2023 Fedora Release Engineering - 6.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From dd57a81f902f7655e55d04dcfd00b6853443e86d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 31 Aug 2023 08:06:15 +0200 Subject: [PATCH 147/184] * WordPress 6.3.1 Maintenance Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 67f43cb..44a4fc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.3.tar.gz) = b9b2fa19efb8a352cd53a16de6baa492e201d8607d4a07758146d9b40b09dd40172d7292cd6ca21be92799e2b40763a537f63c8506da7b99acc5d144196b0566 +SHA512 (wordpress-6.3.1.tar.gz) = 786abd032f2c245f2af4974a3b11cfbc541754a12cbb1bfa2339ab68b469711d5d8bf9394ff12fd7b6b7a5b4006d72aeecd34dc8fbed531b39df287e878e2da9 diff --git a/wordpress.spec b/wordpress.spec index 2c590ce..4095373 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.3 +%global upstream_version 6.3.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -112,7 +112,7 @@ Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.22 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.7 +Provides: bundled(php-phpmailer) = 6.8.0 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -266,6 +266,9 @@ end %changelog +* Thu Aug 31 2023 Remi Collet - 6.3.1-1 +* WordPress 6.3.1 Maintenance Release + * Sun Aug 20 2023 Remi Collet - 6.3-1 - WordPress 6.3 “Lionel” From 09fd35536419b844b35fd6cba853bf2a1b3188c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 16 Oct 2023 07:20:48 +0200 Subject: [PATCH 148/184] =?UTF-8?q?WordPress=206.3.2=20=E2=80=93=20Mainten?= =?UTF-8?q?ance=20and=20Security=20release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 44a4fc5..132d904 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.3.1.tar.gz) = 786abd032f2c245f2af4974a3b11cfbc541754a12cbb1bfa2339ab68b469711d5d8bf9394ff12fd7b6b7a5b4006d72aeecd34dc8fbed531b39df287e878e2da9 +SHA512 (wordpress-6.3.2.tar.gz) = 68fade6d608b8be4f35c7b7d0e8d73658b8690f3548d5374ca8a16a7b18affb9bcea54c1357fb442a1928cc0826ab40cabfd6ad91f0b4a5c00451036bea78747 diff --git a/wordpress.spec b/wordpress.spec index 4095373..055cfc5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.3.1 +%global upstream_version 6.3.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Mon Oct 16 2023 Remi Collet - 6.3.2-1 +- WordPress 6.3.2 – Maintenance and Security release + * Thu Aug 31 2023 Remi Collet - 6.3.1-1 * WordPress 6.3.1 Maintenance Release From 4cc3f8f944f388c03ff0009d75c5eaa476c288f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 Nov 2023 14:58:13 +0100 Subject: [PATCH 149/184] =?UTF-8?q?WordPress=206.4=20=E2=80=9CShirley?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- ...o_swfupload.patch => wordpress-6.4-no_swfupload.patch | 8 ++++---- wordpress.spec | 9 ++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) rename wordpress-5.4-no_swfupload.patch => wordpress-6.4-no_swfupload.patch (74%) diff --git a/sources b/sources index 132d904..4464241 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.3.2.tar.gz) = 68fade6d608b8be4f35c7b7d0e8d73658b8690f3548d5374ca8a16a7b18affb9bcea54c1357fb442a1928cc0826ab40cabfd6ad91f0b4a5c00451036bea78747 +SHA512 (wordpress-6.4.tar.gz) = 9b39725b11a22a4937facb88ebee7999ad6dc539196b763f697773becd05ae18d806aef42ba6992c2b63ab1febb634adc2e87b97654b15f2e0bd9400cc163608 diff --git a/wordpress-5.4-no_swfupload.patch b/wordpress-6.4-no_swfupload.patch similarity index 74% rename from wordpress-5.4-no_swfupload.patch rename to wordpress-6.4-no_swfupload.patch index 3683cb7..2ef7c9e 100644 --- a/wordpress-5.4-no_swfupload.patch +++ b/wordpress-6.4-no_swfupload.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.old 2020-03-25 16:34:50.606199762 +0100 -+++ wordpress/wp-includes/script-loader.php 2020-03-25 16:35:59.409883628 +0100 -@@ -892,12 +892,6 @@ function wp_default_scripts( $scripts ) +--- wordpress/wp-includes/script-loader.php.old 2023-11-08 14:47:40.820208939 +0100 ++++ wordpress/wp-includes/script-loader.php 2023-11-08 14:47:48.593183436 +0100 +@@ -1029,12 +1029,6 @@ function wp_default_scripts( $scripts ) $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); @@ -12,5 +12,5 @@ diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/scrip - did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n ); - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); + did_action( 'init' ) && $scripts->add_data( 'comment-reply', 'strategy', 'async' ); - $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' ); diff --git a/wordpress.spec b/wordpress.spec index 055cfc5..67fbf4c 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.3.2 +%global upstream_version 6.4 #global upstream_prever RC5 #global upstream_lower rc5 @@ -40,7 +40,7 @@ Source5: wordpress-minify.php # (and replace it with Free Software Song) Patch0: wordpress-5.2-hello.patch # Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-5.4-no_swfupload.patch +Patch2: wordpress-6.4-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' @@ -112,7 +112,7 @@ Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.22 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.8.0 +Provides: bundled(php-phpmailer) = 6.8.1 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -266,6 +266,9 @@ end %changelog +* Wed Nov 8 2023 Remi Collet - 6.4-1 +- WordPress 6.4 “Shirley” + * Mon Oct 16 2023 Remi Collet - 6.3.2-1 - WordPress 6.3.2 – Maintenance and Security release From 7d5422b77cfc28cd4136a54583eeaa381ded4c92 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Nov 2023 09:53:56 +0100 Subject: [PATCH 150/184] WordPress 6.4.1 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4464241..befc635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.tar.gz) = 9b39725b11a22a4937facb88ebee7999ad6dc539196b763f697773becd05ae18d806aef42ba6992c2b63ab1febb634adc2e87b97654b15f2e0bd9400cc163608 +SHA512 (wordpress-6.4.1.tar.gz) = 4b977cc8733f9f99e383f7495d626bee0d5b7c84ebffcb4d2eaad8dd2456a00c06f8f3d0eee741048e86ae38357b0e81928c3b4f76bfcb01f441c911704b4f99 diff --git a/wordpress.spec b/wordpress.spec index 67fbf4c..8b95e8b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4 +%global upstream_version 6.4.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Thu Nov 9 2023 Remi Collet - 6.4.1-1 +- WordPress 6.4.1 Maintenance Release + * Wed Nov 8 2023 Remi Collet - 6.4-1 - WordPress 6.4 “Shirley” From 19ce14b238a774ba12e855483a6246b88fac2cb5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Dec 2023 08:39:06 +0100 Subject: [PATCH 151/184] WordPress 6.4.2 Maintenance & Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index befc635..68fa774 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.1.tar.gz) = 4b977cc8733f9f99e383f7495d626bee0d5b7c84ebffcb4d2eaad8dd2456a00c06f8f3d0eee741048e86ae38357b0e81928c3b4f76bfcb01f441c911704b4f99 +SHA512 (wordpress-6.4.2.tar.gz) = 05f23101169d9340000121569b0b1676acc5f144e6e5f1fc320f41e3f57899b39c065049b3cf43fe278248cf51f7102853afa8673ba1be503f5a1016c593db68 diff --git a/wordpress.spec b/wordpress.spec index 8b95e8b..dbf1c0e 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4.1 +%global upstream_version 6.4.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Thu Dec 7 2023 Remi Collet - 6.4.2-1 +- WordPress 6.4.2 Maintenance & Security Release + * Thu Nov 9 2023 Remi Collet - 6.4.1-1 - WordPress 6.4.1 Maintenance Release From 0d6691cddd4255b3e98d98c0c79e9dbdfd73e485 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:04:02 +0000 Subject: [PATCH 152/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index dbf1c0e..e8f1327 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -266,6 +266,9 @@ end %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Dec 7 2023 Remi Collet - 6.4.2-1 - WordPress 6.4.2 Maintenance & Security Release From b32b47631ad7b2ea2f4de1d283941994f14d756a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 1 Feb 2024 08:30:33 +0100 Subject: [PATCH 153/184] WordPress 6.4.3 Maintenance & Security Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 68fa774..83cab3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.2.tar.gz) = 05f23101169d9340000121569b0b1676acc5f144e6e5f1fc320f41e3f57899b39c065049b3cf43fe278248cf51f7102853afa8673ba1be503f5a1016c593db68 +SHA512 (wordpress-6.4.3.tar.gz) = a3602f1b7c046b6463d03d74a4f091434e5251518a4a11146675a5836f75a532d04e9b0fad9474bd9c53ed3e2adb06a2cfb0121fde017180e120ebb58cb643eb diff --git a/wordpress.spec b/wordpress.spec index e8f1327..4ccf270 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4.2 +%global upstream_version 6.4.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -21,7 +21,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -266,6 +266,9 @@ end %changelog +* Thu Feb 1 2024 Remi Collet - 6.4.3-1 +- WordPress 6.4.3 Maintenance & Security Release + * Sat Jan 27 2024 Fedora Release Engineering - 6.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2531810fe48f2fb276c8ea1b021de81b25ce2795 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Apr 2024 08:12:13 +0200 Subject: [PATCH 154/184] =?UTF-8?q?WordPress=206.5=20=E2=80=9CRegina?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 83cab3d..51eadd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.4.3.tar.gz) = a3602f1b7c046b6463d03d74a4f091434e5251518a4a11146675a5836f75a532d04e9b0fad9474bd9c53ed3e2adb06a2cfb0121fde017180e120ebb58cb643eb +SHA512 (wordpress-6.5.tar.gz) = 39ab557bfd4c2af7a5289f379cc4ee62a6720f2f41cefeb5328cf1a053a3f53d471ce081998debe7f4143ed11dcec6cc8c71da8867a3493c83d1b3742a99a9d4 diff --git a/wordpress.spec b/wordpress.spec index 4ccf270..5b92d85 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.4.3 +%global upstream_version 6.5 #global upstream_prever RC5 #global upstream_lower rc5 @@ -110,9 +110,9 @@ Requires: ca-certificates # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php Provides: bundled(php-simplepie) = 1.5.8 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.22 +Provides: bundled(php-getid3) = 1.9.23 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.8.1 +Provides: bundled(php-phpmailer) = 6.9.1 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -266,6 +266,9 @@ end %changelog +* Wed Apr 3 2024 Remi Collet - 6.5-1 +- WordPress 6.5 “Regina” + * Thu Feb 1 2024 Remi Collet - 6.4.3-1 - WordPress 6.4.3 Maintenance & Security Release From 520812b8dd64d3e142c461dbf8f6b604bdfc61e0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Apr 2024 15:22:54 +0200 Subject: [PATCH 155/184] WordPress 6.5.2 Maintenance and Security Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 51eadd7..7193d3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.5.tar.gz) = 39ab557bfd4c2af7a5289f379cc4ee62a6720f2f41cefeb5328cf1a053a3f53d471ce081998debe7f4143ed11dcec6cc8c71da8867a3493c83d1b3742a99a9d4 +SHA512 (wordpress-6.5.2.tar.gz) = 51da72c4a5aeac0ae7ce968a7f05340d4af422226095f7c615dc865bd4fafe855c481df2ca31657c4a705307aaf2b1b941a4246847f1bdb934a49d1e626cb7fb diff --git a/wordpress.spec b/wordpress.spec index 5b92d85..730b047 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.5 +%global upstream_version 6.5.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Wed Apr 10 2024 Remi Collet - 6.5.2-1 +- WordPress 6.5.2 Maintenance and Security Release + * Wed Apr 3 2024 Remi Collet - 6.5-1 - WordPress 6.5 “Regina” From b5c588fb5888eea553d50d142a726bc235870566 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 May 2024 12:00:35 +0200 Subject: [PATCH 156/184] WordPress 6.5.3 Maintenance Release --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7193d3b..51c9774 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.5.2.tar.gz) = 51da72c4a5aeac0ae7ce968a7f05340d4af422226095f7c615dc865bd4fafe855c481df2ca31657c4a705307aaf2b1b941a4246847f1bdb934a49d1e626cb7fb +SHA512 (wordpress-6.5.3.tar.gz) = 904be348fbb416f94a3cfc770e126f920b9dce3b4c8486e50ccbe3e3d37429949c1d385d2a75a70db8632049bd6c482d695e4565372df291403c90a261fe135b diff --git a/wordpress.spec b/wordpress.spec index 730b047..aeb8b69 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.5.2 +%global upstream_version 6.5.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Mon May 13 2024 Remi Collet - 6.5.3-1 +- WordPress 6.5.3 Maintenance Release + * Wed Apr 10 2024 Remi Collet - 6.5.2-1 - WordPress 6.5.2 Maintenance and Security Release From 72216130098b70d1d3bbc6f5d3079fcd53f77d71 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 6 Jun 2024 07:54:45 +0200 Subject: [PATCH 157/184] v6.5.4 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 51c9774..de383d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.5.3.tar.gz) = 904be348fbb416f94a3cfc770e126f920b9dce3b4c8486e50ccbe3e3d37429949c1d385d2a75a70db8632049bd6c482d695e4565372df291403c90a261fe135b +SHA512 (wordpress-6.5.4.tar.gz) = 4300137980c9d0f4c7f4a2ca5771c3b1f70ac7c216f0c634b3c2c755214b697dc6af3223b05f848e2c7133342147e9ef191fd1408bb0f44ab80c03d7f2b3bb0b diff --git a/wordpress.spec b/wordpress.spec index aeb8b69..7718eb2 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,7 +13,7 @@ %else %global with_nginx 0 %endif -%global upstream_version 6.5.3 +%global upstream_version 6.5.4 #global upstream_prever RC5 #global upstream_lower rc5 @@ -266,6 +266,9 @@ end %changelog +* Thu Jun 6 2024 Remi Collet - 6.5.4-1 +- WordPress 6.5.4 Maintenance Release + * Mon May 13 2024 Remi Collet - 6.5.3-1 - WordPress 6.5.3 Maintenance Release From a4d1623c1c0abfc6214dd44b94a70cbcea28d67d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Jul 2024 11:33:41 +0200 Subject: [PATCH 158/184] WordPress 6.4.2 Maintenance & Security Release --- sources | 2 +- wordpress.spec | 18 ++++-------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sources b/sources index de383d0..6a42fba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.5.4.tar.gz) = 4300137980c9d0f4c7f4a2ca5771c3b1f70ac7c216f0c634b3c2c755214b697dc6af3223b05f848e2c7133342147e9ef191fd1408bb0f44ab80c03d7f2b3bb0b +SHA512 (wordpress-6.5.5.tar.gz) = 34b401f6abf08d654188906117c54e962e22fb1e8abcfec2a191d761d5719b4cfe7c33d33f6da786b3e6a04e50622429d5d7c9f9b8baec0bd08430b1f4435ff7 diff --git a/wordpress.spec b/wordpress.spec index 7718eb2..1741c26 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -8,12 +8,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -%global with_nginx 1 -%else -%global with_nginx 0 -%endif -%global upstream_version 6.5.4 +%global upstream_version 6.5.5 #global upstream_prever RC5 #global upstream_lower rc5 @@ -65,16 +60,12 @@ BuildRequires: php-cli BuildRequires: php-patchwork-jsqueeze BuildRequires: php(language) >= 7.2 -%if %{with_nginx} Requires: webserver Requires: php(httpd) Suggests: httpd # For directory ownership Requires: httpd-filesystem Requires: nginx-filesystem -%else -Requires: php -%endif Requires: php(language) >= 7.2 Requires: php-sodium Requires: php-ctype @@ -195,9 +186,7 @@ grep ' VERSION ' wp-includes/PHPMailer/PHPMailer.php # Apache configuration install -m 0644 -D -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/wordpress.conf -%if %{with_nginx} install -m 0644 -D -p %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/nginx/default.d/wordpress.conf -%endif # Application mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/wordpress @@ -239,9 +228,7 @@ end %files %config(noreplace) %{_sysconfdir}/httpd/conf.d/wordpress.conf -%if %{with_nginx} %config(noreplace) %{_sysconfdir}/nginx/default.d/wordpress.conf -%endif %dir %{_datadir}/wordpress %{_datadir}/wordpress/wp-admin %{_datadir}/wordpress/wp-includes @@ -266,6 +253,9 @@ end %changelog +* Tue Jul 2 2024 Remi Collet - 6.5.5-1 +- WordPress 6.4.2 Maintenance & Security Release + * Thu Jun 6 2024 Remi Collet - 6.5.4-1 - WordPress 6.5.4 Maintenance Release From 6cb5fa97c9fa02f877849e1ffe8d7edabbe81126 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Jul 2024 13:48:40 +0200 Subject: [PATCH 159/184] =?UTF-8?q?WordPress=206.6=20=E2=80=9CDorsey?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6a42fba..f0edf67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.5.5.tar.gz) = 34b401f6abf08d654188906117c54e962e22fb1e8abcfec2a191d761d5719b4cfe7c33d33f6da786b3e6a04e50622429d5d7c9f9b8baec0bd08430b1f4435ff7 +SHA512 (wordpress-6.6.tar.gz) = dd0ca8eb1737ca50dacdbb832a2fa5bedcc83fab3ed55aafb210d6fde4af14dec662cf3c0d9974316ad12c0848bdb14222cc43044472bdbd1b302e7bcf72b454 diff --git a/wordpress.spec b/wordpress.spec index 1741c26..88d1996 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -8,7 +8,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.5.5 +%global upstream_version 6.6 #global upstream_prever RC5 #global upstream_lower rc5 @@ -253,6 +253,9 @@ end %changelog +* Wed Jul 17 2024 Remi Collet - 6.6-1 +- WordPress 6.6 “Dorsey” + * Tue Jul 2 2024 Remi Collet - 6.5.5-1 - WordPress 6.4.2 Maintenance & Security Release From 1927c92da2c90a72b47de763838cc7defaa7ac98 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:30:57 +0000 Subject: [PATCH 160/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 88d1996..3c44ce3 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -253,6 +253,9 @@ end %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jul 17 2024 Remi Collet - 6.6-1 - WordPress 6.6 “Dorsey” From f6d465300d62051b1a776e5bad354aeb81714dca Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jul 2024 09:33:22 +0200 Subject: [PATCH 161/184] WordPress 6.6.1 Maintenance Release --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index f0edf67..91b4980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.6.tar.gz) = dd0ca8eb1737ca50dacdbb832a2fa5bedcc83fab3ed55aafb210d6fde4af14dec662cf3c0d9974316ad12c0848bdb14222cc43044472bdbd1b302e7bcf72b454 +SHA512 (wordpress-6.6.1.tar.gz) = a6fa5e8c6ebe57e6064db04286816a898a7c783adc7ffa3244e12e27af6a4eb0aaf49bec8e025c314bcee9d3f63775277211636d6f99a69c6458f73b103565e2 diff --git a/wordpress.spec b/wordpress.spec index 3c44ce3..9e9b28d 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -8,7 +8,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.6 +%global upstream_version 6.6.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -16,7 +16,7 @@ Summary: Blog tool and publishing platform URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -253,6 +253,9 @@ end %changelog +* Wed Jul 24 2024 Remi Collet - 6.6.1-1 +- WordPress 6.6.1 Maintenance Release + * Sat Jul 20 2024 Fedora Release Engineering - 6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7eae81c8d2948b7d786d6bbf55b77511f3625754 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Sep 2024 08:56:40 +0200 Subject: [PATCH 162/184] WordPress 6.6.2 Maintenance Release --- sources | 2 +- wordpress.spec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 91b4980..e86e7b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.6.1.tar.gz) = a6fa5e8c6ebe57e6064db04286816a898a7c783adc7ffa3244e12e27af6a4eb0aaf49bec8e025c314bcee9d3f63775277211636d6f99a69c6458f73b103565e2 +SHA512 (wordpress-6.6.2.tar.gz) = 652d20f2d66a62d1dfa0c0e6edb7b80e32e9a50a6bdbfb995510091ed1e3cfe6c42db2b13cb78b69ff09c7e85a14b5b8881738477fa0ade8998967179df851e7 diff --git a/wordpress.spec b/wordpress.spec index 9e9b28d..afd30c4 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -5,10 +5,9 @@ # # Please preserve changelog entries # -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.6.1 +%global upstream_version 6.6.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -253,6 +252,9 @@ end %changelog +* Wed Sep 11 2024 Remi Collet - 6.6.2-1 +- WordPress 6.6.2 Maintenance Release + * Wed Jul 24 2024 Remi Collet - 6.6.1-1 - WordPress 6.6.1 Maintenance Release From 67b93cf5394effb8b686516f1b3eabfca24ea679 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Nov 2024 10:33:08 +0100 Subject: [PATCH 163/184] =?UTF-8?q?WordPress=206.7=20=E2=80=9CRollins?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress.spec | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/sources b/sources index e86e7b6..5e0b594 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.6.2.tar.gz) = 652d20f2d66a62d1dfa0c0e6edb7b80e32e9a50a6bdbfb995510091ed1e3cfe6c42db2b13cb78b69ff09c7e85a14b5b8881738477fa0ade8998967179df851e7 +SHA512 (wordpress-6.7.tar.gz) = 2fba512d4ddbe2ec7722ecc5a4a2107b7ebdb8578bf3ef041ddafe65affd08fd8031d9088da576f5675bf4d98e7312d7ed903fd69135e7488f44bc6aff2b07c7 diff --git a/wordpress.spec b/wordpress.spec index afd30c4..0560b80 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,12 +7,12 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.6.2 +%global upstream_version 6.7 #global upstream_prever RC5 #global upstream_lower rc5 Summary: Blog tool and publishing platform -URL: http://www.wordpress.org +URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} Release: 1%{?dist} @@ -98,11 +98,11 @@ Requires: httpd Requires: ca-certificates # Bundled # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php -Provides: bundled(php-simplepie) = 1.5.8 +Provides: bundled(php-simplepie) = 1.8.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.23 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.9.1 +Provides: bundled(php-phpmailer) = 6.9.2 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -174,9 +174,9 @@ sed -e 's/\r//' wp-config-sample.php >wp-config.php sed -i -e 's/\r//' license.txt : Bundled library versions -grep "SIMPLEPIE_VERSION'" wp-includes/class-simplepie.php -grep ' VERSION ' wp-includes/ID3/getid3.php -grep ' VERSION ' wp-includes/PHPMailer/PHPMailer.php +grep ' VERSION ' wp-includes/SimplePie/src/SimplePie.php +grep ' VERSION ' wp-includes/ID3/getid3.php +grep ' VERSION ' wp-includes/PHPMailer/PHPMailer.php %build @@ -252,6 +252,9 @@ end %changelog +* Wed Nov 13 2024 Remi Collet - 6.7-1 +- WordPress 6.7 “Rollins” + * Wed Sep 11 2024 Remi Collet - 6.6.2-1 - WordPress 6.6.2 Maintenance Release From a7769fe106e43b073f96aefcefb62375048101de Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Nov 2024 07:00:11 +0100 Subject: [PATCH 164/184] v6.7.1 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 5e0b594..3c23679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.7.tar.gz) = 2fba512d4ddbe2ec7722ecc5a4a2107b7ebdb8578bf3ef041ddafe65affd08fd8031d9088da576f5675bf4d98e7312d7ed903fd69135e7488f44bc6aff2b07c7 +SHA512 (wordpress-6.7.1.tar.gz) = 4d9b7fb4c9e7b3ef4b971e85537db44f98513fba6546eed8d561fb4701f89e466eba8838aec578651abca4f961f10c2d794bc912642bd92017991e200795eb73 diff --git a/wordpress.spec b/wordpress.spec index 0560b80..e843b51 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.7 +%global upstream_version 6.7.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -252,6 +252,9 @@ end %changelog +* Fri Nov 22 2024 Remi Collet - 6.7.1-1 +- WordPress 6.7.1 Maintenance Release + * Wed Nov 13 2024 Remi Collet - 6.7-1 - WordPress 6.7 “Rollins” From a0c1acf4abb3ad3586bb0fc8f9fa80e54aae0d90 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:13:23 +0000 Subject: [PATCH 165/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index e843b51..f8d9fac 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -252,6 +252,9 @@ end %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 6.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 22 2024 Remi Collet - 6.7.1-1 - WordPress 6.7.1 Maintenance Release From 9fb61fd7e70dc28482202c1007de20ab88d8fb58 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Feb 2025 08:33:49 +0100 Subject: [PATCH 166/184] v6.7.2 --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 3c23679..db19506 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.7.1.tar.gz) = 4d9b7fb4c9e7b3ef4b971e85537db44f98513fba6546eed8d561fb4701f89e466eba8838aec578651abca4f961f10c2d794bc912642bd92017991e200795eb73 +SHA512 (wordpress-6.7.2.tar.gz) = a07db3c7e8989dc20496953c68f9772154d5b5bad0cec7c03466bbb6c84eb1f758859e5bbe3e1b27f770d86624006034d75c8c4ee1e1ea622887846bf56da1ca diff --git a/wordpress.spec b/wordpress.spec index f8d9fac..473f855 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.7.1 +%global upstream_version 6.7.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -252,6 +252,9 @@ end %changelog +* Wed Feb 12 2025 Remi Collet - 6.7.2-1 +- WordPress 6.7.2 Maintenance Release + * Sun Jan 19 2025 Fedora Release Engineering - 6.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9407053f374454f8b07a80622621e619b69d418d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Apr 2025 08:31:41 +0200 Subject: [PATCH 167/184] =?UTF-8?q?WordPress=206.8=20=E2=80=9CCecil?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress-5.2-hello.patch => wordpress-6.8-hello.patch | 9 +++++---- wordpress.spec | 9 ++++++--- 3 files changed, 12 insertions(+), 8 deletions(-) rename wordpress-5.2-hello.patch => wordpress-6.8-hello.patch (90%) diff --git a/sources b/sources index db19506..c808ac3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.7.2.tar.gz) = a07db3c7e8989dc20496953c68f9772154d5b5bad0cec7c03466bbb6c84eb1f758859e5bbe3e1b27f770d86624006034d75c8c4ee1e1ea622887846bf56da1ca +SHA512 (wordpress-6.8.tar.gz) = 9698277873810c54003b964a686fc3b88c387495f9b3112a8c27df92d322893fab0695ddc25eb3014a0fa96da805932b4f4a64f1f5ebd25508fa25c61f4d5be3 diff --git a/wordpress-5.2-hello.patch b/wordpress-6.8-hello.patch similarity index 90% rename from wordpress-5.2-hello.patch rename to wordpress-6.8-hello.patch index 5ccc2f5..32bdca9 100644 --- a/wordpress-5.2-hello.patch +++ b/wordpress-6.8-hello.patch @@ -1,7 +1,7 @@ diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugins/hello.php ---- wordpress/wp-content/plugins/hello.php.dolly 2019-03-28 15:09:05.874797878 +0100 -+++ wordpress/wp-content/plugins/hello.php 2019-03-28 15:10:15.892164549 +0100 -@@ -6,41 +6,26 @@ +--- wordpress/wp-content/plugins/hello.php.dolly 2025-04-16 08:21:31.710644174 +0200 ++++ wordpress/wp-content/plugins/hello.php 2025-04-16 08:23:15.011000365 +0200 +@@ -6,7 +6,7 @@ /* Plugin Name: Hello Dolly Plugin URI: http://wordpress.org/plugins/hello-dolly/ @@ -10,7 +10,8 @@ diff -up wordpress/wp-content/plugins/hello.php.dolly wordpress/wp-content/plugi Author: Matt Mullenweg Version: 1.7.2 Author URI: http://ma.tt/ - */ +@@ -18,34 +18,19 @@ if ( ! defined( 'ABSPATH' ) ) { + } function hello_dolly_get_lyric() { - /** These are the lyrics to Hello Dolly */ diff --git a/wordpress.spec b/wordpress.spec index 473f855..7f3a971 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.7.2 +%global upstream_version 6.8 #global upstream_prever RC5 #global upstream_lower rc5 @@ -32,7 +32,7 @@ Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) -Patch0: wordpress-5.2-hello.patch +Patch0: wordpress-6.8-hello.patch # Drop swfupload: not built from source, not reasonably possible to do Patch2: wordpress-6.4-no_swfupload.patch # Adjust tinymce's media plugin not to use its SWF plugin. This changes @@ -102,7 +102,7 @@ Provides: bundled(php-simplepie) = 1.8.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.23 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.9.2 +Provides: bundled(php-phpmailer) = 6.9.3 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -252,6 +252,9 @@ end %changelog +* Wed Apr 16 2025 Remi Collet - 6.8-1 +- WordPress 6.8 “Cecil” + * Wed Feb 12 2025 Remi Collet - 6.7.2-1 - WordPress 6.7.2 Maintenance Release From d84854f5e80304e8daf786811b85a2ebd7c690a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 May 2025 12:44:07 +0200 Subject: [PATCH 168/184] v6.8.1 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c808ac3..3b3cd47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.8.tar.gz) = 9698277873810c54003b964a686fc3b88c387495f9b3112a8c27df92d322893fab0695ddc25eb3014a0fa96da805932b4f4a64f1f5ebd25508fa25c61f4d5be3 +SHA512 (wordpress-6.8.1.tar.gz) = 1ded47540f217e3dc50b176202c09419f4f87d21ab24f8542b1f54b878b225d437e48ed36851d62cec431f661f999fa802e31e1085ad6191cc43d8e727b060ca diff --git a/wordpress.spec b/wordpress.spec index 7f3a971..c9859c8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.8 +%global upstream_version 6.8.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -252,6 +252,9 @@ end %changelog +* Mon May 5 2025 Remi Collet - 6.8.1-1 +- WordPress 6.8.1 Maintenance Release + * Wed Apr 16 2025 Remi Collet - 6.8-1 - WordPress 6.8 “Cecil” From 573ec54ff299317e3783fdeb31ec6a28085467af Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 22 Jul 2025 10:21:10 +0200 Subject: [PATCH 169/184] v6.8.2 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3b3cd47..969f05d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.8.1.tar.gz) = 1ded47540f217e3dc50b176202c09419f4f87d21ab24f8542b1f54b878b225d437e48ed36851d62cec431f661f999fa802e31e1085ad6191cc43d8e727b060ca +SHA512 (wordpress-6.8.2.tar.gz) = 448ab7819bf4ccd00e5cda13122cb89f838db55833fdc5ffc48321a7e201f112e7f80279387386410a29f248bd5aa4b85a145a68b1c42f72287c9d0be38313f7 diff --git a/wordpress.spec b/wordpress.spec index c9859c8..ddc73ee 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.8.1 +%global upstream_version 6.8.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -252,6 +252,9 @@ end %changelog +* Tue Jul 22 2025 Remi Collet - 6.8.2-1 +- WordPress 6.8.2 Maintenance Release + * Mon May 5 2025 Remi Collet - 6.8.1-1 - WordPress 6.8.1 Maintenance Release From 09a3ce2f1e38f0150363fa5c512e50ef29047848 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:31:27 +0000 Subject: [PATCH 170/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index ddc73ee..e7cf578 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -252,6 +252,9 @@ end %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 6.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 22 2025 Remi Collet - 6.8.2-1 - WordPress 6.8.2 Maintenance Release From 70f3360d594705bdea86c5d3a2c226f26df2646e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Jul 2025 07:53:55 +0200 Subject: [PATCH 171/184] fix system certificates path --- wordpress.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index e7cf578..269d1e8 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 3%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -95,7 +95,7 @@ Requires: php-zip Requires: php-zlib Requires: httpd # Unbundled -Requires: ca-certificates +Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # Bundled # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php Provides: bundled(php-simplepie) = 1.8.0 @@ -208,7 +208,7 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/wordpress/{license.txt,readme.html} # Remove bundled ca-bundle.crt rm ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt -ln -s %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ +ln -s %{_sysconfdir}/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt # Remove backup copies of patches @@ -252,6 +252,9 @@ end %changelog +* Mon Jul 28 2025 Remi Collet - 6.8.2-3 +- fix system certificates path + * Fri Jul 25 2025 Fedora Release Engineering - 6.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1dd8ac8d0ce13e228dbd0528ffa63998ad2f8a53 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Oct 2025 07:17:36 +0200 Subject: [PATCH 172/184] v6.8.3 --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 969f05d..dcf4853 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.8.2.tar.gz) = 448ab7819bf4ccd00e5cda13122cb89f838db55833fdc5ffc48321a7e201f112e7f80279387386410a29f248bd5aa4b85a145a68b1c42f72287c9d0be38313f7 +SHA512 (wordpress-6.8.3.tar.gz) = 0e8890d1bc9d6baa344cf5c6c5cb6ec5cdca810311a3508ec4cf9b0d5afe75f949c81a153c27847fa99f6c5d214336281ca9220bb54535996ee2eaa059306864 diff --git a/wordpress.spec b/wordpress.spec index 269d1e8..0792674 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.8.2 +%global upstream_version 6.8.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 3%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -252,6 +252,9 @@ end %changelog +* Wed Oct 1 2025 Remi Collet - 6.8.3-1 +- WordPress 6.8.3 Security Release + * Mon Jul 28 2025 Remi Collet - 6.8.2-3 - fix system certificates path From 1526d59f553a7e08d87bae6a199ab05045ea08d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 3 Dec 2025 09:08:12 +0100 Subject: [PATCH 173/184] =?UTF-8?q?WordPress=206.9=20=E2=80=9CGene?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources | 2 +- wordpress-6.4-no_swfupload.patch | 16 ---------------- wordpress.spec | 18 +++++++----------- 3 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 wordpress-6.4-no_swfupload.patch diff --git a/sources b/sources index dcf4853..8ed87f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.8.3.tar.gz) = 0e8890d1bc9d6baa344cf5c6c5cb6ec5cdca810311a3508ec4cf9b0d5afe75f949c81a153c27847fa99f6c5d214336281ca9220bb54535996ee2eaa059306864 +SHA512 (wordpress-6.9.tar.gz) = 486b31bb8e3836f7e4bf1024098976a98bd52a0280bdb1a9a0c1648865a03cd7a1373a8c232bc82e57c3819dcf757bb26ff172f4ec88e681ff260978e197d0fd diff --git a/wordpress-6.4-no_swfupload.patch b/wordpress-6.4-no_swfupload.patch deleted file mode 100644 index 2ef7c9e..0000000 --- a/wordpress-6.4-no_swfupload.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.old 2023-11-08 14:47:40.820208939 +0100 -+++ wordpress/wp-includes/script-loader.php 2023-11-08 14:47:48.593183436 +0100 -@@ -1029,12 +1029,6 @@ function wp_default_scripts( $scripts ) - $scripts->add( 'wp-plupload', "/wp-includes/js/plupload/wp-plupload$suffix.js", array( 'plupload', 'jquery', 'json2', 'media-models' ), false, 1 ); - did_action( 'init' ) && $scripts->localize( 'wp-plupload', 'pluploadL10n', $uploader_l10n ); - -- // Keep 'swfupload' for back-compat. -- $scripts->add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', array(), '2201-20110113' ); -- $scripts->add( 'swfupload-all', false, array( 'swfupload' ), '2201' ); -- $scripts->add( 'swfupload-handlers', "/wp-includes/js/swfupload/handlers$suffix.js", array( 'swfupload-all', 'jquery' ), '2201-20110524' ); -- did_action( 'init' ) && $scripts->localize( 'swfupload-handlers', 'swfuploadL10n', $uploader_l10n ); -- - $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", array(), false, 1 ); - did_action( 'init' ) && $scripts->add_data( 'comment-reply', 'strategy', 'async' ); - diff --git a/wordpress.spec b/wordpress.spec index 0792674..30a82da 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.8.3 +%global upstream_version 6.9 #global upstream_prever RC5 #global upstream_lower rc5 @@ -33,8 +33,6 @@ Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) Patch0: wordpress-6.8-hello.patch -# Drop swfupload: not built from source, not reasonably possible to do -Patch2: wordpress-6.4-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' @@ -73,22 +71,18 @@ Requires: php-mysqli # From phpcompatinfo report for version 4.5.3 Requires: php-curl -Requires: php-date Requires: php-dom Requires: php-exif Requires: php-fileinfo Requires: php-gd Requires: php-gettext -Requires: php-hash Requires: php-iconv Requires: php-intl Requires: php-json Requires: php-libxml Requires: php-mbstring Requires: php-openssl -Requires: php-pcre Requires: php-simplexml -Requires: php-spl Requires: php-xml Requires: php-xmlreader Requires: php-zip @@ -98,11 +92,11 @@ Requires: httpd Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # Bundled # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php -Provides: bundled(php-simplepie) = 1.8.0 +Provides: bundled(php-simplepie) = 1.9.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.23 +Provides: bundled(php-getid3) = 1.9.24 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 6.9.3 +Provides: bundled(php-phpmailer) = 7.0.0 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -129,7 +123,6 @@ rm -rf wp-includes/random_compat rm -rf wp-includes/sodium_compat %patch -P0 -p1 -b .dolly -%patch -P2 -p1 %patch -P3 -p1 # Adjust mediaelement not to use its SWF %patch -P4 -p1 @@ -252,6 +245,9 @@ end %changelog +* Wed Dec 3 2025 Remi Collet - 6.9-1 +- WordPress 6.9 “Gene” + * Wed Oct 1 2025 Remi Collet - 6.8.3-1 - WordPress 6.8.3 Security Release From d651f2f2c07f513c23f38fa07061a22bf3343c4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:20:51 +0000 Subject: [PATCH 174/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 30a82da..f4ab469 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -245,6 +245,9 @@ end %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 6.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Dec 3 2025 Remi Collet - 6.9-1 - WordPress 6.9 “Gene” From dcce5b90abc307aef6e5fa94e1c23d02af9e01a8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Feb 2026 07:48:41 +0100 Subject: [PATCH 175/184] v6.9.1 --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 8ed87f7..14e806f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.9.tar.gz) = 486b31bb8e3836f7e4bf1024098976a98bd52a0280bdb1a9a0c1648865a03cd7a1373a8c232bc82e57c3819dcf757bb26ff172f4ec88e681ff260978e197d0fd +SHA512 (wordpress-6.9.1.tar.gz) = 66ee4b040efadf99ca250ca9731701003bedf550d4287d6637464d45d57eb8903a1dd82bc3b009c9c9e5892a6dec04c3b73cc05311da0dc0ae6f297be8652c1d diff --git a/wordpress.spec b/wordpress.spec index f4ab469..fd59644 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.9 +%global upstream_version 6.9.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -245,6 +245,9 @@ end %changelog +* Wed Feb 4 2026 Remi Collet - 6.9.1-1 +- WordPress 6.9.1 Maintenance Release + * Sat Jan 17 2026 Fedora Release Engineering - 6.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 52d7e4d70bb46a0c53133378c81c3c0097986f1d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Mar 2026 08:16:16 +0100 Subject: [PATCH 176/184] v6.9.3 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 14e806f..2b09a7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.9.1.tar.gz) = 66ee4b040efadf99ca250ca9731701003bedf550d4287d6637464d45d57eb8903a1dd82bc3b009c9c9e5892a6dec04c3b73cc05311da0dc0ae6f297be8652c1d +SHA512 (wordpress-6.9.3.tar.gz) = d760e4a2d768b97b2de15149a40220931e3fc6fd7726b9b324ac3afce6eb0955f2712fdb097d6068cb21fb64db2733ee989f1b3ef59a65c1dfd72950dd65b986 diff --git a/wordpress.spec b/wordpress.spec index fd59644..df29660 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.9.1 +%global upstream_version 6.9.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -245,6 +245,9 @@ end %changelog +* Wed Mar 11 2026 Remi Collet - 6.9.3-1 +- WordPress 6.9.3 Release + * Wed Feb 4 2026 Remi Collet - 6.9.1-1 - WordPress 6.9.1 Maintenance Release From bfe8ec58b02c1668efc219d23b02f7f3360292cd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Mar 2026 07:10:21 +0100 Subject: [PATCH 177/184] v6.9.4 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2b09a7e..ca97e85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.9.3.tar.gz) = d760e4a2d768b97b2de15149a40220931e3fc6fd7726b9b324ac3afce6eb0955f2712fdb097d6068cb21fb64db2733ee989f1b3ef59a65c1dfd72950dd65b986 +SHA512 (wordpress-6.9.4.tar.gz) = 3065a037dae9450459c475ab85030f0ef0517942d681afe364afbdfd010587d2cb0bb3a520e03ac0492fa6c3d6e904c0da67b8b0b5f1fbd5adf40b5ba29d4362 diff --git a/wordpress.spec b/wordpress.spec index df29660..fa21e8a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.9.3 +%global upstream_version 6.9.4 #global upstream_prever RC5 #global upstream_lower rc5 @@ -245,6 +245,9 @@ end %changelog +* Thu Mar 12 2026 Remi Collet - 6.9.4-1 +- WordPress 6.9.4 Release + * Wed Mar 11 2026 Remi Collet - 6.9.3-1 - WordPress 6.9.3 Release From 0899e8b68e328d939538eb5728a280ca70c2bf7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 May 2026 07:26:33 +0200 Subject: [PATCH 178/184] v7.0 --- sources | 2 +- ...h => wordpress-7.0-remove-jshint-refs.patch | 18 +++++++++--------- wordpress.spec | 11 +++++++---- 3 files changed, 17 insertions(+), 14 deletions(-) rename wordpress-5.1-remove-jshint-refs.patch => wordpress-7.0-remove-jshint-refs.patch (50%) diff --git a/sources b/sources index ca97e85..1e44dd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-6.9.4.tar.gz) = 3065a037dae9450459c475ab85030f0ef0517942d681afe364afbdfd010587d2cb0bb3a520e03ac0492fa6c3d6e904c0da67b8b0b5f1fbd5adf40b5ba29d4362 +SHA512 (wordpress-7.0.tar.gz) = 61cdf1d0bb918f92f8370dd6f050b3f56ac0ab90a519a994314ff9771c00e2abf73c13e41fe7409e8acfc430055862ac18f117ab36b31a77031fab7fb63d9461 diff --git a/wordpress-5.1-remove-jshint-refs.patch b/wordpress-7.0-remove-jshint-refs.patch similarity index 50% rename from wordpress-5.1-remove-jshint-refs.patch rename to wordpress-7.0-remove-jshint-refs.patch index fff7368..a96ced6 100644 --- a/wordpress-5.1-remove-jshint-refs.patch +++ b/wordpress-7.0-remove-jshint-refs.patch @@ -1,11 +1,11 @@ -diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.orig 2019-02-22 10:52:01.902006889 +0100 -+++ wordpress/wp-includes/script-loader.php 2019-02-22 10:52:04.560023086 +0100 -@@ -1251,7 +1251,6 @@ function wp_default_scripts( &$scripts ) - $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.29.1-alpha-ee20357' ); +diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.old 2026-05-26 07:16:50.150861636 +0200 ++++ wordpress/wp-includes/script-loader.php 2026-05-26 07:16:52.778780477 +0200 +@@ -1202,7 +1202,6 @@ function wp_default_scripts( $scripts ) + $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.65.20' ); $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); - $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.0' ); -- $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); - $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.2' ); - $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '0.9.14-xwp' ); + $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.1' ); // Deprecated. +- $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); // Deprecated. + $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.3' ); + $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '1.8.0' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index fa21e8a..910ae4a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 6.9.4 +%global upstream_version 7.0 #global upstream_prever RC5 #global upstream_lower rc5 @@ -49,7 +49,7 @@ Patch5: wordpress-5.4-config.patch # ignore WP_AUTO_UPDATE_CORE (always false) Patch6: wordpress-5.8-noupdate.patch # Debian patch for jshint -Patch8: wordpress-5.1-remove-jshint-refs.patch +Patch8: wordpress-7.0-remove-jshint-refs.patch BuildArch: noarch @@ -94,9 +94,9 @@ Requires: /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem # grep "SIMPLEPIE_VERSION'" wordpress/wp-includes/class-simplepie.php Provides: bundled(php-simplepie) = 1.9.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php -Provides: bundled(php-getid3) = 1.9.24 +Provides: bundled(php-getid3) = 1.9.25 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 7.0.0 +Provides: bundled(php-phpmailer) = 7.0.2 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -245,6 +245,9 @@ end %changelog +* Tue May 26 2026 Remi Collet -7.0-1 +- WordPress 7.0 “Armstrong” + * Thu Mar 12 2026 Remi Collet - 6.9.4-1 - WordPress 6.9.4 Release From 99dc16bcd37d8d573e31f8ad293f7ba0c083fb43 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jul 2026 06:15:58 +0200 Subject: [PATCH 179/184] v7.0.1 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1e44dd2..50fbdf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-7.0.tar.gz) = 61cdf1d0bb918f92f8370dd6f050b3f56ac0ab90a519a994314ff9771c00e2abf73c13e41fe7409e8acfc430055862ac18f117ab36b31a77031fab7fb63d9461 +SHA512 (wordpress-7.0.1.tar.gz) = 37b8c18b9b2e05b2d6e12deba90a5a7ef90ac37123a5b7382874ef2ad20cc27bbd75197e9a77d231c8ed76a0d10a151a0bee6f091daae7ff487a77b7e3747589 diff --git a/wordpress.spec b/wordpress.spec index 910ae4a..93d278b 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 7.0 +%global upstream_version 7.0.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -245,6 +245,9 @@ end %changelog +* Fri Jul 10 2026 Remi Collet -7.0.1-1 +- WordPress 7.0.1 Maintenance Release + * Tue May 26 2026 Remi Collet -7.0-1 - WordPress 7.0 “Armstrong” From 8fe54079a5cd45a1d6a669f667a7cd9784a80430 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:54:38 +0000 Subject: [PATCH 180/184] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wordpress.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wordpress.spec b/wordpress.spec index 93d278b..e2be8e5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 1%{?dist} +Release: 2%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -245,6 +245,9 @@ end %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 7.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jul 10 2026 Remi Collet -7.0.1-1 - WordPress 7.0.1 Maintenance Release From ea22fc54976bee3623fb73e37e941c805937ac78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Jul 2026 06:42:25 +0200 Subject: [PATCH 181/184] v7.0.2 --- sources | 2 +- wordpress.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 50fbdf5..15561b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-7.0.1.tar.gz) = 37b8c18b9b2e05b2d6e12deba90a5a7ef90ac37123a5b7382874ef2ad20cc27bbd75197e9a77d231c8ed76a0d10a151a0bee6f091daae7ff487a77b7e3747589 +SHA512 (wordpress-7.0.2.tar.gz) = 1ef3a6307b3716798e1c20851aef9de2e8818bc8ead41e75521bdb560a440c848d52030f713fa64d3ddaaadfd0474761751305ff6d793724231f3402c92080b1 diff --git a/wordpress.spec b/wordpress.spec index e2be8e5..ef3f8d2 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 7.0.1 +%global upstream_version 7.0.2 #global upstream_prever RC5 #global upstream_lower rc5 @@ -15,7 +15,7 @@ Summary: Blog tool and publishing platform URL: https://wordpress.org/ Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} -Release: 2%{?dist} +Release: 1%{?dist} # Wordpress is GPL-2.0-or-later # php-simplepie is BSD-3-Clause # php-getid3 is LGPL-3.0-or-later (or some others) @@ -245,6 +245,9 @@ end %changelog +* Tue Jul 21 2026 Remi Collet -7.0.2-1 +- WordPress 7.0.2 Release + * Fri Jul 17 2026 Fedora Release Engineering - 7.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 4b7f82d928a80179d1a84d16bdcdd36d6904f5ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Aug 2026 06:15:47 +0200 Subject: [PATCH 182/184] v7.0.3 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 15561b4..7f000e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-7.0.2.tar.gz) = 1ef3a6307b3716798e1c20851aef9de2e8818bc8ead41e75521bdb560a440c848d52030f713fa64d3ddaaadfd0474761751305ff6d793724231f3402c92080b1 +SHA512 (wordpress-7.0.3.tar.gz) = 1cd29afbe1895f02658822d5786b2ba0720cd3eb03b4f1f22b696db820b751fd84af8a71e2e1a232d5b8691d4cb686e0fe0fbddd16022c699fcad8edd24b4791 diff --git a/wordpress.spec b/wordpress.spec index ef3f8d2..9e3dea6 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 7.0.2 +%global upstream_version 7.0.3 #global upstream_prever RC5 #global upstream_lower rc5 @@ -245,6 +245,9 @@ end %changelog +* Fri Aug 7 2026 Remi Collet -7.0.3-1 +- WordPress 7.0.3 Release + * Tue Jul 21 2026 Remi Collet -7.0.2-1 - WordPress 7.0.2 Release From f99d32fd4b282cfeb2e0f3b89ab05e1a1d0ee6c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 13 Aug 2026 05:52:54 +0200 Subject: [PATCH 183/184] v7.0.4 --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 7f000e3..4358751 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-7.0.3.tar.gz) = 1cd29afbe1895f02658822d5786b2ba0720cd3eb03b4f1f22b696db820b751fd84af8a71e2e1a232d5b8691d4cb686e0fe0fbddd16022c699fcad8edd24b4791 +SHA512 (wordpress-7.0.4.tar.gz) = c20add4a81efe7f8e44abeec6bbf28c9ef80ca400b9fce1f9605fde5599a37dbe61435bb6a57d6cfbff9a4aba9bcde0d5a37ca1198f90b707aba70d895df4893 diff --git a/wordpress.spec b/wordpress.spec index 9e3dea6..3ca3e42 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 7.0.3 +%global upstream_version 7.0.4 #global upstream_prever RC5 #global upstream_lower rc5 @@ -245,6 +245,9 @@ end %changelog +* Thu Aug 13 2026 Remi Collet -7.0.4-1 +- WordPress 7.0.4 Release + * Fri Aug 7 2026 Remi Collet -7.0.3-1 - WordPress 7.0.3 Release From 4df68962409223bf6ea5495f8384baa190de9c01 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 25 Aug 2026 07:47:11 +0200 Subject: [PATCH 184/184] v7.1 --- sources | 2 +- ...date.patch => wordpress-7.1-noupdate.patch | 58 +++++++++---------- ... => wordpress-7.1-remove-jshint-refs.patch | 10 ++-- wordpress.spec | 11 ++-- 4 files changed, 42 insertions(+), 39 deletions(-) rename wordpress-5.8-noupdate.patch => wordpress-7.1-noupdate.patch (56%) rename wordpress-7.0-remove-jshint-refs.patch => wordpress-7.1-remove-jshint-refs.patch (65%) diff --git a/sources b/sources index 4358751..80ec3c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-7.0.4.tar.gz) = c20add4a81efe7f8e44abeec6bbf28c9ef80ca400b9fce1f9605fde5599a37dbe61435bb6a57d6cfbff9a4aba9bcde0d5a37ca1198f90b707aba70d895df4893 +SHA512 (wordpress-7.1.tar.gz) = 4bb95bddeb0d30778b9d744e42f7e21507ed3070fda3e34dd41918073618181e350cf77ea8dfaacc48c59a00f50273b4a1b7a6e4c43d2a81ccfd35f27df342bc diff --git a/wordpress-5.8-noupdate.patch b/wordpress-7.1-noupdate.patch similarity index 56% rename from wordpress-5.8-noupdate.patch rename to wordpress-7.1-noupdate.patch index 39dbb92..d327e71 100644 --- a/wordpress-5.8-noupdate.patch +++ b/wordpress-7.1-noupdate.patch @@ -1,7 +1,7 @@ -diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php ---- wordpress/wp-admin/includes/admin-filters.php.noupdate 2021-07-21 13:55:03.381224813 +0200 -+++ wordpress/wp-admin/includes/admin-filters.php 2021-07-21 13:55:11.920208285 +0200 -@@ -113,7 +113,6 @@ add_action( 'personal_options_update', ' +diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/includes/admin-filters.php +--- wordpress/wp-admin/includes/admin-filters.php.orig 2026-03-09 00:49:37.395081000 +0100 ++++ wordpress/wp-admin/includes/admin-filters.php 2026-08-25 07:30:05.010828032 +0200 +@@ -130,7 +130,6 @@ add_action( 'personal_options_update', ' add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called. add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called. @@ -9,10 +9,10 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-adm add_action( 'admin_notices', 'deactivated_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_plugins_notice', 5 ); add_action( 'admin_notices', 'paused_themes_notice', 5 ); -diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noupdate wordpress/wp-admin/includes/class-core-upgrader.php ---- wordpress/wp-admin/includes/class-core-upgrader.php.noupdate 2021-06-19 23:37:57.000000000 +0200 -+++ wordpress/wp-admin/includes/class-core-upgrader.php 2021-07-21 13:55:03.381224813 +0200 -@@ -271,6 +271,9 @@ class Core_Upgrader extends WP_Upgrader +diff -up wordpress/wp-admin/includes/class-core-upgrader.php.orig wordpress/wp-admin/includes/class-core-upgrader.php +--- wordpress/wp-admin/includes/class-core-upgrader.php.orig 2026-02-13 19:34:41.944764000 +0100 ++++ wordpress/wp-admin/includes/class-core-upgrader.php 2026-08-25 07:30:05.010951923 +0200 +@@ -277,6 +277,9 @@ class Core_Upgrader extends WP_Upgrader * @return bool True if we should update to the offered version, otherwise false. */ public static function should_update_to_version( $offered_ver ) { @@ -22,10 +22,10 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.noupdate wordpress/ require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z $current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version ), 0, 2 ) ); // x.y -diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate wordpress/wp-admin/includes/class-wp-automatic-updater.php ---- wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate 2021-04-16 14:01:15.000000000 +0200 -+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2021-07-21 13:55:03.381224813 +0200 -@@ -38,7 +38,7 @@ class WP_Automatic_Updater { +diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.orig wordpress/wp-admin/includes/class-wp-automatic-updater.php +--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.orig 2026-07-29 10:01:50.858475000 +0200 ++++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2026-08-25 07:30:05.011078018 +0200 +@@ -41,7 +41,7 @@ class WP_Automatic_Updater { } // More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters. @@ -34,10 +34,10 @@ diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.noupdate wor /** * Filters whether to entirely disable background updates. -diff -up wordpress/wp-admin/includes/file.php.noupdate wordpress/wp-admin/includes/file.php ---- wordpress/wp-admin/includes/file.php.noupdate 2021-05-24 21:24:57.000000000 +0200 -+++ wordpress/wp-admin/includes/file.php 2021-07-21 13:55:03.381224813 +0200 -@@ -1992,7 +1992,7 @@ function WP_Filesystem( $args = false, $ +diff -up wordpress/wp-admin/includes/file.php.orig wordpress/wp-admin/includes/file.php +--- wordpress/wp-admin/includes/file.php.orig 2026-07-29 10:01:50.858475000 +0200 ++++ wordpress/wp-admin/includes/file.php 2026-08-25 07:30:05.011274367 +0200 +@@ -2270,7 +2270,7 @@ function WP_Filesystem( $args = false, $ */ function get_filesystem_method( $args = array(), $context = '', $allow_relaxed_file_ownership = false ) { // Please ensure that this is either 'direct', 'ssh2', 'ftpext', or 'ftpsockets'. @@ -46,15 +46,15 @@ diff -up wordpress/wp-admin/includes/file.php.noupdate wordpress/wp-admin/includ if ( ! $context ) { $context = WP_CONTENT_DIR; -diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php ---- wordpress/wp-admin/includes/update.php.noupdate 2021-05-17 19:04:01.000000000 +0200 -+++ wordpress/wp-admin/includes/update.php 2021-07-21 13:55:03.381224813 +0200 -@@ -341,12 +341,7 @@ function update_right_now_message() { +diff -up wordpress/wp-admin/includes/update.php.orig wordpress/wp-admin/includes/update.php +--- wordpress/wp-admin/includes/update.php.orig 2026-07-30 16:55:49.613388000 +0200 ++++ wordpress/wp-admin/includes/update.php 2026-08-25 07:31:37.114050011 +0200 +@@ -382,12 +382,7 @@ function update_right_now_message() { $cur = get_preferred_from_update_core(); if ( isset( $cur->response ) && 'upgrade' === $cur->response ) { - $msg .= sprintf( -- '%s ', +- '%s', - network_admin_url( 'update-core.php' ), - /* translators: %s: WordPress version number, or 'Latest' string. */ - sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) @@ -63,10 +63,10 @@ diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/incl } } -diff -up wordpress/wp-includes/load.php.noupdate wordpress/wp-includes/load.php ---- wordpress/wp-includes/load.php.noupdate 2021-06-23 21:05:57.000000000 +0200 -+++ wordpress/wp-includes/load.php 2021-07-21 13:55:03.381224813 +0200 -@@ -1579,7 +1579,7 @@ function wp_is_file_mod_allowed( $contex +diff -up wordpress/wp-includes/load.php.orig wordpress/wp-includes/load.php +--- wordpress/wp-includes/load.php.orig 2026-08-07 21:13:51.810460000 +0200 ++++ wordpress/wp-includes/load.php 2026-08-25 07:30:05.011640399 +0200 +@@ -1835,7 +1835,7 @@ function wp_is_file_mod_allowed( $contex * @param bool $file_mod_allowed Whether file modifications are allowed. * @param string $context The usage context. */ @@ -75,10 +75,10 @@ diff -up wordpress/wp-includes/load.php.noupdate wordpress/wp-includes/load.php } /** -diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php ---- wordpress/wp-includes/update.php.noupdate 2021-05-17 19:04:01.000000000 +0200 -+++ wordpress/wp-includes/update.php 2021-07-21 13:55:03.381224813 +0200 -@@ -926,10 +926,6 @@ function _maybe_update_themes() { +diff -up wordpress/wp-includes/update.php.orig wordpress/wp-includes/update.php +--- wordpress/wp-includes/update.php.orig 2026-07-06 23:09:52.376708000 +0200 ++++ wordpress/wp-includes/update.php 2026-08-25 07:30:05.011769619 +0200 +@@ -1087,10 +1087,6 @@ function _maybe_update_themes() { * @since 3.1.0 */ function wp_schedule_update_checks() { diff --git a/wordpress-7.0-remove-jshint-refs.patch b/wordpress-7.1-remove-jshint-refs.patch similarity index 65% rename from wordpress-7.0-remove-jshint-refs.patch rename to wordpress-7.1-remove-jshint-refs.patch index a96ced6..61d3b6b 100644 --- a/wordpress-7.0-remove-jshint-refs.patch +++ b/wordpress-7.1-remove-jshint-refs.patch @@ -1,11 +1,11 @@ -diff -up wordpress/wp-includes/script-loader.php.old wordpress/wp-includes/script-loader.php ---- wordpress/wp-includes/script-loader.php.old 2026-05-26 07:16:50.150861636 +0200 -+++ wordpress/wp-includes/script-loader.php 2026-05-26 07:16:52.778780477 +0200 -@@ -1202,7 +1202,6 @@ function wp_default_scripts( $scripts ) +diff -up wordpress/wp-includes/script-loader.php.orig wordpress/wp-includes/script-loader.php +--- wordpress/wp-includes/script-loader.php.orig 2026-08-25 07:26:03.212320361 +0200 ++++ wordpress/wp-includes/script-loader.php 2026-08-25 07:26:08.488274508 +0200 +@@ -1205,7 +1205,6 @@ function wp_default_scripts( $scripts ) $scripts->add( 'wp-codemirror', '/wp-includes/js/codemirror/codemirror.min.js', array(), '5.65.20' ); $scripts->add( 'csslint', '/wp-includes/js/codemirror/csslint.js', array(), '1.0.5' ); $scripts->add( 'esprima', '/wp-includes/js/codemirror/esprima.js', array(), '4.0.1' ); // Deprecated. - $scripts->add( 'jshint', '/wp-includes/js/codemirror/fakejshint.js', array( 'esprima' ), '2.9.5' ); // Deprecated. $scripts->add( 'jsonlint', '/wp-includes/js/codemirror/jsonlint.js', array(), '1.6.3' ); - $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '1.8.0' ); + $scripts->add( 'htmlhint', '/wp-includes/js/codemirror/htmlhint.js', array(), '1.9.2' ); $scripts->add( 'htmlhint-kses', '/wp-includes/js/codemirror/htmlhint-kses.js', array( 'htmlhint' ) ); diff --git a/wordpress.spec b/wordpress.spec index 3ca3e42..e2d9f03 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -7,7 +7,7 @@ # %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 7.0.4 +%global upstream_version 7.1 #global upstream_prever RC5 #global upstream_lower rc5 @@ -47,9 +47,9 @@ Patch5: wordpress-5.4-config.patch # disable version check and updated # change DISALLOW_FILE_MODS default value to true # ignore WP_AUTO_UPDATE_CORE (always false) -Patch6: wordpress-5.8-noupdate.patch +Patch6: wordpress-7.1-noupdate.patch # Debian patch for jshint -Patch8: wordpress-7.0-remove-jshint-refs.patch +Patch8: wordpress-7.1-remove-jshint-refs.patch BuildArch: noarch @@ -96,7 +96,7 @@ Provides: bundled(php-simplepie) = 1.9.0 # grep ' VERSION ' wordpress/wp-includes/ID3/getid3.php Provides: bundled(php-getid3) = 1.9.25 # grep ' VERSION ' wordpress/wp-includes/PHPMailer/PHPMailer.php -Provides: bundled(php-phpmailer) = 7.0.2 +Provides: bundled(php-phpmailer) = 7.1.1 Provides: wordpress-mu = %{version}-%{release} Obsoletes: wordpress-mu < 2.9.3 @@ -245,6 +245,9 @@ end %changelog +* Tue Aug 25 2026 Remi Collet -7.1-1 +- WordPress 7.1 “Mary Lou” + * Thu Aug 13 2026 Remi Collet -7.0.4-1 - WordPress 7.0.4 Release