diff -Nru php-dapphp-radius-2.5.8/debian/changelog php-dapphp-radius-2.5.8/debian/changelog
--- php-dapphp-radius-2.5.8/debian/changelog	2022-01-28 05:41:19.000000000 -0300
+++ php-dapphp-radius-2.5.8/debian/changelog	2022-03-10 16:46:02.000000000 -0300
@@ -1,3 +1,11 @@
+php-dapphp-radius (2.5.8-1ubuntu1) jammy; urgency=medium
+
+  * Add PHP 8 support
+    - d/p/0001-Use-current-PHPUnit.patch: drop redundant patch.
+    - d/p/0002-Fixes-for-PHP-8.x.patch: apply upstream changes to support PHP8.
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Thu, 10 Mar 2022 16:46:02 -0300
+
 php-dapphp-radius (2.5.8-1) unstable; urgency=medium
 
   * Fixed upstream URL in d/rules.
diff -Nru php-dapphp-radius-2.5.8/debian/control php-dapphp-radius-2.5.8/debian/control
--- php-dapphp-radius-2.5.8/debian/control	2022-01-28 05:41:19.000000000 -0300
+++ php-dapphp-radius-2.5.8/debian/control	2022-03-10 16:46:02.000000000 -0300
@@ -1,7 +1,8 @@
 Source: php-dapphp-radius
 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:
  Thomas Goirand <zigo@debian.org>,
 Build-Depends:
diff -Nru php-dapphp-radius-2.5.8/debian/patches/0001-Use-current-PHPUnit.patch php-dapphp-radius-2.5.8/debian/patches/0001-Use-current-PHPUnit.patch
--- php-dapphp-radius-2.5.8/debian/patches/0001-Use-current-PHPUnit.patch	2022-01-28 05:41:19.000000000 -0300
+++ php-dapphp-radius-2.5.8/debian/patches/0001-Use-current-PHPUnit.patch	1969-12-31 21:00:00.000000000 -0300
@@ -1,21 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
-Date: Mon, 24 Jan 2022 07:53:03 -0400
-Subject: Use current PHPUnit
-
----
- tests/ClientTest.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/ClientTest.php b/tests/ClientTest.php
-index 62c3904..3be40da 100644
---- a/tests/ClientTest.php
-+++ b/tests/ClientTest.php
-@@ -5,7 +5,7 @@ use Dapphp\Radius\EAPPacket;
- use Dapphp\Radius\MsChapV2Packet;
- use Dapphp\Radius\VendorId;
- 
--class ClientTest extends PHPUnit_Framework_TestCase
-+class ClientTest extends PHPUnit\Framework\TestCase
- {
-     public function testAttributes()
-     {
diff -Nru php-dapphp-radius-2.5.8/debian/patches/0002-Fixes-for-PHP-8.x.patch php-dapphp-radius-2.5.8/debian/patches/0002-Fixes-for-PHP-8.x.patch
--- php-dapphp-radius-2.5.8/debian/patches/0002-Fixes-for-PHP-8.x.patch	1969-12-31 21:00:00.000000000 -0300
+++ php-dapphp-radius-2.5.8/debian/patches/0002-Fixes-for-PHP-8.x.patch	2022-03-10 16:46:02.000000000 -0300
@@ -0,0 +1,110 @@
+From 91577ec55466ec8d7f9e1b606b102a6ece0e5124 Mon Sep 17 00:00:00 2001
+From: dapphp <drew@drew-phillips.com>
+Date: Tue, 25 Jan 2022 20:24:58 -0800
+Subject: [PATCH] Release 3.0 to target PHP 7.3+ and PHP 8.x
+
+Last-Update: 2022-02-25
+Origin: upstream, https://github.com/dapphp/radius/commit/91577ec55466ec8d7f9e1b606b102a6ece0e5124
+---
+ .travis.yml          | 16 +++++-----------
+ composer.json        |  8 ++++----
+ tests/ClientTest.php | 10 +++++++++-
+ tests/bootstrap.php  |  6 ------
+ 4 files changed, 18 insertions(+), 24 deletions(-)
+
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -4,23 +4,17 @@
+ 
+ matrix:
+   include:
+-    - php: 5.4
+-      dist: trusty
+-    - php: 5.6
+-      dist: trusty
+-    - php: 7.0
+-      dist: trusty
+-    - php: 7.1
+-      dist: trusty
+-    - php: 7.2
+-      dist: trusty
+     - php: 7.3
+       dist: bionic
+     - php: 7.4
+       dist: bionic
++    - php: 8.0
++      dist: bionic
++    - php: 8.1
++      dist: bionic
+ 
+ before_install:
+-    - composer require --dev --no-update phpunit/phpunit ^4.8
++    - composer require --dev --no-update phpunit/phpunit ^9.5
+ 
+ before_script: composer install
+ 
+--- a/composer.json
++++ b/composer.json
+@@ -5,10 +5,10 @@
+     "keywords": ["radius","authentication","authorization","pap","chap","ms-chap","ms-chap v2","rfc2865","rfc1994","rfc2284","rfc2869","rfc2759"],
+     "homepage": "https://github.com/dapphp/radius",
+     "require": {
+-        "php": ">=5.3 || <= 7.4"
++        "php": "^7.3 || ^8.0"
+     },
+     "require-dev": {
+-        "phpunit/phpunit": "^4.8"
++        "phpunit/phpunit": "^9.5.13"
+     },
+     "suggest": {
+         "ext-openssl": "To support hashing required by Pear_CHAP"
+@@ -26,9 +26,9 @@
+         }
+     ],
+     "autoload": {
+-	"psr-0": {
++        "psr-0": {
+             "Crypt_CHAP_": "lib/"
+-	},
++        },
+         "psr-4": {
+             "Dapphp\\Radius\\": "src/"
+         }
+--- a/tests/ClientTest.php
++++ b/tests/ClientTest.php
+@@ -5,7 +5,9 @@
+ use Dapphp\Radius\MsChapV2Packet;
+ use Dapphp\Radius\VendorId;
+ 
+-class ClientTest extends PHPUnit_Framework_TestCase
++use PHPUnit\Framework\TestCase;
++
++class ClientTest extends TestCase
+ {
+     public function testAttributes()
+     {
+@@ -248,6 +250,12 @@
+ 
+     public function testEapPacketBasic()
+     {
++        $p = new MsChapV2Packet();
++        $p->opcode = MsChapV2Packet::OPCODE_SUCCESS;
++        $s = $p->__toString();
++
++        $this->assertEquals("\x03", $s, "MsChapV2Packet success returns 0x03 without error");
++
+         $p       = new EAPPacket();
+         $p->code = EAPPacket::CODE_REQUEST;
+         $p->id   = 111;
+--- a/tests/bootstrap.php
++++ b/tests/bootstrap.php
+@@ -1,9 +1,3 @@
+ <?php
+ 
+ require_once __DIR__ . '/../vendor/autoload.php';
+-
+-if (!function_exists('hex2bin')) {
+-    function hex2bin($str) {
+-        return pack("H*" , $str);
+-    }
+-}
diff -Nru php-dapphp-radius-2.5.8/debian/patches/series php-dapphp-radius-2.5.8/debian/patches/series
--- php-dapphp-radius-2.5.8/debian/patches/series	2022-01-28 05:41:19.000000000 -0300
+++ php-dapphp-radius-2.5.8/debian/patches/series	2022-03-10 16:46:02.000000000 -0300
@@ -1 +1 @@
-0001-Use-current-PHPUnit.patch
+0002-Fixes-for-PHP-8.x.patch