Compare commits
No commits in common. "rawhide" and "f24" have entirely different histories.
|
@ -1 +1 @@
|
||||||
/graphviz-*.tar.bz2
|
graphviz-*.tar.gz
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
From 2bd456d77bd035aadff61122868d02291f7898ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mattias Ellert <mattias.ellert@fysast.uu.se>
|
||||||
|
Date: Wed, 28 May 2014 07:05:49 +0200
|
||||||
|
Subject: [PATCH] Break infinite recursion that leads to segfault.
|
||||||
|
|
||||||
|
---
|
||||||
|
lib/dotgen/compound.c | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/lib/dotgen/compound.c b/lib/dotgen/compound.c
|
||||||
|
index ac78cd5..7156103 100644
|
||||||
|
--- a/lib/dotgen/compound.c
|
||||||
|
+++ b/lib/dotgen/compound.c
|
||||||
|
@@ -176,6 +176,9 @@ findVertical(pointf * pts, double tmin, double tmax,
|
||||||
|
double t;
|
||||||
|
int no_cross = countVertCross(pts, xcoord);
|
||||||
|
|
||||||
|
+ if (tmin >= tmax)
|
||||||
|
+ return -1.0;
|
||||||
|
+
|
||||||
|
if (no_cross == 0)
|
||||||
|
return -1.0;
|
||||||
|
|
||||||
|
@@ -214,6 +217,9 @@ findHorizontal(pointf * pts, double tmin, double tmax,
|
||||||
|
double t;
|
||||||
|
int no_cross = countHorzCross(pts, ycoord);
|
||||||
|
|
||||||
|
+ if (tmin >= tmax)
|
||||||
|
+ return -1.0;
|
||||||
|
+
|
||||||
|
if (no_cross == 0)
|
||||||
|
return -1.0;
|
||||||
|
|
||||||
|
--
|
||||||
|
1.9.3
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l
|
||||||
|
index 87db5d4..4edda50 100644
|
||||||
|
--- a/lib/cgraph/scan.l
|
||||||
|
+++ b/lib/cgraph/scan.l
|
||||||
|
@@ -225,7 +225,7 @@ void yyerror(char *str)
|
||||||
|
agxbput (&xb, buf);
|
||||||
|
agxbput (&xb, yytext);
|
||||||
|
agxbput (&xb,"'\n");
|
||||||
|
- agerr(AGERR,agxbuse(&xb));
|
||||||
|
+ agerr(AGERR, "%s", agxbuse(&xb));
|
||||||
|
agxbfree(&xb);
|
||||||
|
}
|
||||||
|
/* must be here to see flex's macro defns */
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- graphviz-2.38.0.old/tclpkg/gv/Makefile.am 2014-04-13 21:40:25.000000000 +0100
|
||||||
|
+++ graphviz-2.38.0/tclpkg/gv/Makefile.am 2014-08-30 20:56:43.689541154 +0100
|
||||||
|
@@ -115,7 +115,7 @@
|
||||||
|
libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
|
||||||
|
libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS)
|
||||||
|
libgv_ocaml_la_LDFLAGS = -module -avoid-version
|
||||||
|
-libgv_ocaml_la_CPPFLAGS = $(BASECPPFLAGS) $(OCAML_INCLUDES)
|
||||||
|
+libgv_ocaml_la_CPPFLAGS = $(BASECPPFLAGS) $(OCAML_INCLUDES) -Dint64=int64_t
|
||||||
|
gv.ml gv.mli: gv_ocaml.cpp
|
||||||
|
gv_ocaml.cpp: gv.i
|
||||||
|
$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- graphviz-2.38.0/configure.ac.rbconfig 2014-04-14 05:40:25.000000000 +0900
|
||||||
|
+++ graphviz-2.38.0/configure.ac 2015-01-17 03:13:15.341730456 +0900
|
||||||
|
@@ -1587,7 +1587,7 @@
|
||||||
|
if test "x$DARWIN" = "xyes"; then
|
||||||
|
RUBY_CFLAGS=`echo $RUBY_CFLAGS | sed 's/powerpc/universal/'`
|
||||||
|
fi
|
||||||
|
- RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
|
||||||
|
+ RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts RbConfig::CONFIG[['LIBRUBYARG_SHARED']]\"`"
|
||||||
|
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
|
||||||
|
if test "x$RUBY_INSTALL_DIR" = "x"; then
|
||||||
|
RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up graphviz-2.38.0/rtest/rtest.sh.origy graphviz-2.38.0/rtest/rtest.sh
|
||||||
|
--- graphviz-2.38.0/rtest/rtest.sh.origy 2014-04-13 22:40:25.000000000 +0200
|
||||||
|
+++ graphviz-2.38.0/rtest/rtest.sh 2014-04-14 15:07:49.113994881 +0200
|
||||||
|
@@ -311,7 +311,7 @@ function doTest
|
||||||
|
|
||||||
|
trap 'rm -f $TMPFILE1 $TMPFILE2 $TMPINFILE errout; exit' 0 1 2 3 15
|
||||||
|
|
||||||
|
-Usage=rrtest [-gvn] [TESTFILE]\n
|
||||||
|
+Usage='rrtest [-gvn] [TESTFILE]\n
|
||||||
|
-g : generate test data\n
|
||||||
|
-v : verbose\n
|
||||||
|
-n : print test'
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/plugin/xlib/vimdot.sh b/plugin/xlib/vimdot.sh
|
||||||
|
index 749fe6a..a45927e 100755
|
||||||
|
--- a/plugin/xlib/vimdot.sh
|
||||||
|
+++ b/plugin/xlib/vimdot.sh
|
||||||
|
@@ -4,6 +4,7 @@
|
||||||
|
error() { echo "$0: $*" >&2; exit 1; }
|
||||||
|
|
||||||
|
editor="/usr/bin/vim"
|
||||||
|
+[ -x "$editor" ] || editor="/usr/bin/vi"
|
||||||
|
|
||||||
|
if ! test -x "$editor"; then error "the \"$editor\" editor not found or not executable"; fi
|
||||||
|
|
|
@ -0,0 +1,25 @@
|
||||||
|
diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp
|
||||||
|
index d1df091..b22ec86 100644
|
||||||
|
--- a/plugin/visio/VisioGraphic.cpp
|
||||||
|
+++ b/plugin/visio/VisioGraphic.cpp
|
||||||
|
@@ -31,6 +31,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 fad75fc..2b7db1a 100644
|
||||||
|
--- a/plugin/visio/VisioText.cpp
|
||||||
|
+++ b/plugin/visio/VisioText.cpp
|
||||||
|
@@ -19,6 +19,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,,[
|
|
990
graphviz.spec
990
graphviz.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue