blender/blender
162
515
Fork 780
Code Issues 6.8k Pull Requests 928 Projects 19 Wiki Activity

Build: update 3.6 libraries to address CVEs and bugs #112528

Merged
Brecht Van Lommel merged 11 commits from brecht/blender:fix-cves-3.6 into blender-v3.6-release 2023-10-09 14:24:44 +02:00
Conversation 4 Commits 11 Files Changed 12 +196 -64
Brecht Van Lommel commented 2023-09-18 15:53:45 +02:00
Owner
Copy Link

And ignore a few CVEs that do not affect Blender.

openimageio 2.4.15
openssl 3.1.2
python 3.10.13
sndfile 1.2.2
webp 1.3.2

Ref #104895

And ignore a few CVEs that do not affect Blender. openimageio 2.4.15 openssl 3.1.2 python 3.10.13 sndfile 1.2.2 webp 1.3.2 Ref #104895
Brecht Van Lommel added 1 commit 2023-09-18 15:53:57 +02:00 
And ignore a few CVEs that do not affect Blender.

openimageio 2.4.15
openssl 3.1.2
python 3.10.13
sndfile 1.2.2
webp 1.3.2
Brecht Van Lommel added this to the 3.6 LTS milestone 2023-09-18 15:54:46 +02:00
Brecht Van Lommel requested review from Campbell Barton 2023-09-18 16:04:19 +02:00
Brecht Van Lommel requested review from Ray molenkamp 2023-09-18 16:04:19 +02:00
Brecht Van Lommel added the
Module
Platforms, Builds & Tests
 label 2023-09-18 16:05:01 +02:00
Brecht Van Lommel added 1 commit 2023-09-18 20:58:11 +02:00
Brecht Van Lommel added 1 commit 2023-09-21 16:01:12 +02:00
Ray molenkamp commented 2023-09-28 02:28:54 +02:00
Member
Copy Link

This looks pretty close to 4.0, can you add

af9523d7c2
3735a4d104
974bb38c51

This looks pretty close to 4.0, can you add af9523d7c2e1536adef07a54422b6b4d624eafdf 3735a4d104936ecd13dc8163d611c499d96a3046 974bb38c51364611cf9862bff2268c8d6de27d00
Brecht Van Lommel added 3 commits 2023-09-28 15:25:20 +02:00 
The last webp update changed the filenames of the webp libraries
on windows causing oiio not to find them and oiio silently build
without webp support, which only came to light after all of
blender was build and a test failed.

This change makes the OIIO validate and error out if certain
dependencies are not found at configure time so these mistakes
are caught early.
webp 1.3 changed the filenames on windows to include a `lib` prefix
(ie libwebp.lib rather than webp.lib) now this is a common thing
on linux and cmake has a `CMAKE_FIND_LIBRARY_PREFIXES` variable that
has a list of prefixes to look for during a `find_library` call.

`CMAKE_FIND_LIBRARY_PREFIXES` gets set during the call to the
`project` method in the main CMakeLists of a project. Now for windows
`lib` is *not* a common prefix by CMake, and it doesn't add "lib" to
CMAKE_FIND_LIBRARY_PREFIXES during that call.

so find library doesn't look for it, the libs are not found and an
unhappy time is had by all. Now the most obvious solution would be to
pass `-DCMAKE_FIND_LIBRARY_PREFIXES=lib` to CMake to sidestep this
however, the `project` call will set the variable overwriting
anything you passed through the CLI.

So the fix here is to have `find_library` counter-intuitively look
for both `libwebp` and `webp`
CMake: Update platform_win32.cmake with webp 1.3 support
All checks were successful
buildbot/vexp-code-patch-coordinator Build done.
Details
50228cabb8 
WebP 1.3 changed the library filenames to include a lib prefix and
added an additional library.
Brecht Van Lommel commented 2023-09-28 15:30:35 +02:00
Author
Owner
Copy Link

@blender-bot build

@blender-bot build
Ray molenkamp reviewed 2023-10-03 01:06:29 +02:00
build_files/build_environment/cmake/versions.cmake Outdated
@ -168,2 +167,3 @@
set(OPENIMAGEIO_VERSION v2.4.15.0)
set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/refs/tags/${OPENIMAGEIO_VERSION}.tar.gz)
set(OPENIMAGEIO_HASH 7eb997479ecfe7d9fa59cc8ddd35d0ae)
set(OPENIMAGEIO_HASH aa4f077e5ba2a2e548afc1c4faddd8ff)
Ray molenkamp commented 2023-10-03 01:06:29 +02:00
Member
Copy Link

set(OPENIMAGEIO_HASH 784391406ee309075a3f82e60a42f023)

`set(OPENIMAGEIO_HASH 784391406ee309075a3f82e60a42f023)`
brecht marked this conversation as resolved
Ray molenkamp commented 2023-10-04 06:09:42 +02:00
Member
Copy Link

the blender mirror is fine, but when using upstream sources, cf973a2d16 is required for zlib, as their url changed

the blender mirror is fine, but when using upstream sources, cf973a2d1617a1c9ec1038fb31ef2eb16ef1d54f is required for zlib, as their url changed
Brecht Van Lommel added 2 commits 2023-10-06 17:59:01 +02:00 
zlib's uri is a bit unstable as when they release a new version they
move the last release "elsewhere"

This change switches the upstream URI over to github, which should be
a bit more reliable.
Brecht Van Lommel added 1 commit 2023-10-06 18:00:53 +02:00
Brecht Van Lommel added 2 commits 2023-10-06 19:58:17 +02:00
Brecht Van Lommel merged commit cd89390b52 into blender-v3.6-release 2023-10-09 14:24:44 +02:00
Brecht Van Lommel deleted branch fix-cves-3.6 2023-10-09 14:24:46 +02:00
Brecht Van Lommel commented 2023-10-09 14:52:43 +02:00
Author
Owner
Copy Link

@LazyDodo @ideasman42 I've updated the TODO list in #104895 for this. Hopefully we can update all platforms before the next LTS.

@LazyDodo @ideasman42 I've updated the TODO list in #104895 for this. Hopefully we can update all platforms before the next LTS.
Sign in to join this conversation.
Reviewers
No reviewers
Campbell Barton
Ray molenkamp
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Code Documentation
Code comments, Python/RNA API descriptions

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, see policy: https://developer.blender.org/docs/handbook/bug_reports/vulnerability_reports/

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

Archived

  
Type
Report

Archived

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Code Documentation
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Viewport & EEVEE
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
3.6 LTS
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#112528
No description provided.
Delete Branch "brecht/blender:fix-cves-3.6"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?