composer.json

@@ -35,7 +35,7 @@
         "oomphinc/composer-installers-extender": "2.0.1",
         "cweagans/composer-patches": "1.7.2",
         "koodimonni/composer-dropin-installer": "1.4",
-        "johnpbloch/wordpress": "5.9.3",
+        "johnpbloch/wordpress": "6.0.0",
         "bjornjohansen/wplang": "0.2.0",
         "wpackagist-plugin/disable-wordpress-updates": "1.7.0",
         "wpackagist-plugin/more-privacy-options": "4.6",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "409f86536284f24ffc215244a36f8f8e",
+    "content-hash": "dcb36406f23f358d11c76a284da96787",
     "packages": [
         {
             "name": "bjornjohansen/wplang",
@@ -250,20 +250,20 @@
         },
         {
             "name": "johnpbloch/wordpress",
-            "version": "5.9.3",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/johnpbloch/wordpress.git",
-                "reference": "8d0788bd5553c897b12bbf0e122c2fc5c4129914"
+                "reference": "2432ce687e68c3df7de16920d467761b241e20cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/8d0788bd5553c897b12bbf0e122c2fc5c4129914",
-                "reference": "8d0788bd5553c897b12bbf0e122c2fc5c4129914",
+                "url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/2432ce687e68c3df7de16920d467761b241e20cf",
+                "reference": "2432ce687e68c3df7de16920d467761b241e20cf",
                 "shasum": ""
             },
             "require": {
-                "johnpbloch/wordpress-core": "5.9.3",
+                "johnpbloch/wordpress-core": "6.0.0",
                 "johnpbloch/wordpress-core-installer": "^1.0 || ^2.0",
                 "php": ">=5.6.20"
             },
@@ -292,20 +292,20 @@
                 "issues": "https://core.trac.wordpress.org/",
                 "source": "https://core.trac.wordpress.org/browser"
             },
-            "time": "2022-04-05T19:23:54+00:00"
+            "time": "2022-05-24T19:10:15+00:00"
         },
         {
             "name": "johnpbloch/wordpress-core",
-            "version": "5.9.3",
+            "version": "6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/johnpbloch/wordpress-core.git",
-                "reference": "455d38c7b7bcdce3e0a1c6108eccca8de1860361"
+                "reference": "90d8de3a682f2ed93ebe8cf99bec8fb297d43967"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/455d38c7b7bcdce3e0a1c6108eccca8de1860361",
-                "reference": "455d38c7b7bcdce3e0a1c6108eccca8de1860361",
+                "url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/90d8de3a682f2ed93ebe8cf99bec8fb297d43967",
+                "reference": "90d8de3a682f2ed93ebe8cf99bec8fb297d43967",
                 "shasum": ""
             },
             "require": {
@@ -313,7 +313,7 @@
                 "php": ">=5.6.20"
             },
             "provide": {
-                "wordpress/core-implementation": "5.9.3"
+                "wordpress/core-implementation": "6.0.0"
             },
             "type": "wordpress-core",
             "notification-url": "https://packagist.org/downloads/",
@@ -340,7 +340,7 @@
                 "source": "https://core.trac.wordpress.org/browser",
                 "wiki": "https://codex.wordpress.org/"
             },
-            "time": "2022-04-05T19:23:48+00:00"
+            "time": "2022-05-24T19:10:11+00:00"
         },
         {
             "name": "johnpbloch/wordpress-core-installer",

patches/core/anonymize-update.php.patch

-Combines old patches to update.php
-* 0101-Do-not-leak-how-many-users-blogs-there-are-to-api.wo.patch
-* 0102-anonymize-user-agent-and-don-t-send-some-headers-whe.patch
-* 0153-do-not-use-fake-wordpress-version.patch
-
---- wp-includes/update.php	2021-02-21 19:16:27.926182327 -0800
-+++ wp-includes/update.php	2021-02-21 19:10:04.860633838 -0800
-@@ -93,15 +93,15 @@
- 	}
+--- wp-includes/update.php	2022-05-24 20:10:11.000000000 +0100
++++ wp-includes/update.php	2022-05-27 07:54:42.729857342 +0100
+@@ -91,12 +91,12 @@
  
  	$query = array(
--		'version'            => $wp_version,
+ 		'version'            => $wp_version,
 -		'php'                => $php_version,
 -		'locale'             => $locale,
 -		'mysql'              => $mysql_version,
--		'local_package'      => isset( $wp_local_package ) ? $wp_local_package : '',
++		'php'                => 'N/A',
++		'locale'             => 'C',
++		'mysql'              => 'N/A',
+ 		'local_package'      => isset( $wp_local_package ) ? $wp_local_package : '',
 -		'blogs'              => $num_blogs,
--		'users'              => $user_count,
--		'multisite_enabled'  => $multisite_enabled,
--		'initial_db_version' => get_site_option( 'initial_db_version' ),
-+		'version'           => $wp_version,
-+		'php'               => 'N/A',
-+		'locale'            => 'C',
-+		'mysql'             => 'N/A',
-+		'local_package'     => isset( $wp_local_package ) ? $wp_local_package : '',
-+		'blogs'             => 31337,
-+		'users'             => 31337,
-+		'multisite_enabled' => 0,
-+                'initial_db_version' => 31337
+-		'users'              => get_user_count(),
++		'blogs'              => 31337,
++		'users'              => 31337,
+ 		'multisite_enabled'  => $multisite_enabled,
+ 		'initial_db_version' => get_site_option( 'initial_db_version' ),
  	);
- 
- 	/**
-@@ -152,13 +152,9 @@
- 	$doing_cron = wp_doing_cron();
+@@ -152,11 +152,7 @@
  
  	$options = array(
--		'timeout'    => $doing_cron ? 30 : 3,
+ 		'timeout'    => $doing_cron ? 30 : 3,
 -		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
 -		'headers'    => array(
 -			'wp_install' => $wp_install,
 -			'wp_blog'    => home_url( '/' ),
 -		),
--		'body'       => $post_body,
-+               'timeout' => $doing_cron ? 30 : 3,
-+		'user-agent' => 'WordPress/' . $wp_version . ';  http://wordpress.org',
-+		'body' => $post_body,
++		'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org',
+ 		'body'       => $post_body,
  	);
  
- 	$response = wp_remote_post( $url, $options );
-@@ -381,7 +377,7 @@
+@@ -383,7 +379,7 @@
  			'locale'       => wp_json_encode( $locales ),
  			'all'          => wp_json_encode( true ),
  		),
 -		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-+		'user-agent' => 'WordPress/' . $wp_version . ';  http://wordpress.org'
++		'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org',
  	);
  
  	if ( $extra_stats ) {
-@@ -585,7 +581,7 @@
+@@ -663,7 +659,7 @@
  			'translations' => wp_json_encode( $translations ),
  			'locale'       => wp_json_encode( $locales ),
  		),
 -		'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
-+		'user-agent' => 'WordPress/' . $wp_version . ';  http://wordpress.org'
++		'user-agent' => 'WordPress/' . $wp_version . '; https://wordpress.org',
  	);
  
  	if ( $extra_stats ) {