Received: by mail.netbsd.org (Postfix, from userid 605) id 5B7FE84E1B; Wed, 18 Mar 2020 17:55:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D52A584E0A for ; Wed, 18 Mar 2020 17:55:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Pqnk_Z_Zwir9 for ; Wed, 18 Mar 2020 17:55:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4DECC84E09 for ; Wed, 18 Mar 2020 17:55:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4C00AFB27; Wed, 18 Mar 2020 17:55:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158455414673060" MIME-Version: 1.0 Date: Wed, 18 Mar 2020 17:55:46 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/games/assaultcube To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200318175546.4C00AFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158455414673060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Wed Mar 18 17:55:46 UTC 2020 Modified Files: pkgsrc/games/assaultcube: distinfo Added Files: pkgsrc/games/assaultcube/patches: patch-source_src_console.h patch-source_src_master.cpp Log Message: Add missing and deal with time_t > unsigned in the seed computation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/assaultcube/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/games/assaultcube/patches/patch-source_src_console.h \ pkgsrc/games/assaultcube/patches/patch-source_src_master.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158455414673060 Content-Disposition: inline Content-Length: 3085 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/assaultcube/distinfo diff -u pkgsrc/games/assaultcube/distinfo:1.2 pkgsrc/games/assaultcube/distinfo:1.3 --- pkgsrc/games/assaultcube/distinfo:1.2 Fri Jul 5 08:01:31 2019 +++ pkgsrc/games/assaultcube/distinfo Wed Mar 18 17:55:46 2020 @@ -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) = 8825c 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 Added files: Index: pkgsrc/games/assaultcube/patches/patch-source_src_console.h diff -u /dev/null pkgsrc/games/assaultcube/patches/patch-source_src_console.h:1.1 --- /dev/null Wed Mar 18 17:55:46 2020 +++ pkgsrc/games/assaultcube/patches/patch-source_src_console.h Wed Mar 18 17:55:46 2020 @@ -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 + struct cline { char *line; int millis; }; + + template struct consolebuffer Index: pkgsrc/games/assaultcube/patches/patch-source_src_master.cpp diff -u /dev/null pkgsrc/games/assaultcube/patches/patch-source_src_master.cpp:1.1 --- /dev/null Wed Mar 18 17:55:46 2020 +++ pkgsrc/games/assaultcube/patches/patch-source_src_master.cpp Wed Mar 18 17:55:46 2020 @@ -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(starttime), servtime, randomMT() }; + static vector buf; + buf.setsize(0); + a.answer = genchallenge(u->pubkey, seed, sizeof(seed), buf); --_----------=_158455414673060--