Djam/graphviz
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/graphviz.git synced 2025-02-23 15:52:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Up to 2.42.2, switch to py3

Browse source
This commit is contained in:
Denis Silakov 2020-01-28 16:45:45 +03:00
parent a7deb9712f
commit 6da24fe12b
4 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,4 +1,2 @@
removed_sources:
graphviz-2.38.0.tar.gz: 053c771278909160916ca5464a0a98ebf034c6ef
sources: sources:
graphviz-2.40.1.tar.gz: 8a44d19bcdb50df1bd8e649de472ebf868468888 graphviz-2.42.2.tar.gz: f3efd959a03a6b2ebb9129fd29bc530f05c0f808

16
graphviz-2.40.1-CVE-2018-10196.patch
View file

@ -1,16 +0,0 @@
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);

12
graphviz-2.40.1-link.patch
View file

@ -20,14 +20,16 @@
fi fi
LDFLAGS=$save_LDFLAGS LDFLAGS=$save_LDFLAGS
CPPFLAGS=$save_CPPFLAGS CPPFLAGS=$save_CPPFLAGS
--- ./tclpkg/tcldot/Makefile.am.orig 2017-10-08 11:55:28.973374397 +0300 diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
+++ ./tclpkg/tcldot/Makefile.am 2017-10-08 11:55:43.072841696 +0300 index 58c88f4..e636cdc 100644
@@ -97,7 +97,7 @@ endif --- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -96,7 +96,7 @@ endif
if WITH_LIBGD if WITH_LIBGD
libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la libtcldot_builtin_la_LIBADD += $(top_builddir)/plugin/gd/libgvplugin_gd_C.la
-libtcldot_builtin_la_LIBADD += $(GD_LIBS) -libtcldot_builtin_la_LIBADD += $(GD_LIBS)
+libtcldot_builtin_la_LIBADD += $(GDLIB_LIBS) +libtcldot_builtin_la_LIBADD += $(GDTCLFT_LIBS) $(GDLIB_LIBS)
endif endif
libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(LIBGEN_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS) libtcldot_builtin_la_LIBADD += $(EXPAT_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)

25
graphviz.spec
View file

@ -32,8 +32,8 @@
Summary: Graph visualization tools Summary: Graph visualization tools
Name: graphviz Name: graphviz
Version: 2.40.1 Version: 2.42.2
Release: 3 Release: 1
License: Common Public License License: Common Public License
Group: Graphics Group: Graphics
Url: http://www.graphviz.org Url: http://www.graphviz.org
@ -221,16 +221,16 @@ This package provides the PHP extension for %{name}.
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
%package -n python-graphviz %package -n python3-graphviz
Summary: Graphviz bindings for python Summary: Graphviz bindings for python
Group: System/Libraries Group: System/Libraries
Obsoletes: %{mklibname graphvizpython 0} < 2.28.0-4 Obsoletes: %{mklibname graphvizpython 0} < 2.28.0-4
BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(python)
%description -n python-graphviz %description -n python3-graphviz
This package provides the Python extension for %{name}. This package provides the Python extension for %{name}.
%files -n python-graphviz %files -n python3-graphviz
%{_libdir}/graphviz/python %{_libdir}/graphviz/python
%{py_platsitedir}/* %{py_platsitedir}/*
@ -376,12 +376,12 @@ Static development package for %{name}.
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
%prep %prep
%setup -q %setup -qn graphviz-stable_release_%{version}
%patch0 -p1 -b .link~ %patch0 -p1 -b .link~
%patch1 -p1 -b .cve~
%build %build
autoreconf -fi ./autogen.sh
#autoreconf -fi
%configure \ %configure \
--with-x \ --with-x \
%if %{without static} %if %{without static}
@ -399,6 +399,9 @@ autoreconf -fi
--enable-php \ --enable-php \
--enable-python \ --enable-python \
--disable-guile \ --disable-guile \
--disable-python \
--disable-python2 \
--enable-python3 \
--disable-sharp \ --disable-sharp \
--with-pangocairo \ --with-pangocairo \
--with-gtk \ --with-gtk \
@ -411,7 +414,11 @@ autoreconf -fi
%endif %endif
--disable-dependency-tracking --disable-dependency-tracking
%make TK_LIB_SPEC="-ltcl -ltk" LIBS="-lX11" %make TK_LIB_SPEC="-ltcl -ltk" LIBS="-lX11" \
PYTHON_INCLUDES=`python3-config --includes` \
PYTHON_LIBS=`python3-config --embed --libs` \
PYTHON_INSTALL_DIR=%{python3_sitearch} \
PYTHON=%{__python3}
%install %install
%makeinstall_std %makeinstall_std