Hi, On Fri, Apr 12, 2024 at 03:26:44PM -0600, Zixing Liu wrote: > 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.
Thanks! I uploaded an NMU with your patch (and some other light packaging changes) to DELAYED/0-day. Kind regards Philipp Kern
diff -Nru samhain-4.1.4/debian/changelog samhain-4.1.4/debian/changelog --- samhain-4.1.4/debian/changelog 2023-08-15 22:46:14.000000000 +0200 +++ samhain-4.1.4/debian/changelog 2024-09-30 09:52:13.000000000 +0200 @@ -1,3 +1,14 @@ +samhain (4.1.4-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix compilation with gcc-13. Thanks to Zixing Liu for the patch. + (Closes: #1066529) + * Add missing build-depends on dh-exec. + * Build-depend on libext2fs-dev instead of obsolete e2fslibs-dev. + * Add missing shebangs to config and preinst. (Closes: #843304) + + -- Philipp Kern <pk...@debian.org> Mon, 30 Sep 2024 09:52:13 +0200 + samhain (4.1.4-2.1) unstable; urgency=medium * Non-maintainer upload diff -Nru samhain-4.1.4/debian/config samhain-4.1.4/debian/config --- samhain-4.1.4/debian/config 2023-08-15 22:46:14.000000000 +0200 +++ samhain-4.1.4/debian/config 2024-09-30 09:52:13.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/sh # Debconf Config Script for samhain # diff -Nru samhain-4.1.4/debian/control samhain-4.1.4/debian/control --- samhain-4.1.4/debian/control 2023-08-15 22:46:14.000000000 +0200 +++ samhain-4.1.4/debian/control 2024-09-30 09:52:13.000000000 +0200 @@ -2,7 +2,7 @@ Section: admin Priority: optional Maintainer: Javier Fernández-Sanguino Peña <j...@debian.org> -Build-Depends: debhelper (>> 9), autoconf, procps, libgmp3-dev, e2fslibs-dev, libprelude-dev, libauparse-dev [linux-any], autotools-dev +Build-Depends: debhelper (>> 9), autoconf, procps, libgmp3-dev, libext2fs-dev, libprelude-dev, libauparse-dev [linux-any], autotools-dev, dh-exec Standards-Version: 3.9.8 Homepage: http://la-samhna.de/samhain/index.html 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 1970-01-01 01:00:00.000000000 +0100 +++ samhain-4.1.4/debian/patches/gcc13.patch 2024-09-30 09:52:06.000000000 +0200 @@ -0,0 +1,33 @@ +Description: Add missing includes and use va_copy compiler builtin +Author: Zixing Liu <zixing....@canonical.com> +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 22:46:14.000000000 +0200 +++ samhain-4.1.4/debian/patches/series 2024-09-30 09:52:06.000000000 +0200 @@ -1,2 +1,3 @@ debian.patch configure.patch +gcc13.patch diff -Nru samhain-4.1.4/debian/preinst samhain-4.1.4/debian/preinst --- samhain-4.1.4/debian/preinst 2023-08-15 22:46:14.000000000 +0200 +++ samhain-4.1.4/debian/preinst 2024-09-30 09:52:13.000000000 +0200 @@ -1,3 +1,4 @@ +#!/bin/sh # Preinstall file for samhain diff -Nru samhain-4.1.4/debian/rules samhain-4.1.4/debian/rules --- samhain-4.1.4/debian/rules 2023-08-15 22:46:14.000000000 +0200 +++ samhain-4.1.4/debian/rules 2024-09-30 09:52:13.000000000 +0200 @@ -51,7 +51,7 @@ --enable-port-check \ --enable-suidcheck \ --with-pid-file=/var/run/samhain/samhain.pid \ - --with-log-file=/var/log/samhain/samhain.log + --with-log-file=/var/log/samhain/samhain.log override_dh_clean: [ ! -f Makefile ] || $(MAKE) distclean
