diff -Nru php-symfony-security-acl-3.1.1/debian/changelog php-symfony-security-acl-3.1.1/debian/changelog
--- php-symfony-security-acl-3.1.1/debian/changelog	2021-06-04 23:15:38.000000000 +0000
+++ php-symfony-security-acl-3.1.1/debian/changelog	2021-06-16 13:29:44.000000000 +0000
@@ -1,3 +1,11 @@
+php-symfony-security-acl (3.1.1-1ubuntu1) impish; urgency=medium
+
+  * d/p/adapt-to-new-symfony.patch: Add patch to adapt to
+    newer Symfony. This helps unblock Symfony's and PHP 8's
+    migration.
+
+ -- Utkarsh Gupta <utkarsh@debian.org>  Wed, 16 Jun 2021 18:59:44 +0530
+
 php-symfony-security-acl (3.1.1-1build1) impish; urgency=medium
 
   * No change rebuild for PHP 8.0 and symfony
diff -Nru php-symfony-security-acl-3.1.1/debian/control php-symfony-security-acl-3.1.1/debian/control
--- php-symfony-security-acl-3.1.1/debian/control	2021-01-13 06:14:53.000000000 +0000
+++ php-symfony-security-acl-3.1.1/debian/control	2021-06-16 13:29:44.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-symfony-security-acl
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: Daniel Beyer <dabe@deb.ymc.ch>, David Prévot <taffit@debian.org>
 Build-Depends: debhelper-compat (= 13),
                php-doctrine-common,
diff -Nru php-symfony-security-acl-3.1.1/debian/patches/adapt-to-new-symfony.patch php-symfony-security-acl-3.1.1/debian/patches/adapt-to-new-symfony.patch
--- php-symfony-security-acl-3.1.1/debian/patches/adapt-to-new-symfony.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-symfony-security-acl-3.1.1/debian/patches/adapt-to-new-symfony.patch	2021-06-16 13:28:31.000000000 +0000
@@ -0,0 +1,56 @@
+Description: Adapt to newer Symfony changes.
+ Class "Symfony\Component\Security\Acl\Tests\Domain\Role" is no longer
+ available and thus drop it from the tests! \o/
+Author: Utkarsh Gupta <utkarsh@debian.org>
+Origin: upstream; cherry-picked from: https://github.com/symfony/security-acl/pull/78
+Last-Update: 2021-06-16
+
+--- a/Tests/Domain/RoleSecurityIdentityTest.php
++++ b/Tests/Domain/RoleSecurityIdentityTest.php
+@@ -11,11 +11,12 @@
+ 
+ namespace Symfony\Component\Security\Acl\Tests\Domain;
+ 
++use PHPUnit\Framework\TestCase;
+ use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity;
+ use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity;
+-use Symfony\Component\Security\Core\Role\Role;
++use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;
+ 
+-class RoleSecurityIdentityTest extends \PHPUnit\Framework\TestCase
++class RoleSecurityIdentityTest extends TestCase
+ {
+     public function testConstructor()
+     {
+@@ -24,17 +25,10 @@
+         $this->assertEquals('ROLE_FOO', $id->getRole());
+     }
+ 
+-    public function testConstructorWithRoleInstance()
+-    {
+-        $id = new RoleSecurityIdentity(new Role('ROLE_FOO'));
+-
+-        $this->assertEquals('ROLE_FOO', $id->getRole());
+-    }
+-
+     /**
+      * @dataProvider getCompareData
+      */
+-    public function testEquals($id1, $id2, $equal)
++    public function testEquals(RoleSecurityIdentity $id1, SecurityIdentityInterface $id2, bool $equal)
+     {
+         if ($equal) {
+             $this->assertTrue($id1->equals($id2));
+@@ -43,11 +37,10 @@
+         }
+     }
+ 
+-    public function getCompareData()
++    public function getCompareData(): array
+     {
+         return [
+             [new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity('ROLE_FOO'), true],
+-            [new RoleSecurityIdentity('ROLE_FOO'), new RoleSecurityIdentity(new Role('ROLE_FOO')), true],
+             [new RoleSecurityIdentity('ROLE_USER'), new RoleSecurityIdentity('ROLE_FOO'), false],
+             [new RoleSecurityIdentity('ROLE_FOO'), new UserSecurityIdentity('ROLE_FOO', 'Foo'), false],
+         ];
diff -Nru php-symfony-security-acl-3.1.1/debian/patches/series php-symfony-security-acl-3.1.1/debian/patches/series
--- php-symfony-security-acl-3.1.1/debian/patches/series	2021-01-13 06:14:53.000000000 +0000
+++ php-symfony-security-acl-3.1.1/debian/patches/series	2021-06-16 13:18:39.000000000 +0000
@@ -1,3 +1,4 @@
 fixed-obsolete-getMock-usage.patch
 tfix-Drop-extra-semi-colon.patch
 WIP-Drop-warning.patch
+adapt-to-new-symfony.patch