[PR PATCH] phpMyAdmin: fix license and update

[PR PATCH] phpMyAdmin: fix license and update

[kawaiiamber]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

There is a new pull request by kawaiiamber against master on the void-packages repository

https://github.com/kawaiiamber/void-packages phpMyAdmin
https://github.com/void-linux/void-packages/pull/27913

phpMyAdmin: fix license and update
Closes [this](https://github.com/void-linux/void-packages/issues/27798), also update to 5.0.4

A patch file from https://github.com/void-linux/void-packages/pull/27913.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phpMyAdmin-27913.patch --]
[-- Type: text/x-diff, Size: 1210 bytes --]

From c51ad8303a629636d2f028b0704dbcb0d36b9746 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 13 Jan 2021 21:17:58 -0700
Subject: [PATCH] phpMyAdmin: fix license and update

---
 srcpkgs/phpMyAdmin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 12cb1d5e4c4..cc5414316a2 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,16 +1,16 @@
 # Template file for 'phpMyAdmin'
 pkgname=phpMyAdmin
-version=5.0.2
+version=5.0.4
 revision=2
 wrksrc="phpMyAdmin-${version}-all-languages"
 conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
 depends="php mysql"
 short_desc="Web interface for MySQL and MariaDB"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
 homepage="https://www.phpmyadmin.net"
 distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=cbcc78d1499308d9329950fcba2ebaa84c559a934fe54efc027d459d8e4161c8
+checksum=1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db
 
 do_install() {
 	vmkdir usr/share/webapps/

Re: [PR REVIEW] phpMyAdmin: fix license and update

[abenson]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/27913#discussion_r557396290

Comment:
Reset `revision` to 1

Re: phpMyAdmin: fix license and update

[abenson]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/27913#issuecomment-760200135

Comment:
change commit message to `phpMyAdmin: update to 5.0.4, fix license`

Re: [PR PATCH] [Updated] phpMyAdmin: fix license and update

[kawaiiamber]

[-- Attachment #1: Type: text/plain, Size: 428 bytes --]

There is an updated pull request by kawaiiamber against master on the void-packages repository

https://github.com/kawaiiamber/void-packages phpMyAdmin
https://github.com/void-linux/void-packages/pull/27913

phpMyAdmin: fix license and update
Closes [this](https://github.com/void-linux/void-packages/issues/27798), also update to 5.0.4

A patch file from https://github.com/void-linux/void-packages/pull/27913.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-phpMyAdmin-27913.patch --]
[-- Type: text/x-diff, Size: 1230 bytes --]

From 4015bf5d80621f2e6ce18adc2b575537a3b7ec0d Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Wed, 13 Jan 2021 21:17:58 -0700
Subject: [PATCH] phpMyAdmin: update to 5.0.4, fix license

---
 srcpkgs/phpMyAdmin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/phpMyAdmin/template b/srcpkgs/phpMyAdmin/template
index 12cb1d5e4c4..a55d2b5dfe2 100644
--- a/srcpkgs/phpMyAdmin/template
+++ b/srcpkgs/phpMyAdmin/template
@@ -1,16 +1,16 @@
 # Template file for 'phpMyAdmin'
 pkgname=phpMyAdmin
-version=5.0.2
-revision=2
+version=5.0.4
+revision=1
 wrksrc="phpMyAdmin-${version}-all-languages"
 conf_files="/etc/webapps/phpMyAdmin/config.inc.php"
 depends="php mysql"
 short_desc="Web interface for MySQL and MariaDB"
 maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-only"
 homepage="https://www.phpmyadmin.net"
 distfiles="https://files.phpmyadmin.net/phpMyAdmin/${version}/phpMyAdmin-${version}-all-languages.tar.xz"
-checksum=cbcc78d1499308d9329950fcba2ebaa84c559a934fe54efc027d459d8e4161c8
+checksum=1578c1a08e594da4f4f62e676ccbdbd17784c3de769b094ba42c35bf05c057db
 
 do_install() {
 	vmkdir usr/share/webapps/

Re: [PR REVIEW] phpMyAdmin: fix license and update

[kawaiiamber]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27913#discussion_r557574288

Comment:
Done

Re: phpMyAdmin: fix license and update

[kawaiiamber]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New comment by kawaiiamber on void-packages repository

https://github.com/void-linux/void-packages/pull/27913#issuecomment-760351624

Comment:
> change commit message to `phpMyAdmin: update to 5.0.4, fix license`

Done

Re: [PR PATCH] [Merged]: phpMyAdmin: update to 5.0.4, fix license

[abenson]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

There's a merged pull request on the void-packages repository

phpMyAdmin: update to 5.0.4, fix license
https://github.com/void-linux/void-packages/pull/27913

Description:
Closes [this](https://github.com/void-linux/void-packages/issues/27798).