From 29f0fc8318a342694fb0676f54789f790d977519fb31f6ee14a2291d4d47f408 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Fri, 23 May 2014 13:36:04 +0000 Subject: [PATCH] - Update to 2.38.0. Changes since 2.36.0: - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425 - Enable packing for dot - Allow scaling to work for all non-dot layouts - Add overline text characteristic. - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs. - Add edgepaint program for coloring edges to make them easier to tell apart. - Modify neato to avoid unnecessary translations of output. This allows positions given on input to remain the same on output. - Fix swig java package to work and support gv.renderresult. - Fix test for the absence of layout (old test relied on statically allocated Agraphinfo_t). - HTML-like tables and cells can now specify which borders should be drawn. - The fixedsize attribute now takes the value "shape" which allows labels much larger than the node shape. - Remove graphviz-fix-includes.patch as the fix has been done upstream. - Add graphviz-array_overflow.patch to fix an off-by-one error. OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=85 --- graphviz-2.36.0.tar.gz | 3 --- graphviz-2.38.0.tar.gz | 3 +++ graphviz-array_overflow.patch | 19 +++++++++++++++++++ graphviz-gvedit.changes | 23 +++++++++++++++++++++++ graphviz-gvedit.spec | 5 ++++- graphviz-plugins.changes | 23 +++++++++++++++++++++++ graphviz-plugins.spec | 4 +++- graphviz-smyrna.changes | 23 +++++++++++++++++++++++ graphviz-smyrna.spec | 4 +++- graphviz.changes | 26 ++++++++++++++++++++++++++ graphviz.spec | 7 ++++++- 11 files changed, 133 insertions(+), 7 deletions(-) delete mode 100644 graphviz-2.36.0.tar.gz create mode 100644 graphviz-2.38.0.tar.gz create mode 100644 graphviz-array_overflow.patch diff --git a/graphviz-2.36.0.tar.gz b/graphviz-2.36.0.tar.gz deleted file mode 100644 index e3b895a..0000000 --- a/graphviz-2.36.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37fd66d8def158575c75c4f6dbf536839e4ee468aa59314eb472d1aecb076361 -size 23846318 diff --git a/graphviz-2.38.0.tar.gz b/graphviz-2.38.0.tar.gz new file mode 100644 index 0000000..0f44671 --- /dev/null +++ b/graphviz-2.38.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e +size 25848858 diff --git a/graphviz-array_overflow.patch b/graphviz-array_overflow.patch new file mode 100644 index 0000000..e8ae51d --- /dev/null +++ b/graphviz-array_overflow.patch @@ -0,0 +1,19 @@ +--- + lib/common/htmltable.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: lib/common/htmltable.c +=================================================================== +--- lib/common/htmltable.c.orig 2014-04-13 22:40:25.000000000 +0200 ++++ lib/common/htmltable.c 2014-05-23 00:01:41.203062717 +0200 +@@ -300,8 +300,8 @@ static void doBorder(GVJ_t * job, htmlda + gvrender_polyline(job, AF+2, 4); + break; + case BORDER_TOP|BORDER_LEFT|BORDER_BOTTOM : +- AF[5] = AF[1]; +- AF[6] = AF[2]; ++ AF[4] = AF[1]; ++ AF[5] = AF[2]; + gvrender_polyline(job, AF+3, 4); + break; + case BORDER_LEFT|BORDER_BOTTOM|BORDER_RIGHT : diff --git a/graphviz-gvedit.changes b/graphviz-gvedit.changes index b738827..6a59f95 100644 --- a/graphviz-gvedit.changes +++ b/graphviz-gvedit.changes @@ -1,3 +1,26 @@ +Fri May 23 14:23:57 CEST 2014 - pth@suse.de + +- Update to 2.30.0. Changes since 1.35.0: + - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425 + - Enable packing for dot + - Allow scaling to work for all non-dot layouts + - Add overline text characteristic. + - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs. + - Add edgepaint program for coloring edges to make them easier to + tell apart. + - Modify neato to avoid unnecessary translations of output. This + allows positions given on input to remain the same on output. + - Fix swig java package to work and support gv.renderresult. + - Fix test for the absence of layout (old test relied on statically + allocated Agraphinfo_t). + - HTML-like tables and cells can now specify which borders should be drawn. + - The fixedsize attribute now takes the value "shape" which allows + labels much larger than the node shape. + +- Remove graphviz-fix-includes.patch as the fix has been done + upstream. +- Add graphviz-array_overflow.patch to fix an off-by-one error. + ------------------------------------------------------------------- Fri Feb 28 15:45:07 CET 2014 - pth@suse.de diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec index 4011712..226d979 100644 --- a/graphviz-gvedit.spec +++ b/graphviz-gvedit.spec @@ -19,7 +19,7 @@ %define mname graphviz Name: graphviz-gvedit -Version: 2.36.0 +Version: 2.38.0 Release: 0 Summary: Graph editor based on Qt License: IPL-1.0 @@ -30,6 +30,8 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +#PATCH-FIX-UPSTREAM Off-by-one error in htmltable.c +Patch4: graphviz-array_overflow.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -65,6 +67,7 @@ package. %setup -q -n %{mname}-%{version} %patch2 %patch3 +%patch4 rm -f contrib/gprof2dot.awk # Fix path in generated man pages diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 7cee4a8..14e0863 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,26 @@ +Fri May 23 14:23:57 CEST 2014 - pth@suse.de + +- Update to 2.30.0. Changes since 1.35.0: + - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425 + - Enable packing for dot + - Allow scaling to work for all non-dot layouts + - Add overline text characteristic. + - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs. + - Add edgepaint program for coloring edges to make them easier to + tell apart. + - Modify neato to avoid unnecessary translations of output. This + allows positions given on input to remain the same on output. + - Fix swig java package to work and support gv.renderresult. + - Fix test for the absence of layout (old test relied on statically + allocated Agraphinfo_t). + - HTML-like tables and cells can now specify which borders should be drawn. + - The fixedsize attribute now takes the value "shape" which allows + labels much larger than the node shape. + +- Remove graphviz-fix-includes.patch as the fix has been done + upstream. +- Add graphviz-array_overflow.patch to fix an off-by-one error. + ------------------------------------------------------------------- Sat Feb 8 18:00:04 CET 2014 - pth@suse.de diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index 830ab04..ab9831d 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -85,7 +85,7 @@ BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.36.0 +Version: 2.38.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 @@ -94,6 +94,7 @@ Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +Patch4: graphviz-array_overflow.patch #Patches from 100 up are for graphviz-plugin only Patch100: graphviz-plugins-fix_install_dirs.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -267,6 +268,7 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} %patch3 +%patch4 %patch100 %patch102 %patch103 diff --git a/graphviz-smyrna.changes b/graphviz-smyrna.changes index 9f1e76b..dcfc479 100644 --- a/graphviz-smyrna.changes +++ b/graphviz-smyrna.changes @@ -1,3 +1,26 @@ +Fri May 23 14:23:57 CEST 2014 - pth@suse.de + +- Update to 2.30.0. Changes since 1.35.0: + - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425 + - Enable packing for dot + - Allow scaling to work for all non-dot layouts + - Add overline text characteristic. + - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs. + - Add edgepaint program for coloring edges to make them easier to + tell apart. + - Modify neato to avoid unnecessary translations of output. This + allows positions given on input to remain the same on output. + - Fix swig java package to work and support gv.renderresult. + - Fix test for the absence of layout (old test relied on statically + allocated Agraphinfo_t). + - HTML-like tables and cells can now specify which borders should be drawn. + - The fixedsize attribute now takes the value "shape" which allows + labels much larger than the node shape. + +- Remove graphviz-fix-includes.patch as the fix has been done + upstream. +- Add graphviz-array_overflow.patch to fix an off-by-one error. + ------------------------------------------------------------------- Tue Feb 4 13:20:33 CET 2014 - pth@suse.de diff --git a/graphviz-smyrna.spec b/graphviz-smyrna.spec index 0bc993b..638e634 100644 --- a/graphviz-smyrna.spec +++ b/graphviz-smyrna.spec @@ -19,7 +19,7 @@ %define mname graphviz Name: graphviz-smyrna -Version: 2.36.0 +Version: 2.38.0 Release: 0 Summary: Glut based graph viewer License: IPL-1.0 @@ -30,6 +30,7 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +Patch4: graphviz-array_overflow.patch #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL Patch10: graphviz-smyrna-link_against_glu.patch BuildRequires: autoconf @@ -78,6 +79,7 @@ package. %patch2 %patch3 %patch10 +%patch4 rm -f contrib/gprof2dot.awk # Fix path in generated man pages diff --git a/graphviz.changes b/graphviz.changes index f26f3f2..622c52c 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri May 23 14:23:57 CEST 2014 - pth@suse.de + +- Update to 2.38.0. Changes since 2.36.0: + - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425 + - Enable packing for dot + - Allow scaling to work for all non-dot layouts + - Add overline text characteristic. + - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs. + - Add edgepaint program for coloring edges to make them easier to + tell apart. + - Modify neato to avoid unnecessary translations of output. This + allows positions given on input to remain the same on output. + - Fix swig java package to work and support gv.renderresult. + - Fix test for the absence of layout (old test relied on statically + allocated Agraphinfo_t). + - HTML-like tables and cells can now specify which borders should be drawn. + - The fixedsize attribute now takes the value "shape" which allows + labels much larger than the node shape. + +- Remove graphviz-fix-includes.patch as the fix has been done + upstream. +- Add graphviz-array_overflow.patch to fix an off-by-one error. + ------------------------------------------------------------------- Tue Feb 4 15:52:00 CET 2014 - pth@suse.de @@ -28,6 +52,8 @@ Tue Feb 4 15:52:00 CET 2014 - pth@suse.de September 15, 2013 - Add element for strike-through to HTML-like labels. + - This version also fixes the security bugs reported in january. + ------------------------------------------------------------------- Tue Feb 4 13:19:20 CET 2014 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 719047e..96e69e2 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -20,7 +20,7 @@ %define config_file config6 Name: graphviz -Version: 2.36.0 +Version: 2.38.0 Release: 0 Summary: Graph Visualization Tools License: EPL-1.0 @@ -31,6 +31,8 @@ Source2: graphviz-rpmlintrc Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources Patch3: graphviz-no_strict_aliasing.patch +#PATCH-FIX-UPSTREAM Off-by-one bug +Patch4: graphviz-array_overflow.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -89,6 +91,8 @@ Note: If you need output in png format you also need to install %setup -q %patch2 %patch3 +%patch4 + rm -f contrib/gprof2dot.awk # Fix path in generated man pages @@ -184,6 +188,7 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %{_bindir}/dot2gxl %{_bindir}/dot_builtins %{_bindir}/dotty +%{_bindir}/edgepaint %{_bindir}/fdp %{_bindir}/gc %{_bindir}/gml2gv