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