Merge ~athos-ribeiro/ubuntu/+source/civicrm:merge-lp1978501-kinetic into ubuntu/+source/civicrm:debian/sid

[Athos Ribeiro]

Merge for new civirm package.

I replaced the current delta in favor of the upstream change addressing the PSR transition.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1978501-merge-civicrm-kinetic/+packages

There is no DEP8 test suite for this package.

[Bryce Harrington (bryce)]

Looks good, thanks for updating to the newer patch.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Bryce!

Uploaded

$ dput ubuntu ../civicrm_5.50.1+dfsg1-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../civicrm_5.50.1+dfsg1-1ubuntu1_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../civicrm_5.50.1+dfsg1-1ubuntu1.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading civicrm_5.50.1+dfsg1-1ubuntu1.dsc: done.
  Uploading civicrm_5.50.1+dfsg1.orig-l10n.tar.xz: done.
  Uploading civicrm_5.50.1+dfsg1.orig-wordpress.tar.xz: done.
  Uploading civicrm_5.50.1+dfsg1.orig.tar.xz: done.
  Uploading civicrm_5.50.1+dfsg1-1ubuntu1.debian.tar.xz: done.
  Uploading civicrm_5.50.1+dfsg1-1ubuntu1_source.buildinfo: done.
  Uploading civicrm_5.50.1+dfsg1-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, bryce
Uploaders: athos-ribeiro, bryce
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 60c64ae..3064555 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+civicrm (5.50.1+dfsg1-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1978501).
+  * Dropped changes:
+    - d/p/use-php-psr-log-3.patch: use psr/log 3.
+      [ Drop in favor of upstream patch ]
+  * New changes:
+    - d/p/allow_psr_log_3.patch: allow psr/log up to version 3.
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 13 Jun 2022 17:51:09 -0300
+
 civicrm (5.50.1+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -9,6 +20,18 @@ civicrm (5.50.1+dfsg1-1) unstable; urgency=medium
 
  -- Dmitry Smirnov <[e-mail]>  Sat, 11 Jun 2022 13:34:01 +1000
 
+civicrm (5.33.2+dfsg1-1ubuntu1) jammy; urgency=medium
+
+  * d/p/use-php-psr-log-3.patch: use psr/log 3.
+
+ -- Athos Ribeiro <[e-mail]>  Mon, 04 Apr 2022 17:50:56 -0300
+
+civicrm (5.33.2+dfsg1-1build1) jammy; urgency=medium
+
+  * No change rebuild for symfony 5.4 and php-psr-log 3
+
+ -- Bryce Harrington <[e-mail]>  Fri, 25 Feb 2022 06:28:35 +0000
+
 civicrm (5.33.2+dfsg1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 54b34e4..461c71c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: civicrm
 Section: web
 Priority: optional
 Standards-Version: 4.6.1
-Maintainer: Dmitry Smirnov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Dmitry Smirnov <[e-mail]>
 Build-Depends: debhelper-compat (= 12)
     ,dh-linktree
     ,phpab
diff --git a/debian/patches/alllow_psr_log_3.patch b/debian/patches/alllow_psr_log_3.patch
new file mode 100644
index 0000000..f8b61fb
--- /dev/null
+++ b/debian/patches/alllow_psr_log_3.patch
@@ -0,0 +1,83 @@
+From ada741b8c7ccec08e2a89389a8bde651d62ea2a0 Mon Sep 17 00:00:00 2001
+From: demeritcowboy <[e-mail]>
+Date: Mon, 9 May 2022 08:39:44 -0400
+Subject: allow more log
+
+Last-Update: 2022-06-13
+Origin: upstream, https://github.com/civicrm/civicrm-core/commit/ada741b8c7ccec08e2a89389a8bde651d62ea2a0
+---
+ CRM/Core/Error/Log.php                | 2 +-
+ CRM/Utils/EchoLogger.php              | 2 +-
+ CRM/Utils/SystemLogger.php            | 2 +-
+ Civi/Api4/Action/System/RotateKey.php | 2 +-
+ composer.json                         | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CRM/Core/Error/Log.php b/CRM/Core/Error/Log.php
+index 9904045ad1..964c7ed0ac 100644
+--- a/CRM/Core/Error/Log.php
++++ b/CRM/Core/Error/Log.php
+@@ -52,7 +52,7 @@ class CRM_Core_Error_Log extends \Psr\Log\AbstractLogger {
+    * @param string $message
+    * @param array $context
+    */
+-  public function log($level, $message, array $context = []) {
++  public function log($level, $message, array $context = []): void {
+     // FIXME: This flattens a $context a bit prematurely. When integrating
+     // with external/CMS logs, we should pass through $context.
+     if (!empty($context)) {
+diff --git a/CRM/Utils/EchoLogger.php b/CRM/Utils/EchoLogger.php
+index c6db7c04b7..1bad4ae9ea 100644
+--- a/CRM/Utils/EchoLogger.php
++++ b/CRM/Utils/EchoLogger.php
+@@ -23,7 +23,7 @@ class CRM_Utils_EchoLogger extends Psr\Log\AbstractLogger implements \Psr\Log\Lo
+    * @param string $message
+    * @param array $context
+    */
+-  public function log($level, $message, array $context = []) {
++  public function log($level, $message, array $context = []): void {
+     echo $message . "\n";
+   }
+ 
+diff --git a/CRM/Utils/SystemLogger.php b/CRM/Utils/SystemLogger.php
+index eefdaffe5c..25d7356ae2 100644
+--- a/CRM/Utils/SystemLogger.php
++++ b/CRM/Utils/SystemLogger.php
+@@ -23,7 +23,7 @@ class CRM_Utils_SystemLogger extends Psr\Log\AbstractLogger implements \Psr\Log\
+    * @param string $message
+    * @param array $context
+    */
+-  public function log($level, $message, array $context = []) {
++  public function log($level, $message, array $context = []): void {
+     if (!isset($context['hostname'])) {
+       $context['hostname'] = CRM_Utils_System::ipAddress();
+     }
+diff --git a/Civi/Api4/Action/System/RotateKey.php b/Civi/Api4/Action/System/RotateKey.php
+index c904a2c0e4..7afc9b204e 100644
+--- a/Civi/Api4/Action/System/RotateKey.php
++++ b/Civi/Api4/Action/System/RotateKey.php
+@@ -60,7 +60,7 @@ class RotateKey extends AbstractAction {
+        * @param string $message
+        * @param array $context
+        */
+-      public function log($level, $message, array $context = []) {
++      public function log($level, $message, array $context = []): void {
+         $evalVar = function($m) use ($context) {
+           return $context[$m[1]] ?? '';
+         };
+diff --git a/composer.json b/composer.json
+index e2edf902b4..43f5f96eff 100644
+--- a/composer.json
++++ b/composer.json
+@@ -59,7 +59,7 @@
+     "symfony/filesystem": "~3.0 || ~4.4",
+     "symfony/process": "~3.0 || ~4.4",
+     "symfony/var-dumper": "~3.0 || ~4.4 || ~5.1",
+-    "psr/log": "~1.0",
++    "psr/log": "~1.0 || ~2.0 || ~3.0",
+     "symfony/finder": "~3.0 || ~4.4",
+     "tecnickcom/tcpdf" : "6.4.*",
+     "totten/ca-config": "~22.05",
+-- 
+2.36.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 6be9cc6..71ab7a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ GenericHookEvent_nowarning.patch
 PHP-HTMLPurifier.patch
 ##defaults.patch
 wordpress_preload.patch
+alllow_psr_log_3.patch