From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 07412159C96 for ; Sat, 27 Jul 2024 12:09:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DAEA2BC037; Sat, 27 Jul 2024 12:09:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2BC372BC037 for ; Sat, 27 Jul 2024 12:09:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AE2133EB78 for ; Sat, 27 Jul 2024 12:09:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D52351D88 for ; Sat, 27 Jul 2024 12:09:50 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1722082155.a4f7145c4c1f2c2c9910a3fc847cbfd84362f42c.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/drush/, app-admin/drush/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/drush/drush-6.7.0-r7.ebuild app-admin/drush/drush-6.7.0-r8.ebuild app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch X-VCS-Directories: app-admin/drush/ app-admin/drush/files/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: a4f7145c4c1f2c2c9910a3fc847cbfd84362f42c X-VCS-Branch: master Date: Sat, 27 Jul 2024 12:09:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b6e830b-ed07-4214-9cb9-8ac33045c3ab X-Archives-Hash: 71f512eec5c694ec19a32a06d8efc161 commit: a4f7145c4c1f2c2c9910a3fc847cbfd84362f42c Author: Michael Orlitzky gentoo org> AuthorDate: Sat Jul 27 11:55:49 2024 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Sat Jul 27 12:09:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f7145c app-admin/drush: add another compatibility patch Signed-off-by: Michael Orlitzky gentoo.org> ...drush-6.7.0-r7.ebuild => drush-6.7.0-r8.ebuild} | 1 + .../drush/files/drush-6.7.0-sql-dollar-sign.patch | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/app-admin/drush/drush-6.7.0-r7.ebuild b/app-admin/drush/drush-6.7.0-r8.ebuild similarity index 97% rename from app-admin/drush/drush-6.7.0-r7.ebuild rename to app-admin/drush/drush-6.7.0-r8.ebuild index 1329345e4dc0..2768a8302b65 100644 --- a/app-admin/drush/drush-6.7.0-r7.ebuild +++ b/app-admin/drush/drush-6.7.0-r8.ebuild @@ -23,6 +23,7 @@ PATCHES=( "${FILESDIR}/${P}-gzip-mime.patch" "${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch" "${FILESDIR}/${P}-batch-signature-fix-r1.patch" + "${FILESDIR}/${P}-sql-dollar-sign.patch" ) src_prepare() { diff --git a/app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch b/app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch new file mode 100644 index 000000000000..9d6b37274a75 --- /dev/null +++ b/app-admin/drush/files/drush-6.7.0-sql-dollar-sign.patch @@ -0,0 +1,26 @@ +From ed5365ba0e6021d2dfbfe9b31bfd641d718eb978 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Sat, 27 Jul 2024 07:52:15 -0400 +Subject: [PATCH 1/1] commands/sql/sql.drush.inc: ${var} -> {$var} + +This fixes a deprecation warning with newer PHPs. +--- + commands/sql/sql.drush.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/commands/sql/sql.drush.inc b/commands/sql/sql.drush.inc +index 6d7a4aa..fcf2654 100644 +--- a/commands/sql/sql.drush.inc ++++ b/commands/sql/sql.drush.inc +@@ -1414,7 +1414,7 @@ function drush_sql_format_oracle($query) { + $sqlp_settings = implode("\n", $settings)."\n"; + + // important for sqlplus to exit correctly +- return "${sqlp_settings}${query};\nexit;\n"; ++ return "{$sqlp_settings}{$query};\nexit;\n"; + } + + +-- +2.44.2 +