rpm/assimp
SHA256
1
0
Fork 0
forked from pool/assimp
Code Pull Requests Activity

Accepting request 1115678 from games

Browse Source 
- Disable the collada importer/exporter due to a long standing
  security issue (boo#1207377, CVE-2022-45748, gh#assimp/assimp#4286)
- Add patch:
  * 0001-Don-t-build-the-collada-importer-exporter-tests.patch

OBS-URL: https://build.opensuse.org/request/show/1115678
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/assimp?expand=0&rev=22
This commit is contained in:
Ana Guerrero 2023-10-05 18:04:00 +00:00 committed by Git OBS Bridge
commit c2ba7f4db3
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Don-t-build-the-collada-importer-exporter-tests.patch Normal file
View File

@ -0,0 +1,27 @@
From a0628aa4b175b6764ac6ea481a5e65f91cd118fa Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Wed, 4 Oct 2023 16:23:17 +0200
Subject: [PATCH] Don't build the collada importer/exporter tests
---
test/CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index afe487411..d8f044501 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -141,8 +141,8 @@ SET( IMPORTERS
unit/utBlendImportMaterials.cpp
unit/utBlenderWork.cpp
unit/utBVHImportExport.cpp
- unit/utColladaExport.cpp
- unit/utColladaImportExport.cpp
+ # unit/utColladaExport.cpp
+ # unit/utColladaImportExport.cpp
unit/utCSMImportExport.cpp
unit/utB3DImportExport.cpp
#unit/utM3DImportExport.cpp
--
2.42.0

8
assimp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Oct 4 14:14:08 UTC 2023 - Christophe Marin <christophe@krop.fr>
- Disable the collada importer/exporter due to a long standing
security issue (boo#1207377, CVE-2022-45748, gh#assimp/assimp#4286)
- Add patch:
* 0001-Don-t-build-the-collada-importer-exporter-tests.patch
-------------------------------------------------------------------
Fri Sep 29 13:23:52 UTC 2023 - Ferdinand Thiessen <rpm@fthiessen.de>

18
assimp.spec
View File

@ -25,6 +25,8 @@ License: BSD-3-Clause AND MIT
Group: Development/Libraries/C and C++
URL: https://www.assimp.org/
Source0: %{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch0: 0001-Don-t-build-the-collada-importer-exporter-tests.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: gcc-c++
@ -71,23 +73,29 @@ engine-specific format for easy and fast every-day-loading.
%build
%cmake \
-DASSIMP_IGNORE_GIT_HASH=ON \
-DASSIMP_BUILD_ZLIB=OFF \
-DASSIMP_WARNINGS_AS_ERRORS=OFF \
-DASSIMP_BUILD_ASSIMP_TOOLS=ON
-DASSIMP_BUILD_ASSIMP_TOOLS=ON \
-DASSIMP_BUILD_COLLADA_IMPORTER=OFF \
-DASSIMP_BUILD_COLLADA_EXPORTER=OFF
%cmake_build
%install
%cmake_install
find %{buildroot} -type f -name "*.la" -delete -print
%check
pushd build/test
LD_LIBRARY_PATH=%{buildroot}%{_libdir} ctest --output-on-failure --force-new-ctest-process
pushd build
# utIssues.OpacityBugWhenExporting_727 test fails
# utVersion.aiGetVersionRevisionTest passes with git builds only
# the models-nonbsd are not in the tarball, tests depending on it are also excluded
./bin/unit --gtest_filter="-utIssues.OpacityBugWhenExporting_727:utVersion.aiGetVersionRevisionTest:ut3DImportExport*:ut3DSImportExport*:utMD2Importer*:utMD5Importer*:utBlenderImporter*:utQ3BSPImportExport*:utXImporter.importDwarf:utDXFImporterExporter.importRifle:utPMXImporter.importTest"
popd
%post -n lib%{name}%{sover} -p /sbin/ldconfig
%postun -n lib%{name}%{sover} -p /sbin/ldconfig
%ldconfig_scriptlets -n lib%{name}%{sover}
%files -n lib%{name}%{sover}
%license LICENSE