diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 398e2c9a3002..8822f94c3b51 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -1,47 +1,53 @@ 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/ LICENSE= GPLv2+ LGPL20+ LICENSE_COMB= multi LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libosg.so:graphics/osg \ libexpat.so:textproc/expat2 \ libcurl.so:ftp/curl USES= alias cmake compiler:c++11-lib cpe gl jpeg openal:al,alut \ tar:bzip2 xorg USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu glut USE_LDCONFIG= yes LDFLAGS_gcc= -losgDB LDFLAGS+= ${LDFLAGS_${CHOSEN_COMPILER_TYPE}} CMAKE_ARGS+= -DSYSTEM_EXPAT:BOOL=ON \ -DENABLE_TESTS:BOOL=OFF PLIST_SUB= PORTVERSION=${PORTVERSION} .include .if ${ARCH} != amd64 && ${ARCH} != i386 CMAKE_ARGS+= -DENABLE_SIMD:BOOL=OFF .endif post-patch: # Avoid conflict with C++20 - used version file is simgear-version @${RM} ${WRKSRC}/version .include 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,66 +1,71 @@ 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/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpng.so:graphics/png \ libboost_thread.so:devel/boost-libs \ libfltk.so:x11-toolkits/fltk \ libfreetype.so:print/freetype2 \ libosg.so:graphics/osg \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ libcurl.so:ftp/curl \ libudev.so:devel/libudev-devd \ libexpat.so:textproc/expat2 \ libSimGearCore.so:devel/simgear BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:x11-toolkits/plib \ ${LOCALBASE}/share/flightgear/version:games/flightgear-data # Disable ninja, see https://sourceforge.net/p/flightgear/codetickets/2118/ USES= alias cmake:noninja compiler:c++11-lang cpe dos2unix gl jpeg \ openal:al,alut sqlite tar:bzip2 xorg USE_XORG= ice sm x11 xext xft xi xinerama xmu xt USE_GL= gl glew glu glut DOS2UNIX_REGEX= .*\.(c|h|cxx|cpp|hxx|hpp) CMAKE_ARGS+= -DSYSTEM_SQLITE:BOOL=ON \ -DENABLE_HID_INPUT:BOOL=OFF \ -DFG_DATA_DIR:PATH=${LOCALBASE}/share/${PORTNAME} \ -DFGCOM_DATA_PATH:PATH=${DATADIR} LDFLAGS+= -L${LOCALBASE}/lib LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= DBUS QT5 OPTIONS_DEFAULT= DBUS QT5 DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_USES= pkgconfig DBUS_CMAKE_ON= -DUSE_DBUS:BOOL=ON DBUS_CMAKE_OFF= -DUSE_DBUS:BOOL=OFF QT5_CMAKE_ON= -DENABLE_QT:BOOL=ON QT5_CMAKE_OFF= -DENABLE_QT:BOOL=OFF QT5_USES= qt:5 QT5_USE= QT=core,buildtools,linguisttools,gui,declarative,network,qmake,widgets,svg post-patch: # Avoid conflict with C++20 - used version file is flightgear-version @${RM} ${WRKSRC}/version .include .if ${COMPILER_TYPE} == "clang" LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations .endif .include 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