From e3b3a79838fe6d4095542390445c1721a089c556 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Feb 2019 15:22:08 +0100 Subject: [PATCH 01/11] =?UTF-8?q?WordPress=205.1=20=E2=80=9CBetty=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit ef3a22d1f44d723ba6e3ef11174995aaf2f52f0b) (cherry picked from commit 50ad660690ec8ef886f5c0fd63b37edec95ca5e3) --- .gitignore | 10 ---- sources | 2 +- strip.sh | 33 ----------- wordpress-4.4-systemlibs.patch | 20 ------- wordpress-4.9-tinymce_noflash.patch | 36 ------------ wordpress-4.9.4-remove-jshint-refs.patch | 19 ------- ...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-remove-jshint-refs.patch | 11 ++++ wordpress-5.1-systemlibs.patch | 21 +++++++ wordpress-5.1-tinymce_noflash.patch | 35 ++++++++++++ wordpress.spec | 25 ++++---- 13 files changed, 123 insertions(+), 172 deletions(-) delete mode 100755 strip.sh delete mode 100644 wordpress-4.4-systemlibs.patch delete mode 100644 wordpress-4.9-tinymce_noflash.patch delete mode 100644 wordpress-4.9.4-remove-jshint-refs.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-remove-jshint-refs.patch create mode 100644 wordpress-5.1-systemlibs.patch create mode 100644 wordpress-5.1-tinymce_noflash.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 94297ed..8312a1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.0.3-strip.tar.xz) = 1091f6607ca1eb93873b918ff0212824174330bd4d775f2a34480a79dc5cd3e7788f245e9fc27f365f6e54b48255e97c66463bd7589608edcae61e2eb85fbe6f +SHA512 (wordpress-5.1.tar.gz) = e8504be918add0533a99f62e967e2c86afce0c28ae474cace5e4c44f66e8a71394eed7bc6f1e3108734e4410849b28d1da6c545c05a24025067a1321a8fa9a99 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.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-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-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-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 eb0649b..253c2b5 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -14,25 +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 -Group: Applications/Publishing +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) @@ -41,26 +39,26 @@ 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 +Patch8: wordpress-5.1-remove-jshint-refs.patch BuildArch: noarch @@ -273,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” + * Fri Jan 11 2019 Remi Collet - 5.0.3-1 - WordPress 5.0.3 Maintenance Release From 8b92e78659f2b10d280de539211fd26512e9c2e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2019 07:07:17 +0100 Subject: [PATCH 02/11] WordPress 5.1.1 Security and Maintenance Release (cherry picked from commit 6c6cc5b0b5b9e467b73939c210c985ac4833eb7f) --- 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 253c2b5..5933880 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 7c135ae8ec7a13b20d0ae2656ad844c9273148f7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 09:23:40 +0100 Subject: [PATCH 03/11] fix wp-tinymce.js.gz is empty #1691524 (cherry picked from commit a036eddc5f684fcd9481aaffcac531f87f37c141) --- wordpress.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 5933880..2767060 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 88dce03bdcb661dd95051b8558cfd9d09e0affd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 09:55:59 +0100 Subject: [PATCH 04/11] fix wp-tinymce.js is missing, wp-tinymce.js.gz is empty #1691524 (cherry picked from commit 56508b8b2164d451e77216c9f3df6e3dedf29ff8) --- wordpress.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index 2767060..3da0318 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 dec03d96ab4c62b9ce5e0ef8f988560e0c571328 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 10:03:35 +0100 Subject: [PATCH 05/11] also add wp-tinymce.js.gz --- wordpress.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wordpress.spec b/wordpress.spec index 3da0318..fa3cd63 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 4d8368f7e213b898397de278f1971204743a0438 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2019 10:06:22 +0100 Subject: [PATCH 06/11] bump release (cherry picked from commit 6005fbcc0c00bf44e541381f9c8d369cb9fce540) --- wordpress.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wordpress.spec b/wordpress.spec index fa3cd63..4299222 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 82fd1aebce7ffc8fa6bba63f578f23141fde556e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 8 May 2019 08:02:53 +0200 Subject: [PATCH 07/11] Merge branch 'master' into f30 (cherry picked from commit 0eb9555b8249802cf287110f70f4ece01d900eb3) --- sources | 2 +- ...s_hello.patch => wordpress-5.2-hello.patch | 12 ++--- ...date.patch => wordpress-5.2-noupdate.patch | 32 +++++++------- wordpress.spec | 44 +++++++++++++++---- 4 files changed, 58 insertions(+), 32 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..86563e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-5.1.1.tar.gz) = 0b06630c894c535b24787cda0ee9c8bc8eab54fe6f6523fd78da55cb00ea9b9404454d51a3b9b77c72fb5ebc94d36719be50785fd82ff3311ca1df9b8fd980c9 +SHA512 (wordpress-5.2.tar.gz) = 741699a26b956b9d80505954f38e95b9f6328f892efb957d584ba6b669ae28d9a9e63249b72cc7a677cb4ae1008e0545f846492636e7e10442593be2054be824 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 4299222..8215fc0 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -13,15 +13,20 @@ %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 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} -Release: 4%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} +Release: 1%{?dist} License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz @@ -34,7 +39,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 +59,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 +69,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.20 +%endif %if %{with_nginx} Requires: webserver @@ -72,9 +82,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.20 %endif Requires: php-simplepie >= 1.3.1 Requires: php-getid3 @@ -127,6 +142,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 +296,10 @@ 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” +- 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 e0c63a9f4da688adba52e13bee01a2ee1242f513 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 May 2019 07:08:21 +0200 Subject: [PATCH 08/11] WordPress 5.2.1 Maintenance Release (cherry picked from commit a0e7b400871d5534742b739022623de1c1d0589f) --- 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 8215fc0..a580409 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” - raise dependency on PHP 7.2 From 72b2e5d759afcd166c8514799cc588b1d85cf2e6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Jun 2019 07:31:16 +0200 Subject: [PATCH 09/11] WordPress 5.2.2 Maintenance Release (cherry picked from commit 2a36e4d145dcd76a019416839c6b2f01e1e7d967) --- 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 a580409..2d7f6d3 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” - raise dependency on PHP 7.2 From 343a11f999f72f80f715bbaca65092df1d0da32c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Sep 2019 07:53:49 +0200 Subject: [PATCH 10/11] WordPress 5.2.3 Security and Maintenance Release (cherry picked from commit f98a471d2b00cbfa4c9d35d9bcd7b4ed32be772a) (cherry picked from commit 1d3cec1c8f67f86583619bf0423dc499466f8e39) --- sources | 2 +- wordpress.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 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 2d7f6d3..e1893f0 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 @@ -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 + * Wed Jun 19 2019 Remi Collet - 5.2.2-1 - WordPress 5.2.2 Maintenance Release From 7d8c5d433aecfbe944bccd74ba0ff5d5b3ddfe89 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Oct 2019 08:00:07 +0200 Subject: [PATCH 11/11] WordPress 5.2.4 Security Release (cherry picked from commit dce3e0cbdce3abc5127b5bf9cac5bc57f49940b5) --- 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 e1893f0..a2d2aef 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