diff --git a/sources b/sources index 80ec3c6..692e00b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wordpress-7.1.tar.gz) = 4bb95bddeb0d30778b9d744e42f7e21507ed3070fda3e34dd41918073618181e350cf77ea8dfaacc48c59a00f50273b4a1b7a6e4c43d2a81ccfd35f27df342bc +SHA512 (wordpress-5.9.5.tar.gz) = 94583fafc75e674045ccbf1a9001bf5f0991146acc5c780bb103e1d7ac8e3b011c516b11029c9f891c2d534ad88a4788a6d9ae9752151c7a9d18ba7fef7cd785 diff --git a/wordpress-7.1-remove-jshint-refs.patch b/wordpress-5.1-remove-jshint-refs.patch similarity index 59% rename from wordpress-7.1-remove-jshint-refs.patch rename to wordpress-5.1-remove-jshint-refs.patch index 61d3b6b..fff7368 100644 --- a/wordpress-7.1-remove-jshint-refs.patch +++ b/wordpress-5.1-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 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' ); +--- 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.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.9.2' ); + $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-6.8-hello.patch b/wordpress-5.2-hello.patch similarity index 90% rename from wordpress-6.8-hello.patch rename to wordpress-5.2-hello.patch index 32bdca9..5ccc2f5 100644 --- a/wordpress-6.8-hello.patch +++ b/wordpress-5.2-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 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 @@ +--- 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 Plugin URI: http://wordpress.org/plugins/hello-dolly/ @@ -10,8 +10,7 @@ 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-5.4-no_swfupload.patch b/wordpress-5.4-no_swfupload.patch new file mode 100644 index 0000000..3683cb7 --- /dev/null +++ b/wordpress-5.4-no_swfupload.patch @@ -0,0 +1,16 @@ +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. +- $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 ); + + $scripts->add( 'json2', "/wp-includes/js/json2$suffix.js", array(), '2015-05-03' ); diff --git a/wordpress-7.1-noupdate.patch b/wordpress-5.8-noupdate.patch similarity index 56% rename from wordpress-7.1-noupdate.patch rename to wordpress-5.8-noupdate.patch index d327e71..39dbb92 100644 --- a/wordpress-7.1-noupdate.patch +++ b/wordpress-5.8-noupdate.patch @@ -1,7 +1,7 @@ -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', ' +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. @@ -9,10 +9,10 @@ diff -up wordpress/wp-admin/includes/admin-filters.php.orig wordpress/wp-admin/i 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.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 +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. */ public static function should_update_to_version( $offered_ver ) { @@ -22,10 +22,10 @@ diff -up wordpress/wp-admin/includes/class-core-upgrader.php.orig 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.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 { +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 { } // 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.orig wordpre /** * Filters whether to entirely disable background updates. -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, $ +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,15 +46,15 @@ diff -up wordpress/wp-admin/includes/file.php.orig wordpress/wp-admin/includes/f if ( ! $context ) { $context = WP_CONTENT_DIR; -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() { +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 ) { - $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.orig wordpress/wp-admin/includes } } -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 +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.orig wordpress/wp-includes/load.php } /** -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() { +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-5.9-systemlibs.patch b/wordpress-5.9-systemlibs.patch new file mode 100644 index 0000000..19c0507 --- /dev/null +++ b/wordpress-5.9-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 2022-01-26 09:56:17.799913105 +0100 ++++ wordpress/wp-admin/includes/media.php 2022-01-26 09:56:42.782804248 +0100 +@@ -3555,7 +3555,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(); +@@ -3669,7 +3669,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-httpd-conf b/wordpress-httpd-conf index dbefe97..3692823 100644 --- a/wordpress-httpd-conf +++ b/wordpress-httpd-conf @@ -5,19 +5,31 @@ 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 - Require all denied + Order Deny,Allow + Deny from all # Deny access to any php file in the akismet directory - Require all denied + Order Deny,Allow + Deny from all diff --git a/wordpress-move-wp-content.patch b/wordpress-move-wp-content.patch new file mode 100644 index 0000000..54eb921 --- /dev/null +++ b/wordpress-move-wp-content.patch @@ -0,0 +1,30 @@ +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 e2d9f03..376af3a 100644 --- a/wordpress.spec +++ b/wordpress.spec @@ -5,22 +5,24 @@ # # Please preserve changelog entries # +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} %global wp_content %{_datadir}/wordpress/wp-content -%global upstream_version 7.1 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 +%global with_nginx 1 +%else +%global with_nginx 0 +%endif +%global upstream_version 5.9.5 #global upstream_prever RC5 #global upstream_lower rc5 Summary: Blog tool and publishing platform -URL: https://wordpress.org/ +URL: http://www.wordpress.org Name: wordpress Version: %{upstream_version}%{?upstream_prever:~%upstream_lower} 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 +License: GPLv2 Source0: https://wordpress.org/%{name}-%{upstream_version}%{?upstream_prever:-%{upstream_prever}}.tar.gz Source1: wordpress-httpd-conf @@ -32,7 +34,12 @@ Source5: wordpress-minify.php # Patch out copyrighted text of Hello, Dolly # (and replace it with Free Software Song) -Patch0: wordpress-6.8-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 +# 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 # 'p.getParam("flash_video_player_url",u.convertUrl(u.url+"/moxieplayer.swf"))' # to 'false' @@ -47,9 +54,11 @@ 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-7.1-noupdate.patch +Patch6: wordpress-5.8-noupdate.patch +# Use system libraries +Patch7: wordpress-5.9-systemlibs.patch # Debian patch for jshint -Patch8: wordpress-7.1-remove-jshint-refs.patch +Patch8: wordpress-5.1-remove-jshint-refs.patch BuildArch: noarch @@ -57,50 +66,53 @@ 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-simplepie >= 1.3.1 +Requires: php-getid3 Requires: php-ctype Requires: php-filter 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 Requires: php-zlib +# Unbundled libraries +Requires: php-phpmailer6 Requires: httpd -# Unbundled -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.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.1.1 +Requires: ca-certificates 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. @@ -122,11 +134,15 @@ rm -rf wp-includes/random_compat # only for PHP < 7.2 without sodium_crypto_box rm -rf wp-includes/sodium_compat -%patch -P0 -p1 -b .dolly -%patch -P3 -p1 +%patch0 -p1 -b .dolly +#patch1 -p1 -b .rhbz522897 +%patch2 -p1 +%patch3 -p1 # Adjust mediaelement not to use its SWF -%patch -P4 -p1 -%patch -P8 -p1 +%patch4 -p1 +#rm wp-includes/js/mediaelement/media*swf +%patch7 -p1 +%patch8 -p1 # We patch .js files, so minify them php %{SOURCE5} \ @@ -160,17 +176,12 @@ fi # Create RPM configuration sed -e 's/\r//' wp-config-sample.php >wp-config.php -%patch -P5 -p1 -%patch -P6 -p1 +%patch5 -p1 +%patch6 -p1 # fix file encoding sed -i -e 's/\r//' license.txt -: Bundled library versions -grep ' VERSION ' wp-includes/SimplePie/src/SimplePie.php -grep ' VERSION ' wp-includes/ID3/getid3.php -grep ' VERSION ' wp-includes/PHPMailer/PHPMailer.php - %build @@ -178,7 +189,9 @@ 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 @@ -199,28 +212,48 @@ 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/ca-trust/extracted/pem/tls-ca-bundle.pem \ +ln -s %{_sysconfdir}/pki/tls/certs/ca-bundle.crt \ ${RPM_BUILD_ROOT}%{_datadir}/wordpress/wp-includes/certificates/ca-bundle.crt # Remove backup copies of patches 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 -%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 +#%%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 %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 @@ -245,159 +278,11 @@ end %changelog -* Tue Aug 25 2026 Remi Collet -7.1-1 -- WordPress 7.1 “Mary Lou” +* Tue Oct 18 2022 Remi Collet - 5.9.5-1 +- WordPress 5.9.5 Security Release -* 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 - -* 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 - -* 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” - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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” - -* 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 - -* 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 - -* 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 - -* 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” - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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” +* Thu Sep 8 2022 Remi Collet - 5.9.4-1 +- WordPress 5.9.4 Security Release * Wed Apr 6 2022 Remi Collet - 5.9.3-1 - WordPress 5.9.3 Maintenance Release @@ -411,15 +296,9 @@ end * 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 - * 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 - * Thu Nov 11 2021 Remi Collet - 5.8.2-1 - WordPress 5.8.2 Security and Maintenance Release