Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: php-net-ldap2

php-net-ldap2 (2.2.0-3ubuntu3) focal; urgency=medium * d/p/phpunit8.5_compatibility.patch: fix test issues with phpunit 8.5 -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 03 Mar 2020 15:38:30 +0100 php-net-ldap2 (2.2.0-3ubuntu2) cosmic; urgency=medium * debian/patches/phpunit7-compatibility.patch: assertTrue returns void. -- Iain Lane <iain@orangesquash.org.uk> Wed, 08 Aug 2018 11:00:25 +0100 php-net-ldap2 (2.2.0-3ubuntu1) bionic; urgency=medium * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has namespaced classes. -- Nishanth Aravamudan <nish.aravamudan@canonical.com> Wed, 14 Feb 2018 13:06:16 -0800

Modifications :
  1. Download patch debian/tests/control

    --- 2.2.0-3/debian/tests/control 2016-06-24 06:23:45.000000000 +0000 +++ 2.2.0-3ubuntu3/debian/tests/control 2018-08-08 09:49:10.000000000 +0000 @@ -1,2 +1,2 @@ Test-Command: phpunit Net_LDAP2-*/tests -Depends: @, phpunit +Depends: @, phpunit (>= 7)
  2. Download patch debian/patches/phpunit6_compatibility.patch

    --- 2.2.0-3/debian/patches/phpunit6_compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.0-3ubuntu3/debian/patches/phpunit6_compatibility.patch 2018-02-14 21:06:09.000000000 +0000 @@ -0,0 +1,79 @@ +Description: PHPUnit 6 has namespaced classes +Author: Nishanth Aravamudan <nish.aravamudan@canonical.com> +Forwarded: Will be done by Nishanth Aravamudan +Last-Update: 2018-02-14 + +--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php ++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php +@@ -24,8 +24,8 @@ class Net_LDAP2_EntryTest extends Net_LD + public static function main() { + require_once "PHPUnit/TextUI/TestRunner.php"; + +- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_EntryTest"); +- $result = PHPUnit_TextUI_TestRunner::run($suite); ++ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_EntryTest"); ++ $result = PHPUnit\TextUI\TestRunner::run($suite); + } + + /** +--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php ++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php +@@ -21,8 +21,8 @@ class Net_LDAP2_FilterTest extends Net_L + public static function main() { + require_once "PHPUnit/TextUI/TestRunner.php"; + +- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_FilterTest"); +- $result = PHPUnit_TextUI_TestRunner::run($suite); ++ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_FilterTest"); ++ $result = PHPUnit\TextUI\TestRunner::run($suite); + } + + /** +--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php ++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php +@@ -91,8 +91,8 @@ class Net_LDAP2_LDIFTest extends Net_LDA + public static function main() { + require_once "PHPUnit/TextUI/TestRunner.php"; + +- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_LDIFTest"); +- $result = PHPUnit_TextUI_TestRunner::run($suite); ++ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_LDIFTest"); ++ $result = PHPUnit\TextUI\TestRunner::run($suite); + } + + /** +--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php ++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php +@@ -16,8 +16,8 @@ class Net_LDAP2_RootDSETest extends Net_ + public static function main() { + require_once "PHPUnit/TextUI/TestRunner.php"; + +- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_RootDSETest"); +- $result = PHPUnit_TextUI_TestRunner::run($suite); ++ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_RootDSETest"); ++ $result = PHPUnit\TextUI\TestRunner::run($suite); + } + + /** +--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php ++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php +@@ -1,5 +1,5 @@ + <?php +-class Net_LDAP2_TestBase extends PHPUnit_Framework_TestCase ++class Net_LDAP2_TestBase extends PHPUnit\Framework\TestCase + { + public static function assertTrue($condition, $msg = null) + { +--- php-net-ldap2-2.2.0.orig/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php ++++ php-net-ldap2-2.2.0/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php +@@ -16,8 +16,8 @@ class Net_LDAP2_UtilTest extends Net_LDA + public static function main() { + require_once "PHPUnit/TextUI/TestRunner.php"; + +- $suite = new PHPUnit_Framework_TestSuite("Net_LDAP2_UtilTest"); +- $result = PHPUnit_TextUI_TestRunner::run($suite); ++ $suite = new PHPUnit\Framework\TestSuite("Net_LDAP2_UtilTest"); ++ $result = PHPUnit\TextUI\TestRunner::run($suite); + } + + /**
  3. Download patch debian/patches/phpunit7-compatibility.patch

    --- 2.2.0-3/debian/patches/phpunit7-compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.0-3ubuntu3/debian/patches/phpunit7-compatibility.patch 2018-08-08 09:49:28.000000000 +0000 @@ -0,0 +1,23 @@ +Description: With phpunit7, $msg needs to be a string and the function needs to return void +Author: Iain Lane <iain.lane@canonical.com> +Forwarded: not-needed (upstream is dead) + +Index: b/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php +=================================================================== +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php +@@ -1,12 +1,12 @@ + <?php + class Net_LDAP2_TestBase extends PHPUnit\Framework\TestCase + { +- public static function assertTrue($condition, $msg = null) ++ public static function assertTrue($condition, $msg = ''): void + { + if ($condition instanceof Net_LDAP2_Error) { + self::fail('Error: ' . $condition->getMessage()); + } +- return parent::assertTrue($condition, $msg); ++ parent::assertTrue($condition, $msg); + } + } + ?>
  4. Download patch debian/control

    --- 2.2.0-3/debian/control 2016-06-24 06:35:00.000000000 +0000 +++ 2.2.0-3ubuntu3/debian/control 2018-08-08 09:48:29.000000000 +0000 @@ -1,12 +1,13 @@ Source: php-net-ldap2 Section: php Priority: optional -Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org> Uploaders: Benoit Mortier <benoit.mortier@opensides.be>, Prach Pongpanich <prach@debian.org> Build-Depends: debhelper (>= 9), php-pear (>= 1.10.1), - phpunit, + phpunit (>= 7), pkg-php-tools (>= 1.32) Standards-Version: 3.9.8 Homepage: http://pear.php.net/package/Net_LDAP2/
  5. Download patch debian/patches/phpunit8.5_compatibility.patch

    --- 2.2.0-3/debian/patches/phpunit8.5_compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.0-3ubuntu3/debian/patches/phpunit8.5_compatibility.patch 2020-03-03 14:38:30.000000000 +0000 @@ -0,0 +1,153 @@ +Description: follow phpunit to use explicit return types + phpunit when going from 7.x to 8.5 will now break with an issue like + HTTP_Request2_Adapter_CommonNetworkTest::setUp() must be compatible with + PHPUnit\Framework\TestCase::setUp(): void in .../CommonNetworkTest.php + This is due to + https://github.com/sebastianbergmann/phpunit/commit/f5e5add13e7 + and explained here + https://github.com/sebastianbergmann/phpunit/issues/3288 + https://phpunit.de/announcements/phpunit-7.html +Forwarded: no +X-Not-Forwarded-Reason: upstream seems dead +Author: Christian Ehrhardt <christian.ehrhardt@canonical.com> +Last-Update: 2020-03-03 +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php +@@ -18,7 +18,7 @@ class Net_LDAP2Test extends Net_LDAP2_Te + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->ldapcfg = $this->getTestConfig(); + } + +@@ -28,7 +28,7 @@ class Net_LDAP2Test extends Net_LDAP2_Te + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php +@@ -34,7 +34,7 @@ class Net_LDAP2_EntryTest extends Net_LD + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->ldapcfg = $this->getTestConfig(); + } + +@@ -44,7 +44,7 @@ class Net_LDAP2_EntryTest extends Net_LD + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php +@@ -31,7 +31,7 @@ class Net_LDAP2_FilterTest extends Net_L + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + } + + /** +@@ -40,7 +40,7 @@ class Net_LDAP2_FilterTest extends Net_L + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php +@@ -100,7 +100,7 @@ class Net_LDAP2_LDIFTest extends Net_LDA + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + // initialize test entries + $this->testentries = array(); + foreach ($this->testentries_data as $dn => $attrs) { +@@ -120,7 +120,7 @@ class Net_LDAP2_LDIFTest extends Net_LDA + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + // uncomment this if you debug the test cases so you will have output available + if (file_exists($this->outfile)) @unlink($this->outfile); + } +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php +@@ -26,7 +26,7 @@ class Net_LDAP2_RootDSETest extends Net_ + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->markTestIncomplete('Test not implemented yet.'); + } + +@@ -36,7 +36,7 @@ class Net_LDAP2_RootDSETest extends Net_ + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /** +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php +@@ -19,7 +19,7 @@ class Net_LDAP2_SearchTest extends Net_L + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + $this->ldapcfg = $this->getTestConfig(); + } + +@@ -29,7 +29,7 @@ class Net_LDAP2_SearchTest extends Net_L + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown():void { + } + + /** +--- a/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php ++++ b/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php +@@ -26,7 +26,7 @@ class Net_LDAP2_UtilTest extends Net_LDA + * + * @access protected + */ +- protected function setUp() { ++ protected function setUp(): void { + } + + /** +@@ -35,7 +35,7 @@ class Net_LDAP2_UtilTest extends Net_LDA + * + * @access protected + */ +- protected function tearDown() { ++ protected function tearDown(): void { + } + + /**
  6. Download patch debian/patches/series

    --- 2.2.0-3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.0-3ubuntu3/debian/patches/series 2020-03-03 14:30:12.000000000 +0000 @@ -0,0 +1,3 @@ +phpunit6_compatibility.patch +phpunit7-compatibility.patch +phpunit8.5_compatibility.patch

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: phpunit

phpunit (8.5.2-1ubuntu1) focal; urgency=medium * d/p/0003-Default-cache-location-to-current-directory.patch: cherry-pick from Debian VCS 4e3d1bb to change default cache location to the current directory. This stops phpunit failing by default when it tries to write to /usr/bin to fix autopkgtests of reverse dependencies. Closes: #951258. Thanks to Andrius Merkys. -- Robie Basak <robie.basak@ubuntu.com> Wed, 04 Mar 2020 08:18:26 +0000

Modifications :
  1. Download patch debian/control

    --- 8.5.2-1/debian/control 2020-01-09 12:07:53.000000000 +0000 +++ 8.5.2-1ubuntu1/debian/control 2020-03-03 12:24:09.000000000 +0000 @@ -1,7 +1,8 @@ Source: phpunit Section: php Priority: optional -Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org> Uploaders: Prach Pongpanich <prach@debian.org>, David Prévot <taffit@debian.org> Build-Depends: debhelper-compat (= 12),
  2. Download patch debian/patches/0003-Default-cache-location-to-current-directory.patch

    --- 8.5.2-1/debian/patches/0003-Default-cache-location-to-current-directory.patch 1970-01-01 00:00:00.000000000 +0000 +++ 8.5.2-1ubuntu1/debian/patches/0003-Default-cache-location-to-current-directory.patch 2020-03-04 08:18:15.000000000 +0000 @@ -0,0 +1,22 @@ +From: Andrius Merkys <merkys@debian.org> +Date: Sun, 16 Feb 2020 10:37:31 +0200 +Subject: Default cache location to current directory + +Bug-Debian: https://bugs.debian.org/951258 +Origin: vendor, https://salsa.debian.org/php-team/pear/phpunit/-/commit/4e3d1bb78a4da170467ebcb6a3c19e97e1d2220a +Last-Update: 2020-03-04 +--- + src/TextUI/TestRunner.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/TextUI/TestRunner.php ++++ b/src/TextUI/TestRunner.php +@@ -157,7 +157,7 @@ + if (isset($arguments['configuration']) && $arguments['configuration'] instanceof Configuration) { + $cacheLocation = $arguments['configuration']->getFilename(); + } else { +- $cacheLocation = $_SERVER['PHP_SELF']; ++ $cacheLocation = \getcwd() . \DIRECTORY_SEPARATOR . 'cache'; /* get around \dirname(...) */ + } + + $arguments['cacheResultFile'] = null;
  3. Download patch debian/patches/series

    --- 8.5.2-1/debian/patches/series 2020-01-09 12:07:44.000000000 +0000 +++ 8.5.2-1ubuntu1/debian/patches/series 2020-03-03 12:20:07.000000000 +0000 @@ -1,2 +1,3 @@ 0001-Remove-Composer-autoload.patch 0002-phpunit.xsd-is-installed-in-usr-share-php-PHPUnit.patch +0003-Default-cache-location-to-current-directory.patch
  1. php-net-ldap2
  2. phpunit