Your message dated Sat, 29 Jun 2024 10:47:46 +0000
with message-id <e1snvcq-002bq5...@coccia.debian.org>
and subject line Released with 11.10
has caused the Debian Bug report #1065076,
regarding bullseye-pu: package php-proxy-manager/2.11.1+1.0.3-1+deb11u1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1065076: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1065076
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: bullseye
X-Debbugs-Cc: php-proxy-mana...@packages.debian.org, t...@security.debian.org
Control: affects -1 + src:php-proxy-manager
User: release.debian....@packages.debian.org
Usertags: pu
[4/6 for bullseye]
This is a follow up from composer/DSA-5632-1, similar to #1065061 in
bookworm.
In order to fix a Debian-specific issue related to CVE-2024-24821, we
agreed with the security team to push related dependencies via the next
point release.
The only change (besides changelog entry) in the binary package is the
following (thanks to diffoscope).
│ │ ├── ./usr/share/php/ProxyManager/autoload.php
│ │ │ @@ -1,10 +1,10 @@
│ │ │ <?php
│ │ │
│ │ │ -require_once 'Laminas/Code/autoload.php';
│ │ │ +require_once __DIR__ . '/../Laminas/Code/autoload.php';
│ │ │
│ │ │ // @codingStandardsIgnoreFile
The goal is to ensure related dependencies are loaded from the system
path.
The attached debdiff is a bit bigger, since it aims at keeping the
testsuite at buildtime effective.
[ 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 (old)stable
[x] the issue is verified as fixed in unstable
TIA for considering.
Cheers,
taffit
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl
--- php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl 2021-01-27 20:55:23.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl 2024-02-18 12:10:10.000000000 +0100
@@ -1,6 +1,6 @@
<?php
-require_once 'Laminas/Code/autoload.php';
+require_once __DIR__ . '/../Laminas/Code/autoload.php';
// @codingStandardsIgnoreFile
// @codeCoverageIgnoreStart
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/changelog php-proxy-manager-2.11.1+1.0.3/debian/changelog
--- php-proxy-manager-2.11.1+1.0.3/debian/changelog 2021-01-27 21:03:45.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/changelog 2024-02-18 12:10:39.000000000 +0100
@@ -1,3 +1,10 @@
+php-proxy-manager (2.11.1+1.0.3-1+deb11u1) bullseye; urgency=medium
+
+ * Track debian/bullseye
+ * Force system dependencies loading
+
+ -- David Prévot <taf...@debian.org> Sun, 18 Feb 2024 12:10:39 +0100
+
php-proxy-manager (2.11.1+1.0.3-1) unstable; urgency=medium
[ Nicolas Grekas ]
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/clean php-proxy-manager-2.11.1+1.0.3/debian/clean
--- php-proxy-manager-2.11.1+1.0.3/debian/clean 2021-01-15 03:02:22.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/clean 2024-02-18 12:10:10.000000000 +0100
@@ -1,4 +1,6 @@
.phpunit.result.cache
-ProxyManager
+Laminas
+ProxyManager/
src/ProxyManager/autoload.php
+Symfony
vendor/
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/control php-proxy-manager-2.11.1+1.0.3/debian/control
--- php-proxy-manager-2.11.1+1.0.3/debian/control 2021-01-27 21:03:45.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/control 2024-02-18 12:10:10.000000000 +0100
@@ -12,7 +12,7 @@
pkg-php-tools
Standards-Version: 4.5.1
Homepage: https://github.com/FriendsOfPHP/proxy-manager-lts
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-proxy-manager.git -b debian/lts
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-proxy-manager.git -b debian/bullseye
Vcs-Browser: https://salsa.debian.org/php-team/pear/php-proxy-manager
Rules-Requires-Root: no
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf
--- php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf 2021-01-27 20:55:23.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf 2024-02-18 12:10:10.000000000 +0100
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/lts
+debian-branch = debian/bullseye
pristine-tar = True
pristine-tar-commit = True
upstream-branch = upstream-lts
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch
--- php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch 2021-01-27 20:55:23.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch 2024-02-18 12:10:10.000000000 +0100
@@ -3,22 +3,23 @@
Subject: Also skip system classes during tests
---
- tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php | 2 ++
- 1 file changed, 2 insertions(+)
+ tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php | 3 +++
+ 1 file changed, 3 insertions(+)
diff --git a/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php b/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
-index 146eeb0..abded91 100644
+index 146eeb0..37cceb8 100644
--- a/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
+++ b/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php
-@@ -112,6 +112,7 @@ final class FatalPreventionFunctionalTest extends TestCase
+@@ -112,6 +112,8 @@ final class FatalPreventionFunctionalTest extends TestCase
realpath(__DIR__ . '/../../../src'),
realpath(__DIR__ . '/../../../vendor'),
realpath(__DIR__ . '/../../ProxyManagerTest'),
++ realpath(__DIR__ . '/../../../ProxyManager'),
+ realpath('/usr/share/php'),
];
return array_filter(
-@@ -138,6 +139,7 @@ final class FatalPreventionFunctionalTest extends TestCase
+@@ -138,6 +140,7 @@ final class FatalPreventionFunctionalTest extends TestCase
if (strpos($realPath, $skippedPath) === 0) {
// skip classes defined within ProxyManager, vendor or the test suite
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/rules php-proxy-manager-2.11.1+1.0.3/debian/rules
--- php-proxy-manager-2.11.1+1.0.3/debian/rules 2021-01-27 20:55:23.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/rules 2024-02-18 12:10:10.000000000 +0100
@@ -15,7 +15,9 @@
tests/ProxyManagerTest \
tests/ProxyManagerTestAsset \
tests/Stubbed/Laminas/Server
- ln -s src/ProxyManager .
+ cp -r src/ProxyManager .
+ ln -s /usr/share/php/Laminas .
+ ln -s /usr/share/php/Symfony .
override_dh_auto_test:
phpunit
diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/tests/control php-proxy-manager-2.11.1+1.0.3/debian/tests/control
--- php-proxy-manager-2.11.1+1.0.3/debian/tests/control 2021-01-27 20:55:23.000000000 +0100
+++ php-proxy-manager-2.11.1+1.0.3/debian/tests/control 2024-02-18 12:10:10.000000000 +0100
@@ -1,3 +1,3 @@
-Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --template debian/autoload.tests.php.tpl tests/ProxyManagerTest tests/ProxyManagerTestAsset tests/Stubbed/Laminas/Server && phpunit
+Test-Command: mkdir --parents vendor ProxyManager && phpab --output vendor/autoload.php --template debian/autoload.tests.php.tpl tests/ProxyManagerTest tests/ProxyManagerTestAsset tests/Stubbed/Laminas/Server && phpunit
Restrictions: rw-build-tree
Depends: composer, php-symfony-filesystem, phpab, phpunit, @
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Version: 11.10
The upload requested in this bug has been released as part of 11.10.
--- End Message ---
