From 1751452fa4741b969b0c58bcafa6914b879edcff Mon Sep 17 00:00:00 2001 From: Daniel Lewart Date: Tue, 31 Oct 2023 02:03:50 -0500 Subject: [PATCH 1/6] Fix two Lintian errors in generated Debian package --- utils/wp-cli-updatedeb.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/wp-cli-updatedeb.sh b/utils/wp-cli-updatedeb.sh index 9b1ab9d5..ab9c613e 100755 --- a/utils/wp-cli-updatedeb.sh +++ b/utils/wp-cli-updatedeb.sh @@ -3,8 +3,8 @@ # Package wp-cli to be installed in Debian-compatible systems. # Only the phar file is included. # -# VERSION :0.2.5 -# DATE :2023-07-22 +# VERSION :0.2.6 +# DATE :2023-10-31 # AUTHOR :Viktor Szépe # LICENSE :The MIT License (MIT) # URL :https://github.com/wp-cli/wp-cli/tree/main/utils @@ -31,8 +31,8 @@ Architecture: all Maintainer: Alain Schlesser Section: php Priority: optional -Depends: php5-cli (>= 5.6) | php-cli | php7-cli, php5-mysql | php5-mysqlnd | php7.0-mysql | php7.1-mysql | php7.2-mysql | php7.3-mysql | php7.4-mysql | php8.0-mysql | php8.1-mysql | php8.2-mysql | php-mysql, mysql-client | mariadb-client -Homepage: http://wp-cli.org/ +Depends: php-cli, php-mysqlnd, default-mysql-client | virtual-mysql-client +Homepage: https://wp-cli.org/ Description: wp-cli is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite installations and much more, without using a web browser. @@ -116,4 +116,4 @@ lintian --display-info --display-experimental --pedantic --show-overrides php-wp # optional steps echo "sign it: dpkg-sig -k SIGNING-KEY -s builder \"${WPCLI_PKG}\"" echo "include in your repo: pushd /var/www/REPO-DIR" -echo " reprepro includedeb jessie \"${WPCLI_PKG}\" && popd" +echo " reprepro includedeb bookworm \"${WPCLI_PKG}\" && popd" From cd2da484b78c8fd9de303a1157461b39dafb1996 Mon Sep 17 00:00:00 2001 From: Daniel Lewart Date: Mon, 6 Nov 2023 04:46:43 -0600 Subject: [PATCH 2/6] Depends: prefer generic php-mysql to php-mysqlnd --- utils/wp-cli-updatedeb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/wp-cli-updatedeb.sh b/utils/wp-cli-updatedeb.sh index ab9c613e..b3acec27 100755 --- a/utils/wp-cli-updatedeb.sh +++ b/utils/wp-cli-updatedeb.sh @@ -31,7 +31,7 @@ Architecture: all Maintainer: Alain Schlesser Section: php Priority: optional -Depends: php-cli, php-mysqlnd, default-mysql-client | virtual-mysql-client +Depends: php-cli, php-mysql | php-mysqlnd, default-mysql-client | virtual-mysql-client Homepage: https://wp-cli.org/ Description: wp-cli is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite From 54056c0c454cdd5d95809673845e44b7be780cbd Mon Sep 17 00:00:00 2001 From: Daniel Lewart Date: Mon, 6 Nov 2023 11:34:44 -0600 Subject: [PATCH 3/6] Restore PHP 5.6 support --- utils/wp-cli-updatedeb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/wp-cli-updatedeb.sh b/utils/wp-cli-updatedeb.sh index b3acec27..4565c1e7 100755 --- a/utils/wp-cli-updatedeb.sh +++ b/utils/wp-cli-updatedeb.sh @@ -31,7 +31,7 @@ Architecture: all Maintainer: Alain Schlesser Section: php Priority: optional -Depends: php-cli, php-mysql | php-mysqlnd, default-mysql-client | virtual-mysql-client +Depends: php-cli | php5-cli (>= 5.6), php-mysql | php-mysqlnd | php5-mysql, default-mysql-client | virtual-mysql-client Homepage: https://wp-cli.org/ Description: wp-cli is a set of command-line tools for managing WordPress installations. You can update plugins, set up multisite From bbc405d080c3a181ecd48875b9225879ea92aa11 Mon Sep 17 00:00:00 2001 From: Daniel Lewart Date: Mon, 6 Nov 2023 22:50:00 -0600 Subject: [PATCH 4/6] Create php-wpcli Lintian override file --- utils/wp-cli-updatedeb.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/utils/wp-cli-updatedeb.sh b/utils/wp-cli-updatedeb.sh index 4565c1e7..3d3be7b5 100755 --- a/utils/wp-cli-updatedeb.sh +++ b/utils/wp-cli-updatedeb.sh @@ -4,7 +4,7 @@ # Only the phar file is included. # # VERSION :0.2.6 -# DATE :2023-10-31 +# DATE :2023-11-06 # AUTHOR :Viktor Szépe # LICENSE :The MIT License (MIT) # URL :https://github.com/wp-cli/wp-cli/tree/main/utils @@ -89,6 +89,17 @@ echo "Current version: ${WPCLI_VER}" # update version sed -i -e "s/^Version: .*$/Version: ${WPCLI_VER}/" DEBIAN/control || die 6 "Version update failure" +# Lintian overrides (delete this stanza 2024-08-08) +if [[ "$(date +%F)" < 2024-08-08 ]]; then + if ! [ -r usr/share/lintian/overrides/php-wpcli ]; then + mkdir -p usr/share/lintian/overrides + cat > usr/share/lintian/overrides/php-wpcli < /dev/null From 51513a178a139e522aeb0b30cc9c9c86390068e1 Mon Sep 17 00:00:00 2001 From: Daniel Lewart Date: Fri, 10 Nov 2023 02:20:00 -0600 Subject: [PATCH 5/6] Remove hardcoded date for when WP-CLI drops PHP 5.6 support --- utils/wp-cli-updatedeb.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/utils/wp-cli-updatedeb.sh b/utils/wp-cli-updatedeb.sh index 3d3be7b5..9c956c28 100755 --- a/utils/wp-cli-updatedeb.sh +++ b/utils/wp-cli-updatedeb.sh @@ -4,7 +4,7 @@ # Only the phar file is included. # # VERSION :0.2.6 -# DATE :2023-11-06 +# DATE :2023-11-10 # AUTHOR :Viktor Szépe # LICENSE :The MIT License (MIT) # URL :https://github.com/wp-cli/wp-cli/tree/main/utils @@ -89,15 +89,13 @@ echo "Current version: ${WPCLI_VER}" # update version sed -i -e "s/^Version: .*$/Version: ${WPCLI_VER}/" DEBIAN/control || die 6 "Version update failure" -# Lintian overrides (delete this stanza 2024-08-08) -if [[ "$(date +%F)" < 2024-08-08 ]]; then - if ! [ -r usr/share/lintian/overrides/php-wpcli ]; then - mkdir -p usr/share/lintian/overrides - cat > usr/share/lintian/overrides/php-wpcli < usr/share/lintian/overrides/php-wpcli < Date: Wed, 7 Feb 2024 05:20:26 -0600 Subject: [PATCH 6/6] Update utils/wp-cli-updatedeb.sh Co-authored-by: Alain Schlesser --- utils/wp-cli-updatedeb.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/wp-cli-updatedeb.sh b/utils/wp-cli-updatedeb.sh index 9c956c28..1152ebdc 100755 --- a/utils/wp-cli-updatedeb.sh +++ b/utils/wp-cli-updatedeb.sh @@ -89,11 +89,11 @@ echo "Current version: ${WPCLI_VER}" # update version sed -i -e "s/^Version: .*$/Version: ${WPCLI_VER}/" DEBIAN/control || die 6 "Version update failure" -# Lintian overrides (delete this stanza for WP-CLI Aug 2024 release) +# Lintian overrides (delete this stanza for WP-CLI release that bumps PHP minimum) if ! [ -r usr/share/lintian/overrides/php-wpcli ]; then mkdir -p usr/share/lintian/overrides cat > usr/share/lintian/overrides/php-wpcli <