Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian....@packages.debian.org
Usertags: pu
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hi release team and happy new year to you all,
the PHP updates through security team are going without any serious
troubles, so this is not a p-u for new upstream version, but I would
like to include attached patch in the next round of updates.
The patch is only piece missing that prevents coinstallability of
src:php5 and src:php7.0, and I think it's quite simple. It only
renames /usr/bin/phar (and accompanying man page) to phar5 and uses
update-alternatives to create symlink with priority 50 back to phar
command.
The same mechanism is already used in src:php7.0 (with priority 70).
This would allow people upgrading from jessie to stretch to keep
existing src:php5 packages for the time of migration to PHP 7.0.
Cheers,
Ondrej
- -- System Information:
Debian Release: 8.2
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.2.0-18-generic (SMP w/24 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQJ8BAEBCgBmBQJWi7QlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMEI5MzNEODBGQ0UzRDk4MUEyRDM4RkIw
Qzk5QjcwRUY0RkNCQjA3AAoJEAyZtw70/LsHA/kP/25QB6ZZJ1Qs/6dQ9w+dD7DC
1CjdOzd/ewrcp0sHqz15fRcW07PlOsR/vH41NAoALmrL6Q+qullW8SW0g1WRGkPm
soRhS2E0DzWpu8D2AP25MR0hOtxaHf5v+Y0EzaQrOapcCrukJCj7QbkKdh6RJ/rE
pFVVhW2i+TZrmYUnQqZxzGnqgYnPFE/ftUlJcKuML8VyfOwrhDTQIxgwqtng/YQA
6VlqcLbL+xfJUskS/2qINFrBlwT6MMnSWczDGJ5SzMGZmJSN63xvyMJq1PRl20P+
5ppPr69Mf9LFsDkuRN7BVmTJr7Z66BtAaiL0/GUIgqItPw3RksBwX5SsVBK7iRTR
i6Er5QxqHb+5fXVq8EUI9loVHzmYheHWnlamCSSoZVZy1lSOG7JcWAivM3f6c88k
HXnk79F1wVG1Hxqozz9PDgnyaLWbpvy5JMILuAjs492GhqXFlQb6l9n2YfUSIiqR
dzLVcwRHgT6a0sBMBZqngh3wSJjuFNOZ9Yqxmct58QH/RTtLzDLSAIA0qvF7Om5D
/ktARiwiPAWQh/rGZDdpWuLZ+1dRvmIe6hCU/mEYUG6psp/Q30nTYZiB+YpN1e6k
OfvIYtNaAZa51IeDYFR7yTQ10Au/nELo2TiYomlebChQV/5ccHKcw1HAFrlppZrD
voXM1e3WhcAfS+GdTqBi
=RRJ2
-----END PGP SIGNATURE-----
>From 12c7ba66eb008332c610f415a3bf3173dc8c5a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ond...@sury.org>
Date: Mon, 4 Jan 2016 13:49:00 +0100
Subject: [PATCH 1/2] Make phar command versioned and use update-alternatives
for 'phar' name
---
debian/php5-cli.postinst.extra | 9 ++++++---
debian/php5-cli.prerm.extra | 1 +
debian/rules | 4 ++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debian/php5-cli.postinst.extra b/debian/php5-cli.postinst.extra
index 41718cf..74808ce 100644
--- a/debian/php5-cli.postinst.extra
+++ b/debian/php5-cli.postinst.extra
@@ -1,5 +1,8 @@
if [ "$1" = "configure" ]; then
update-alternatives \
- --install /usr/bin/php php /usr/bin/php5 50 \
- --slave /usr/share/man/man1/php.1.gz php.1.gz /usr/share/man/man1/php5.1.gz
-fi
\ No newline at end of file
+ --install /usr/bin/php php /usr/bin/php5 50 \
+ --slave /usr/share/man/man1/php.1.gz php.1.gz /usr/share/man/man1/php5.1.gz
+ update-alternatives \
+ --install /usr/bin/phar phar /usr/bin/phar5 50 \
+ --slave /usr/share/man/man1/phar.1.gz phar.1.gz /usr/share/man/man1/phar5.1.gz
+fi
diff --git a/debian/php5-cli.prerm.extra b/debian/php5-cli.prerm.extra
index 2f253c5..5d8c778 100644
--- a/debian/php5-cli.prerm.extra
+++ b/debian/php5-cli.prerm.extra
@@ -1,3 +1,4 @@
if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
update-alternatives --remove php /usr/bin/php5
+ update-alternatives --remove phar /usr/bin/phar5
fi
diff --git a/debian/rules b/debian/rules
index caa0b6c..52b3e7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -632,8 +632,8 @@ endif
# install CLI
cp cli-build/sapi/cli/php debian/php5-cli/usr/bin/php5
cp cli-build/sapi/cli/php.1 debian/php5-cli/usr/share/man/man1/php5.1
- cp cli-build/ext/phar/phar.phar debian/php5-cli/usr/bin/phar
- cp cli-build/ext/phar/phar.1 debian/php5-cli/usr/share/man/man1/phar.1
+ cp cli-build/ext/phar/phar.phar debian/php5-cli/usr/bin/phar5
+ cp cli-build/ext/phar/phar.1 debian/php5-cli/usr/share/man/man1/phar5.1
# install PHPDBG
cp phpdbg-build/sapi/phpdbg/phpdbg debian/php5-phpdbg/usr/bin/php5dbg
--
2.1.4
