Merge ~vpa1977/ubuntu/+source/sniffit:ubuntu/devel into ubuntu/+source/sniffit:ubuntu/devel

Proposed by Vladimir Petko
Status: Merged
Merged at revision: ca9c1178945a7ef7a25bf2b6779ad705e40e2c3e
Proposed branch: ~vpa1977/ubuntu/+source/sniffit:ubuntu/devel
Merge into: ubuntu/+source/sniffit:ubuntu/devel
Diff against target: 107 lines (+87/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/implicit-declaration.patch (+79/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+464250@code.launchpad.net

Description of the change

Changes:
 - cherry-pick upstream patch

PPA: ppa:vpa1977/october-21[1]

Testing:
 - ppa build [1]

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21/+sourcepub/15931250/+listing-archive-extra

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index ee2b554..15bfd63 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+sniffit (0.5-3ubuntu1) noble; urgency=medium
7+
8+ * d/p/implicit-declaration.patch: cherry-pick upstream patch
9+ to resolve -Werror=implicit-function-declaration (LP: #2061033).
10+
11+ -- Vladimir Petko <vladimir.petko@canonical.com> Mon, 15 Apr 2024 10:10:17 +1200
12+
13 sniffit (0.5-3build2) noble; urgency=medium
14
15 * No-change rebuild for CVE-2024-3094
16diff --git a/debian/patches/implicit-declaration.patch b/debian/patches/implicit-declaration.patch
17new file mode 100644
18index 0000000..4b41023
19--- /dev/null
20+++ b/debian/patches/implicit-declaration.patch
21@@ -0,0 +1,79 @@
22+From: Sam James <sam@gentoo.org>
23+Date: Thu, 28 Jul 2022 12:14:44 +0100
24+Subject: [PATCH 2/2] Fix -Wimplicit-function-declaration (Clang 16)
25+
26+Clang 16 will make -Wimplicit-function-declaration error by default.
27+
28+For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2],
29+or the (new) c-std-porting mailing list [3].
30+
31+[0] https://lwn.net/Articles/913505/
32+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
33+[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
34+[3] hosted at lists.linux.dev.
35+
36+Signed-off-by: Sam James <sam@gentoo.org>
37+Origin: upstream, https://github.com/resurrecting-open-source-projects/sniffit/commit/df0221e95527e9f935b583da5d922c4d3e63d749
38+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066536
39+Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/sniffit/+bug/2061033
40+Forwarded: not-needed
41+
42+---
43+ src/sn_cfgfile.c | 1 +
44+ src/sn_generation.c | 2 ++
45+ src/sn_interface.c | 1 +
46+ src/sniffit.c | 1 +
47+ 4 files changed, 5 insertions(+)
48+
49+diff --git a/src/sn_cfgfile.c b/src/sn_cfgfile.c
50+index 4ea5d39..b27ac7d 100644
51+--- a/src/sn_cfgfile.c
52++++ b/src/sn_cfgfile.c
53+@@ -2,6 +2,7 @@
54+ /* - by : Brecht Claerhout */
55+ /* - improvements: Shudoh Kazuyuki */
56+
57++#include <ctype.h>
58+ #include <stdlib.h>
59+ #include <stdio.h>
60+ #include <string.h>
61+diff --git a/src/sn_generation.c b/src/sn_generation.c
62+index e08741e..030075a 100644
63+--- a/src/sn_generation.c
64++++ b/src/sn_generation.c
65+@@ -13,7 +13,9 @@
66+ #include "sn_curses.h"
67+ #include "sn_defines.h"
68+ #include "sn_structs.h"
69++#include "sn_packets.h"
70+ #include "sn_generation.h"
71++#include "sn_interface.h"
72+
73+ extern volatile int screen_busy;
74+
75+diff --git a/src/sn_interface.c b/src/sn_interface.c
76+index 4842974..f8434d9 100644
77+--- a/src/sn_interface.c
78++++ b/src/sn_interface.c
79+@@ -4,6 +4,7 @@
80+ #include "sn_config.h"
81+
82+ #ifdef INCLUDE_INTERFACE
83++#include <ctype.h>
84+ #include <signal.h>
85+ #include <termios.h>
86+ #include <stdlib.h>
87+diff --git a/src/sniffit.c b/src/sniffit.c
88+index 7ab88a1..4adbe69 100644
89+--- a/src/sniffit.c
90++++ b/src/sniffit.c
91+@@ -3,6 +3,7 @@
92+
93+ #include "sn_config.h" /* Config header file */
94+
95++#include <ctype.h>
96+ #include <unistd.h>
97+ #include <signal.h>
98+ #include <stdlib.h>
99+--
100+2.40.1
101diff --git a/debian/patches/series b/debian/patches/series
102new file mode 100644
103index 0000000..ebe797f
104--- /dev/null
105+++ b/debian/patches/series
106@@ -0,0 +1 @@
107+implicit-declaration.patch

Subscribers

People subscribed via source and target branches