diff -Nru fwknop-2.6.10/debian/changelog fwknop-2.6.10/debian/changelog --- fwknop-2.6.10/debian/changelog 2020-06-16 03:16:27.000000000 +0000 +++ fwknop-2.6.10/debian/changelog 2020-07-23 03:33:25.000000000 +0000 @@ -1,3 +1,11 @@ +fwknop (2.6.10-11) unstable; urgency=high + + * Fix gcc10 build (closes: #957244). + * Fix typo in lintian override. + * Build with root explicitly. + + -- Francois Marier Wed, 22 Jul 2020 20:33:25 -0700 + fwknop (2.6.10-10) unstable; urgency=medium * Remove PIDFile from systemd service since systemd tries to read that diff -Nru fwknop-2.6.10/debian/control fwknop-2.6.10/debian/control --- fwknop-2.6.10/debian/control 2020-06-16 03:16:27.000000000 +0000 +++ fwknop-2.6.10/debian/control 2020-07-23 03:33:25.000000000 +0000 @@ -16,6 +16,7 @@ wget, Maintainer: Francois Marier Standards-Version: 4.5.0 +Rules-Requires-Root: binary-targets Vcs-Git: https://salsa.debian.org/debian/fwknop.git Vcs-Browser: https://salsa.debian.org/debian/fwknop Homepage: https://www.cipherdyne.com/fwknop/ diff -Nru fwknop-2.6.10/debian/fwknop-server.lintian-overrides fwknop-2.6.10/debian/fwknop-server.lintian-overrides --- fwknop-2.6.10/debian/fwknop-server.lintian-overrides 2020-06-16 03:16:27.000000000 +0000 +++ fwknop-2.6.10/debian/fwknop-server.lintian-overrides 2020-07-23 03:33:25.000000000 +0000 @@ -1,7 +1,5 @@ -# The access file contains informations (passwords) that could allow users to +# The access file contains information (passwords) that could allow users to # get unauthorized access to the fwknop-server. Therefore permissions on this # file have to be tightened. non-standard-file-perm etc/fwknop/access.conf 0600 != 0644 - non-standard-file-perm etc/fwknop/fwknopd.conf 0600 != 0644 - diff -Nru fwknop-2.6.10/debian/patches/005_gcc10.patch fwknop-2.6.10/debian/patches/005_gcc10.patch --- fwknop-2.6.10/debian/patches/005_gcc10.patch 1970-01-01 00:00:00.000000000 +0000 +++ fwknop-2.6.10/debian/patches/005_gcc10.patch 2020-07-23 03:33:25.000000000 +0000 @@ -0,0 +1,18 @@ +Author: Jakub Jelen +Description: Add Ubuntu 20.04 support to AppArmor profile +Bug: https://github.com/mrash/fwknop/issues/305 +Bug-Debian: https://bugs.debian.org/957244 +Last-Update: 2020-07-22 +Forwarded: no + +--- a/client/log_msg.h ++++ b/client/log_msg.h +@@ -38,7 +38,7 @@ enum + LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ + LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ + LOG_LAST_VERBOSITY +-} log_level_t; ++}; + + #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ + diff -Nru fwknop-2.6.10/debian/patches/series fwknop-2.6.10/debian/patches/series --- fwknop-2.6.10/debian/patches/series 2020-06-16 03:16:27.000000000 +0000 +++ fwknop-2.6.10/debian/patches/series 2020-07-23 03:33:25.000000000 +0000 @@ -2,3 +2,4 @@ 002_fix-run-dir.patch 003_apparmor_ipset.patch 004_apparmor_ubuntu2004.patch +005_gcc10.patch