Bug#990904: unblock: php-horde-imap-client/2.30.1-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package php-horde-imap-client
I am unsure if php-horde-imap-client 2.30.1-4 will migrated just because
of succeeded autopktests, so filing an unblock bug anyway.
[ Reason ]
Upstream provided two patches recently:
+ * d/patches:
+ + Add 0001_fix-remove-redundant-array_diff.patch, Prevent unwanted
+ removal of mails.
-> Must have for bullseye.
+ + Add 0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch. Prepare for PHP 8.x.
-> People have started used php 8.0 already on buster (from
https://packages.sury.org/php/), more will follow for bullseye, although
php7.4 will be the default for bullseye. So, fixing things for PHP 8.0
is probably nice to have if fixed by a simple change.
[ Impact ]
Esp. the unwanted mail removal might hit users of php-horde from Debian.
[ Tests ]
autopkgtests, manual runtime test
[ Risks ]
Breakage of php-horde (all maintained by me) which would need a follow-up upload.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
None.
unblock php-horde-imap-client/2.30.1-4
diff -Nru php-horde-imap-client-2.30.1/debian/changelog php-horde-imap-client-2.30.1/debian/changelog
--- php-horde-imap-client-2.30.1/debian/changelog 2020-09-12 21:52:01.000000000 +0200
+++ php-horde-imap-client-2.30.1/debian/changelog 2021-07-05 14:12:17.000000000 +0200
@@ -1,3 +1,11 @@
+php-horde-imap-client (2.30.1-4) unstable; urgency=medium
+
+ * d/patches: Add 0001_fix-remove-redundant-array_diff.patch,
+ 0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch. Prevent unwanted
+ removal of mails. Prepare for PHP 8.x.
+
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 05 Jul 2021 14:12:17 +0200
+
php-horde-imap-client (2.30.1-3) unstable; urgency=medium
* d/t/control: Add Ds: php-horde-hashtable, php-horde-pack.
diff -Nru php-horde-imap-client-2.30.1/debian/patches/0001_fix-remove-redundant-array_diff.patch php-horde-imap-client-2.30.1/debian/patches/0001_fix-remove-redundant-array_diff.patch
--- php-horde-imap-client-2.30.1/debian/patches/0001_fix-remove-redundant-array_diff.patch 1970-01-01 01:00:00.000000000 +0100
+++ php-horde-imap-client-2.30.1/debian/patches/0001_fix-remove-redundant-array_diff.patch 2021-07-05 14:12:17.000000000 +0200
@@ -0,0 +1,29 @@
+From 65d4fbb528f152383e101d6eb8f6138500798d05 Mon Sep 17 00:00:00 2001
+From: Silvio Zimmer <silvio.zimmer@die-kinderwelt.com>
+Date: Tue, 23 Mar 2021 10:58:52 +0100
+Subject: [PATCH] fix: remove redundant array_diff
+
+Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+---
+ Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Base.php | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Base.php b/Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Base.php
+index 6d596992..2e2c02fe 100644
+--- a/Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Base.php
++++ b/Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Base.php
+@@ -3993,9 +3993,8 @@ implements Serializable, SplObserver
+ $vanished = $this->vanished($this->_selected, $modseq, array(
+ 'ids' => $uids_ob
+ ));
+- $disappear = array_diff($uids_ob->ids, $vanished->ids);
+- if (!empty($disappear)) {
+- $this->_deleteMsgs($this->_selected, $this->getIdsOb($disappear));
++ if (!empty($vanished->ids)) {
++ $this->_deleteMsgs($this->_selected, $this->getIdsOb($vanished->ids));
+ }
+
+ $mbox_ob->sync = true;
+--
+2.30.2
+
diff -Nru php-horde-imap-client-2.30.1/debian/patches/0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch php-horde-imap-client-2.30.1/debian/patches/0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch
--- php-horde-imap-client-2.30.1/debian/patches/0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch 1970-01-01 01:00:00.000000000 +0100
+++ php-horde-imap-client-2.30.1/debian/patches/0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch 2021-07-05 14:12:17.000000000 +0200
@@ -0,0 +1,21 @@
+From 71e977fc3cd7c57ccf5ba6052f680325cb2b7980 Mon Sep 17 00:00:00 2001
+From: Ralf Becker <rb@egroupware.org>
+Date: Sat, 12 Jun 2021 13:14:08 -0400
+Subject: [PATCH] Fix removing FETCH query labels in PHP 8
+
+Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+---
+ lib/Horde/Imap/Client/Socket.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Socket.php
++++ b/Horde_Imap_Client-2.30.1/lib/Horde/Imap/Client/Socket.php
+@@ -2952,7 +2952,7 @@
+ case Horde_Imap_Client::FETCH_BODYPART:
+ case Horde_Imap_Client::FETCH_HEADERS:
+ foreach ($c_val as $key => $val) {
+- $cmd = ($key == 0)
++ $cmd = ((int)$key == 0)
+ ? ''
+ : $key . '.';
+ $main_cmd = 'BODY';
diff -Nru php-horde-imap-client-2.30.1/debian/patches/series php-horde-imap-client-2.30.1/debian/patches/series
--- php-horde-imap-client-2.30.1/debian/patches/series 2020-09-12 21:52:01.000000000 +0200
+++ php-horde-imap-client-2.30.1/debian/patches/series 2021-07-05 14:12:17.000000000 +0200
@@ -1,2 +1,4 @@
1010_phpunit-8.x+9.x.patch
2001_no-IMAP+POP3-live-tests-during-Debian-builds.patch
+0001_fix-remove-redundant-array_diff.patch
+0002_Fix-removing-FETCH-query-labels-in-PHP-8.patch
Reply to: