Wednesday, November 01, 2023

Update from Maintainer: games/ezquake to 3.6.4

Hi,

Here's a diff updating games/ezquake to 3.6.4. There is a potential
RCE with games/ezquake older than 3.6.4:
https://github.com/QW-Group/ezquake-source/issues/857

A few changes:

* Uses new DIST_TUPLE to handle qw protocol in a different repo
* Now relies on newer devel/pcre2 instead of old devel/pcre
* New dependency on archivers/minizip (unzip.h reference in .h files)
* The source code was moved into a 'src' subdirectory, so one of the
patches needed a new path.

Changelog can be found on the Github releases page here:
https://github.com/QW-Group/ezquake-source/releases

Unfortunately, I'm not able to test the client itself as my OpenBSD
machines are currently headless.

Thanks,
Tom

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 6 Mar 2023 13:37:15 -0000 1.15
+++ Makefile 1 Nov 2023 21:21:58 -0000
@@ -1,30 +1,30 @@
-N = ezquake
-V = 3.6.1
COMMENT = modern QuakeWorld client

-PKGNAME = ${N}-${V}
-GH_ACCOUNT = QW-Group
-GH_PROJECT = ${N}-source
-GH_TAGNAME = ${V}
-
CATEGORIES = games

-HOMEPAGE = https://ezquake.github.io/
-MAINTAINER
= Tom Murphy <openbsd@pertho.net>
+N = ezquake
+V = 3.6.4
+DIST_TUPLE += github QW-Group ${N}-source ${V} .
+DIST_TUPLE += github QW-Group qwprot 53af547d0608a1507895fc1629cdc3f4820fc0af src/qwprot

# GPLv2+
PERMIT_PACKAGE = Yes

-WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m pcre png pthread
-WANTLIB += sndfile speex speexdsp z
+MAINTAINER = Tom Murphy <openbsd@pertho.net>
+
+HOMEPAGE = https://ezquake.github.io/
+
+WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m minizip pcre2-8 png
+WANTLIB += pthread sndfile speex speexdsp z

-LIB_DEPENDS = audio/libsndfile \
+LIB_DEPENDS = archivers/minizip \
+ audio/libsndfile \
audio/speex \
graphics/jpeg \
graphics/png \
+ devel/pcre2 \
devel/sdl2 \
devel/jansson \
- devel/pcre \
net/curl

USE_GMAKE = Yes
@@ -36,7 +36,7 @@ GAMEDIR = ${PREFIX}/share/ezquake
SUBST_VARS += GAMEDIR

do-configure:
- ${SUBST_CMD} ${WRKSRC}/EX_browser_sources.c
+ ${SUBST_CMD} ${WRKSRC}/src/EX_browser_sources.c

do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ezquake ${PREFIX}/bin
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo 29 Nov 2022 15:03:53 -0000 1.9
+++ distinfo 1 Nov 2023 21:21:58 -0000
@@ -1,2 +1,4 @@
-SHA256 (ezquake-source-3.6.1.tar.gz) = u2+D8QD+6h4ld2gE5J/79UjXh3wPR9XiuZ8+ShdnX/4=
-SIZE (ezquake-source-3.6.1.tar.gz) = 23503412
+SHA256 (QW-Group-ezquake-source-3.6.4.tar.gz) = BvKf049WKRxMr/GTyLJUF6DBjlj6JrwOWOBjl//tmTM=
+SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = +nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
+SIZE (QW-Group-ezquake-source-3.6.4.tar.gz) = 1920426
+SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 8815
Index: patches/patch-EX_browser_sources_c
===================================================================
RCS file: patches/patch-EX_browser_sources_c
diff -N patches/patch-EX_browser_sources_c
--- patches/patch-EX_browser_sources_c 11 Mar 2022 19:04:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: EX_browser_sources.c
---- EX_browser_sources.c.orig
-+++ EX_browser_sources.c
-@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.
-
- #include "EX_browser.h"
-
--#define SOURCES_LIST_FILENAME "sb/sources.txt"
-+#define SOURCES_LIST_FILENAME "${GAMEDIR}/sources.txt"
-
- // Used by curl to read server lists from the web
- struct curl_buf
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile 29 Nov 2022 15:03:53 -0000 1.6
+++ patches/patch-Makefile 1 Nov 2023 21:21:58 -0000
@@ -12,8 +12,8 @@ Index: Makefile
+LDFLAGS ?= -L${X11BASE}/lib
LIBS ?=

- #Temporarily disable tree vectorization optimization enabled at O3 due to gcc bug
-@@ -575,7 +575,7 @@ endif
+ CFLAGS_c :=
+@@ -571,7 +571,7 @@ endif
ifdef CONFIG_WINDOWS
TARG_c := ezquake$(EZ_POSTFIX).exe
else

No comments:

Post a Comment