Package: release.debian.org Severity: normal Tags: bookworm X-Debbugs-Cc: php-doctrine-deprecati...@packages.debian.org, t...@security.debian.org Control: affects -1 + src:php-doctrine-deprecations User: release.debian....@packages.debian.org Usertags: pu
[9/9 for bookworm]
This is a follow up from composer/DSA-5632-1 (the last one for
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/Doctrine/Deprecations/autoload.php
│ │ │ @@ -1,13 +1,13 @@
│ │ │ <?php
│ │ │
│ │ │ // Require
│ │ │
│ │ │ // Suggest
│ │ │ -if (stream_resolve_include_path('Psr/Log/autoload.php')) { include_once
'Psr/Log/autoload.php'; }
│ │ │ +if (stream_resolve_include_path(__DIR__ .
'/../../Psr/Log/autoload.php')) { include_once __DIR__ .
'/../../Psr/Log/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-doctrine-deprecations-1.0.0/debian/autoload.php.tpl php-doctrine-deprecations-1.0.0/debian/autoload.php.tpl
--- php-doctrine-deprecations-1.0.0/debian/autoload.php.tpl 1970-01-01 01:00:00.000000000 +0100
+++ php-doctrine-deprecations-1.0.0/debian/autoload.php.tpl 2024-02-15 23:25:51.000000000 +0100
@@ -0,0 +1,29 @@
+<?php
+
+// Require
+
+// Suggest
+if (stream_resolve_include_path(__DIR__ . '/../../Psr/Log/autoload.php')) { include_once __DIR__ . '/../../Psr/Log/autoload.php'; }
+
+// @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-doctrine-deprecations-1.0.0/debian/changelog php-doctrine-deprecations-1.0.0/debian/changelog
--- php-doctrine-deprecations-1.0.0/debian/changelog 2022-08-06 18:36:35.000000000 +0200
+++ php-doctrine-deprecations-1.0.0/debian/changelog 2024-02-15 23:26:09.000000000 +0100
@@ -1,3 +1,10 @@
+php-doctrine-deprecations (1.0.0-2+deb12u1) bookworm; urgency=medium
+
+ * Track debian/bookworm
+ * Force system dependencies loading
+
+ -- David Prévot <taf...@debian.org> Thu, 15 Feb 2024 23:26:09 +0100
+
php-doctrine-deprecations (1.0.0-2) unstable; urgency=medium
* Be tolerant about line number pointer (PHP 8.2 related fix)
diff -Nru php-doctrine-deprecations-1.0.0/debian/clean php-doctrine-deprecations-1.0.0/debian/clean
--- php-doctrine-deprecations-1.0.0/debian/clean 2022-06-19 21:05:43.000000000 +0200
+++ php-doctrine-deprecations-1.0.0/debian/clean 2024-02-15 23:25:51.000000000 +0100
@@ -1,5 +1,5 @@
.phpunit.result.cache
-debian/autoload.php.tpl
debian/autoload.tests.php.tpl
lib/Doctrine/Deprecations/autoload.php
+lib/Psr
vendor/
diff -Nru php-doctrine-deprecations-1.0.0/debian/control php-doctrine-deprecations-1.0.0/debian/control
--- php-doctrine-deprecations-1.0.0/debian/control 2022-06-19 21:19:29.000000000 +0200
+++ php-doctrine-deprecations-1.0.0/debian/control 2024-02-15 23:23:24.000000000 +0100
@@ -10,7 +10,7 @@
phpunit,
pkg-php-tools (>= 1.41~)
Standards-Version: 4.6.1
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-doctrine-deprecations.git
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-doctrine-deprecations.git -b debian/bookworm
Vcs-Browser: https://salsa.debian.org/php-team/pear/php-doctrine-deprecations
Homepage: https://www.doctrine-project.org/
Rules-Requires-Root: no
diff -Nru php-doctrine-deprecations-1.0.0/debian/gbp.conf php-doctrine-deprecations-1.0.0/debian/gbp.conf
--- php-doctrine-deprecations-1.0.0/debian/gbp.conf 2022-06-19 21:07:24.000000000 +0200
+++ php-doctrine-deprecations-1.0.0/debian/gbp.conf 2024-02-15 23:23:30.000000000 +0100
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/latest
+debian-branch = debian/bookworm
filter = [ '.gitattributes' ]
pristine-tar = True
upstream-vcs-tag = v%(version%~%-)s
diff -Nru php-doctrine-deprecations-1.0.0/debian/install php-doctrine-deprecations-1.0.0/debian/install
--- php-doctrine-deprecations-1.0.0/debian/install 2022-06-19 21:05:43.000000000 +0200
+++ php-doctrine-deprecations-1.0.0/debian/install 2024-02-15 23:25:51.000000000 +0100
@@ -1 +1 @@
-lib/* usr/share/php
+lib/Doctrine usr/share/php
diff -Nru php-doctrine-deprecations-1.0.0/debian/rules php-doctrine-deprecations-1.0.0/debian/rules
--- php-doctrine-deprecations-1.0.0/debian/rules 2022-06-19 21:05:43.000000000 +0200
+++ php-doctrine-deprecations-1.0.0/debian/rules 2024-02-15 23:25:51.000000000 +0100
@@ -4,12 +4,12 @@
dh $@
override_dh_auto_build:
- phpabtpl composer.json > debian/autoload.php.tpl
phpab \
--output lib/Doctrine/Deprecations/autoload.php \
--template debian/autoload.php.tpl \
lib/Doctrine/Deprecations
mkdir --parents vendor
+ ln -s /usr/share/php/Psr lib/
phpabtpl \
--require doctrine/deprecations \
> debian/autoload.tests.php.tpl
signature.asc
Description: PGP signature
