Package: tcpxtract Followup-For: Bug #1066484 User: ubuntu-de...@lists.ubuntu.com 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/70_fix-implicit-declarations.patch: Add missing includes and function prototypes. Closes #1066484, LP: #2061589. 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-27-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 tcpxtract-1.0.1/debian/patches/70_fix-implicit-declarations.patch tcpxtract-1.0.1/debian/patches/70_fix-implicit-declarations.patch --- tcpxtract-1.0.1/debian/patches/70_fix-implicit-declarations.patch 1969-12-31 17:00:00.000000000 -0700 +++ tcpxtract-1.0.1/debian/patches/70_fix-implicit-declarations.patch 2024-04-15 10:41:14.000000000 -0600 @@ -0,0 +1,57 @@ +Description: Add missing includes and function prototypes + This fixes the FTBFS on armhf +Author: Zixing Liu <zixing....@canonical.com> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066484 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/2061589 +Forwarded: no +Last-Update: 2024-04-15 +--- +Index: tcpxtract/conf.h +=================================================================== +--- tcpxtract.orig/conf.h ++++ tcpxtract/conf.h +@@ -24,5 +24,8 @@ + #define CONF_H + + extern void config_type(char *, char *, char *, char *); ++int yyparse (void); ++int yyerror(char *s); ++int yylex (void); + + #endif /* CONF_H */ +Index: tcpxtract/confl.l +=================================================================== +--- tcpxtract.orig/confl.l ++++ tcpxtract/confl.l +@@ -20,6 +20,7 @@ + Tcpxtract, a sniffer that extracts files based on headers + by Nick Harbour + */ ++#include <stdlib.h> + #include "confy.h" + %} + +Index: tcpxtract/confy.y +=================================================================== +--- tcpxtract.orig/confy.y ++++ tcpxtract/confy.y +@@ -23,6 +23,7 @@ + + #include <stdlib.h> + #include "conf.h" ++#include "confy.h" + %} + + %union { +Index: tcpxtract/tcpxtract.c +=================================================================== +--- tcpxtract.orig/tcpxtract.c ++++ tcpxtract/tcpxtract.c +@@ -44,6 +44,7 @@ + + #include "sessionlist.h" + #include "util.h" ++#include "conf.h" + #include "confy.h" + #include "search.h" + diff -Nru tcpxtract-1.0.1/debian/patches/series tcpxtract-1.0.1/debian/patches/series --- tcpxtract-1.0.1/debian/patches/series 2023-02-06 05:27:00.000000000 -0700 +++ tcpxtract-1.0.1/debian/patches/series 2024-04-15 10:38:13.000000000 -0600 @@ -4,3 +4,4 @@ 40_fix-png-header-bytes.patch 50_fix-spelling-binary.patch 60_libfl.patch +70_fix-implicit-declarations.patch