Merge ~liushuyu-011/ubuntu/+source/tcpxtract:ubuntu/devel into ubuntu/+source/tcpxtract:ubuntu/devel

[Zixing Liu]

This MP fixes the FTBFS issue on armhf due to missing includes and function prototypes.

[Zixing Liu (liushuyu-011)]

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/15932753/+listing-archive-extra

[Nick Rosbrook (enr0n)]

LGTM. Sponsored.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 95caf6a..90e76d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tcpxtract (1.0.1-17ubuntu1) noble; urgency=medium
+
+  * debian/patches/70_fix-implicit-declarations.patch: Add missing
+    includes and function prototypes.  Closes #1066484, LP: #2061589.
+
+ -- Zixing Liu <[e-mail]>  Mon, 15 Apr 2024 10:41:14 -0600
+
 tcpxtract (1.0.1-17build2) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/70_fix-implicit-declarations.patch b/debian/patches/70_fix-implicit-declarations.patch
 new file mode 100644
index 0000000..300762f
--- /dev/null
+++ b/debian/patches/70_fix-implicit-declarations.patch
@@ -0,0 +1,57 @@
+Description: Add missing includes and function prototypes
+ This fixes the FTBFS on armhf
+Author: Zixing Liu <[e-mail]>
+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 --git a/debian/patches/series b/debian/patches/series
index 4cca07f..4c8260e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 40_fix-png-header-bytes.patch
 50_fix-spelling-binary.patch
 60_libfl.patch
+70_fix-implicit-declarations.patch