Package: release.debian.org Severity: normal Tags: bookworm X-Debbugs-Cc: php-zend-c...@packages.debian.org, t...@security.debian.org Control: affects -1 + src:php-zend-code User: release.debian....@packages.debian.org Usertags: pu
[6/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/Laminas/Code/autoload.php
│ │ │ @@ -1,14 +1,14 @@
│ │ │ <?php
│ │ │
│ │ │ // Require
│ │ │
│ │ │ // Suggest
│ │ │ -if
(stream_resolve_include_path('Doctrine/Common/Annotations/autoload.php')) {
include_once 'Doctrine/Common/Annotations/autoload.php'; }
│ │ │ -if (stream_resolve_include_path('Laminas/Stdlib/autoload.php')) {
include_once 'Laminas/Stdlib/autoload.php'; }
│ │ │ +if (stream_resolve_include_path(__DIR__ .
'/../../Doctrine/Common/Annotations/autoload.php')) { include_once __DIR__ .
'/../../Doctrine/Common/Annotations/autoload.php'; }
│ │ │ +if (stream_resolve_include_path(__DIR__ . '/../Stdlib/autoload.php')) {
include_once __DIR__ . '/../Stdlib/autoload.php'; }
│ │ │
│ │ │ // @codingStandardsIgnoreFile
│ │ │ // @codeCoverageIgnoreStart
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-zend-code-4.8.0/debian/autoload.php.tpl php-zend-code-4.8.0/debian/autoload.php.tpl
--- php-zend-code-4.8.0/debian/autoload.php.tpl 1970-01-01 01:00:00.000000000 +0100
+++ php-zend-code-4.8.0/debian/autoload.php.tpl 2024-02-15 23:03:09.000000000 +0100
@@ -0,0 +1,30 @@
+<?php
+
+// Require
+
+// Suggest
+if (stream_resolve_include_path(__DIR__ . '/../../Doctrine/Common/Annotations/autoload.php')) { include_once __DIR__ . '/../../Doctrine/Common/Annotations/autoload.php'; }
+if (stream_resolve_include_path(__DIR__ . '/../Stdlib/autoload.php')) { include_once __DIR__ . '/../Stdlib/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-zend-code-4.8.0/debian/changelog php-zend-code-4.8.0/debian/changelog
--- php-zend-code-4.8.0/debian/changelog 2022-12-11 17:50:13.000000000 +0100
+++ php-zend-code-4.8.0/debian/changelog 2024-02-15 23:03:09.000000000 +0100
@@ -1,3 +1,10 @@
+php-zend-code (4.8.0-1+deb12u1) bookworm; urgency=medium
+
+ * Track debian/bookworm
+ * Force system dependencies loading
+
+ -- David Prévot <taf...@debian.org> Thu, 15 Feb 2024 23:03:09 +0100
+
php-zend-code (4.8.0-1) unstable; urgency=medium
[ Marco Pivetta ]
diff -Nru php-zend-code-4.8.0/debian/clean php-zend-code-4.8.0/debian/clean
--- php-zend-code-4.8.0/debian/clean 2022-12-11 17:50:13.000000000 +0100
+++ php-zend-code-4.8.0/debian/clean 2024-02-15 23:03:09.000000000 +0100
@@ -1,6 +1,6 @@
.phpunit.result.cache
-debian/autoload.php.tpl
debian/autoload.tests.php.tpl
+Doctrine
src/autoload.php
vendor/
Laminas/
diff -Nru php-zend-code-4.8.0/debian/control php-zend-code-4.8.0/debian/control
--- php-zend-code-4.8.0/debian/control 2022-06-18 16:41:55.000000000 +0200
+++ php-zend-code-4.8.0/debian/control 2024-02-15 23:03:09.000000000 +0100
@@ -12,7 +12,7 @@
pkg-php-tools (>= 1.41~)
Standards-Version: 4.6.1
Homepage: https://docs.laminas.dev/laminas-code/
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-zend-code.git
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-zend-code.git -b debian/bookworm
Vcs-Browser: https://salsa.debian.org/php-team/pear/php-zend-code
Rules-Requires-Root: no
diff -Nru php-zend-code-4.8.0/debian/gbp.conf php-zend-code-4.8.0/debian/gbp.conf
--- php-zend-code-4.8.0/debian/gbp.conf 2021-04-09 03:16:02.000000000 +0200
+++ php-zend-code-4.8.0/debian/gbp.conf 2024-02-15 23:03:09.000000000 +0100
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/latest
+debian-branch = debian/bookworm
filter = [ '.gitattributes' ]
pristine-tar = True
upstream-vcs-tag = %(version%~%-)s
diff -Nru php-zend-code-4.8.0/debian/rules php-zend-code-4.8.0/debian/rules
--- php-zend-code-4.8.0/debian/rules 2022-12-11 17:50:13.000000000 +0100
+++ php-zend-code-4.8.0/debian/rules 2024-02-15 23:03:09.000000000 +0100
@@ -3,12 +3,13 @@
dh $@ -Xindex.md
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 Laminas
- ln -s ../src Laminas/Code
+ cp -r src Laminas/Code
+ ln -s /usr/share/php/Doctrine .
+ ln -s /usr/share/php/Laminas/Stdlib Laminas
phpabtpl \
--require laminas/laminas-code \
> debian/autoload.tests.php.tpl
signature.asc
Description: PGP signature
