Package: graphviz Version: 2.42.2-8 Severity: serious Tags: patch
Hello, looks like the package will FTBFS due to newly introduced
implicit-declaration flag
I did cherry-pick two upstream patches and the package now build successfully.
* Fix implicit declaration issue with two upstream patches
- b4947d67a4ebd48ca0105d44f92e47f044e51600
- be6f649995d00865e7c7d721f9b5bdb13fd715c0
Thanks for considering the patch.
*** /tmp/tmp_b0oalmu/graphviz_2.42.2-8ubuntu1.debdiff
diff -Nru graphviz-2.42.2/debian/patches/coverity-scan.patch
graphviz-2.42.2/debian/patches/coverity-scan.patch
--- graphviz-2.42.2/debian/patches/coverity-scan.patch 1970-01-01
01:00:00.000000000 +0100
+++ graphviz-2.42.2/debian/patches/coverity-scan.patch 2024-03-21
08:41:54.000000000 +0100
@@ -0,0 +1,39 @@
+From b4947d67a4ebd48ca0105d44f92e47f044e51600 Mon Sep 17 00:00:00 2001
+From: John Ellson <ell...@research.att.com>
+Date: Thu, 9 Apr 2020 16:11:58 -0400
+Subject: [PATCH] applying RH's graphviz-2.42.2-coverity-scan-fixes.patch
+
+---
+ cmd/lefty/dot2l/dotlex.c | 2 +-
+ cmd/tools/gvgen.c | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c
+index cf738c0c7e..65e17e2462 100644
+--- a/cmd/lefty/dot2l/dotlex.c
++++ b/cmd/lefty/dot2l/dotlex.c
+@@ -252,7 +252,7 @@ static char *scan_token (char *p) {
+ char *q;
+
+ q = lexbuf;
+- if (p == '\0')
++ if (!p || *p == '\0')
+ return NULL;
+ while (isalnum (*p) || (*p == '_') || (!isascii (*p)))
+ *q++ = *p++;
+diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
+index c2b166d449..c9a51e9cf7 100644
+--- a/cmd/tools/gvgen.c
++++ b/cmd/tools/gvgen.c
+@@ -453,6 +453,8 @@ closeOpen (void)
+ fprintf(opts.outfile, "}\ngraph {\n");
+ }
+
++extern void makeTetrix(int depth, edgefn ef);
++
+ int main(int argc, char *argv[])
+ {
+ GraphType graphType;
+--
+GitLab
+
diff -Nru graphviz-2.42.2/debian/patches/implicit-declaration.patch
graphviz-2.42.2/debian/patches/implicit-declaration.patch
--- graphviz-2.42.2/debian/patches/implicit-declaration.patch 1970-01-01
01:00:00.000000000 +0100
+++ graphviz-2.42.2/debian/patches/implicit-declaration.patch 2024-03-21
08:41:54.000000000 +0100
@@ -0,0 +1,47 @@
+From be6f649995d00865e7c7d721f9b5bdb13fd715c0 Mon Sep 17 00:00:00 2001
+From: Matthew Fernandez <matthew.fernan...@gmail.com>
+Date: Fri, 24 Jun 2022 22:05:31 -0700
+Subject: [PATCH] prototype 'makeTetrix', squashing a '-Wmissing-prototypes'
+ warning
+
+The missing prototype appears to have two causes:
+
+ 1. 265eeb66ea0dbb4f7cdeb75dcc5f802d948b40a9 added `makeTetrix` without a
+ prototype.
+
+ 2. b4947d67a4ebd48ca0105d44f92e47f044e51600 appears to have applied some
+ Coverity suggestions without investigating the underlying history that led
+ to the Coverity warnings.
+---
+ cmd/tools/graph_generator.h | 1 +
+ cmd/tools/gvgen.c | 2 --
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/cmd/tools/graph_generator.h b/cmd/tools/graph_generator.h
+index dce4f3f45d..3879acdf73 100644
+--- a/cmd/tools/graph_generator.h
++++ b/cmd/tools/graph_generator.h
+@@ -26,6 +26,7 @@ extern void makeRandom(int, int, edgefn);
+ extern void makeSquareGrid(int, int, int, int, edgefn);
+ extern void makeBinaryTree(int, edgefn);
+ extern void makeSierpinski(int, edgefn);
++extern void makeTetrix(int, edgefn);
+ extern void makeHypercube(int, edgefn);
+ extern void makeTree(int, int, edgefn);
+ extern void makeTriMesh(int, edgefn);
+diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
+index 4aba7bee7c..4b45759e8c 100644
+--- a/cmd/tools/gvgen.c
++++ b/cmd/tools/gvgen.c
+@@ -451,8 +451,6 @@ closeOpen (void)
+ fprintf(opts.outfile, "}\ngraph {\n");
+ }
+
+-extern void makeTetrix(int depth, edgefn ef);
+-
+ int main(int argc, char *argv[])
+ {
+ GraphType graphType;
+--
+GitLab
+
diff -Nru graphviz-2.42.2/debian/patches/series
graphviz-2.42.2/debian/patches/series
--- graphviz-2.42.2/debian/patches/series 2024-01-26 21:26:42.000000000
+0100
+++ graphviz-2.42.2/debian/patches/series 2024-03-21 08:41:54.000000000
+0100
@@ -10,3 +10,5 @@
update_documentation_link.patch
fix_out-of-bounds_write_on_invalid_label.patch
CVE-2023-46045.patch
+coverity-scan.patch
+implicit-declaration.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
