Wed Mar 18 17:55:46 2020 UTC ()
Add missing <string> and deal with time_t > unsigned in the seed
computation.


(joerg)
diff -r1.2 -r1.3 pkgsrc/games/assaultcube/distinfo
diff -r0 -r1.1 pkgsrc/games/assaultcube/patches/patch-source_src_console.h
diff -r0 -r1.1 pkgsrc/games/assaultcube/patches/patch-source_src_master.cpp
cvs diff -r1.2 -r1.3 pkgsrc/games/assaultcube/distinfo (expand / switch to unified diff)

--- pkgsrc/games/assaultcube/distinfo 2019/07/05 08:01:31 1.2
+++ pkgsrc/games/assaultcube/distinfo 2020/03/18 17:55:46 1.3
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1$NetBSD: distinfo,v 1.2 2019/07/05 08:01:31 nia Exp $ 1$NetBSD: distinfo,v 1.3 2020/03/18 17:55:46 joerg Exp $
2 2
3SHA1 (AssaultCube_v1.2.0.2.tar.bz2) = 16b5239c1e2129ba980aee2b96ee52c6128e5821 3SHA1 (AssaultCube_v1.2.0.2.tar.bz2) = 16b5239c1e2129ba980aee2b96ee52c6128e5821
4RMD160 (AssaultCube_v1.2.0.2.tar.bz2) = 861c5d59e8313b7dd8548605f08d6829dca76326 4RMD160 (AssaultCube_v1.2.0.2.tar.bz2) = 861c5d59e8313b7dd8548605f08d6829dca76326
5SHA512 (AssaultCube_v1.2.0.2.tar.bz2) = e2a0d3380db6d2ac2773ea90703fd572504729b9214a6c105f39aefa4c06ff48720634c6601efdad8b9b3b22dec9bc3a9ea7e094839042bc3ff5cfdd88eac976 5SHA512 (AssaultCube_v1.2.0.2.tar.bz2) = e2a0d3380db6d2ac2773ea90703fd572504729b9214a6c105f39aefa4c06ff48720634c6601efdad8b9b3b22dec9bc3a9ea7e094839042bc3ff5cfdd88eac976
6Size (AssaultCube_v1.2.0.2.tar.bz2) = 48181347 bytes 6Size (AssaultCube_v1.2.0.2.tar.bz2) = 48181347 bytes
7SHA1 (patch-source_src_Makefile) = 8825c40bf869166708a1f9277b1f77901137771d 7SHA1 (patch-source_src_Makefile) = 8825c40bf869166708a1f9277b1f77901137771d
8SHA1 (patch-source_src_bot_bot__waypoint.cpp) = 5ded14f79b69ee6ec6c2e9628452a1d6db0d406e 8SHA1 (patch-source_src_bot_bot__waypoint.cpp) = 5ded14f79b69ee6ec6c2e9628452a1d6db0d406e
9SHA1 (patch-source_src_command.cpp) = 9bf2127eff468fd213bf66d345daab982b1c0722 9SHA1 (patch-source_src_command.cpp) = 9bf2127eff468fd213bf66d345daab982b1c0722
10SHA1 (patch-source_src_command.h) = 300f62adb527224c420ed2a6ce3044660fdb4e7a 10SHA1 (patch-source_src_command.h) = 300f62adb527224c420ed2a6ce3044660fdb4e7a
 11SHA1 (patch-source_src_console.h) = e1cc0060bee43f5c02a9e7107e02a651458f8b93
11SHA1 (patch-source_src_crypto.cpp) = fff2b1cf9cac8c4dd9999fc99ed5ce3200f331fc 12SHA1 (patch-source_src_crypto.cpp) = fff2b1cf9cac8c4dd9999fc99ed5ce3200f331fc
12SHA1 (patch-source_src_editing.cpp) = 7bf829a47233358fe14341691e84c9bd5ff880b7 13SHA1 (patch-source_src_editing.cpp) = 7bf829a47233358fe14341691e84c9bd5ff880b7
13SHA1 (patch-source_src_entity.h) = ab67abee7df1587eb01877a9aea64a1b28a940ea 14SHA1 (patch-source_src_entity.h) = ab67abee7df1587eb01877a9aea64a1b28a940ea
14SHA1 (patch-source_src_main.cpp) = 4b3dc7617cb36054ed6de111e8994d22d2e0267b 15SHA1 (patch-source_src_main.cpp) = 4b3dc7617cb36054ed6de111e8994d22d2e0267b
 16SHA1 (patch-source_src_master.cpp) = 95c9630e4f33e79ab9ef646532baada13b92e749
15SHA1 (patch-source_src_platform.h) = 82530eef173f161ed33cee368c0afd6ccd5644a7 17SHA1 (patch-source_src_platform.h) = 82530eef173f161ed33cee368c0afd6ccd5644a7
16SHA1 (patch-source_src_protos.h) = 0944251480debf25e8dc25463307c223ffebbfbb 18SHA1 (patch-source_src_protos.h) = 0944251480debf25e8dc25463307c223ffebbfbb
17SHA1 (patch-source_src_rendercubes.cpp) = 740f5dc169a5e0b331437fd157238a5323a0c866 19SHA1 (patch-source_src_rendercubes.cpp) = 740f5dc169a5e0b331437fd157238a5323a0c866
18SHA1 (patch-source_src_rendertext.cpp) = 3082ca174416c21157ef56fb4d09f3ae3653a47d 20SHA1 (patch-source_src_rendertext.cpp) = 3082ca174416c21157ef56fb4d09f3ae3653a47d
19SHA1 (patch-source_src_tools.h) = a6c0ca4a28b51fc437ed69fe3e7ea48f07c711cb 21SHA1 (patch-source_src_tools.h) = a6c0ca4a28b51fc437ed69fe3e7ea48f07c711cb
20SHA1 (patch-source_src_world.cpp) = 2b48cddb24109c018dc70a3e94417c43178ae101 22SHA1 (patch-source_src_world.cpp) = 2b48cddb24109c018dc70a3e94417c43178ae101
21SHA1 (patch-source_src_worldrender.cpp) = fb7341ad70fcb242982a5f02d7ab0fe3759245d0 23SHA1 (patch-source_src_worldrender.cpp) = fb7341ad70fcb242982a5f02d7ab0fe3759245d0
File Added: pkgsrc/games/assaultcube/patches/patch-source_src_console.h
$NetBSD: patch-source_src_console.h,v 1.1 2020/03/18 17:55:46 joerg Exp $

--- source/src/console.h.orig	2020-03-18 14:22:32.205453475 +0000
+++ source/src/console.h
@@ -1,3 +1,4 @@
+#include <string>
 struct cline { char *line; int millis; };
 
 template<class LINE> struct consolebuffer
File Added: pkgsrc/games/assaultcube/patches/patch-source_src_master.cpp
$NetBSD: patch-source_src_master.cpp,v 1.1 2020/03/18 17:55:46 joerg Exp $

Truncate time_t to uint.

--- source/src/master.cpp.orig	2020-03-18 14:23:02.395419378 +0000
+++ source/src/master.cpp
@@ -510,7 +510,7 @@ void reqauth(client &c, uint id, char *n
     authreq &a = c.authreqs.add();
     a.reqtime = servtime;
     a.id = id;
-    uint seed[3] = { starttime, servtime, randomMT() };
+    uint seed[3] = { static_cast<uint>(starttime), servtime, randomMT() };
     static vector<char> buf;
     buf.setsize(0);
     a.answer = genchallenge(u->pubkey, seed, sizeof(seed), buf);