Control: tags 1067628 + patch
Dear maintainer,
I've prepared an NMU for cctools (versioned as 9.9-4.1). The diff
is attached to this message.
Regards.
--
Sebastian Ramacher
diff -Nru cctools-9.9/debian/changelog cctools-9.9/debian/changelog
--- cctools-9.9/debian/changelog 2023-12-06 11:26:18.000000000 +0100
+++ cctools-9.9/debian/changelog 2024-04-21 22:18:03.000000000 +0200
@@ -1,3 +1,13 @@
+cctools (9.9-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+
+ [ Michael Hudson-Doyle ]
+ * Undefine _FILE_OFFSET_BITS and _TIME_BITS in rmonitor_helper.c so the library's
+ interposition of open/open64 still works. (Closes: #1067628)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sun, 21 Apr 2024 22:18:03 +0200
+
cctools (9.9-4) unstable; urgency=medium
* Fix to build to correct globus configuration, enable broken
diff -Nru cctools-9.9/debian/patches/globus-flags.patch cctools-9.9/debian/patches/globus-flags.patch
--- cctools-9.9/debian/patches/globus-flags.patch 2023-12-06 11:26:18.000000000 +0100
+++ cctools-9.9/debian/patches/globus-flags.patch 2024-03-20 03:59:10.000000000 +0100
@@ -15,3 +15,17 @@
CCTOOLS_GLOBUS_CCFLAGS=${globus_ccflags}
export CCTOOLS_TEST_CCFLAGS=${test_ccflags}
+--- a/resource_monitor/src/rmonitor_helper.c
++++ b/resource_monitor/src/rmonitor_helper.c
+@@ -13,6 +13,11 @@
+ #define _GNU_SOURCE // Aaaaaah!!
+ #endif
+
++/* Building with these macros defines interferes with this files attempt to
++ interpose both open and open64 */
++#undef _FILE_OFFSET_BITS
++#undef _TIME_BITS
++
+ #include <assert.h>
+ #include <dlfcn.h>
+ #include <errno.h>
