--- Begin Message ---
Package: pkg-php-tools
Version: 1.28
Severity: wishlist
Tags: patch
Hi Mathieu,
While updating php-invoker, I noticed pkg-php-tools added a dependency
on the inexistent php5-pcntl, while the pcntl has been activated since
version 5.3.6-12 of php5 according to its changelog.
I’m not sure why those extensions are declared twice, but in doubt, I
updated the two files (maybe one is a no-op, sorry for not diving into
the pkg-php-tools code right know to have a better understanding of it),
and offer the patch via a bug report so you can review it properly.
While building the package, I also noticed a testsuite failure (no idea
why the expected output seems also declared twice), please find attached
another patch to fix it.
Regards
David
P.-S.: thanks for already providing the code to handle the caret
operator, it was already in the VCS when I noticed it would have been a
worthy addition ;).
From f45ce0e79901bca3235eae64582c72f89908605a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <[email protected]>
Date: Sun, 15 Mar 2015 15:44:31 -0400
Subject: [PATCH] pcntl extension is enabled since php5 5.3.6-12
---
share/php/pkgtools/base/overrides.php | 2 +-
share/pkg-php-tools/scripts/phppkginfo | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/share/php/pkgtools/base/overrides.php b/share/php/pkgtools/base/overrides.php
index 92859a8..ac33240 100644
--- a/share/php/pkgtools/base/overrides.php
+++ b/share/php/pkgtools/base/overrides.php
@@ -70,7 +70,7 @@ class Overrides {
// Statically compiled extensions
'bcmath', 'bz2', 'calendar', 'core', 'ctype', 'date', 'dba', 'dom',
'ereg', 'exif', 'fileinfo', 'filter', 'ftp', 'gettext', 'hash',
- 'iconv', 'libxml', 'mbstring', 'openssl', 'pcre', 'phar', 'posix',
+ 'iconv', 'libxml', 'mbstring', 'openssl', 'pcntl', 'pcre', 'phar', 'posix',
'reflection', 'session', 'shmop', 'simplexml', 'soap', 'sockets',
'spl', 'standard', 'sysvmsg', 'sysvsem', 'sysvshm', 'tokenizer',
'wddx', 'xml', 'xmlreader', 'xmlwriter', 'zip', 'zlib',
diff --git a/share/pkg-php-tools/scripts/phppkginfo b/share/pkg-php-tools/scripts/phppkginfo
index 89e7ad6..13a6b05 100755
--- a/share/pkg-php-tools/scripts/phppkginfo
+++ b/share/pkg-php-tools/scripts/phppkginfo
@@ -486,7 +486,7 @@ $builtin_extensions = Array(
// Compiled in extensions (static)
'bcmath', 'bz2', 'calendar', 'core', 'ctype', 'date',
'dba', 'dom', 'ereg', 'exif', 'fileinfo', 'filter', 'ftp', 'gettext', 'hash', 'iconv', 'libxml',
- 'mbstring', 'openssl', 'pcre', 'phar', 'posix', 'reflection', 'session', 'shmop', 'simplexml',
+ 'mbstring', 'openssl', 'pcntl', 'pcre', 'phar', 'posix', 'reflection', 'session', 'shmop', 'simplexml',
'soap', 'sockets', 'spl', 'standard', 'sysvmsg', 'sysvsem', 'sysvshm', 'tokenizer', 'wddx', 'xml',
'xmlreader', 'xmlwriter', 'zip', 'zlib',
// Other compiled extensions (dynamic)
--
2.1.4
From 0be73fcf0601e2c90a8e70f1626b2894f3dadfc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Pr=C3=A9vot?= <[email protected]>
Date: Sun, 15 Mar 2015 16:00:33 -0400
Subject: [PATCH] Fix testsuite
---
testsuite/tests/151_dh_phpcomposer_substvars.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/tests/151_dh_phpcomposer_substvars.sh b/testsuite/tests/151_dh_phpcomposer_substvars.sh
index 88e64f3..c0dada2 100644
--- a/testsuite/tests/151_dh_phpcomposer_substvars.sh
+++ b/testsuite/tests/151_dh_phpcomposer_substvars.sh
@@ -28,7 +28,7 @@ cd "${composerpkg2}"
expect_equal "perl '${old_dir}/bin/dh_phpcomposer.test'" '' || ret=$?
expect_equal "cat 'debian/php-foo.substvars'" 'phpcomposer:name=vendor/project2
phpcomposer:description=Some vendor project 2
-phpcomposer:Debian-require=php5-cli, php-proj1-equal-any, php-proj1-equal-self (= ${binary:Version}), php-proj1-equal-wildcard (>= 2), php-proj1-equal-wildcard (<< 3~~), php-proj1-equal-exact (= 3.1.2), php-proj1-range-ge (>= 1.0), php-proj1-range-ge-lt (>= 1.1), php-proj1-range-ge-lt (<< 1.9~~), php-proj1-range-gt-le (>> 1.1), php-proj1-range-gt-le (<= 1.9), php-proj1-tilde (>= 1.2), php-proj1-tilde (<< 2~~), php-proj1-unsupported-or, php-proj1-stability-dev (>= 0.3.1), php-proj1-stability-dev (<< 0.4~~), php-proj1-stability-patch (>= 0.4~~patch1), php-proj1-stability-beta (>= 2.3~beta2), php-proj1-stabilityflag-alpha-caps (>= 2.0), php-proj1-stabilityflag-alpha-caps (<< 2.1~~), php-proj1-stabilityflag-beta (>= 1.0), php-proj1-stabilityflag-beta (<< 1.1~~), php-proj1-stabilityflag-dev, php-proj1-alias-dev-master, php-proj1-alias-inline
+phpcomposer:Debian-require=php5-cli, php-proj1-equal-any, php-proj1-equal-self (= ${binary:Version}), php-proj1-equal-wildcard (>= 2), php-proj1-equal-wildcard (<< 3~~), php-proj1-equal-exact (= 3.1.2), php-proj1-range-ge (>= 1.0), php-proj1-range-ge-lt (>= 1.1), php-proj1-range-ge-lt (<< 1.9~~), php-proj1-range-gt-le (>> 1.1), php-proj1-range-gt-le (<= 1.9), php-proj1-tilde (>= 1.2), php-proj1-tilde (<< 2~~), php-proj1-caret (>= 1.2.3), php-proj1-caret (<< 2~~), php-proj1-caret-pre-1.0 (>= 0.1.2), php-proj1-caret-pre-1.0 (<< 0.2~~), php-proj1-unsupported-or, php-proj1-stability-dev (>= 0.3.1), php-proj1-stability-dev (<< 0.4~~), php-proj1-stability-patch (>= 0.4~~patch1), php-proj1-stability-beta (>= 2.3~beta2), php-proj1-stabilityflag-alpha-caps (>= 2.0), php-proj1-stabilityflag-alpha-caps (<< 2.1~~), php-proj1-stabilityflag-beta (>= 1.0), php-proj1-stabilityflag-beta (<< 1.1~~), php-proj1-stabilityflag-dev, php-proj1-alias-dev-master, php-proj1-alias-inline
phpcomposer:Debian-recommend=libcurl3 (>= 7.37), libicu52 (>= 50), libxml2 (>= 2.8), libssl1.0.0 (>= 1.0.1), libpcre3 (>= 8.30), libxslt1.1 (>= 1.1.24)
phpcomposer:Debian-suggest=php-proj1-suggest-unparsable, php-proj1-suggest-versioned (>> 12)
phpcomposer:Debian-provide=php-proj1-provide-versioned (>= 1.7), php-proj1-provide-versioned (<< 1.8~~), php-proj1-provide-any' || ret=$?
--
2.1.4
signature.asc
Description: Digital signature
--- End Message ---
