diff -Nru ctfutils-9.2/debian/changelog ctfutils-9.2/debian/changelog --- ctfutils-9.2/debian/changelog 2014-01-08 19:57:04.000000000 +0000 +++ ctfutils-9.2/debian/changelog 2014-01-09 23:54:09.000000000 +0000 @@ -1,3 +1,10 @@ +ctfutils (9.2-5) unstable; urgency=low + + * Add -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE to CFLAGS. Thanks + Aaron M. Ucko. (Closes: #734782) + + -- Robert Millan Fri, 10 Jan 2014 00:54:09 +0100 + ctfutils (9.2-4) unstable; urgency=low * off64_t.diff: Fix off64_t typedef conflict. diff -Nru ctfutils-9.2/debian/patches/off64_t.diff ctfutils-9.2/debian/patches/off64_t.diff --- ctfutils-9.2/debian/patches/off64_t.diff 2014-01-08 19:55:46.000000000 +0000 +++ ctfutils-9.2/debian/patches/off64_t.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ ---- a/sys/cddl/compat/opensolaris/sys/types.h -+++ b/sys/cddl/compat/opensolaris/sys/types.h -@@ -52,7 +52,8 @@ - typedef u_long ulong_t; - typedef long long longlong_t; - typedef unsigned long long u_longlong_t; --typedef off_t off64_t; -+typedef __off64_t off64_t; -+#define __off64_t_defined - typedef id_t taskid_t; - typedef id_t projid_t; - typedef id_t poolid_t; diff -Nru ctfutils-9.2/debian/patches/series ctfutils-9.2/debian/patches/series --- ctfutils-9.2/debian/patches/series 2014-01-08 19:56:02.000000000 +0000 +++ ctfutils-9.2/debian/patches/series 2014-01-09 23:49:59.000000000 +0000 @@ -5,7 +5,6 @@ # Other patches that might or might not be mergeable ulong_t.diff -off64_t.diff # Patches that are likely to be Debian-specific makefile.diff diff -Nru ctfutils-9.2/debian/rules ctfutils-9.2/debian/rules --- ctfutils-9.2/debian/rules 2013-12-29 19:30:03.000000000 +0000 +++ ctfutils-9.2/debian/rules 2014-01-09 23:53:20.000000000 +0000 @@ -15,6 +15,12 @@ -Werror=implicit-function-declaration \ $(NULL) +# Satisfy 64-bit off_t assumptions in the compat layer (see #734782) +CFLAGS += -D_FILE_OFFSET_BITS=64 + +# Enable fseeko / ftello prototypes, used in the compat layer +CFLAGS += -D_LARGEFILE_SOURCE + ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else