Processed: Re: Bug#1065065: bookworm-pu: package php-doctrine-annotations/2.0.1-1+deb12u1

2024-03-25 Thread Debian Bug Tracking System
Processing control commands:

> tags -1 + confirmed
Bug #1065065 [release.debian.org] bookworm-pu: package 
php-doctrine-annotations/2.0.1-1+deb12u1
Added tag(s) confirmed.

-- 
1065065: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1065065
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Bug#1065065: bookworm-pu: package php-doctrine-annotations/2.0.1-1+deb12u1

2024-03-25 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Thu, 2024-02-29 at 12:05 +0100, David Prévot wrote:
> 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.

Please go ahead.

Regards,

Adam



Bug#1065065: bookworm-pu: package php-doctrine-annotations/2.0.1-1+deb12u1

2024-02-29 Thread David Prévot
Package: release.debian.org
Severity: normal
Tags: bookworm
X-Debbugs-Cc: php-doctrine-annotati...@packages.debian.org, 
t...@security.debian.org
Control: affects -1 + src:php-doctrine-annotations
User: release.debian@packages.debian.org
Usertags: pu

[7/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/Doctrine/Common/Annotations/autoload.php
│ │ │ @@ -1,12 +1,12 @@
│ │ │  diff -Nru php-doctrine-annotations-2.0.1/debian/autoload.php.tpl php-doctrine-annotations-2.0.1/debian/autoload.php.tpl
--- php-doctrine-annotations-2.0.1/debian/autoload.php.tpl	1970-01-01 01:00:00.0 +0100
+++ php-doctrine-annotations-2.0.1/debian/autoload.php.tpl	2024-02-15 23:14:38.0 +0100
@@ -0,0 +1,30 @@
+  Thu, 15 Feb 2024 23:14:38 +0100
+
 php-doctrine-annotations (2.0.1-1) unstable; urgency=medium
 
   [ Alexander M. Turek ]
diff -Nru php-doctrine-annotations-2.0.1/debian/clean php-doctrine-annotations-2.0.1/debian/clean
--- php-doctrine-annotations-2.0.1/debian/clean	2021-05-23 19:31:29.0 +0200
+++ php-doctrine-annotations-2.0.1/debian/clean	2024-02-15 23:14:38.0 +0100
@@ -1,5 +1,8 @@
 .phpunit.result.cache
-debian/autoload.php.tpl
 debian/autoload.tests.php.tpl
 lib/Doctrine/Common/Annotations/autoload.php
+lib/Doctrine/Common/Cache
+lib/Doctrine/Common/Lexer
+lib/Psr
+lib/Symfony
 vendor/
diff -Nru php-doctrine-annotations-2.0.1/debian/control php-doctrine-annotations-2.0.1/debian/control
--- php-doctrine-annotations-2.0.1/debian/control	2023-02-03 05:25:51.0 +0100
+++ php-doctrine-annotations-2.0.1/debian/control	2024-02-15 23:14:38.0 +0100
@@ -13,7 +13,7 @@
phpunit,
pkg-php-tools
 Standards-Version: 4.6.2
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-doctrine-annotations.git
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-doctrine-annotations.git -b debian/bookworm
 Vcs-Browser: https://salsa.debian.org/php-team/pear/php-doctrine-annotations
 Homepage: https://www.doctrine-project.org/projects/annotations.html
 Rules-Requires-Root: no
diff -Nru php-doctrine-annotations-2.0.1/debian/gbp.conf php-doctrine-annotations-2.0.1/debian/gbp.conf
--- php-doctrine-annotations-2.0.1/debian/gbp.conf	2021-02-20 14:25:27.0 +0100
+++ php-doctrine-annotations-2.0.1/debian/gbp.conf	2024-02-15 23:14:38.0 +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-doctrine-annotations-2.0.1/debian/rules php-doctrine-annotations-2.0.1/debian/rules
--- php-doctrine-annotations-2.0.1/debian/rules	2021-10-11 03:02:26.0 +0200
+++ php-doctrine-annotations-2.0.1/debian/rules	2024-02-15 23:14:38.0 +0100
@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ -XCommon/Cache -XCommon/Lexer -Xlib/Psr -XSymfony
 
 override_dh_auto_build:
-	phpabtpl composer.json > debian/autoload.php.tpl
 	phpab \
 		--output lib/Doctrine/Common/Annotations/autoload.php \
 		--template debian/autoload.php.tpl \
 		lib/Doctrine/Common/Annotations
 	mkdir --parents vendor
+	ln -s /usr/share/php/Doctrine/Common/Cache lib/Doctrine/Common
+	ln -s /usr/share/php/Doctrine/Common/Lexer lib/Doctrine/Common
+	ln -s /usr/share/php/Psr lib
+	ln -s /usr/share/php/Symfony lib
 	phpabtpl \
 		--require doctrine/annotations \
 		--require doctrine/cache \


signature.asc
Description: PGP signature