Change FS_METHOD default to 'direct' to allow enabling FILE_MODS #1889644

2020-10-20 15:12:45 +02:00 · 2020-10-20 15:12:45 +02:00 · e2320b2e46
commit e2320b2e46
parent 5cfa351092
3 changed files with 47 additions and 29 deletions
--- 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' ) ) {
--- 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() {
--- 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 <remi@remirepo.net> - 5.5.1-2
+- Change FS_METHOD default to 'direct' to allow enabling FILE_MODS #1889644
+
 * Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 5.5.1-1
 - WordPress 5.5.1 Maintenance Release