Package: php-horde-compress
Version: 2.2.1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/tests_dont_rely_on_directory_order.patch: don't rely
on directory order. Thanks to Remi Collet <r...@remirepo.net>.
Thanks for considering the patch.
*** /tmp/tmp8z9ngU/php-horde-compress_2.2.1-1ubuntu1.debdiff
diff -Nru php-horde-compress-2.2.1/debian/patches/series
php-horde-compress-2.2.1/debian/patches/series
--- php-horde-compress-2.2.1/debian/patches/series 1969-12-31
16:00:00.000000000 -0800
+++ php-horde-compress-2.2.1/debian/patches/series 2018-02-02
12:50:44.000000000 -0800
@@ -0,0 +1 @@
+tests_dont_rely_on_directory_order.patch
diff -Nru
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
---
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
1969-12-31 16:00:00.000000000 -0800
+++
php-horde-compress-2.2.1/debian/patches/tests_dont_rely_on_directory_order.patch
2018-02-02 12:53:41.000000000 -0800
@@ -0,0 +1,29 @@
+Description: don't rely on directory order
+Author: Remi Collet <r...@remirepo.net>
+Origin: upstream,
https://github.com/horde/Compress/commit/795f908809c4181b7d267bc9df3682e3b4ed45d0.patch
+Last-Update: 2018-02-02
+
+---
php-horde-compress-2.2.1.orig/Horde_Compress-2.2.1/test/Horde/Compress/TarTest.php
++++
php-horde-compress-2.2.1/Horde_Compress-2.2.1/test/Horde/Compress/TarTest.php
+@@ -111,6 +111,9 @@ class Horde_Compress_TarTest extends Hor
+ $this->assertNotEmpty($tar_data);
+
+ $list = $compress->decompress($tar_data);
++ usort($list, function ($a, $b) {
++ return strcmp($a['name'], $b['name']);
++ });
+ $this->assertCount(3, $list);
+ $this->assertEquals('one.txt', $list[0]['name']);
+ $this->assertEquals(4, $list[0]['size']);
+---
php-horde-compress-2.2.1.orig/Horde_Compress-2.2.1/test/Horde/Compress/ZipTest.php
++++
php-horde-compress-2.2.1/Horde_Compress-2.2.1/test/Horde/Compress/ZipTest.php
+@@ -142,6 +142,9 @@ class Horde_Compress_ZipTest extends Hor
+ $list = $compress->decompress(
+ $zip_data, array('action' => Horde_Compress_Zip::ZIP_LIST)
+ );
++ usort($list, function ($a, $b) {
++ return strcmp($a['name'], $b['name']);
++ });
+ $this->assertCount(3, $list);
+ $this->assertEquals('one.txt', $list[0]['name']);
+ $this->assertEquals(4, $list[0]['size']);
-- System Information:
Debian Release: buster/sid
APT prefers bionic
APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
--
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd
