diff options
| author | joerg <joerg@pkgsrc.org> | 2020-03-18 17:55:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-03-18 17:55:46 +0000 |
| commit | aab803d10b0d74a1889509f552ebf54ae0d8860f (patch) | |
| tree | 2f7c4d52703d0255707fd436d519bb92ea63b873 /games | |
| parent | 8790e6c77a81c4af8cc8a4d10dd14e4eedbe73f1 (diff) | |
| download | pkgsrc-aab803d10b0d74a1889509f552ebf54ae0d8860f.tar.gz | |
Add missing <string> and deal with time_t > unsigned in the seed
computation.
Diffstat (limited to 'games')
| -rw-r--r-- | games/assaultcube/distinfo | 4 | ||||
| -rw-r--r-- | games/assaultcube/patches/patch-source_src_console.h | 9 | ||||
| -rw-r--r-- | games/assaultcube/patches/patch-source_src_master.cpp | 15 |
3 files changed, 27 insertions, 1 deletions
diff --git a/games/assaultcube/distinfo b/games/assaultcube/distinfo index f84312b64cd..66166e67920 100644 --- a/games/assaultcube/distinfo +++ b/games/assaultcube/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2019/07/05 08:01:31 nia Exp $ +$NetBSD: distinfo,v 1.3 2020/03/18 17:55:46 joerg Exp $ SHA1 (AssaultCube_v1.2.0.2.tar.bz2) = 16b5239c1e2129ba980aee2b96ee52c6128e5821 RMD160 (AssaultCube_v1.2.0.2.tar.bz2) = 861c5d59e8313b7dd8548605f08d6829dca76326 @@ -8,10 +8,12 @@ SHA1 (patch-source_src_Makefile) = 8825c40bf869166708a1f9277b1f77901137771d SHA1 (patch-source_src_bot_bot__waypoint.cpp) = 5ded14f79b69ee6ec6c2e9628452a1d6db0d406e SHA1 (patch-source_src_command.cpp) = 9bf2127eff468fd213bf66d345daab982b1c0722 SHA1 (patch-source_src_command.h) = 300f62adb527224c420ed2a6ce3044660fdb4e7a +SHA1 (patch-source_src_console.h) = e1cc0060bee43f5c02a9e7107e02a651458f8b93 SHA1 (patch-source_src_crypto.cpp) = fff2b1cf9cac8c4dd9999fc99ed5ce3200f331fc SHA1 (patch-source_src_editing.cpp) = 7bf829a47233358fe14341691e84c9bd5ff880b7 SHA1 (patch-source_src_entity.h) = ab67abee7df1587eb01877a9aea64a1b28a940ea SHA1 (patch-source_src_main.cpp) = 4b3dc7617cb36054ed6de111e8994d22d2e0267b +SHA1 (patch-source_src_master.cpp) = 95c9630e4f33e79ab9ef646532baada13b92e749 SHA1 (patch-source_src_platform.h) = 82530eef173f161ed33cee368c0afd6ccd5644a7 SHA1 (patch-source_src_protos.h) = 0944251480debf25e8dc25463307c223ffebbfbb SHA1 (patch-source_src_rendercubes.cpp) = 740f5dc169a5e0b331437fd157238a5323a0c866 diff --git a/games/assaultcube/patches/patch-source_src_console.h b/games/assaultcube/patches/patch-source_src_console.h new file mode 100644 index 00000000000..20712922241 --- /dev/null +++ b/games/assaultcube/patches/patch-source_src_console.h @@ -0,0 +1,9 @@ +$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 diff --git a/games/assaultcube/patches/patch-source_src_master.cpp b/games/assaultcube/patches/patch-source_src_master.cpp new file mode 100644 index 00000000000..e39c33f3e2f --- /dev/null +++ b/games/assaultcube/patches/patch-source_src_master.cpp @@ -0,0 +1,15 @@ +$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); |