diff -pruN 0.11.1+ds-4/debian/changelog 0.11.1+ds-4ubuntu1/debian/changelog
--- 0.11.1+ds-4/debian/changelog	2021-10-03 02:28:41.000000000 +0000
+++ 0.11.1+ds-4ubuntu1/debian/changelog	2021-12-30 08:00:06.000000000 +0000
@@ -1,3 +1,11 @@
+securefs (0.11.1+ds-4ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/p/0004-Ensure-tmp-dir-exists-before-use.patch:
+      Ensure tmp dir exists before use.  Fixes FTBFS.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 30 Dec 2021 00:00:06 -0800
+
 securefs (0.11.1+ds-4) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.0
@@ -7,6 +15,25 @@ securefs (0.11.1+ds-4) unstable; urgency
 
  -- Yanhao <yanhaocs@gmail.com>  Sun, 03 Oct 2021 10:28:41 +0800
 
+securefs (0.11.1+ds-3ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild against libjsoncpp25
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 14 Dec 2021 07:52:08 +0000
+
+securefs (0.11.1+ds-3ubuntu2) hirsute; urgency=medium
+
+  * Update-maintainer
+
+ -- Bryce Harrington <bryce@canonical.com>  Fri, 09 Apr 2021 21:11:01 +0000
+
+securefs (0.11.1+ds-3ubuntu1) hirsute; urgency=medium
+
+  * d/p/0004-Ensure-tmp-dir-exists-before-use.patch:
+    Ensure tmp dir exists before use.  Fixes FTBFS.
+
+ -- Bryce Harrington <bryce@canonical.com>  Fri, 09 Apr 2021 02:43:27 +0000
+
 securefs (0.11.1+ds-3) unstable; urgency=medium
 
   * Source only upload for migration to testing
@@ -54,3 +81,4 @@ securefs (0.8.2+ds-1) unstable; urgency=
   * Initial release. Closes: #906791
 
  -- Yanhao Mo <yanhaocs@gmail.com>  Mon, 27 Aug 2018 10:17:49 +0800
+
diff -pruN 0.11.1+ds-4/debian/control 0.11.1+ds-4ubuntu1/debian/control
--- 0.11.1+ds-4/debian/control	2021-10-03 02:28:41.000000000 +0000
+++ 0.11.1+ds-4ubuntu1/debian/control	2021-12-30 08:00:06.000000000 +0000
@@ -1,7 +1,8 @@
 Source: securefs
 Section: utils
 Priority: optional
-Maintainer: Yanhao Mo <yanhaocs@gmail.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Yanhao Mo <yanhaocs@gmail.com>
 Build-Depends: catch,
                cmake,
                debhelper (>=11~),
diff -pruN 0.11.1+ds-4/debian/patches/0004-Ensure-tmp-dir-exists-before-use.patch 0.11.1+ds-4ubuntu1/debian/patches/0004-Ensure-tmp-dir-exists-before-use.patch
--- 0.11.1+ds-4/debian/patches/0004-Ensure-tmp-dir-exists-before-use.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.11.1+ds-4ubuntu1/debian/patches/0004-Ensure-tmp-dir-exists-before-use.patch	2021-04-09 02:41:48.000000000 +0000
@@ -0,0 +1,34 @@
+From 8824e71092cd19b7e928d7dea563656752d7a32a Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <bryce@canonical.com>
+Date: Fri, 9 Apr 2021 02:39:11 +0000
+Subject: [PATCH] Ensure tmp dir exists before use
+
+Under at least some circumstances, the test_chpass test case can be
+invoked before the 'tmp/' directory has been created, resulting in the
+following error:
+
+  File "/home/bryce/pkg/Securefs/ubuntu-hirsute/securefs-0.11.1+ds-build/./test/simple_test.py", line 561, in test_chpass
+    old_keyfiles = [None, self._generate_keyfile()]
+  File "/home/bryce/pkg/Securefs/ubuntu-hirsute/securefs-0.11.1+ds-build/./test/simple_test.py", line 509, in _generate_keyfile
+    with tempfile.NamedTemporaryFile(
+  FileNotFoundError: [Errno 2] No such file or directory: 'tmp/keynzcdbht0'
+---
+ test/simple_test.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/simple_test.py b/test/simple_test.py
+index 9e86a5b..c8ad4e7 100755
+--- a/test/simple_test.py
++++ b/test/simple_test.py
+@@ -506,6 +506,8 @@ def list_dir_recursive(dirname: str, relpath=False) -> Set[str]:
+ 
+ class ChpassTest(unittest.TestCase):
+     def _generate_keyfile(self):
++        if not os.path.exists("tmp"):
++            os.mkdir("tmp")
+         with tempfile.NamedTemporaryFile(
+             dir="tmp", mode="wb", delete=False, prefix="key"
+         ) as f:
+-- 
+2.30.2
+
diff -pruN 0.11.1+ds-4/debian/patches/series 0.11.1+ds-4ubuntu1/debian/patches/series
--- 0.11.1+ds-4/debian/patches/series	2021-10-03 02:28:41.000000000 +0000
+++ 0.11.1+ds-4ubuntu1/debian/patches/series	2021-12-20 04:47:21.000000000 +0000
@@ -1,3 +1,4 @@
 0001-use-system-libcrypto.patch
 0002-use-system-libjsoncpp.patch
 0003-use-system-utf8proc.patch
+0004-Ensure-tmp-dir-exists-before-use.patch