diff -Nru modglue-1.19/debian/changelog modglue-1.19/debian/changelog --- modglue-1.19/debian/changelog 2020-03-22 15:50:03.000000000 +0000 +++ modglue-1.19/debian/changelog 2020-05-26 02:51:58.000000000 +0000 @@ -1,3 +1,10 @@ +modglue (1.19-0ubuntu8) groovy; urgency=medium + + * Import patch from Debian to fix FTBFS due to unused struct violating + flexible array constraints. + + -- Logan Rosen Mon, 25 May 2020 22:51:58 -0400 + modglue (1.19-0ubuntu7) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. diff -Nru modglue-1.19/debian/patches/flexible-array-member.patch modglue-1.19/debian/patches/flexible-array-member.patch --- modglue-1.19/debian/patches/flexible-array-member.patch 1970-01-01 00:00:00.000000000 +0000 +++ modglue-1.19/debian/patches/flexible-array-member.patch 2020-05-26 02:51:40.000000000 +0000 @@ -0,0 +1,24 @@ +Author: Andreas Beckmann +Description: disable an unused struct that was violating flexible array constraints +Bug-Debian: https://bugs.debian.org/954602 + +--- a/src/pipe.cc ++++ b/src/pipe.cc +@@ -236,13 +236,17 @@ int modglue::pipe::send_blocking_(const + // CHECKED: sendmsg is not the reason for dropped bytes + struct iovec iov[1]; + struct msghdr msg; ++/* + struct { + struct cmsghdr cm; + int fd; + } cmsg; ++*/ + + memset( &msg, 0, sizeof(msg) ); ++/* + memset( &cmsg, 0, sizeof(cmsg) ); ++*/ + + msg.msg_control=0; + msg.msg_controllen=0; diff -Nru modglue-1.19/debian/patches/series modglue-1.19/debian/patches/series --- modglue-1.19/debian/patches/series 2015-08-04 16:48:16.000000000 +0000 +++ modglue-1.19/debian/patches/series 2020-05-26 02:51:52.000000000 +0000 @@ -1 +1,2 @@ 01_fix_libs_in_linking_tests +flexible-array-member.patch