From ec5935e0a53a0e998057c07c3961563767dd445a Mon Sep 17 00:00:00 2001 From: bakedsnake Date: Sat, 26 Sep 2026 22:49:24 +0200 Subject: [PATCH] media-gfx/slic3r: drop ( vendored ) admesh patch Drops admesh vulnerability patch as system lib already addresses that, and is in use now. Updates 1.3.0 cmake build patch. Signed-off-by: bakedsnake --- .../slic3r/files/admesh-vulnerability.patch | 21 ------------------- .../slic3r/files/cmake-with-system-libs.patch | 19 ++--------------- 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 media-gfx/slic3r/files/admesh-vulnerability.patch diff --git a/media-gfx/slic3r/files/admesh-vulnerability.patch b/media-gfx/slic3r/files/admesh-vulnerability.patch deleted file mode 100644 index 1bd6efb636..0000000000 --- a/media-gfx/slic3r/files/admesh-vulnerability.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 18d95adb01337e18d49e7c40355dd64df556b67d Mon Sep 17 00:00:00 2001 -From: pr-hung -Date: Wed, 11 Mar 2026 23:29:37 +0800 -Subject: [PATCH] Fix potential vulnerability in cloned code - (xs/src/admesh/normals.c) - ---- - ---- a/src/admesh/normals.c -+++ b/src/admesh/normals.c -@@ -142,7 +142,8 @@ stl_fix_normal_directions(stl_file *stl) { - } - } - /* If this edge of the facet is connected: */ -- if(stl->neighbors_start[facet_num].neighbor[j] != -1) { -+ if(stl->neighbors_start[facet_num].neighbor[j] != -1 && -+ stl->neighbors_start[facet_num].neighbor[j] < stl->stats.number_of_facets*sizeof(char)) { - /* If we haven't fixed this facet yet, add it to the list: */ - if(norm_sw[stl->neighbors_start[facet_num].neighbor[j]] != 1) { - /* Add node to beginning of list. */ - diff --git a/media-gfx/slic3r/files/cmake-with-system-libs.patch b/media-gfx/slic3r/files/cmake-with-system-libs.patch index ea690875e5..76011d5302 100644 --- a/media-gfx/slic3r/files/cmake-with-system-libs.patch +++ b/media-gfx/slic3r/files/cmake-with-system-libs.patch @@ -5,9 +5,9 @@ Subject: [PATCH] Use system's libexpat instead of vendored code --- --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -32,7 +32,6 @@ include_directories(${LIBDIR}/Slic3r/GUI/) +@@ -32,7 +32,5 @@ include_directories(${LIBDIR}/Slic3r/GUI/) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/standalone/) - include_directories(${LIBDIR}/admesh/) +-include_directories(${LIBDIR}/admesh/) include_directories(${LIBDIR}/BSpline/) -include_directories(${LIBDIR}/expat/) include_directories(${LIBDIR}/poly2tri/) @@ -25,18 +25,3 @@ Subject: [PATCH] Use system's libexpat instead of vendored code add_library(polypartition STATIC ${LIBDIR}/polypartition.cpp) add_library(poly2tri STATIC ${LIBDIR}/poly2tri/common/shapes.cc -@@ -149,7 +143,7 @@ IF(CMAKE_HOST_UNIX) - #set(Boost_LIBRARIES bsystem bthread bfilesystem) - ENDIF(CMAKE_HOST_UNIX) - --target_link_libraries (slic3r libslic3r admesh BSpline clipper expat polypartition poly2tri ${Boost_LIBRARIES}) -+target_link_libraries (slic3r libslic3r admesh BSpline clipper polypartition poly2tri ${Boost_LIBRARIES}) - - IF(wxWidgets_FOUND) - MESSAGE("wx found!") -@@ -173,4 +167,4 @@ IF (WIN32) - target_link_libraries(extrude-tin boost-nowide) - ENDIF(WIN32) - --target_link_libraries (extrude-tin libslic3r admesh BSpline clipper expat polypartition poly2tri ${Boost_LIBRARIES}) -+target_link_libraries (extrude-tin libslic3r admesh BSpline clipper polypartition poly2tri ${Boost_LIBRARIES})