From eb44a44fecae61fe07d87978c521196af5b98b8b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Dec 2018 14:14:59 +0100 Subject: [PATCH 001/111] =?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 002/111] 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 003/111] 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 004/111] 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 005/111] 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 006/111] - 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 007/111] 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 008/111] =?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 009/111] 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 010/111] 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 011/111] 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 012/111] 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 013/111] 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 014/111] 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 015/111] 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 016/111] 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 017/111] 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 018/111] =?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 019/111] 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 020/111] 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 021/111] - 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 022/111] 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 023/111] 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 024/111] =?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 025/111] 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 026/111] 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 027/111] - 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 028/111] 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 029/111] 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 030/111] =?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 031/111] 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 032/111] 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 033/111] - 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 034/111] =?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 035/111] 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 036/111] 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 037/111] 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 038/111] 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 039/111] =?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 040/111] - 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 041/111] 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 042/111] 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 043/111] =?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 044/111] 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 045/111] 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 046/111] 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 047/111] - 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 048/111] 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 049/111] 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 050/111] 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 051/111] 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 052/111] - 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 053/111] 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 054/111] 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 055/111] 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 056/111] 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 057/111] 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 058/111] 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 059/111] =?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 060/111] 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 061/111] 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 062/111] 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 063/111] 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 064/111] =?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 065/111] 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 066/111] 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 067/111] =?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 068/111] 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 069/111] 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 070/111] 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 071/111] 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 072/111] 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 073/111] =?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 074/111] * 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 075/111] =?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 076/111] =?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 077/111] 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 078/111] 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 079/111] 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 080/111] 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 081/111] =?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 082/111] 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 083/111] 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 084/111] 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 085/111] 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 086/111] =?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 087/111] 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 088/111] 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 089/111] 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 090/111] =?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 091/111] 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 092/111] 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 093/111] 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 094/111] =?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 095/111] 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 096/111] 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 097/111] 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 098/111] 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 099/111] 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 100/111] =?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 101/111] 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 102/111] 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 103/111] 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 104/111] 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 105/111] 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 106/111] 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 107/111] 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 108/111] 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 109/111] 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 110/111] 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 111/111] 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