Attachment 261554 Details for Bug 287777 – ports update for games/flightgear

[patch] ports update for games/flightgear

0001-Update-games-flightgear-to-2024.1.1.patch (text/plain), 4.55 KB, created by Stefan Rumetshofer on 2025-06-24 17:29:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Rumetshofer

Created: 2025-06-24 17:29:53 UTC

Size: 4.55 KB

patch

obsolete

>From 517a013d1f5238fc726cab7dd05ca4b0f57a3a51 Mon Sep 17 00:00:00 2001
>From: Charlie Root <root@saturn.lan>
>Date: Tue, 24 Jun 2025 07:50:43 +0200
>Subject: [PATCH] Update games/flightgear to 2024.1.1
>
>---
> games/flightgear/Makefile                             |  9 ++++-----
> games/flightgear/distinfo                             |  8 +++-----
> .../patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp | 11 +++++++++++
> .../patch-src-FDM-JSBSim-input_output-FGfdmSocket.h   | 11 +++++++++++
> games/flightgear/pkg-plist                            |  3 ---
> 5 files changed, 29 insertions(+), 13 deletions(-)
> create mode 100644 games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp
> create mode 100644 games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h
>
>diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
>index cdf052278..d5e5377a1 100644
>--- a/games/flightgear/Makefile
>+++ b/games/flightgear/Makefile
>@@ -1,13 +1,12 @@
> PORTNAME=	flightgear
>-PORTVERSION=	2020.3.19
>-PORTREVISION=	7
>+PORTVERSION=	2024.1.1
> CATEGORIES=	games
>-MASTER_SITES=	SF/flightgear/release-${PORTVERSION:R}
>+MASTER_SITES=	https://gitlab.com/flightgear/fgmeta/-/jobs/9264813015/artifacts/raw/fgbuild/
> 
> # 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
>+#PATCH_SITES=	https://gitlab.com/frougon/flightgear-${PORTNAME}/-/commit/
>+#PATCHFILES+=	cf99dc921aadab502ff90a1dd943d8bbb897de91.patch:-p1
> 
> MAINTAINER=	martymac@FreeBSD.org
> COMMENT=	FlightGear flight simulator
>diff --git a/games/flightgear/distinfo b/games/flightgear/distinfo
>index c0feffc00..724b02da5 100644
>--- a/games/flightgear/distinfo
>+++ b/games/flightgear/distinfo
>@@ -1,5 +1,3 @@
>-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
>+TIMESTAMP = 1750355015
>+SHA256 (flightgear-2024.1.1.tar.bz2) = 3a17903cebd56043c55305ff78e793ed80bdcc89d8e8a141d27e62563e313859
>+SIZE (flightgear-2024.1.1.tar.bz2) = 9421622
>diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp
>new file mode 100644
>index 000000000..7d7817975
>--- /dev/null
>+++ b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.cpp
>@@ -0,0 +1,11 @@
>+--- src/FDM/JSBSim/input_output/FGfdmSocket.cpp.orig	2025-02-27 15:49:31.000000000 +0100
>++++ src/FDM/JSBSim/input_output/FGfdmSocket.cpp	2025-06-22 15:53:46.113857000 +0200
>+@@ -40,7 +40,7 @@
>+ 
>+ #if defined(_MSC_VER) || defined(__MINGW32__)
>+ #include <ws2tcpip.h>
>+-#elif defined(__OpenBSD__)
>++#elif defined(__OpenBSD__)  || defined(__FreeBSD__)
>+ #include <sys/types.h>
>+ #include <sys/socket.h>
>+ #include <netdb.h>
>diff --git a/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h
>new file mode 100644
>index 000000000..2dea75fd9
>--- /dev/null
>+++ b/games/flightgear/files/patch-src-FDM-JSBSim-input_output-FGfdmSocket.h
>@@ -0,0 +1,11 @@
>+--- src/FDM/JSBSim/input_output/FGfdmSocket.h.orig	2025-02-27 15:49:31.000000000 +0100
>++++ src/FDM/JSBSim/input_output/FGfdmSocket.h	2025-06-22 15:54:34.901331000 +0200
>+@@ -44,6 +44,8 @@
>+ #if defined(_MSC_VER) || defined(__MINGW32__)
>+   #include <winsock.h>
>+   #include <io.h>
>++#elif defined(__FreeBSD__)
>++  #include <netinet/in.h>
>+ #else
>+   #include <netdb.h>
>+ #endif
>diff --git a/games/flightgear/pkg-plist b/games/flightgear/pkg-plist
>index 94cc162d5..002a7e57e 100644
>--- a/games/flightgear/pkg-plist
>+++ b/games/flightgear/pkg-plist
>@@ -6,7 +6,6 @@ bin/fgcom
> bin/fgelev
> bin/fgfs
> bin/fgjs
>-bin/fgpanel
> bin/fgtraffic
> bin/fgviewer
> bin/js_demo
>@@ -21,7 +20,6 @@ share/man/it/man1/fgcom.1.gz
> share/man/it/man1/fgelev.1.gz
> share/man/it/man1/fgfs.1.gz
> share/man/it/man1/fgjs.1.gz
>-share/man/it/man1/fgpanel.1.gz
> share/man/it/man1/fgviewer.1.gz
> share/man/it/man1/js_demo.1.gz
> share/man/it/man1/metar.1.gz
>@@ -34,7 +32,6 @@ share/man/man1/fgcom.1.gz
> share/man/man1/fgelev.1.gz
> share/man/man1/fgfs.1.gz
> share/man/man1/fgjs.1.gz
>-share/man/man1/fgpanel.1.gz
> share/man/man1/fgviewer.1.gz
> share/man/man1/js_demo.1.gz
> share/man/man1/metar.1.gz
>-- 
>2.49.0
>

Actions: View | Diff

Attachments on bug 287777: 261554 | 261684