[arch-commits] Commit in wordpress/repos/community-any (5 files)

[Alexander Rødseth]

    Date: Sunday, April 5, 2020 @ 15:38:44
  Author: arodseth
Revision: 611864

archrelease: copy trunk to community-any

Added:
  wordpress/repos/community-any/PKGBUILD
    (from rev 611863, wordpress/trunk/PKGBUILD)
  wordpress/repos/community-any/wordpress.install
    (from rev 611863, wordpress/trunk/wordpress.install)
Deleted:
  wordpress/repos/community-any/PKGBUILD
  wordpress/repos/community-any/password_reset_exploit.patch
  wordpress/repos/community-any/wordpress.install

------------------------------+
 PKGBUILD                     |   65 ++++++++++++++++++-----------------------
 password_reset_exploit.patch |   31 -------------------
 wordpress.install            |   42 +++++++++++++-------------
 3 files changed, 50 insertions(+), 88 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-05 15:38:37 UTC (rev 611863)
+++ PKGBUILD	2020-04-05 15:38:44 UTC (rev 611864)
@@ -1,36 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Thomas Dziedzic <gostrc at gmail.com>
-# Contributor: Jose Valecillos <valecillosjg at gmail.com>
-# Contributor: Kaos <gianlucaatlas at gmail.com>
-# Contributor: Christopher Rogers <slaxemulator at gmail.com>
-
-pkgname=wordpress
-pkgver=5.3.2
-pkgrel=1
-pkgdesc='Blog tool and publishing platform'
-arch=(any)
-url='https://wordpress.org/'
-license=(GPL)
-depends=(php)
-optdepends=('nginx: Web server for serving WordPress'
-            'apache: Web server for serving WordPress'
-            'mariadb: Database server')
-options=(emptydirs)
-install=$pkgname.install
-source=("https://wordpress.org/$pkgname-$pkgver.tar.gz"
-        password_reset_exploit.patch)
-sha256sums=('e186687e82a154da187dce888c016284e2afe9eb3088e3f365db811e06910167'
-            '84c716953fb1aad583bfe62c2aba88173b760c60a90f6752228d4ba966e647b9')
-
-prepare() {
-  cd $pkgname
-  patch -p1 -i "$srcdir/password_reset_exploit.patch"
-}
-
-package() {
-  install -d "$pkgdir/usr/share/webapps"
-  cp -r $pkgname "$pkgdir/usr/share/webapps"
-}
-
-# getver: core.trac.wordpress.org/timeline?milestone=on
-# vim: ts=2 sw=2 et:

Copied: wordpress/repos/community-any/PKGBUILD (from rev 611863, wordpress/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-05 15:38:44 UTC (rev 611864)
@@ -0,0 +1,29 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: Jose Valecillos <valecillosjg at gmail.com>
+# Contributor: Kaos <gianlucaatlas at gmail.com>
+# Contributor: Christopher Rogers <slaxemulator at gmail.com>
+
+pkgname=wordpress
+pkgver=5.4
+pkgrel=1
+pkgdesc='Blog tool and publishing platform'
+arch=(any)
+url='https://wordpress.org/'
+license=(GPL)
+depends=(php)
+optdepends=('nginx: Web server for serving WordPress'
+            'apache: Web server for serving WordPress'
+            'mariadb: Database server')
+options=(emptydirs)
+install=$pkgname.install
+source=("https://wordpress.org/$pkgname-$pkgver.tar.gz")
+sha256sums=('39c326170d0e18ea6daac4d3082574d2ae66cbdbc0a0b34b3e286693f27af283')
+
+package() {
+  install -d "$pkgdir/usr/share/webapps"
+  cp -r $pkgname "$pkgdir/usr/share/webapps"
+}
+
+# getver: core.trac.wordpress.org/timeline?milestone=on
+# vim: ts=2 sw=2 et:

Deleted: password_reset_exploit.patch
===================================================================
--- password_reset_exploit.patch	2020-04-05 15:38:37 UTC (rev 611863)
+++ password_reset_exploit.patch	2020-04-05 15:38:44 UTC (rev 611864)
@@ -1,31 +0,0 @@
---- a/wp-includes/pluggable.php	2017-05-07 15:19:40.838218673 +0200
-+++ b/wp-includes/pluggable.php	2017-05-07 15:25:35.661548515 +0200
-@@ -328,14 +328,20 @@
- 		 * https://core.trac.wordpress.org/ticket/5007.
- 		 */
- 
--		if ( ! isset( $from_email ) ) {
--			// Get the site domain and get rid of www.
--			$sitename = strtolower( $_SERVER['SERVER_NAME'] );
--			if ( substr( $sitename, 0, 4 ) == 'www.' ) {
--				$sitename = substr( $sitename, 4 );
--			}
--
--			$from_email = 'wordpress@' . $sitename;
-+		// Thanks simlevesque @ https://news.ycombinator.com/item?id=14265092
-+		if ( !isset( $from_email ) ) {
-+				// Get the site domain and get rid of www.
-+				$sitename = strtolower( WP_HOME );
-+				if ( substr( $sitename, 0, 7 ) == 'http://' ) {
-+						$sitename = substr( $sitename, 7 );
-+				}
-+				if ( substr( $sitename, 0, 8 ) == 'https://' ) {
-+						$sitename = substr( $sitename, 8 );
-+				}
-+				if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-+						$sitename = substr( $sitename, 4 );
-+				}
-+				$from_email = 'wordpress@' . $sitename;
- 		}
- 
- 		/**

Deleted: wordpress.install
===================================================================
--- wordpress.install	2020-04-05 15:38:37 UTC (rev 611863)
+++ wordpress.install	2020-04-05 15:38:44 UTC (rev 611864)
@@ -1,21 +0,0 @@
-post_install() {
-  # Make uploads work
-  install -dm775 /usr/share/webapps/wordpress/wp-content/uploads
-  chown http:http /usr/share/webapps/wordpress/wp-content/uploads
-  echo 'You can now configure your (PHP compatible) web server to run WordPress'
-}
-
-pre_remove() {
-  cp -r /usr/share/webapps/wordpress /usr/share/webapps/wordpress_backup
-  echo 'Your WordPress folder was backed up to /usr/share/webapps/wordpress_backup'
-}
-
-post_remove() {
-  rm -rf /usr/share/webapps/wordpress
-}
-
-post_upgrade() {
-  echo 'WordPress was placed in /usr/share/webapps'
-}
-
-# vim: ts=2 sw=2 et:

Copied: wordpress/repos/community-any/wordpress.install (from rev 611863, wordpress/trunk/wordpress.install)
===================================================================
--- wordpress.install	                        (rev 0)
+++ wordpress.install	2020-04-05 15:38:44 UTC (rev 611864)
@@ -0,0 +1,21 @@
+post_install() {
+  # Make uploads work
+  install -dm775 /usr/share/webapps/wordpress/wp-content/uploads
+  chown http:http /usr/share/webapps/wordpress/wp-content/uploads
+  echo 'You can now configure your (PHP compatible) web server to run WordPress'
+}
+
+pre_remove() {
+  cp -r /usr/share/webapps/wordpress /usr/share/webapps/wordpress_backup
+  echo 'Your WordPress folder was backed up to /usr/share/webapps/wordpress_backup'
+}
+
+post_remove() {
+  rm -rf /usr/share/webapps/wordpress
+}
+
+post_upgrade() {
+  echo 'WordPress was placed in /usr/share/webapps'
+}
+
+# vim: ts=2 sw=2 et: