Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
47ee5de9e3 | ||
|
cf72afc1b4 |
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;
|
@ -49,12 +49,14 @@
|
|||||||
Name: graphviz
|
Name: graphviz
|
||||||
Summary: Graph Visualization Tools
|
Summary: Graph Visualization Tools
|
||||||
Version: 2.40.1
|
Version: 2.40.1
|
||||||
Release: 10%{?dist}
|
Release: 12%{?dist}
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
License: EPL
|
License: EPL
|
||||||
URL: http://www.graphviz.org/
|
URL: http://www.graphviz.org/
|
||||||
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
|
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
|
||||||
Patch0: graphviz-2.40.1-visio.patch
|
Patch0: graphviz-2.40.1-visio.patch
|
||||||
|
Patch1: graphviz-2.40.1-CVE-2018-10196.patch
|
||||||
|
Patch2: graphviz-2.40.1-dotty-menu-fix.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
|
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
|
||||||
BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
|
BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
|
||||||
@ -259,6 +261,8 @@ Various tcl packages (extensions) for the graphviz tools.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .visio
|
%patch0 -p1 -b .visio
|
||||||
|
%patch1 -p1 -b .CVE-2018-10196
|
||||||
|
%patch2 -p1 -b .dotty-menu-fix
|
||||||
|
|
||||||
# Attempt to fix rpmlint warnings about executable sources
|
# Attempt to fix rpmlint warnings about executable sources
|
||||||
find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
|
find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';'
|
||||||
@ -554,6 +558,13 @@ rm -rf %{buildroot}
|
|||||||
%{_mandir}/man3/*.3tcl*
|
%{_mandir}/man3/*.3tcl*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 17 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-12
|
||||||
|
- Fixed menu in dotty
|
||||||
|
Resolves: rhbz#1505230
|
||||||
|
|
||||||
|
* Thu May 17 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-11
|
||||||
|
- Fixed CVE-2018-10196
|
||||||
|
|
||||||
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.40.1-10
|
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.40.1-10
|
||||||
- OCaml 4.05.0 rebuild.
|
- OCaml 4.05.0 rebuild.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user