Hello community, here is the log from the commit of package Coin for openSUSE:Factory checked in at 2020-12-21 10:23:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Coin (Old) and /work/SRC/openSUSE:Factory/.Coin.new.5145 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Coin" Mon Dec 21 10:23:28 2020 rev:6 rq:856936 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/Coin/Coin.changes 2017-07-27 11:13:40.481347538 +0200 +++ /work/SRC/openSUSE:Factory/.Coin.new.5145/Coin.changes 2020-12-21 10:26:34.708194920 +0100 @@ -1,0 +2,13 @@ +Tue Dec 15 00:12:48 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Explicitly request system libexpat. The bundled expat 2.0.1 has + known vulnerabilities, and also causes crashes in e.g. FreeCADs + SVG import due to using incompatible expat versions in use at + the same time (https://tracker.freecadweb.org/view.php?id=3307). + * 0001-Actually-link-to-system-expat.patch +- Cleanup spec file: + * Update Homepage URL + * Remove Source URL, bitbucket download is no longer functional + * Use %license, %make_build, %make_install macros + +------------------------------------------------------------------- New: ---- 0001-Actually-link-to-system-expat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Coin.spec ++++++ --- /var/tmp/diff_new_pack.oLuxnp/_old 2020-12-21 10:26:35.316195610 +0100 +++ /var/tmp/diff_new_pack.oLuxnp/_new 2020-12-21 10:26:35.316195610 +0100 @@ -1,7 +1,7 @@ # # spec file for package Coin # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,14 +22,19 @@ Version: 3.1.3 Release: 0 Summary: Scene-graph based retain-mode 3D graphics library -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/C and C++ -Url: http://www.coin3d.org/lib/coin/ -Source0: https://bitbucket.org/Coin3D/coin/downloads/%{name}-%{version}.tar.gz +URL: https://github.com/coin3d/coin/wiki +# The bitbucket site is no longer functional, and the github repo only provides +# tarballs for 3.1.0 and 4.0.0 (and no 3.1.3 tag either). +# Source0: https://bitbucket.org/Coin3D/coin/downloads/%%{name}-%%{version}.tar.gz +Source0: %{name}-%{version}.tar.gz Patch0: 0012-memhandler-initialization.patch # X-OPENSUSE-PATCH: Coin60.patch -- hack around library policy names Patch1: Coin60.patch Patch2: Coin.patch +# PATCH-FIX-OPENSUSE -- https://github.com/coin3d/coin/issues/436, fixed with CMake build available with 4.0.0 +Patch3: 0001-Actually-link-to-system-expat.patch BuildRequires: c++_compiler BuildRequires: doxygen BuildRequires: fdupes @@ -45,7 +50,6 @@ BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xt) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Coin is a scene-graph based, retain-mode, rendering and model @@ -95,6 +99,7 @@ %patch0 -p1 %patch1 -p0 %patch2 -p1 +%patch3 -p1 sed -i '/^#include "fonts\/freetype.h"$/i #include <cstdlib>\n#include <cmath>' src/fonts/freetype.cpp sed -i '/^#include <Inventor\/C\/basic.h>$/i #include <Inventor/C/errors/debugerror.h>' include/Inventor/SbBasic.h @@ -112,6 +117,7 @@ --enable-threadsafe \ --enable-html \ --enable-man \ + --enable-system-expat \ --disable-dl-openal \ --disable-dl-fontconfig \ --disable-dl-freetype \ @@ -120,10 +126,10 @@ --disable-dl-glu \ --with-freetype=%{_prefix} -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install +%make_install # avoid conflicting man page rm %{buildroot}/usr/share/man/man3/deprecated.* @@ -144,14 +150,13 @@ %postun -n libCoin%{soname} -p /sbin/ldconfig %files -n libCoin%{soname} -%defattr(-,root,root,-) -%doc LICENSE.GPL +%license LICENSE.GPL %{_datadir}/Coin%{soname}/ %{_libdir}/libCoin.so.%{soname}* %files devel -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog FAQ FAQ.legal LICENSE.GPL NEWS README RELNOTES THANKS +%doc AUTHORS ChangeLog FAQ NEWS README RELNOTES THANKS +%license COPYING FAQ.legal LICENSE.GPL %{_bindir}/coin-config %{_includedir}/Inventor/ %{_includedir}/SoDebug.h ++++++ 0001-Actually-link-to-system-expat.patch ++++++ From 7aa9771a15fe561155740fadccf161ed174d997e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Mon, 14 Dec 2020 23:42:09 +0100 Subject: [PATCH] Actually link to system expat The config variable is HAVE_SYSTEM_EXPAT, USE_SYSTEM_EXPAT is the Makefile variable. --- src/Makefile.in | 4 +++- src/xml/expat/all-expat-c.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 1d53733..e39b214 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -662,6 +662,8 @@ ExtraIncludeDirs = -I$(top_srcdir)/include/Inventor/annex -I$(top_builddir) @MAC_FRAMEWORK_FALSE@ 3ds collision hardcopy shadows geo threads shaders profiler \ @MAC_FRAMEWORK_FALSE@ vrml97 foreignfiles scxml doc . +@USE_SYSTEM_EXPAT_TRUE@EXPATLIBADD = -lexpat +@USE_SYSTEM_EXPAT_FALSE@EXPATLIBADD = # ************************************************************************** @MAC_FRAMEWORK_TRUE@SUBDIRS = @@ -686,7 +688,7 @@ DEFAULT_INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_bui @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ 3ds/libformat3ds.la collision/libcollision.la hardcopy/libhardcopy.la \ @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ threads/libthreads.la shaders/libshaders.la \ @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ shadows/libshadows.la geo/libgeo.la foreignfiles/libforeignfiles.la \ -@HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/libxml.la xml/expat/libexpat.la profiler/libprofiler.la \ +@HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ xml/libxml.la xml/expat/libexpat.la $(EXPATLIBADD) profiler/libprofiler.la \ @HACKING_DYNAMIC_MODULES_FALSE@@MAC_FRAMEWORK_FALSE@ vrml97/libvrml97.la scxml/libscxml.la $(SUPERGLULIBADD) @HACKING_DYNAMIC_MODULES_TRUE@@MAC_FRAMEWORK_FALSE@libCoin@SUFFIX@_la_LIBADD = diff --git a/src/xml/expat/all-expat-c.c b/src/xml/expat/all-expat-c.c index 34a1b01..6eb72e2 100755 --- a/src/xml/expat/all-expat-c.c +++ b/src/xml/expat/all-expat-c.c @@ -1,6 +1,6 @@ #include "config.h" -#ifndef USE_SYSTEM_EXPAT +#ifndef HAVE_SYSTEM_EXPAT #include "xmltok.c" #include "xmlparse.c" #include "xmlrole.c" -- 2.29.2 _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
