Commit 97b2fcecdbe41d01080736e28eca46f0e84248ad - iortcw

Drop patch build-Link-game-cgame-ui-modules-to-LIBS.patch, present upstream. Debian Janitor 2 years ago

3 changed file(s) with 1 addition(s) and 124 deletion(s). Raw diff Collapse all Expand all

-0

debian/changelog less more

0	0	iortcw (1.51.c+dfsg1+git20211114.1.d91019d-1) UNRELEASED; urgency=low
1	1
2	2	* New upstream snapshot.
	3	* Drop patch build-Link-game-cgame-ui-modules-to-LIBS.patch, present upstream.
3	4
4	5	-- Debian Janitor <janitor@jelmer.uk> Thu, 18 Nov 2021 21:32:42 -0000
5	6

-123

~~debian/patches/build-Link-game-cgame-ui-modules-to-LIBS.patch~~ less more

0		From: Simon McVittie <smcv@debian.org>
1		Date: Fri, 24 Jul 2020 10:55:56 +0100
2		Subject: build: Link game, cgame, ui modules to $(LIBS)
3
4		All three modules call mathematical functions like atan2(). On glibc
5		systems, when compiled to native code with an ordinary C compiler
6		(as opposed to bytecode from q3lcc), they get the definition of those
7		functions from libm.
8
9		Until now, they were not explicitly linked to libm, and instead relied
10		on the fact that libm is linked into the main executable. However,
11		doing it this way defeats glibc's symbol-versioning mechanisms, and
12		can fail in some situations, in particular binaries built with
13		-ffast-math on a pre-2.31 version of glibc (where atan2() resolves to
14		__atan2_finite()), and used without recompilation on a post-2.31 version
15		of glibc (where __atan2_finite() has become a deprecated hidden symbol
16		that is only available as a versioned symbol).
17
18		When building shared libraries and loadable modules, it's most robust
19		to link them explicitly to their dependencies, as is done here.
20		$(LIBS) also includes -ldl, which is unnecessary but harmless.
21
22		Bug-Debian: https://bugs.debian.org/966150
23		Bug-Debian: https://bugs.debian.org/966173
24		Forwarded: https://github.com/iortcw/iortcw/pull/112
25		Applied-upstream: 1.51d, commit:9601361
26		---
27		MP/Makefile \| 12 ++++++------
28		SP/Makefile \| 12 ++++++------
29		2 files changed, 12 insertions(+), 12 deletions(-)
30
31		diff --git a/MP/Makefile b/MP/Makefile
32		index 5447e44..0f1f7eb 100644
33		--- a/MP/Makefile
34		+++ b/MP/Makefile
35		@@ -2405,11 +2405,11 @@ Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm)
36		ifdef MINGW
37		$(B)/$(BASEGAME)/cgame_mp_$(SHLIBNAME): $(Q3CGOBJ)
38		$(echo_cmd) "LD $@"
39		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
40		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(LIBS)
41		else
42		$(B)/$(BASEGAME)/cgame.mp.$(SHLIBNAME): $(Q3CGOBJ)
43		$(echo_cmd) "LD $@"
44		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
45		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(LIBS)
46		endif
47		$(B)/$(BASEGAME)/vm/cgame.mp.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm $(Q3ASM)
48		$(echo_cmd) "Q3ASM $@"
49		@@ -2480,11 +2480,11 @@ Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm)
50		ifdef MINGW
51		$(B)/$(BASEGAME)/qagame_mp_$(SHLIBNAME): $(Q3GOBJ)
52		$(echo_cmd) "LD $@"
53		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
54		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(LIBS)
55		else
56		$(B)/$(BASEGAME)/qagame.mp.$(SHLIBNAME): $(Q3GOBJ)
57		$(echo_cmd) "LD $@"
58		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
59		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(LIBS)
60		endif
61		$(B)/$(BASEGAME)/vm/qagame.mp.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm $(Q3ASM)
62		$(echo_cmd) "Q3ASM $@"
63		@@ -2514,11 +2514,11 @@ Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
64		ifdef MINGW
65		$(B)/$(BASEGAME)/ui_mp_$(SHLIBNAME): $(Q3UIOBJ)
66		$(echo_cmd) "LD $@"
67		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
68		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(LIBS)
69		else
70		$(B)/$(BASEGAME)/ui.mp.$(SHLIBNAME): $(Q3UIOBJ)
71		$(echo_cmd) "LD $@"
72		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
73		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(LIBS)
74		endif
75		$(B)/$(BASEGAME)/vm/ui.mp.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM)
76		$(echo_cmd) "Q3ASM $@"
77		diff --git a/SP/Makefile b/SP/Makefile
78		index 667aeeb..9ca1d62 100644
79		--- a/SP/Makefile
80		+++ b/SP/Makefile
81		@@ -2371,11 +2371,11 @@ Q3CGVMOBJ = $(Q3CGOBJ_:%.o=%.asm)
82		ifdef MINGW
83		$(B)/$(BASEGAME)/cgame_sp_$(SHLIBNAME): $(Q3CGOBJ)
84		$(echo_cmd) "LD $@"
85		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
86		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(LIBS)
87		else
88		$(B)/$(BASEGAME)/cgame.sp.$(SHLIBNAME): $(Q3CGOBJ)
89		$(echo_cmd) "LD $@"
90		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
91		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ) $(LIBS)
92		endif
93		$(B)/$(BASEGAME)/vm/cgame.sp.qvm: $(Q3CGVMOBJ) $(CGDIR)/cg_syscalls.asm $(Q3ASM)
94		$(echo_cmd) "Q3ASM $@"
95		@@ -2446,11 +2446,11 @@ Q3GVMOBJ = $(Q3GOBJ_:%.o=%.asm)
96		ifdef MINGW
97		$(B)/$(BASEGAME)/qagame_sp_$(SHLIBNAME): $(Q3GOBJ)
98		$(echo_cmd) "LD $@"
99		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
100		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(LIBS)
101		else
102		$(B)/$(BASEGAME)/qagame.sp.$(SHLIBNAME): $(Q3GOBJ)
103		$(echo_cmd) "LD $@"
104		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
105		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ) $(LIBS)
106		endif
107		$(B)/$(BASEGAME)/vm/qagame.sp.qvm: $(Q3GVMOBJ) $(GDIR)/g_syscalls.asm $(Q3ASM)
108		$(echo_cmd) "Q3ASM $@"
109		@@ -2480,11 +2480,11 @@ Q3UIVMOBJ = $(Q3UIOBJ_:%.o=%.asm)
110		ifdef MINGW
111		$(B)/$(BASEGAME)/ui_sp_$(SHLIBNAME): $(Q3UIOBJ)
112		$(echo_cmd) "LD $@"
113		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
114		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(LIBS)
115		else
116		$(B)/$(BASEGAME)/ui.sp.$(SHLIBNAME): $(Q3UIOBJ)
117		$(echo_cmd) "LD $@"
118		- $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
119		+ $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ) $(LIBS)
120		endif
121		$(B)/$(BASEGAME)/vm/ui.sp.qvm: $(Q3UIVMOBJ) $(UIDIR)/ui_syscalls.asm $(Q3ASM)
122		$(echo_cmd) "Q3ASM $@"

-1

debian/patches/series less more

0	0	All-Rend2-Stub-out-USE_BOX_CUBEMAP_PARALLAX-on-GLSL-1.30.patch
1		build-Link-game-cgame-ui-modules-to-LIBS.patch
2	1	debian/Disable-client-side-auto-download-by-default.patch
3	2	debian/File-access-methods-prevent-overwriting-DLLs-CVE-201.patch
4	3	debian/Remove-support-for-downloading-executable-updates.patch