rpms/wordpress
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WordPress 5.3 “Kirk”

Browse source 
(cherry picked from commit 21ec765605)
This commit is contained in:
Remi Collet 2019-11-13 08:14:19 +01:00
commit f9fa40a52f
7 changed files with 95 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sources
View file

@ -1 +1 @@
SHA512 (wordpress-5.2.4.tar.gz) = eaf6e1555f13e4fe1f1a99691b271e658d9a83ab5fa7de1480987875565aab45d246bf8bb2e9828bd43979b96a0fb0db1ebf61c62c4967d9af08a370bef083e0
SHA512 (wordpress-5.3.tar.gz) = 90a0df8a2b965c06ac10ba0dd3521b98bbd6040780bd2ccfa14a445bd2cbdb1311277563dd30f5cdc918a4177ec7c49e89260d95309fb08e271173f242fcfc07

38
wordpress-4.9-mediaelement_no_swf.patch
View file

@ -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){

21
wordpress-5.1-systemlibs.patch
View file

@ -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 );

38
wordpress-5.3-mediaelement_no_swf.patch Normal file
View file

@ -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){

51
wordpress-5.2-noupdate.patch → wordpress-5.3-noupdate.patch
View file

@ -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 .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
- $msg .= sprintf(
- '<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
- 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() {

21
wordpress-5.3-systemlibs.patch Normal file
View file

@ -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();

11
wordpress.spec
View file

@ -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 <remi@remirepo.net> - 5.3-1
- WordPress 5.3 “Kirk”
* Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 5.2.4-1
- WordPress 5.2.4 Security Release