diff -Nru librelp-1.9.0/debian/changelog librelp-1.9.0/debian/changelog
--- librelp-1.9.0/debian/changelog	2020-11-27 07:06:29.000000000 +1300
+++ librelp-1.9.0/debian/changelog	2020-11-27 10:52:43.000000000 +1300
@@ -1,3 +1,18 @@
+librelp (1.9.0-1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. (LP: #1910307)
+    Remaining changes:
+    [ William Grant ]
+    - d/p/shrink-receiver-abort-tests.sh: Reduce message count
+      so tests pass on slow platforms like riscv64.
+    Dropped changes:
+    - d/p/python2.diff: No longer needed due to tests being 
+      ported to python3 in recent versions.
+  * Fix file descriptor leak as sockets are stuck in CLOSE_WAIT
+    due to not being closed properly due to memory leak. (LP: #1908473)
+
+ -- Matthew Ruffell <matthew.ruffell@canonical.com>  Thu, 26 Nov 2020 21:52:43 +0000
+
 librelp (1.9.0-1) unstable; urgency=medium
 
   * New upstream version 1.9.0
@@ -36,6 +51,20 @@
 
  -- Michael Biebl <biebl@debian.org>  Wed, 22 Apr 2020 13:38:25 +0200
 
+librelp (1.5.0-1ubuntu2) focal; urgency=medium
+
+  * Reduce message count in tests/(tls-)receiver-abort.sh so they reliably
+    succeed on slow platforms like riscv64.
+
+ -- William Grant <wgrant@ubuntu.com>  Tue, 21 Apr 2020 14:07:02 +1000
+
+librelp (1.5.0-1ubuntu1) focal; urgency=medium
+
+  * Build-depend on python2.
+  * Build using python2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 27 Mar 2020 14:06:00 +0100
+
 librelp (1.5.0-1) unstable; urgency=medium
 
   * New upstream version 1.5.0
@@ -338,3 +367,4 @@
   * New upstream release. Closes: #497613
 
  -- Michael Biebl <biebl@debian.org>  Tue, 10 Feb 2009 20:43:37 +0100
+
diff -Nru librelp-1.9.0/debian/control librelp-1.9.0/debian/control
--- librelp-1.9.0/debian/control	2020-11-27 07:06:29.000000000 +1300
+++ librelp-1.9.0/debian/control	2020-11-27 10:52:43.000000000 +1300
@@ -1,7 +1,8 @@
 Source: librelp
 Section: libs
 Priority: optional
-Maintainer: Michael Biebl <biebl@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper-compat (= 13),
                autoconf-archive,
                libgnutls28-dev (>= 2.10.0),
diff -Nru librelp-1.9.0/debian/patches/series librelp-1.9.0/debian/patches/series
--- librelp-1.9.0/debian/patches/series	1970-01-01 12:00:00.000000000 +1200
+++ librelp-1.9.0/debian/patches/series	2020-11-27 10:52:43.000000000 +1300
@@ -0,0 +1 @@
+shrink-receiver-abort-tests.sh
diff -Nru librelp-1.9.0/debian/patches/shrink-receiver-abort-tests.sh librelp-1.9.0/debian/patches/shrink-receiver-abort-tests.sh
--- librelp-1.9.0/debian/patches/shrink-receiver-abort-tests.sh	1970-01-01 12:00:00.000000000 +1200
+++ librelp-1.9.0/debian/patches/shrink-receiver-abort-tests.sh	2020-11-27 10:52:43.000000000 +1300
@@ -0,0 +1,42 @@
+Description: Shrink (tls-)receiver-abort tests
+ Reduce the message count so they reliably succeed on slow platforms like
+ riscv64. Fast platforms work too.
+Author: William Grant <wgrant@ubuntu.com>
+
+Index: librelp-1.9.0-1ubuntu1/tests/receiver-abort.sh
+===================================================================
+--- librelp-1.9.0-1ubuntu1.orig/tests/receiver-abort.sh	2021-01-06 17:15:14.209477534 +1300
++++ librelp-1.9.0-1ubuntu1/tests/receiver-abort.sh	2021-01-06 17:15:14.205477483 +1300
+@@ -5,11 +5,11 @@
+ . ${srcdir:=$(pwd)}/test-framework.sh
+ # export OPT_VERBOSE=-v # uncomment for debugging 
+ export errorlog="error.$LIBRELP_DYN.log"
+-export NUMMESSAGES=100000
++export NUMMESSAGES=10000
+ check_command_available timeout
+ 
+ startup_receiver -e ${TESTDIR}/${errorlog}
+-./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES --no-exit-on-error --kill-on-msg 20000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
++./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES --no-exit-on-error --kill-on-msg 2000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
+ SENDER_PID=$!
+ 
+ for i in {1..3};  do
+Index: librelp-1.9.0-1ubuntu1/tests/tls-receiver-abort.sh
+===================================================================
+--- librelp-1.9.0-1ubuntu1.orig/tests/tls-receiver-abort.sh	2021-01-06 17:15:14.209477534 +1300
++++ librelp-1.9.0-1ubuntu1/tests/tls-receiver-abort.sh	2021-01-06 17:15:14.205477483 +1300
+@@ -4,12 +4,12 @@
+ # of messages
+ . ${srcdir:=$(pwd)}/test-framework.sh
+ check_command_available timeout
+-export NUMMESSAGES=100000
++export NUMMESSAGES=10000
+ 
+ actual_test() {
+ 	startup_receiver
+ 	./send -t 127.0.0.1 -p $TESTPORT -n$NUMMESSAGES --no-exit-on-error \
+-		--kill-on-msg 20000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
++		--kill-on-msg 2000 --kill-pid $RECEIVE_PID $OPT_VERBOSE &
+ 	SENDER_PID=$!
+ 
+ 	for i in {1..3};  do