Package: release.debian.org Severity: normal Tags: bookworm X-Debbugs-Cc: php-composer-xdebug-hand...@packages.debian.org, t...@security.debian.org Control: affects -1 + src:php-composer-xdebug-handler User: release.debian....@packages.debian.org Usertags: pu
[2/9 for bookworm] This is a follow up from composer/DSA-5632-1. 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/Composer/XdebugHandler/autoload.php │ │ │ @@ -1,12 +1,12 @@ │ │ │ <?php │ │ │ │ │ │ // Require │ │ │ -require_once 'Composer/Pcre/autoload.php'; │ │ │ -require_once 'Psr/Log/autoload.php'; │ │ │ +require_once __DIR__ . '/../Pcre/autoload.php'; │ │ │ +require_once __DIR__ . '/../../Psr/Log/autoload.php'; │ │ │ │ │ │ // Suggest 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-composer-xdebug-handler-3.0.3/debian/autoload.php.tpl php-composer-xdebug-handler-3.0.3/debian/autoload.php.tpl
--- php-composer-xdebug-handler-3.0.3/debian/autoload.php.tpl 1970-01-01 01:00:00.000000000 +0100
+++ php-composer-xdebug-handler-3.0.3/debian/autoload.php.tpl 2024-02-13 17:13:43.000000000 +0100
@@ -0,0 +1,30 @@
+<?php
+
+// Require
+require_once __DIR__ . '/../Pcre/autoload.php';
+require_once __DIR__ . '/../../Psr/Log/autoload.php';
+
+// Suggest
+
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+ function($class) {
+ static $classes = null;
+ if ($classes === null) {
+ $classes = array(
+ ___CLASSLIST___
+ );
+ }
+ $cn = strtolower($class);
+ if (isset($classes[$cn])) {
+ require ___BASEDIR___$classes[$cn];
+ }
+ },
+ ___EXCEPTION___,
+ ___PREPEND___
+);
+// @codeCoverageIgnoreEnd
+
+// Files
diff -Nru php-composer-xdebug-handler-3.0.3/debian/changelog php-composer-xdebug-handler-3.0.3/debian/changelog
--- php-composer-xdebug-handler-3.0.3/debian/changelog 2022-06-18 12:06:48.000000000 +0200
+++ php-composer-xdebug-handler-3.0.3/debian/changelog 2024-02-13 17:13:43.000000000 +0100
@@ -1,3 +1,10 @@
+php-composer-xdebug-handler (3.0.3-2+deb12u1) bookworm; urgency=medium
+
+ * Track debian/bookworm-security
+ * Force system dependencies loading
+
+ -- David Prévot <taf...@debian.org> Tue, 13 Feb 2024 17:13:43 +0100
+
php-composer-xdebug-handler (3.0.3-2) unstable; urgency=medium
* Upload to unstable for composer 2.3
diff -Nru php-composer-xdebug-handler-3.0.3/debian/clean php-composer-xdebug-handler-3.0.3/debian/clean
--- php-composer-xdebug-handler-3.0.3/debian/clean 2022-01-05 14:42:04.000000000 +0100
+++ php-composer-xdebug-handler-3.0.3/debian/clean 2024-02-13 17:13:43.000000000 +0100
@@ -1,6 +1,6 @@
.phpunit.result.cache
Composer/
-debian/autoload.php.tpl
debian/autoload.tests.php.tpl
+Psr
src/autoload.php
vendor/
diff -Nru php-composer-xdebug-handler-3.0.3/debian/control php-composer-xdebug-handler-3.0.3/debian/control
--- php-composer-xdebug-handler-3.0.3/debian/control 2022-06-17 19:03:15.000000000 +0200
+++ php-composer-xdebug-handler-3.0.3/debian/control 2024-02-13 17:13:43.000000000 +0100
@@ -12,7 +12,7 @@
Standards-Version: 4.6.1
Homepage: https://github.com/composer/xdebug-handler
Vcs-Browser: https://salsa.debian.org/php-team/pear/php-composer-xdebug-handler
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-composer-xdebug-handler.git -b debian/latest
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-composer-xdebug-handler.git -b debian/bookworm-security
Rules-Requires-Root: no
Package: php-composer-xdebug-handler
diff -Nru php-composer-xdebug-handler-3.0.3/debian/gbp.conf php-composer-xdebug-handler-3.0.3/debian/gbp.conf
--- php-composer-xdebug-handler-3.0.3/debian/gbp.conf 2022-01-05 15:28:30.000000000 +0100
+++ php-composer-xdebug-handler-3.0.3/debian/gbp.conf 2024-02-13 17:13:43.000000000 +0100
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/latest
+debian-branch = debian/bookworm-security
filter = [ '.gitattributes' ]
pristine-tar = True
upstream-vcs-tag = %(version%~%-)s
diff -Nru php-composer-xdebug-handler-3.0.3/debian/rules php-composer-xdebug-handler-3.0.3/debian/rules
--- php-composer-xdebug-handler-3.0.3/debian/rules 2022-01-05 14:42:04.000000000 +0100
+++ php-composer-xdebug-handler-3.0.3/debian/rules 2024-02-13 17:13:43.000000000 +0100
@@ -3,13 +3,14 @@
dh $@
override_dh_auto_build:
- phpabtpl composer.json > debian/autoload.php.tpl
phpab \
--output src/autoload.php \
--template debian/autoload.php.tpl \
src
mkdir --parents vendor Composer
- ln -s ../src Composer/XdebugHandler
+ cp -r src Composer/XdebugHandler
+ ln -s /usr/share/php/Composer/Pcre Composer
+ ln -s /usr/share/php/Psr .
phpabtpl \
--require composer/xdebug-handler \
> debian/autoload.tests.php.tpl
signature.asc
Description: PGP signature
