diff -Nru snoopy-2.4.6/debian/changelog snoopy-2.4.6/debian/changelog
--- snoopy-2.4.6/debian/changelog	2019-11-08 23:23:51.000000000 +0000
+++ snoopy-2.4.6/debian/changelog	2020-03-04 13:32:21.000000000 +0000
@@ -1,3 +1,11 @@
+snoopy (2.4.6-6ubuntu1) focal; urgency=medium
+
+  * debian/rules: set -Wno-error=stringop-truncation, to avoid a build
+    failure for a perfectly valid use of strncpy() that is incompatible
+    with -O3.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 04 Mar 2020 05:32:21 -0800
+
 snoopy (2.4.6-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru snoopy-2.4.6/debian/control snoopy-2.4.6/debian/control
--- snoopy-2.4.6/debian/control	2019-11-08 23:23:51.000000000 +0000
+++ snoopy-2.4.6/debian/control	2020-03-04 13:32:21.000000000 +0000
@@ -1,7 +1,8 @@
 Source: snoopy
 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: Marcos Fouces <marcos.fouces@gmail.com>
 Build-Depends: debhelper-compat (= 12), procps, socat
 Standards-Version: 4.4.1
diff -Nru snoopy-2.4.6/debian/patches/06_disable_rpname_test.patch snoopy-2.4.6/debian/patches/06_disable_rpname_test.patch
--- snoopy-2.4.6/debian/patches/06_disable_rpname_test.patch	2019-11-08 23:23:51.000000000 +0000
+++ snoopy-2.4.6/debian/patches/06_disable_rpname_test.patch	2020-03-04 13:32:00.000000000 +0000
@@ -8,11 +8,11 @@
 Author: Aleksey Kravchenko <rhash.admin@gmail.com>
 Forwarded: not-needed
 
-diff --git a/tests/datasource/Makefile.am b/tests/datasource/Makefile.am
-index 0ebd615..fb1c532 100644
---- a/tests/datasource/Makefile.am
-+++ b/tests/datasource/Makefile.am
-@@ -79,7 +79,7 @@ if DATASOURCE_ENABLED_ppid
+Index: snoopy-2.4.6/tests/datasource/Makefile.am
+===================================================================
+--- snoopy-2.4.6.orig/tests/datasource/Makefile.am
++++ snoopy-2.4.6/tests/datasource/Makefile.am
+@@ -79,7 +79,7 @@
  endif
  
  if DATASOURCE_ENABLED_rpname
diff -Nru snoopy-2.4.6/debian/rules snoopy-2.4.6/debian/rules
--- snoopy-2.4.6/debian/rules	2019-11-08 23:23:51.000000000 +0000
+++ snoopy-2.4.6/debian/rules	2020-03-04 13:28:41.000000000 +0000
@@ -3,6 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+export DEB_CFLAGS_MAINT_APPEND = -Wno-error=stringop-truncation
 %:
 	dh $@