git: 18b01fd52dc9 - main - games/flightgear: apply fix for CVE-2025-0781

From: Ganael LAPLANCHE <martymac_at_FreeBSD.org>
Date: Wed, 29 Jan 2025 16:53:18 UTC
The branch main has been updated by martymac:

URL: https://cgit.FreeBSD.org/ports/commit/?id=18b01fd52dc9e04f93f411c4387e4913fae16413

commit 18b01fd52dc9e04f93f411c4387e4913fae16413
Author:     Ganael LAPLANCHE <martymac@FreeBSD.org>
AuthorDate: 2025-01-29 16:51:49 +0000
Commit:     Ganael LAPLANCHE <martymac@FreeBSD.org>
CommitDate: 2025-01-29 16:52:49 +0000

    games/flightgear: apply fix for CVE-2025-0781
    
    Security:       CVE-2025-0781
---
 devel/simgear/Makefile    | 8 +++++++-
 devel/simgear/distinfo    | 6 +++++-
 games/flightgear/Makefile | 7 ++++++-
 games/flightgear/distinfo | 4 +++-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 398e2c9a3002..8822f94c3b51 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -1,9 +1,15 @@
 PORTNAME=	simgear
 PORTVERSION=	2020.3.19
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
+# Fix for CVE-2025-0781
+# See: https://gitlab.com/frougon/flightgear-simgear/-/commits/2020.3.6-minimal-fix-for-CVE-2025-0781
+PATCH_SITES=	https://gitlab.com/frougon/flightgear-${PORTNAME}/-/commit/
+PATCHFILES+=	bcd6f22586be0058ee58d61ebfd227bd01c1bb1b.patch:-p1 \
+		f2e8c8ce3925e62275d97d46c73c32cbc864d80b.patch:-p1
+
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Toolkit for 3D games and simulations
 WWW=		https://www.flightgear.org/
diff --git a/devel/simgear/distinfo b/devel/simgear/distinfo
index fc46ba2f608d..03afdfcea491 100644
--- a/devel/simgear/distinfo
+++ b/devel/simgear/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1697744971
+TIMESTAMP = 1738150339
 SHA256 (simgear-2020.3.19.tar.bz2) = 3b937c5b94422478e5d79114bdcd6c78e43a0a6ffba97544a86d441c3f9e8c3a
 SIZE (simgear-2020.3.19.tar.bz2) = 1427799
+SHA256 (bcd6f22586be0058ee58d61ebfd227bd01c1bb1b.patch) = 4a92971b46dbca3eaefea6e1d0923dbbb169c9e42c8d343ae275c81784651ee6
+SIZE (bcd6f22586be0058ee58d61ebfd227bd01c1bb1b.patch) = 700
+SHA256 (f2e8c8ce3925e62275d97d46c73c32cbc864d80b.patch) = f2d6cf9f622563e0118f77d5dfdcf9785a1e90ce1ce496aeaa1afa145e7fff23
+SIZE (f2e8c8ce3925e62275d97d46c73c32cbc864d80b.patch) = 1865
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 140aeca19be0..8e12570285a0 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -1,9 +1,14 @@
 PORTNAME=	flightgear
 PORTVERSION=	2020.3.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
 
+# Fix for CVE-2025-0781
+# See: https://gitlab.com/frougon/flightgear-flightgear/-/commits/2020.3.6-minimal-fix-for-CVE-2025-0781
+PATCH_SITES=	https://gitlab.com/frougon/flightgear-${PORTNAME}/-/commit/
+PATCHFILES+=	cf99dc921aadab502ff90a1dd943d8bbb897de91.patch:-p1
+
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	FlightGear flight simulator
 WWW=		https://www.flightgear.org/
diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
index 2ed4ec19d3a6..c0feffc003ac 100644
--- a/games/flightgear/distinfo
+++ b/games/flightgear/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1697740014
+TIMESTAMP = 1738150411
 SHA256 (flightgear-2020.3.19.tar.bz2) = 167d08de9cc0f72218b379b23cd7e56c7f6ee18d7d559512da51a3bd67f38e6e
 SIZE (flightgear-2020.3.19.tar.bz2) = 8935152
+SHA256 (cf99dc921aadab502ff90a1dd943d8bbb897de91.patch) = c3cf18bec3510b870bcdb8cb3a833c58f63d33aa9d071d11ac893f90d6e2fe60
+SIZE (cf99dc921aadab502ff90a1dd943d8bbb897de91.patch) = 2178