Package: samhain
Followup-For: Bug #1066529
User: [email protected]
Usertags: origin-ubuntu noble ubuntu-patch
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/gcc13.patch: Add missing includes and use va_copy
compiler builtin. Closes LP: #2061192.
Thanks for considering the patch.
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'),
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 6.5.0-26-generic (SMP w/10 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8),
LANGUAGE=en_CA:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru samhain-4.1.4/debian/patches/gcc13.patch
samhain-4.1.4/debian/patches/gcc13.patch
--- samhain-4.1.4/debian/patches/gcc13.patch 1969-12-31 17:00:00.000000000
-0700
+++ samhain-4.1.4/debian/patches/gcc13.patch 2024-04-12 15:20:21.000000000
-0600
@@ -0,0 +1,33 @@
+Description: Add missing includes and use va_copy compiler builtin
+Author: Zixing Liu <[email protected]>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066529
+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/samhain/+bug/2061192
+Forwarded: no
+Last-Update: 2024-04-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: samhain/src/sh_error.c
+===================================================================
+--- samhain.orig/src/sh_error.c
++++ samhain/src/sh_error.c
+@@ -1584,7 +1584,7 @@ int sh_error_ehead (/*@null@*/const char
+ #if defined(__GNUC__) && defined(__PPC__) && (defined(_CALL_SYSV) ||
defined(_WIN32))
+ #define VA_COPY(ap1, ap2) (*(ap1) = *(ap2))
+ #elif defined(VA_COPY_AS_ARRAY)
+-#define VA_COPY(ap1, ap2) memmove ((ap1), (ap2), sizeof (va_list))
++#define VA_COPY(ap1, ap2) va_copy((ap1), (ap2))
+ #else /* va_list is a pointer */
+ #define VA_COPY(ap1, ap2) ((ap1) = (ap2))
+ #endif
+Index: samhain/src/sh_prelude.c
+===================================================================
+--- samhain.orig/src/sh_prelude.c
++++ samhain/src/sh_prelude.c
+@@ -35,6 +35,7 @@
+
+ #include "config_xor.h"
+
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
diff -Nru samhain-4.1.4/debian/patches/series
samhain-4.1.4/debian/patches/series
--- samhain-4.1.4/debian/patches/series 2023-08-15 14:46:14.000000000 -0600
+++ samhain-4.1.4/debian/patches/series 2024-04-12 15:17:16.000000000 -0600
@@ -1,2 +1,3 @@
debian.patch
configure.patch
+gcc13.patch
