Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
7a951025df | ||
|
268f36e388 | ||
|
4cf6bb136b | ||
|
619fbb253b |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/graphviz-*.tar.bz2
|
graphviz-*.tar.gz
|
||||||
|
16
graphviz-2.40.1-CVE-2018-10196.patch
Normal file
16
graphviz-2.40.1-CVE-2018-10196.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/lib/dotgen/conc.c b/lib/dotgen/conc.c
|
||||||
|
--- a/lib/dotgen/conc.c
|
||||||
|
+++ b/lib/dotgen/conc.c
|
||||||
|
@@ -159,7 +159,11 @@ static void rebuild_vlists(graph_t * g)
|
||||||
|
|
||||||
|
for (r = GD_minrank(g); r <= GD_maxrank(g); r++) {
|
||||||
|
lead = GD_rankleader(g)[r];
|
||||||
|
- if (GD_rank(dot_root(g))[r].v[ND_order(lead)] != lead) {
|
||||||
|
+ if (lead == NULL) {
|
||||||
|
+ agerr(AGERR, "rebuiltd_vlists: lead is null for rank %d\n", r);
|
||||||
|
+ longjmp(jbuf, 1);
|
||||||
|
+ }
|
||||||
|
+ else if (GD_rank(dot_root(g))[r].v[ND_order(lead)] != lead) {
|
||||||
|
agerr(AGERR, "rebuiltd_vlists: rank lead %s not in order %d of rank %d\n",
|
||||||
|
agnameof(lead), ND_order(lead), r);
|
||||||
|
longjmp(jbuf, 1);
|
22
graphviz-2.40.1-dotty-menu-fix.patch
Normal file
22
graphviz-2.40.1-dotty-menu-fix.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/cmd/dotty/dotty_ui.lefty b/cmd/dotty/dotty_ui.lefty
|
||||||
|
index a8c9116..a708c61 100644
|
||||||
|
--- a/cmd/dotty/dotty_ui.lefty
|
||||||
|
+++ b/cmd/dotty/dotty_ui.lefty
|
||||||
|
@@ -342,7 +342,7 @@ dotty.protovt.normal.uifuncs = [
|
||||||
|
else
|
||||||
|
gt.insertedge (gt, data.pobj, null, data.obj, null, null, 1);
|
||||||
|
};
|
||||||
|
- 'rightdown' = function (data) {
|
||||||
|
+ 'rightup' = function (data) {
|
||||||
|
local vt, gt, menu, i;
|
||||||
|
|
||||||
|
vt = dotty.views[data.widget];
|
||||||
|
@@ -447,7 +447,7 @@ dotty.protovt.birdseye.uifuncs = [
|
||||||
|
'middledown' = dotty.protovt.normal.uifuncs.middledown;
|
||||||
|
'middlemove' = dotty.protovt.normal.uifuncs.middlemove;
|
||||||
|
'middleup' = dotty.protovt.normal.uifuncs.middleup;
|
||||||
|
- 'rightdown' = dotty.protovt.normal.uifuncs.rightdown;
|
||||||
|
+ 'rightup' = dotty.protovt.normal.uifuncs.rightup;
|
||||||
|
'keyup' = dotty.protovt.normal.uifuncs.keyup;
|
||||||
|
'redraw' = dotty.protovt.normal.uifuncs.redraw;
|
||||||
|
'closeview' = dotty.protovt.normal.uifuncs.closeview;
|
25
graphviz-2.40.1-visio.patch
Normal file
25
graphviz-2.40.1-visio.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
|
||||||
|
index 303eac0..14e377c 100644
|
||||||
|
--- a/plugin/visio/VisioGraphic.cpp
|
||||||
|
+++ b/plugin/visio/VisioGraphic.cpp
|
||||||
|
@@ -29,6 +29,8 @@
|
||||||
|
#define isfinite(x) finite(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include <cstdlib>
|
||||||
|
+
|
||||||
|
#include "VisioGraphic.h"
|
||||||
|
|
||||||
|
#include "gvcjob.h"
|
||||||
|
diff --git a/plugin/visio/VisioText.cpp b/plugin/visio/VisioText.cpp
|
||||||
|
index 635806c..3c6441a 100644
|
||||||
|
--- a/plugin/visio/VisioText.cpp
|
||||||
|
+++ b/plugin/visio/VisioText.cpp
|
||||||
|
@@ -17,6 +17,7 @@
|
||||||
|
|
||||||
|
#include "gvcjob.h"
|
||||||
|
#include "gvio.h"
|
||||||
|
+#include <cstdlib>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
extern "C" char *xml_string(char* str);
|
@ -1,15 +0,0 @@
|
|||||||
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
|
|
||||||
index 4978fea..9fbe2e2 100644
|
|
||||||
--- a/cmd/tools/Makefile.am
|
|
||||||
+++ b/cmd/tools/Makefile.am
|
|
||||||
@@ -249,7 +249,9 @@ gvpack_LDADD = \
|
|
||||||
$(top_builddir)/lib/ingraphs/libingraphs_C.la \
|
|
||||||
$(top_builddir)/lib/cgraph/libcgraph.la \
|
|
||||||
$(top_builddir)/lib/cdt/libcdt.la \
|
|
||||||
- $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
|
|
||||||
+ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
|
|
||||||
+ $(top_builddir)/lib/pathplan/libpathplan_C.la \
|
|
||||||
+ $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
|
|
||||||
|
|
||||||
if ENABLE_STATIC
|
|
||||||
gvpack_static_SOURCES = gvpack.cpp
|
|
@ -1,13 +0,0 @@
|
|||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 49e027f..542c23a 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -1141,7 +1141,7 @@ else
|
|
||||||
use_python3="No (python-$PYTHON3_VERSION.pc not found)"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
- PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(1,0))'`"
|
|
||||||
+ PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'import sysconfig; print(sysconfig.get_path("platlib"))'`"
|
|
||||||
save_CPPFLAGS=$CPPFLAGS
|
|
||||||
CPPFLAGS="$CPPFLAGS $PYTHON3_INCLUDES"
|
|
||||||
AC_CHECK_HEADER(Python.h,,[
|
|
848
graphviz.spec
848
graphviz.spec
File diff suppressed because it is too large
Load Diff
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (graphviz-7.1.0.tar.bz2) = 28b3217153cbe96270b25862aa030269128653b011cf9eb6607fe9d061aa9db85f9b2454d9fde70be5af4f98474f8cac61040584ce164723df6ceb372cfb29ad
|
SHA512 (graphviz-2.40.1.tar.gz) = a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
|
||||||
|
Loading…
Reference in New Issue
Block a user