Bug#853071: unblock: symfony/2.8.7+dfsg-1.1
Control: retitle -1 unblock: symfony/2.8.7+dfsg-1.2
I messed up the 2.8.7+dfsg-1.1 upload (used an outdated chroot so missed
test failures) so it FTBFS on the buildd. Additional debdiff attached.
unblock symfony/2.8.7+dfsg-1.2
Regards,
James
diff -Nru symfony-2.8.7+dfsg/debian/changelog symfony-2.8.7+dfsg/debian/changelog
--- symfony-2.8.7+dfsg/debian/changelog 2017-01-29 13:54:28.000000000 +0000
+++ symfony-2.8.7+dfsg/debian/changelog 2017-01-29 16:05:28.000000000 +0000
@@ -1,3 +1,12 @@
+symfony (2.8.7+dfsg-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport additional upstream patches needed to fix FTBFS:
+ - Update IpValidatorTest data set with a valid reserved IP
+ - Relax 1 test failing with latest PHP versions
+
+ -- James Clarke <jrtc27@debian.org> Sun, 29 Jan 2017 16:05:28 +0000
+
symfony (2.8.7+dfsg-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru symfony-2.8.7+dfsg/debian/patches/relax-1-test-failing-with-latest-php-ver symfony-2.8.7+dfsg/debian/patches/relax-1-test-failing-with-latest-php-ver
--- symfony-2.8.7+dfsg/debian/patches/relax-1-test-failing-with-latest-php-ver 1970-01-01 01:00:00.000000000 +0100
+++ symfony-2.8.7+dfsg/debian/patches/relax-1-test-failing-with-latest-php-ver 2017-01-29 16:05:28.000000000 +0000
@@ -0,0 +1,26 @@
+From: Remi Collet <fedora@famillecollet.com>
+Date: Fri, 5 Aug 2016 09:21:03 +0200
+X-Dgit-Generated: 2.8.7+dfsg-1.2 5f7c01770fe23c699caa96782ce8a6e2cad4811a
+Subject: Relax 1 test failing with latest PHP versions
+
+Related to php bug #52646 which is fixed in 5.6.25RC1, 7.0.10RC1, 7.1.0beta2
+
+Origin: https://github.com/symfony/symfony/commit/6703b416d8e7edc2fd04a214b317ea4a189cac51
+
+---
+
+--- symfony-2.8.7+dfsg.orig/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
++++ symfony-2.8.7+dfsg/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
+@@ -94,10 +94,10 @@ SplFileObject {
+ file: true
+ dir: false
+ link: false
+-%AcsvControl: array:2 [
++%AcsvControl: array:%d [
+ 0 => ","
+ 1 => """
+- ]
++%A]
+ flags: DROP_NEW_LINE|SKIP_EMPTY
+ maxLineLen: 0
+ fstat: array:26 [
diff -Nru symfony-2.8.7+dfsg/debian/patches/series symfony-2.8.7+dfsg/debian/patches/series
--- symfony-2.8.7+dfsg/debian/patches/series 2017-01-29 13:54:28.000000000 +0000
+++ symfony-2.8.7+dfsg/debian/patches/series 2017-01-29 16:05:28.000000000 +0000
@@ -5,3 +5,5 @@
HttpFoundation-Fix-incompatibility-with-php-memcache.patch
fix-php-7.1-related-failures
do-not-depend-on-a-fixed-date-in-layout-
+update-ipvalidatortest-data-set-with-a-v
+relax-1-test-failing-with-latest-php-ver
diff -Nru symfony-2.8.7+dfsg/debian/patches/update-ipvalidatortest-data-set-with-a-v symfony-2.8.7+dfsg/debian/patches/update-ipvalidatortest-data-set-with-a-v
--- symfony-2.8.7+dfsg/debian/patches/update-ipvalidatortest-data-set-with-a-v 1970-01-01 01:00:00.000000000 +0100
+++ symfony-2.8.7+dfsg/debian/patches/update-ipvalidatortest-data-set-with-a-v 2017-01-29 16:05:28.000000000 +0000
@@ -0,0 +1,22 @@
+From: Jakub Zalas <jakub@zalas.pl>
+Date: Tue, 13 Sep 2016 12:11:56 +0100
+X-Dgit-Generated: 2.8.7+dfsg-1.2 007ac6e42739ef24a35a1872a566ac35e90f0aaf
+Subject: Update IpValidatorTest data set with a valid reserved IP
+
+The validator uses PHP filter which was recently fixed (see https://bugs.php.net/bug.php?id=72972).
+
+Origin: https://github.com/symfony/symfony/commit/86a151c9f57adc3cb3734aa7b74d5bf1462bf0ce
+
+---
+
+--- symfony-2.8.7+dfsg.orig/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
++++ symfony-2.8.7+dfsg/src/Symfony/Component/Validator/Tests/Constraints/IpValidatorTest.php
+@@ -221,7 +221,7 @@ class IpValidatorTest extends AbstractCo
+ {
+ return array(
+ array('0.0.0.0'),
+- array('224.0.0.1'),
++ array('240.0.0.1'),
+ array('255.255.255.255'),
+ );
+ }
Reply to: