diff -pruN 0.0~git20191015.7330a51-6.1/debian/changelog 0.0~git20191015.7330a51-6.1ubuntu3/debian/changelog
--- 0.0~git20191015.7330a51-6.1/debian/changelog	2021-02-10 11:15:45.000000000 +0000
+++ 0.0~git20191015.7330a51-6.1ubuntu3/debian/changelog	2022-03-21 15:05:34.000000000 +0000
@@ -1,3 +1,21 @@
+golang-github-avast-apkverifier (0.0~git20191015.7330a51-6.1ubuntu3) jammy; urgency=medium
+
+  * Temporarily allow SHA1 certs in test cases only to fix tests with Go 1.18
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Mon, 21 Mar 2022 10:05:34 -0500
+
+golang-github-avast-apkverifier (0.0~git20191015.7330a51-6.1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against Go 1.17
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Tue, 30 Nov 2021 13:50:35 -0600
+
+golang-github-avast-apkverifier (0.0~git20191015.7330a51-6.1ubuntu1) hirsute; urgency=medium
+
+  * Backport upstream patch to fix autopkgtests with Go 1.16.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 22 Feb 2021 13:27:36 +1300
+
 golang-github-avast-apkverifier (0.0~git20191015.7330a51-6.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -pruN 0.0~git20191015.7330a51-6.1/debian/control 0.0~git20191015.7330a51-6.1ubuntu3/debian/control
--- 0.0~git20191015.7330a51-6.1/debian/control	2020-04-14 08:20:20.000000000 +0000
+++ 0.0~git20191015.7330a51-6.1ubuntu3/debian/control	2021-02-22 00:27:36.000000000 +0000
@@ -1,5 +1,6 @@
 Source: golang-github-avast-apkverifier
-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders: Hans-Christoph Steiner <hans@eds.org>
 Section: devel
 Testsuite: autopkgtest-pkg-go
diff -pruN 0.0~git20191015.7330a51-6.1/debian/patches/0001-Try-to-fix-DSA-on-go1.16.patch 0.0~git20191015.7330a51-6.1ubuntu3/debian/patches/0001-Try-to-fix-DSA-on-go1.16.patch
--- 0.0~git20191015.7330a51-6.1/debian/patches/0001-Try-to-fix-DSA-on-go1.16.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.0~git20191015.7330a51-6.1ubuntu3/debian/patches/0001-Try-to-fix-DSA-on-go1.16.patch	2021-02-22 00:27:36.000000000 +0000
@@ -0,0 +1,51 @@
+From 99f949ba866c8c05a786cc4b2bec824fe70c946d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Vojt=C4=9Bch=20Bo=C4=8Dek?= <vojtech.bocek@avast.com>
+Date: Tue, 6 Oct 2020 11:51:34 +0200
+Subject: [PATCH] Try to fix DSA on go1.16+
+
+---
+ fullsailor/pkcs7/pkcs7_test.go | 8 +++++++-
+ schemev1.go                    | 4 +++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+--- a/fullsailor/pkcs7/pkcs7_test.go
++++ b/fullsailor/pkcs7/pkcs7_test.go
+@@ -16,6 +16,7 @@
+ 	"math/big"
+ 	"os"
+ 	"os/exec"
++	"strings"
+ 	"testing"
+ 	"time"
+ )
+@@ -45,9 +46,14 @@
+ 	if err != nil {
+ 		t.Errorf("Parse encountered unexpected error: %v", err)
+ 	}
++
+ 	p7.Certificates = []*go_x509.Certificate{andrCertToGoCert(fixture.Certificate)}
+ 	if err := p7.Verify(); err != nil {
+-		t.Errorf("Verify failed with error: %v", err)
++		if strings.Contains(err.Error(), "algorithm unimplemented") {
++			t.Skip("DSA is not supported since go1.16, ignoring:", err)
++		} else {
++			t.Errorf("Verify failed with error: %v", err)
++		}
+ 	}
+ }
+ 
+--- a/schemev1.go
++++ b/schemev1.go
+@@ -811,9 +811,11 @@
+ 			return fmt.Errorf("Unexpected public key type (%T)!", cert.PublicKey)
+ 		}
+ 		return rsa.VerifyPKCS1v15(pub, crypto.SHA224, digest[:], signature)
+-	case DSAWithSHA224, x509.DSAWithSHA256:
++	case x509.DSAWithSHA1, DSAWithSHA224, x509.DSAWithSHA256:
+ 		var hasher hash.Hash
+ 		switch algo {
++		case x509.DSAWithSHA1:
++			hasher = sha1.New()
+ 		case x509.DSAWithSHA256:
+ 			hasher = sha256.New()
+ 		case DSAWithSHA224:
diff -pruN 0.0~git20191015.7330a51-6.1/debian/patches/series 0.0~git20191015.7330a51-6.1ubuntu3/debian/patches/series
--- 0.0~git20191015.7330a51-6.1/debian/patches/series	2021-02-10 11:15:45.000000000 +0000
+++ 0.0~git20191015.7330a51-6.1ubuntu3/debian/patches/series	2021-02-22 00:27:36.000000000 +0000
@@ -1,3 +1,4 @@
 apkverifier-bin.patch
 no-parallel.patch
 disable-TestV1SignedAttrsNotInDerOrder.patch
+0001-Try-to-fix-DSA-on-go1.16.patch
diff -pruN 0.0~git20191015.7330a51-6.1/debian/tests/control 0.0~git20191015.7330a51-6.1ubuntu3/debian/tests/control
--- 0.0~git20191015.7330a51-6.1/debian/tests/control	2021-02-10 11:15:45.000000000 +0000
+++ 0.0~git20191015.7330a51-6.1ubuntu3/debian/tests/control	2022-03-21 15:05:34.000000000 +0000
@@ -1,3 +1,3 @@
-Test-Command: ./runtests.sh
+Test-Command: GODEBUG=x509sha1=1 ./runtests.sh
 Depends: @, @builddeps@, git, ca-certificates, golang-any
 Restrictions: needs-internet, allow-stderr