Hello community, here is the log from the commit of package graphviz for openSUSE:Factory checked in at 2019-04-18 09:55:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/graphviz (Old) and /work/SRC/openSUSE:Factory/.graphviz.new.17052 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "graphviz" Thu Apr 18 09:55:40 2019 rev:77 rq:694811 version:2.40.1+git20190410.b0871968d Changes: -------- --- /work/SRC/openSUSE:Factory/graphviz/graphviz-addons.changes 2018-12-05 09:37:57.361062162 +0100 +++ /work/SRC/openSUSE:Factory/.graphviz.new.17052/graphviz-addons.changes 2019-04-18 09:55:44.677315624 +0200 @@ -1,0 +2,26 @@ +Tue Apr 16 11:04:44 UTC 2019 - Christian Vögl <[email protected]> + +- Disabled Visio plugin + +------------------------------------------------------------------- +Mon Apr 15 18:14:39 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Use %%python3_sitearch macro to package python3 modules. +- use correct ruby version (2.5) for openSUSE 15.1 and earlier. + +------------------------------------------------------------------- +Tue Apr 2 15:10:04 UTC 2019 - Christian Vögl <[email protected]> + +- Now using master branch of upstream, as there have been no releases for + over two years + * this should fix CVE-2019-11023 (boo#1132091) + +- Removed graphviz-qt5.patch (now in upstream) +- Removed reproducible.patch (now in upstream) +- graphviz-smyrna-link_against_glu.patch changed to be applicable to current files +- graphviz-no_strict_aliasing.patch changed to be applicable to current files +- Added graphviz-fix-ruby-version.patch to remove hardcoded dependency on ruby 1.9 +- graphviz.spec updated for new version +- created _service file + +------------------------------------------------------------------- graphviz.changes: same change Old: ---- graphviz-2.40.1.tar.gz graphviz-qt5.patch reproducible.patch New: ---- _service graphviz-2.40.1+git20190410.b0871968d.tar.gz graphviz-fix-ruby-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphviz-addons.spec ++++++ --- /var/tmp/diff_new_pack.gZoK3z/_old 2019-04-18 09:55:46.633316855 +0200 +++ /var/tmp/diff_new_pack.gZoK3z/_new 2019-04-18 09:55:46.633316855 +0200 @@ -1,7 +1,7 @@ # # spec file for package graphviz-addons # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +#fixes build failure caused by new .debug files, not sure how to fix correctly + %define mname graphviz %define libname libgraphviz6 # name of the plugin config file that dot creates @@ -32,6 +34,13 @@ %else %define php_version 5 %endif + +%if 0%{?suse_version} > 1510 +%define ruby_version 2.6 +%else +%define ruby_version 2.5 +%endif + # No pkgconfig(gts) in sle12 GA or SPx, but in sle15 %if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define sle12 1 @@ -39,27 +48,25 @@ %define sle12 0 %endif Name: graphviz-addons -Version: 2.40.1 +Version: 2.40.1+git20190410.b0871968d Release: 0 Summary: Graph Visualization Tools License: EPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ -Source: http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-%{version}.tar.gz +Source: %{mname}-%{version}.tar.gz Source2: graphviz-rpmlintrc -#PATCH-FIX-UPSTREAM Build qith Qt5 rather than with qt4 -Patch0: graphviz-qt5.patch #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL Patch1: graphviz-smyrna-link_against_glu.patch Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM Off-by-one bug Patch3: graphviz-array_overflow.patch -#PATCH-FIX-OPENSUSE Make build reproducible (boo#1041534) -Patch4: reproducible.patch + Patch6: graphviz-2.20.2-interpreter_names.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code Patch7: graphviz-useless_warnings.patch Patch8: graphviz-no_strict_aliasing.patch +Patch9: graphviz-fix-ruby-version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -78,10 +85,13 @@ Requires: graphviz-plugins-core = %{version} Recommends: graphviz-gd = %{version} %if %{with extras} +BuildRequires: argon2-devel BuildRequires: freeglut-devel + BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: perl +BuildRequires: python3-devel %if 0%{?suse_version} >= 1500 BuildRequires: php7-devel BuildRequires: swig >= 3.0.11 @@ -299,16 +309,20 @@ The graphviz-devel package contains all that's necessary for developing programs that use the graphviz libraries including man3 pages. + +#autosetup breaks graphviz-addons %prep %setup -q -n %{mname}-%{version} -%patch0 -p1 + %patch1 %patch2 %patch3 -%patch4 -p1 + %patch6 %patch7 %patch8 +%patch9 + # pkg-config returns 0 (TRUE) when guile-2.2 is present if pkg-config --atleast-version=2.2 guile-2.2; then sed "s/guile-2.0/guile-2.2/" -i configure.ac @@ -324,11 +338,15 @@ configure.ac %build -autoreconf -fvi +./autogen.sh RUBY_VER=%{ruby_version} CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" %if %{with extras} -CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo %{rb_ver} | sed 's|\.[^.]*$||'))" + +CFLAGS="$CFLAGS -I/usr/include/ruby-%{ruby_version}.0" +#seems to be broken? gives -I/usr/lib64/ruby/2.6.0/x86_64-linux-gnu, ruby.h is in /usr/lib64/ruby/2.6.0 +#CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo {rb_ver} | sed 's|\.[^.]*$||'))" + %endif export CFLAGS="$CFLAGS" @@ -341,10 +359,12 @@ --with-ipsepcola \ --without-ming \ --disable-io \ + --without-visio \ %if %{with extras} --with-x \ --with-qt \ --with-smyrna \ + RUBY_VER=%{ruby_version} \ %else --without-mylibgd \ --without-libgd \ @@ -458,6 +478,7 @@ fi %post -n %{libname} -p /sbin/ldconfig + %postun -n %{libname} -p /sbin/ldconfig %if %{with extras} @@ -543,8 +564,18 @@ %{_mandir}/man3/gv.3php%{ext_man} %files -n graphviz-python +%dir %{_libdir}/graphviz/python2 +%dir %{_libdir}/graphviz/python3 %{python_sitearch}/_gv.so %{python_sitearch}/gv.py +%{_libdir}/graphviz/python2/_gv.so +%{_libdir}/graphviz/python2/gv.py +%{_libdir}/graphviz/python2/libgv_python2.so +%{python3_sitearch}/_gv.so +%{python3_sitearch}/gv.py +%{_libdir}/graphviz/python3/_gv.so +%{_libdir}/graphviz/python3/gv.py +%{_libdir}/graphviz/python3/libgv_python3.so %{_mandir}/man3/gv.3python%{ext_man} %files -n graphviz-ruby ++++++ graphviz.spec ++++++ --- /var/tmp/diff_new_pack.gZoK3z/_old 2019-04-18 09:55:46.661316873 +0200 +++ /var/tmp/diff_new_pack.gZoK3z/_new 2019-04-18 09:55:46.665316875 +0200 @@ -1,7 +1,7 @@ # # spec file for package graphviz # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,8 @@ # +#fixes build failure caused by new .debug files, not sure how to fix correctly + %define mname graphviz %define libname libgraphviz6 # name of the plugin config file that dot creates @@ -32,6 +34,13 @@ %else %define php_version 5 %endif + +%if 0%{?suse_version} > 1510 +%define ruby_version 2.6 +%else +%define ruby_version 2.5 +%endif + # No pkgconfig(gts) in sle12 GA or SPx, but in sle15 %if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %define sle12 1 @@ -39,27 +48,25 @@ %define sle12 0 %endif Name: graphviz -Version: 2.40.1 +Version: 2.40.1+git20190410.b0871968d Release: 0 Summary: Graph Visualization Tools License: EPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ -Source: http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-%{version}.tar.gz +Source: %{mname}-%{version}.tar.gz Source2: graphviz-rpmlintrc -#PATCH-FIX-UPSTREAM Build qith Qt5 rather than with qt4 -Patch0: graphviz-qt5.patch #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL Patch1: graphviz-smyrna-link_against_glu.patch Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM Off-by-one bug Patch3: graphviz-array_overflow.patch -#PATCH-FIX-OPENSUSE Make build reproducible (boo#1041534) -Patch4: reproducible.patch + Patch6: graphviz-2.20.2-interpreter_names.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code Patch7: graphviz-useless_warnings.patch Patch8: graphviz-no_strict_aliasing.patch +Patch9: graphviz-fix-ruby-version.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -78,10 +85,13 @@ Requires: graphviz-plugins-core = %{version} Recommends: graphviz-gd = %{version} %if %{with extras} +BuildRequires: argon2-devel BuildRequires: freeglut-devel + BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: perl +BuildRequires: python3-devel %if 0%{?suse_version} >= 1500 BuildRequires: php7-devel BuildRequires: swig >= 3.0.11 @@ -299,16 +309,20 @@ The graphviz-devel package contains all that's necessary for developing programs that use the graphviz libraries including man3 pages. + +#autosetup breaks graphviz-addons %prep %setup -q -n %{mname}-%{version} -%patch0 -p1 + %patch1 %patch2 %patch3 -%patch4 -p1 + %patch6 %patch7 %patch8 +%patch9 + # pkg-config returns 0 (TRUE) when guile-2.2 is present if pkg-config --atleast-version=2.2 guile-2.2; then sed "s/guile-2.0/guile-2.2/" -i configure.ac @@ -324,11 +338,15 @@ configure.ac %build -autoreconf -fvi +./autogen.sh RUBY_VER=%{ruby_version} CFLAGS="%{optflags} -ffast-math -fno-strict-aliasing -fno-strict-overflow -fPIC" %if %{with extras} -CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo %{rb_ver} | sed 's|\.[^.]*$||'))" + +CFLAGS="$CFLAGS -I/usr/include/ruby-%{ruby_version}.0" +#seems to be broken? gives -I/usr/lib64/ruby/2.6.0/x86_64-linux-gnu, ruby.h is in /usr/lib64/ruby/2.6.0 +#CFLAGS="$CFLAGS $(pkg-config --cflags ruby-$(echo {rb_ver} | sed 's|\.[^.]*$||'))" + %endif export CFLAGS="$CFLAGS" @@ -341,10 +359,12 @@ --with-ipsepcola \ --without-ming \ --disable-io \ + --without-visio \ %if %{with extras} --with-x \ --with-qt \ --with-smyrna \ + RUBY_VER=%{ruby_version} \ %else --without-mylibgd \ --without-libgd \ @@ -458,6 +478,7 @@ fi %post -n %{libname} -p /sbin/ldconfig + %postun -n %{libname} -p /sbin/ldconfig %if %{with extras} @@ -543,8 +564,18 @@ %{_mandir}/man3/gv.3php%{ext_man} %files -n graphviz-python +%dir %{_libdir}/graphviz/python2 +%dir %{_libdir}/graphviz/python3 %{python_sitearch}/_gv.so %{python_sitearch}/gv.py +%{_libdir}/graphviz/python2/_gv.so +%{_libdir}/graphviz/python2/gv.py +%{_libdir}/graphviz/python2/libgv_python2.so +%{python3_sitearch}/_gv.so +%{python3_sitearch}/gv.py +%{_libdir}/graphviz/python3/_gv.so +%{_libdir}/graphviz/python3/gv.py +%{_libdir}/graphviz/python3/libgv_python3.so %{_mandir}/man3/gv.3python%{ext_man} %files -n graphviz-ruby ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://gitlab.com/graphviz/graphviz</param> <param name="scm">git</param> <param name="revision">master</param> <param name="changesgenerate">disable</param> <param name="filename">graphviz</param> <param name="versionformat">2.40.1+git%cd.%h</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">gz</param> </service> <service mode="disabled" name="set_version"/> </services>++++++ graphviz-fix-ruby-version.patch ++++++ --- configure.ac.orig 2019-04-11 15:12:07.607681824 +0200 +++ configure.ac 2019-04-11 14:43:28.508860376 +0200 @@ -116,6 +116,7 @@ AC_ARG_VAR(LIBPOSTFIX, [subscript to lib, e.g. "/64" for "/usr/lib/64" on Solaris]) AC_ARG_VAR(INTGOSIZE, [integer size for go, 32 or 64]) +AC_ARG_VAR(RUBY_VER, [version number of ruby package]) INTGOSIZE=32 if test -z "$LIBPOSTFIX"; then @@ -1397,7 +1398,7 @@ RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`" fi ],[ - PKG_CHECK_MODULES([RUBY], [ruby-1.9],[ + PKG_CHECK_MODULES([RUBY], [ruby-${RUBY_VER}],[ AC_CHECK_PROG(RUBY,ruby,ruby) if test "x$RUBY" = "x"; then use_ruby="No (ruby not available)" ++++++ graphviz-no_strict_aliasing.patch ++++++ --- /var/tmp/diff_new_pack.gZoK3z/_old 2019-04-18 09:55:46.729316915 +0200 +++ /var/tmp/diff_new_pack.gZoK3z/_new 2019-04-18 09:55:46.729316915 +0200 @@ -1,17 +1,9 @@ ---- - lib/vmalloc/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -Index: lib/vmalloc/Makefile.am -=================================================================== ---- lib/vmalloc/Makefile.am.orig 2013-09-07 03:07:52.000000000 +0200 -+++ lib/vmalloc/Makefile.am 2013-09-11 18:51:30.719515603 +0200 -@@ -9,6 +9,8 @@ libvmalloc_C_la_SOURCES = malloc.c vmbes +--- .orig/lib/vmalloc/Makefile.am 2019-04-02 14:39:35.873818775 +0200 ++++ lib/vmalloc/Makefile.am 2019-04-02 14:50:07.659001790 +0200 +@@ -9,4 +9,6 @@ vmprofile.c vmregion.c vmsegment.c vmset.c vmstat.c vmstrdup.c \ vmtrace.c vmwalk.c +libvmalloc_C_la_CFLAGS = -fno-strict-aliasing + - ${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc - mkdir -p ${top_builddir}/FEATURE - ${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@ + EXTRA_DIST = README vmalloc.vcxproj* ++++++ graphviz-smyrna-link_against_glu.patch ++++++ --- /var/tmp/diff_new_pack.gZoK3z/_old 2019-04-18 09:55:46.753316930 +0200 +++ /var/tmp/diff_new_pack.gZoK3z/_new 2019-04-18 09:55:46.753316930 +0200 @@ -1,13 +1,7 @@ ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: configure.ac -=================================================================== ---- configure.ac.orig 2013-10-23 17:25:44.020188917 +0200 -+++ configure.ac 2013-10-23 17:26:17.637411247 +0200 -@@ -2811,7 +2811,7 @@ else - +--- configure.ac.orig 2019-04-02 14:33:44.229152722 +0200 ++++ configure.ac 2019-04-02 14:34:01.573185574 +0200 +@@ -2605,7 +2605,7 @@ + AC_CHECK_HEADER(GL/glut.h, AC_CHECK_LIB(glut,main, - [GLUT_LIBS="$GLUT_LIBS -lglut"
