diff -Nru john-1.8.0/debian/changelog john-1.8.0/debian/changelog
--- john-1.8.0/debian/changelog	2021-02-05 03:59:29.000000000 +0000
+++ john-1.8.0/debian/changelog	2021-03-31 07:06:51.000000000 +0000
@@ -1,3 +1,12 @@
+john (1.8.0-4ubuntu1) hirsute; urgency=medium
+
+  * Fix FTBFS on s390x with LTO (LP: #1922012)
+    - d/p/s390x-lto-ftbfs.diff: Don't try and inline a function which is
+      used across two different compilation units as this can fail with LTO
+      enabled.
+
+ -- Alex Murray <alex.murray@canonical.com>  Wed, 31 Mar 2021 17:36:51 +1030
+
 john (1.8.0-4) unstable; urgency=medium
 
   * Also unconditionally and always call "mkdir -p $RUNDIR" in cron
diff -Nru john-1.8.0/debian/control john-1.8.0/debian/control
--- john-1.8.0/debian/control	2021-01-31 22:20:19.000000000 +0000
+++ john-1.8.0/debian/control	2021-03-31 07:06:51.000000000 +0000
@@ -1,7 +1,8 @@
 Source: john
 Section: admin
 Priority: optional
-Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
 Uploaders: Julián Moreno Patiño <julian@debian.org>,
            Axel Beckert <abe@debian.org>
 Build-Depends: debhelper-compat (= 13),
diff -Nru john-1.8.0/debian/patches/s390x-lto-ftbfs.diff john-1.8.0/debian/patches/s390x-lto-ftbfs.diff
--- john-1.8.0/debian/patches/s390x-lto-ftbfs.diff	1970-01-01 00:00:00.000000000 +0000
+++ john-1.8.0/debian/patches/s390x-lto-ftbfs.diff	2021-03-31 07:06:51.000000000 +0000
@@ -0,0 +1,13 @@
+Author: Alex Murray <alex.murray@canonical.com>
+Description: Don't inline across different compilation units
+--- a/src/DES_bs_b.c
++++ b/src/DES_bs_b.c
+@@ -1041,7 +1041,7 @@ static MAYBE_INLINE void DES_bs_finalize
+ #endif
+ 
+ #if DES_bs_mt
+-MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt)
++void DES_bs_set_salt_for_thread(int t, unsigned int salt)
+ #else
+ void DES_bs_set_salt(ARCH_WORD salt)
+ #endif
diff -Nru john-1.8.0/debian/patches/series john-1.8.0/debian/patches/series
--- john-1.8.0/debian/patches/series	2021-01-26 03:30:58.000000000 +0000
+++ john-1.8.0/debian/patches/series	2021-03-31 05:23:03.000000000 +0000
@@ -3,3 +3,4 @@
 kfreebsd-c3_fmt.diff
 define-cfg-name.diff
 enable-openmp-support.diff
+s390x-lto-ftbfs.diff