Package: vde2
Version: 2.3.2+r586-9.1
Followup-For: Bug #1065951
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
X-Debbugs-Cc: michael.hud...@ubuntu.com
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Undefine _FILE_OFFSET_BITS and _TIME_BITS in libvdetap.c so the library's
interposition of open/open64 still works.
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers mantic-updates
APT policy: (500, 'mantic-updates'), (500, 'mantic-security'), (500,
'mantic'), (100, 'mantic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-25-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
LANGUAGE=en_NZ.UTF-8:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru vde2-2.3.2+r586/debian/patches/interposition-vs-lfs.patch
vde2-2.3.2+r586/debian/patches/interposition-vs-lfs.patch
--- vde2-2.3.2+r586/debian/patches/interposition-vs-lfs.patch 1970-01-01
12:00:00.000000000 +1200
+++ vde2-2.3.2+r586/debian/patches/interposition-vs-lfs.patch 2024-03-20
09:33:55.000000000 +1300
@@ -0,0 +1,22 @@
+Description: Undo lfs/time64 defines in libvdetap.c
+ Building with these macros defines interferes with this files attempt to
+ interpose both open and open64
+Author: Michael Hudson-Doyle <michael.hud...@ubuntu.com>
+Forwarded: no
+Last-Update: 2024-03-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/vdetaplib/libvdetap.c
++++ b/src/vdetaplib/libvdetap.c
+@@ -1,6 +1,11 @@
+ /* Copyright 2004 Renzo Davoli
+ * Reseased under the GPLv2 */
+
++/* Building with these macros defines interferes with this files attempt to
++ interpose both open and open64 */
++#undef _FILE_OFFSET_BITS
++#undef _TIME_BITS
++
+ #define _GNU_SOURCE
+ #include <dlfcn.h>
+ #include <stdio.h>
diff -Nru vde2-2.3.2+r586/debian/patches/series
vde2-2.3.2+r586/debian/patches/series
--- vde2-2.3.2+r586/debian/patches/series 2020-01-31 00:43:23.000000000
+1300
+++ vde2-2.3.2+r586/debian/patches/series 2024-03-20 09:33:55.000000000
+1300
@@ -5,3 +5,4 @@
vdeterm_terminal_reset.patch
fix_qtime_hash_gc_race_condition.patch
vde_cryptcab-compile-against-openssl-1.1.0.patch
+interposition-vs-lfs.patch
