From unknown Fri Aug 15 15:36:08 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#27250 <27250@debbugs.gnu.org> To: bug#27250 <27250@debbugs.gnu.org> Subject: Status: [PATCH] gnu: crawl: Update to 0.20.0. Reply-To: bug#27250 <27250@debbugs.gnu.org> Date: Fri, 15 Aug 2025 22:36:08 +0000 retitle 27250 [PATCH] gnu: crawl: Update to 0.20.0. reassign 27250 guix-patches submitter 27250 nee severity 27250 normal tag 27250 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 05 07:32:22 2017 Received: (at submit) by debbugs.gnu.org; 5 Jun 2017 11:32:22 +0000 Received: from localhost ([127.0.0.1]:56558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHqF6-0002oS-LQ for submit@debbugs.gnu.org; Mon, 05 Jun 2017 07:32:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHqF2-0002ht-Nn for submit@debbugs.gnu.org; Mon, 05 Jun 2017 07:32:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHqEw-0002tO-D2 for submit@debbugs.gnu.org; Mon, 05 Jun 2017 07:32:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:56641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHqEw-0002tK-9Q for submit@debbugs.gnu.org; Mon, 05 Jun 2017 07:32:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHqEu-0007Ou-Hj for guix-patches@gnu.org; Mon, 05 Jun 2017 07:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHqEq-0002rf-Vm for guix-patches@gnu.org; Mon, 05 Jun 2017 07:32:04 -0400 Received: from cock.li ([185.100.85.212]:43185) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHqEq-0002q3-FQ for guix-patches@gnu.org; Mon, 05 Jun 2017 07:32:00 -0400 From: nee DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1496662316; bh=NiLcPVKpRuvrIi3K4kSU/yRWEb4itds6QVpzvVD765U=; h=From:To:Subject:Date:From; b=N+N7moEWyb729GidcGa624nNPDLVnBfAvv3hN8okw4ZZSaQjmG94dim5tHVHXf+kU 4+7U/4LwkMNJm/zDoCF43d99v+3OvFLHV1r+dkYTXfDuJx54PITgMSVQSO7zX3kq57 QjAyVAjYy4Bcwj/U4736aekhzAj+HVmlZqlyAlsSPbgAn7o5Mce/pEjMusAl7BzQnv OTS4CKFyDScjCZne+YjHLnRUTYFyttmFDc1kkgWhOmUj1/S1ICvlm4lAEYwo8h6dgx 5wKjQF3auMm4x1NHWskxdWrmlIgkkaXWCJDTRR8QAFE4sCFWJ+XK6e0Z2+LV/Vph7A +LgVilAG/+DLA== To: guix-patches@gnu.org Subject: [PATCH] gnu: crawl: Update to 0.20.0. Message-ID: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> Date: Mon, 5 Jun 2017 15:31:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------0D5DF6F3EC4283397C90BA52" Content-Language: en-GB X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.9 (/) This is a multi-part message in MIME format. --------------0D5DF6F3EC4283397C90BA52 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hello, this updates crawl to 0.20.0 which came out about a week ago. crawl-tiles indirectly updated through inheritance. I also wrote a patch to make crawl upgrade cached strings in the SAVEDIR by release version in addition to mtime. Without this patch crawl will not detect that there is a new version installed and will not upgrade files in ~/.crawl/saves/db/, because guix sets all the timestamps on the installed files to 1970. I will attempt to get this patch into crawl master. Announcement for this release: https://crawl.develz.org/wordpress/crawl-0-20-scarf-our-wanderful-fried-f= rogs Changelog for this release: https://github.com/crawl/crawl/blob/stone_soup-0.20/crawl-ref/docs/change= log.txt --------------0D5DF6F3EC4283397C90BA52 Content-Type: text/x-patch; name="0001-gnu-crawl-Update-to-0.20.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-crawl-Update-to-0.20.0.patch" =46rom 3aa8588481fb11a3abaa07d754f768b95433aede Mon Sep 17 00:00:00 2001 From: nee Date: Sun, 4 Jun 2017 17:19:41 +0200 Subject: [PATCH] gnu: crawl: Update to 0.20.0. * gnu/packages/games.scm (crawl)[source]: Add a patch to fix savegame upgrades. Update to 0.20.0. * gnu/packages/patches/crawl-upgrade-saves.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/games.scm | 5 +- gnu/packages/patches/crawl-upgrade-saves.patch | 117 +++++++++++++++++++= ++++++ 3 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/crawl-upgrade-saves.patch diff --git a/gnu/local.mk b/gnu/local.mk index e7d5ee2f4..b8a85494d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -550,6 +550,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cracklib-CVE-2016-6318.patch \ %D%/packages/patches/cracklib-fix-buffer-overflow.patch \ + %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/csound-header-ordering.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c1993485b..c2c24f3c8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3955,7 +3955,7 @@ fish. The whole game is accompanied by quiet, comf= orting music.") (define-public crawl (package (name "crawl") - (version "0.19.5") + (version "0.20.0") (source (origin (method url-fetch) @@ -3969,7 +3969,8 @@ fish. The whole game is accompanied by quiet, comf= orting music.") version "-nodeps.tar.xz"))) (sha256 (base32 - "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18")))) + "0127dgldij2h4m7cf32yy9ndv4vcz03g4km71lmxrsi5mw7ljgpd")) + (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/package= s/patches/crawl-upgrade-saves.patch new file mode 100644 index 000000000..c6b6b53bc --- /dev/null +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -0,0 +1,117 @@ +Store the crawl version in the textdatabases in SAVEDIR and +upgrade the databases when the crawl version changes. + +By default crawl checks for a mtime difference on files in DATADIR to se= e if an +upgrade is required, but guix nulls all file dates, +and crawl would never upgrade saves. + +*** a/source/database.cc 2016-05-31 09:56:08.000000000 +0200 +--- b/source/database.cc 2017-06-05 02:25:44.080149014 +0200 +*************** +*** 25,30 **** +--- 25,31 ---- + #include "syscalls.h" + #include "threads.h" + #include "unicode.h" ++ #include "version.h" + =20 + // TextDB handles dependency checking the db vs text files, creating t= he + // db, loading, and destroying the DB. +*************** +*** 55,60 **** +--- 56,62 ---- + vector _input_files; + DBM* _db; + string timestamp; ++ string version; + TextDB *_parent; + const char* lang() { return _parent ? Options.lang_name : 0; } + public: +*************** +*** 165,171 **** + =20 + TextDB::TextDB(const char* db_name, const char* dir, ...) + : _db_name(db_name), _directory(dir), +! _db(nullptr), timestamp(""), _parent(0), translation(0) + { + va_list args; + va_start(args, dir); +--- 167,173 ---- + =20 + TextDB::TextDB(const char* db_name, const char* dir, ...) + : _db_name(db_name), _directory(dir), +! _db(nullptr), timestamp(""), version(""), _parent(0), translati= on(0) + { + va_list args; + va_start(args, dir); +*************** +*** 187,193 **** + : _db_name(parent->_db_name), + _directory(parent->_directory + Options.lang_name + "/"), + _input_files(parent->_input_files), // FIXME: pointless copy +! _db(nullptr), timestamp(""), _parent(parent), translation(nullpt= r) + { + } + =20 +--- 189,195 ---- + : _db_name(parent->_db_name), + _directory(parent->_directory + Options.lang_name + "/"), + _input_files(parent->_input_files), // FIXME: pointless copy +! _db(nullptr), timestamp(""), version(""), _parent(parent), trans= lation(nullptr) + { + } + =20 +*************** +*** 202,207 **** +--- 204,212 ---- + return false; + =20 + timestamp =3D _query_database(*this, "TIMESTAMP", false, false, tr= ue); ++ version =3D _query_database(*this, "VERSION", false, false, true);= ++ if (version.empty()) ++ return false; + if (timestamp.empty()) + return false; + =20 +*************** +*** 245,250 **** +--- 250,258 ---- + string ts; + bool no_files =3D true; + =20 ++ if (string(Version::Long) !=3D version) ++ return true; ++=20 + for (const string &file : _input_files) + { + string full_input_path =3D _directory + file; +*************** +*** 261,267 **** + ts +=3D buf; + } + =20 +! if (no_files && timestamp.empty()) + { + // No point in empty databases, although for simplicity keep o= nes + // for disappeared translations for now. +--- 269,275 ---- + ts +=3D buf; + } + =20 +! if (no_files && timestamp.empty() && version.empty()) + { + // No point in empty databases, although for simplicity keep o= nes + // for disappeared translations for now. +*************** +*** 321,327 **** +--- 329,338 ---- + _store_text_db(full_input_path, _db); + } + } ++=20 ++ string current_version =3D string(Version::Long); + _add_entry(_db, "TIMESTAMP", ts); ++ _add_entry(_db, "VERSION", current_version); + =20 + dbm_close(_db); + _db =3D 0; --=20 2.13.0 --------------0D5DF6F3EC4283397C90BA52-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 05 10:14:31 2017 Received: (at 27250) by debbugs.gnu.org; 5 Jun 2017 14:14:31 +0000 Received: from localhost ([127.0.0.1]:57696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHsm7-0000BV-2N for submit@debbugs.gnu.org; Mon, 05 Jun 2017 10:14:31 -0400 Received: from o152.p9.mailjet.com ([87.253.234.152]:56995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@bnc3.mailjet.com>) id 1dHsm5-0000BN-Ij for 27250@debbugs.gnu.org; Mon, 05 Jun 2017 10:14:29 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=Ng2GzeLmka+IxPtHvzOu1IEzeEs=; b=RnBHG0t+T6uXrOGm7XzqoMjnJ9bJb2fTnkqSZcK+3BLJENpAk1rXou6VS pVOsA0U9uY+o3r2zkGaSyo53Rfr6rUdgA5gEuGuEIkxpQ17GcD67J6WNrJWT 92iWrOFdYyGAxgimz6oYnJ00Vvse7AX0NRomA027LZ+3pEUGkmryeI= Message-Id: <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> MIME-Version: 1.0 From: Arun Isaac To: nee Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Mon, 05 Jun 2017 19:44:18 +0530 In-reply-to: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdEB8if0aV-TwSxhtf6TUClwwAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 27250 Cc: 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) Thanks! LGTM. Only one problem: crawl-upgrade-saves.patch seems to have trailing whitespace, and git is complaining about that. Use `git diff --check' on your commit to see what I mean. Could you fix this and send a new patch? gnu/packages/patches/crawl-upgrade-saves.patch:17: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:32: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:40: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:55: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:63: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:68: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:75: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:81: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:84: trailing whitespace. ++=20 gnu/packages/patches/crawl-upgrade-saves.patch:92: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:100: trailing whitespace. + =20 gnu/packages/patches/crawl-upgrade-saves.patch:111: trailing whitespace. ++=20 gnu/packages/patches/crawl-upgrade-saves.patch:115: trailing whitespace. + =20 = From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 05 11:41:48 2017 Received: (at 27250) by debbugs.gnu.org; 5 Jun 2017 15:41:48 +0000 Received: from localhost ([127.0.0.1]:57881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHu8Z-0002L1-Sk for submit@debbugs.gnu.org; Mon, 05 Jun 2017 11:41:48 -0400 Received: from cock.li ([185.100.85.212]:33825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHu8V-0002Kk-Fd for 27250@debbugs.gnu.org; Mon, 05 Jun 2017 11:41:47 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40, NO_RECEIVED, NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1496677296; bh=4wyoTpfd4UKLMJxiRghuMZhAplNrB9WkUvVWMm4NOQE=; h=Subject:To:References:From:Date:In-Reply-To:From; b=ecDXSbhNOpFMqP2EQc7yfUMH9XmZQfsWFAApWJgZtA50seglPx/bOQ+P/NbJdUJH8 is13drSg0wtHQCvJaVhHFXJnHDcLp7SouAckKNAEEXYUo/tZO6y2skSa7lJ5sTSu1l Pwnw8vDXXHb61rET5WH9UUh3+0NtKaSvMH1htb0jvt+UcwdVnSLQ1xlibzFnP+8lBl gWrnm6wY0J+jPU97NNxgHYhRW9OS6QF50Az19m5ypYllT852wovn2LuOa3DUAzg4In feQ495gzye0tFrHa1EV7yeozBQXc2QmPVbZ8Tp27JAlplqtoTAwrbJKbuI72mH+XDY QRMINLiddsx0A== To: 27250@debbugs.gnu.org References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <4577ad88.AEUAK6w8Z7kAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> From: nee Message-ID: <90198a38-ba6a-f627-edae-68d4baf31b8d@cock.li> Date: Mon, 5 Jun 2017 19:41:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <4577ad88.AEUAK6w8Z7kAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> Content-Type: multipart/mixed; boundary="------------3471048B224340A7766F5386" Content-Language: en-GB X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 27250 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) This is a multi-part message in MIME format. --------------3471048B224340A7766F5386 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Am 05.06.2017 um 16:14 schrieb Arun Isaac: > > Thanks! LGTM. Only one problem: crawl-upgrade-saves.patch seems to have > trailing whitespace, and git is complaining about that. Use `git diff > --check' on your commit to see what I mean. Could you fix this and send > a new patch? > > gnu/packages/patches/crawl-upgrade-saves.patch:17: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:32: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:40: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:55: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:63: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:68: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:75: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:81: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:84: trailing whitespace. > ++ > gnu/packages/patches/crawl-upgrade-saves.patch:92: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:100: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:111: trailing whitespace. > ++ > gnu/packages/patches/crawl-upgrade-saves.patch:115: trailing whitespace. > + > I ran git diff --check HEAD~ on my branch and saw the same warnings. I don't know much about diff and patch, though. What is the correct diff command to generate a patch? I used `diff -crB database.cc database2.cc > crawl-upgrade-saves.patch` and then edited the header myself. Searching for 'diff ' or 'patch' on https://www.gnu.org/software/guix/manual/guix.html doesn't bring up anything related. I did some comparison with other files in ./gnu/packages/patches/ and it seems like `diff -u` generates the format that most files in there have. But it still leaves one trailing whitespace in empty lines. Other .patch files have those too. I attached the commit with the .patch file generated in the diff -u format instead of diff -c. --------------3471048B224340A7766F5386 Content-Type: text/x-patch; name="0001-gnu-crawl-Update-to-0.20.0.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-gnu-crawl-Update-to-0.20.0.patch" =46rom bdcc845e3ff430762efc22af82c54f58c65763f4 Mon Sep 17 00:00:00 2001 From: nee Date: Sun, 4 Jun 2017 17:19:41 +0200 Subject: [PATCH] gnu: crawl: Update to 0.20.0. * gnu/packages/games.scm (crawl)[source]: Add a patch to fix savegame upgrades. Update to 0.20.0. * gnu/packages/patches/crawl-upgrade-saves.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/games.scm | 5 +- gnu/packages/patches/crawl-upgrade-saves.patch | 83 ++++++++++++++++++++= ++++++ 3 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/crawl-upgrade-saves.patch diff --git a/gnu/local.mk b/gnu/local.mk index e7d5ee2f4..b8a85494d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -550,6 +550,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cracklib-CVE-2016-6318.patch \ %D%/packages/patches/cracklib-fix-buffer-overflow.patch \ + %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/csound-header-ordering.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index c1993485b..c2c24f3c8 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3955,7 +3955,7 @@ fish. The whole game is accompanied by quiet, comf= orting music.") (define-public crawl (package (name "crawl") - (version "0.19.5") + (version "0.20.0") (source (origin (method url-fetch) @@ -3969,7 +3969,8 @@ fish. The whole game is accompanied by quiet, comf= orting music.") version "-nodeps.tar.xz"))) (sha256 (base32 - "00yl2lb2shglxlxzpyk99zvglfx4amjybqwnzdcasvbiggb4cj18")))) + "0127dgldij2h4m7cf32yy9ndv4vcz03g4km71lmxrsi5mw7ljgpd")) + (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/package= s/patches/crawl-upgrade-saves.patch new file mode 100644 index 000000000..301942dc3 --- /dev/null +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -0,0 +1,83 @@ +Store the crawl version in the textdatabases in SAVEDIR and +upgrade the databases when the crawl version changes. + +By default crawl checks for a mtime difference on files in DATADIR to se= e if an +upgrade is required, but guix nulls all file dates, +and crawl would never upgrade saves. + +--- a/source/database.cc 2016-05-31 09:56:08.000000000 +0200 ++++ a/source/database.cc 2017-06-05 03:00:19.270632107 +0200 +@@ -25,6 +25,7 @@ + #include "syscalls.h" + #include "threads.h" + #include "unicode.h" ++#include "version.h" +=20 + // TextDB handles dependency checking the db vs text files, creating th= e + // db, loading, and destroying the DB. +@@ -55,6 +56,7 @@ + vector _input_files; + DBM* _db; + string timestamp; ++ string version; + TextDB *_parent; + const char* lang() { return _parent ? Options.lang_name : 0; } + public: +@@ -165,7 +167,7 @@ +=20 + TextDB::TextDB(const char* db_name, const char* dir, ...) + : _db_name(db_name), _directory(dir), +- _db(nullptr), timestamp(""), _parent(0), translation(0) ++ _db(nullptr), timestamp(""), version(""), _parent(0), translatio= n(0) + { + va_list args; + va_start(args, dir); +@@ -187,7 +189,7 @@ + : _db_name(parent->_db_name), + _directory(parent->_directory + Options.lang_name + "/"), + _input_files(parent->_input_files), // FIXME: pointless copy +- _db(nullptr), timestamp(""), _parent(parent), translation(nullptr= ) ++ _db(nullptr), timestamp(""), version(""), _parent(parent), transl= ation(nullptr) + { + } +=20 +@@ -202,6 +204,9 @@ + return false; +=20 + timestamp =3D _query_database(*this, "TIMESTAMP", false, false, tru= e); ++ version =3D _query_database(*this, "VERSION", false, false, true); ++ if (version.empty()) ++ return false; + if (timestamp.empty()) + return false; +=20 +@@ -245,6 +250,9 @@ + string ts; + bool no_files =3D true; +=20 ++ if (string(Version::Long) !=3D version) ++ return true; ++ + for (const string &file : _input_files) + { + string full_input_path =3D _directory + file; +@@ -261,7 +269,7 @@ + ts +=3D buf; + } +=20 +- if (no_files && timestamp.empty()) ++ if (no_files && timestamp.empty() && version.empty()) + { + // No point in empty databases, although for simplicity keep on= es + // for disappeared translations for now. +@@ -321,7 +329,10 @@ + _store_text_db(full_input_path, _db); + } + } ++ ++ string current_version =3D string(Version::Long); + _add_entry(_db, "TIMESTAMP", ts); ++ _add_entry(_db, "VERSION", current_version); +=20 + dbm_close(_db); + _db =3D 0; --=20 2.13.0 --------------3471048B224340A7766F5386-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 05 11:54:22 2017 Received: (at submit) by debbugs.gnu.org; 5 Jun 2017 15:54:22 +0000 Received: from localhost ([127.0.0.1]:57916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHuKj-0002dK-Sg for submit@debbugs.gnu.org; Mon, 05 Jun 2017 11:54:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dHuKi-0002d6-5I for submit@debbugs.gnu.org; Mon, 05 Jun 2017 11:54:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHuKc-0007CD-4n for submit@debbugs.gnu.org; Mon, 05 Jun 2017 11:54:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60135) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHuKc-0007Bu-1c for submit@debbugs.gnu.org; Mon, 05 Jun 2017 11:54:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHuKa-0003Yv-RB for guix-patches@gnu.org; Mon, 05 Jun 2017 11:54:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHuKX-000777-O1 for guix-patches@gnu.org; Mon, 05 Jun 2017 11:54:12 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:38625) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHuKX-00074k-5v for guix-patches@gnu.org; Mon, 05 Jun 2017 11:54:09 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A111C20B16; Mon, 5 Jun 2017 11:54:07 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Mon, 05 Jun 2017 11:54:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=c8C A7uHkzYxuXBIEEwOtU6Jl/SNufTnO8k9Ce+z2RMc=; b=BlEPzCm07o98NuthNbp bVmENdulKdAz6yLbN3GiX4nBTEduzpdaV/gtp15kLUpjW6oPAMefYjk73avhG0SV 3n0B+IPj0GUllV46QVGf57LEIjJUb7L3BEic7LwosT1zjRLsncBp70FPfn37J1K6 0FWvVY5zbRD0ncDkKN38XieA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= fm1; bh=c8CA7uHkzYxuXBIEEwOtU6Jl/SNufTnO8k9Ce+z2RMc=; b=lZpMsjp2 y/kQhH1TeVXIA8f3Gn18xQCOSmNSq/sndm4MHBWbXyBbe4RbXiAMK5ITXPVshfmH jADxwpP3F+XEn2zPWCizCWqauUeFe6Xqbl1DpOU73NkCRij7I07jgap9UAvFfPaQ dmdUv+Mmypg3Erq8vMVjjT02vXKmie0ozDnaY0991bYNdw6/2zgoPv2sqFxKdosw zPR/13AJKx68PbCOQqXcv9+E9TXEMW/zOl1xJQ5H8tWEkuOIYGMkqLmQdeI/V4xm Tw2abRwdnjFgRBuGl2fsqrDwkufjFb4z5iP7lR6PPIeY0uMu1D7978KT1qwETmYM 8sbfFVBtnCbqgA== X-ME-Sender: X-Sasl-enc: X8xEWgEtrkoN1EZdI/0VutzKkEULUukRPRpX96dyiNw6 1496678047 Received: from [IPv6:2607:fb90:2b01:a80:e3f7:eb16:db6a:69f3] (m865a36d0.tmodns.net [208.54.90.134]) by mail.messagingengine.com (Postfix) with ESMTPA id E391D7E7EE; Mon, 5 Jun 2017 11:54:06 -0400 (EDT) Date: Mon, 05 Jun 2017 11:54:07 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. To: guix-patches@gnu.org, Arun Isaac , nee From: Leo Famulari Message-ID: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit Cc: 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Generally, I think it's fine if the patches we include contain whitespace i= ssues=2E -------- Original Message -------- From: Arun Isaac Sent: June 5, 2017 10:14:18 AM EDT To: nee Cc: 27250@debbugs=2Egnu=2Eorg Subject: bug#27250: [PATCH] gnu: crawl: Update to 0=2E20=2E0=2E Thanks! LGTM=2E Only one problem: crawl-upgrade-saves=2Epatch seems to hav= e trailing whitespace, and git is complaining about that=2E Use `git diff --check' on your commit to see what I mean=2E Could you fix this and send a new patch? gnu/packages/patches/crawl-upgrade-saves=2Epatch:17: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:32: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:40: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:55: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:63: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:68: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:75: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:81: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:84: trailing whitespace= =2E ++=20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:92: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:100: trailing whitespace= =2E + =20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:111: trailing whitespace= =2E ++=20 gnu/packages/patches/crawl-upgrade-saves=2Epatch:115: trailing whitespace= =2E + =20 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 06 04:27:30 2017 Received: (at 27250) by debbugs.gnu.org; 6 Jun 2017 08:27:31 +0000 Received: from localhost ([127.0.0.1]:58462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dI9pq-0001KS-Mt for submit@debbugs.gnu.org; Tue, 06 Jun 2017 04:27:30 -0400 Received: from o138.p8.mailjet.com ([87.253.233.138]:51869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dI9po-0001KJ-Kl for 27250@debbugs.gnu.org; Tue, 06 Jun 2017 04:27:29 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=VXmpYZHShmC8rDoWLS/nrVjMFqU=; b=GEqLVGe9cfZSFwxMLIfH0SqTDSfEXhKvhRs0tN/LNQxwSiBw7P5/4qXvb VTLwadgntGdpeUHTOjODSvmiymECUyuEfDNHKR4LCn0knc9jZ+7cB2ZEuwkX dBftlB9zrf1rZnBhEehEmqTSJynYy2i0jYvMn6B2fuHHF8SJPRU1D0= Message-Id: MIME-Version: 1.0 From: Arun Isaac To: Leo Famulari Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Tue, 06 Jun 2017 13:57:11 +0530 In-reply-to: References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUAK9NcTPUAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNmdv6CXZMhtCS-WikRN61jYwkAAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 27250 Cc: nee , 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Leo Famulari writes: > Generally, I think it's fine if the patches we include contain > whitespace issues. Ok, I'll ignore the whitespace issues. @nee: For some reason, the `check' phase of `crawl' seems to be failing on my machine. Did the build complete successfully on yours? [C], function generate_level, line -1 unique.lua, function test_uniques, line 5 unique.lua, function test_uniques_blank, line 26 unique.lua, function run_unique_tests, line 65 unique.lua, function (null), line 73 Lua persistent data: <<<<<<<<<<<<<<<<<<<<<< bailey_type: bailey_axe ice_cave_hard: false tomb_guardian_sets: 1: 3 2: 3 3: 4 4: 3 5: 4 6: 3 aquarium_serial_pool_size: 1 grunt_iron_hall_animated: false >>>>>>>>>>>>>>>>>>>>>> Lua marker contents: <<<<<<<<<<<<<<<<<<<<<< >>>>>>>>>>>>>>>>>>>>>> make: *** [Makefile:1767: test-test] Error 124 make: Leaving directory '/tmp/guix-build-crawl-0.20.0.drv-0/stone_soup-0.20= .0/source' phase `check' failed after 1291.6 seconds builder for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' = failed with exit code 1 @ build-failed /gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv= - 1 builder for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanb jaq-crawl-0.20.0.drv' failed with exit code 1 guix build: error: build failed: build of `/gnu/store/66h101ccsvhv6nkj4w444= ks59kanbjaq-crawl-0.20.0.drv' failed = From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 06 13:56:18 2017 Received: (at 27250) by debbugs.gnu.org; 6 Jun 2017 17:56:18 +0000 Received: from localhost ([127.0.0.1]:59835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIIiI-0008KD-4R for submit@debbugs.gnu.org; Tue, 06 Jun 2017 13:56:18 -0400 Received: from cock.li ([185.100.85.212]:56442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIIiG-0008K0-7J for 27250@debbugs.gnu.org; Tue, 06 Jun 2017 13:56:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50, NO_RECEIVED, NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1496771769; bh=f4zJq7fwuWdQkc/ABwduRJRGuq5q/5y7URHCYfWorc0=; h=Subject:To:References:From:Date:In-Reply-To:From; b=igQD9egJlQwztpvYG8YthJ4tsyowgrt6DRXX6SvvJgeNil1xGBx/B6/HVBuVZBRbQ p/Pi7zGqIKDK6qMUHDrRlK+G4ZpWUf+VqBwuJanDAj4MvKg+sYeZbHzCcyweFLKdR2 QKKDjT1k9k2hdZjeSvguj3a+zjhg4VMZnU0c35eAX8LImI8xDUagtRrAISCHBoJeLC Ekrpqrc9eMq16Pz6Cj0dfq5dGRFrITOmpmiXsBbHSHVxBjWt1XjwYUjPtFd5mDCyU1 EANa5TXjCW5HerrgEuatNS5pkldmHKi81k8ST2LdL0YazsQmDqOk8Rt6GY/f3anYpv k4D8/aDV0HuvQ== To: 27250@debbugs.gnu.org References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> From: nee Message-ID: Date: Tue, 6 Jun 2017 19:56:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 27250 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Am 06.06.2017 um 10:27 schrieb Arun Isaac:> For some reason, the `check' phase of `crawl' seems to be failing on my > machine. Did the build complete successfully on yours? > > [C], function generate_level, line -1 > unique.lua, function test_uniques, line 5 > unique.lua, function test_uniques_blank, line 26 > unique.lua, function run_unique_tests, line 65 > unique.lua, function (null), line 73 > > Lua persistent data: > <<<<<<<<<<<<<<<<<<<<<< > bailey_type: bailey_axe > ice_cave_hard: false > tomb_guardian_sets: > 1: 3 > 2: 3 > 3: 4 > 4: 3 > 5: 4 > 6: 3 > > aquarium_serial_pool_size: 1 > grunt_iron_hall_animated: false >>>>>>>>>>>>>>>>>>>>>>> > > Lua marker contents: > <<<<<<<<<<<<<<<<<<<<<< >>>>>>>>>>>>>>>>>>>>>>> > make: *** [Makefile:1767: test-test] Error 124 > make: Leaving directory '/tmp/guix-build-crawl-0.20.0.drv-0/stone_soup-0.20.0/source' > phase `check' failed after 1291.6 seconds > builder for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' failed with exit code 1 > @ build-failed /gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv - 1 builder for `/gnu/store/66h101ccsvhv6nkj4w444ks59kanb > jaq-crawl-0.20.0.drv' failed with exit code 1 > guix build: error: build failed: build of `/gnu/store/66h101ccsvhv6nkj4w444ks59kanbjaq-crawl-0.20.0.drv' failed > I ran the build 9 times trying to reproduce it, but every time all 29 tests succeeded. I'm building on x86_64 on GuixSD, using `./pre-inst-env guix build crawl --rounds=9` on the commit I sent in last. @arun sorry for the second mail, forgot to reply to list From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 07 14:24:56 2017 Received: (at 27250) by debbugs.gnu.org; 7 Jun 2017 18:24:57 +0000 Received: from localhost ([127.0.0.1]:33532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIfdY-0005na-M0 for submit@debbugs.gnu.org; Wed, 07 Jun 2017 14:24:56 -0400 Received: from o120.p9.mailjet.com ([87.253.234.120]:58367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIfdX-0005nS-1Z for 27250@debbugs.gnu.org; Wed, 07 Jun 2017 14:24:55 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=gycVSWuQdna3QL5J5ZDkJOIogig=; b=aZyYg+GaAEUs7Jp8PO68WLwqTDrejBFo4l3IHH53WNx2ESDkxPeFMwwIj CrAGd8tUFLN/t5obxkp/KItawdgGzIeqeXhuIpuKZ23IQcZzu0gYnA51zYXZ paOsVMtIlTtgfY69nPsfyf4Ql5NgshEiAcVowX3tMDEsdak1oCmKRc= Message-Id: MIME-Version: 1.0 From: Arun Isaac To: nee Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Wed, 07 Jun 2017 23:54:31 +0530 In-reply-to: References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEQALUTaCeQAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZOET1CTSzgr-XQsW4ckX6oIS2lgAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 27250 Cc: 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > I ran the build 9 times trying to reproduce it, but every time all 29 > tests succeeded. I'm building on x86_64 on GuixSD, using `./pre-inst-env > guix build crawl --rounds=3D9` on the commit I sent in last. I must admit I am mystified. I hope I didn't mess up somehow while applying your patch. I will reapply your patch to a fresh branch and try again. Meanwhile, could you rebase against the latest master, and try building again? Maybe, a change to some other package breaks the crawl tests. = From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 07 15:20:23 2017 Received: (at 27250) by debbugs.gnu.org; 7 Jun 2017 19:20:23 +0000 Received: from localhost ([127.0.0.1]:33557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIgVC-00074A-Sc for submit@debbugs.gnu.org; Wed, 07 Jun 2017 15:20:23 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIgVA-000742-S7 for 27250@debbugs.gnu.org; Wed, 07 Jun 2017 15:20:21 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A2E9820A49; Wed, 7 Jun 2017 15:20:18 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Wed, 07 Jun 2017 15:20:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=Owedtv8rZSg6tUzS0obXJ+6ghQz9iucaOQaHb/ dnxXo=; b=1Zil8uft4GDVL+nkOJYasH9g6d8TvBvlKUlC4lAjeNVqqXEkeujLzS 6sgzzHdrsSOoGD7/zqpk+FIZYa/PmIJx5becpHqB2asbt5BZbqQAMWAZA+XEBhdQ /xPgsWQ3cAAp9/koURfIKUx6UI1G6B59LHuAJgOMrKZuTBKJvmY84= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=Owedtv8rZSg6tUzS0o bXJ+6ghQz9iucaOQaHb/dnxXo=; b=SeO0DqKQ0yBUyOYtsb2IcXWCKm6ux60pON TmfHyyUjL4GnF/zLW6YkYmrFlyE0gJ3YauINTACbCaUH3wF0nb/BWqxXH+kmB95d zfO60NVxOTIjAwQeD97VyucVVu8QaCPGerdO5jXirBmcCQMtv77SKS5to7o2pI7V +Y+N27hMS1f8Soxrw/r5wfvwn7QXoxO6a9An7s52B37dDjWTY9lLG5KQc6wxMU+U e+B525butIJCZaGt3bCTGIQnYDyfuVslohOTtuliBvYMcwgMtlVczJreNuQN2Nsz LzZU0IosFOD4ulRD4+3KY/7B7i2qAvx0c9Y0+YO72N6ZKQrG6xqw== X-ME-Sender: X-Sasl-enc: 2UEvxJS/U39nRdpvD4N8gUuezNFjzsezZUIgqoamG57m 1496863218 Received: from localhost (c-71-230-122-237.hsd1.pa.comcast.net [71.230.122.237]) by mail.messagingengine.com (Postfix) with ESMTPA id 51AA27E8E4; Wed, 7 Jun 2017 15:20:18 -0400 (EDT) Date: Wed, 7 Jun 2017 15:20:17 -0400 From: Leo Famulari To: Arun Isaac Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Message-ID: <20170607192017.GA6971@jasmine> References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="OgqxwSJOaUobr8KG" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.3 (2017-05-23) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 27250 Cc: nee , 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --OgqxwSJOaUobr8KG Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jun 07, 2017 at 11:54:31PM +0530, Arun Isaac wrote: >=20 > > I ran the build 9 times trying to reproduce it, but every time all 29 > > tests succeeded. I'm building on x86_64 on GuixSD, using `./pre-inst-env > > guix build crawl --rounds=3D9` on the commit I sent in last. >=20 > I must admit I am mystified. I hope I didn't mess up somehow while > applying your patch. I will reapply your patch to a fresh branch and try > again. Meanwhile, could you rebase against the latest master, and try > building again? Maybe, a change to some other package breaks the crawl > tests. Another option is that the tests are affected by differences in the host kernel or filesystem. --OgqxwSJOaUobr8KG Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlk4Ue0ACgkQJkb6MLrK fwhljA/9GcWc0aodxKIt8+zjoZDXykXMFGpxTrHjueLYwkM96aPyttc/ZVxz3Gju 81gldN19VoVTZczwsUg9MKvFYVi+eBpTvp0WpZ7f6kLsufxHapWgTe/eA4+w41cC nOCxvlou3+QHBJ8ccrBn4b4oEa40JXe0ezHcw92Ts3vYIP2F3ndOwgdArHkrrpJM UJRu56rbNUPINlQMp22DmIGZ1Hc+jhfhBCrkWcrYxWTCRl18astQzF3wi7dPNm6Y wFyncVIaPWx+RToFssAjTZO6KizEqi5IVjK91d/gTgW7CYc9eUFBvzQ23pwygHPF lcNspN+8d6RLGVLkJYwiWPx1V3IxEmtEdNjCnVBN1fjkTYpKFgBI4CmHJiImZWhG P3vf4JfIep6PQxLQzB+HT1yXAjgJ5FdYlYoHMokVbv3smlgJywu8h6nTgllks1cs prRC0yJV5frlgvJSddc0X6+cwppwymPUTmAd/8HnV3hPzSpw56ZsA37pHO1WdCTN E/xTdXbABFDq6twrWXxTTTMWX7oRsD5ReLD08dsAGi4zQywBR2E8Bq/eE72PDhcg Z7uN1l3Fr4vh5sqkKYpuZc/g3bTosn7AEKn5BTgbMF3ek2Z0iYdWfFwRBBFWORPg C7TCJtUKYiGqnOHQSagFD+XL177AjtbSTD0WfWE90/Z0Y/xdR7s= =PDnE -----END PGP SIGNATURE----- --OgqxwSJOaUobr8KG-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 07 15:26:43 2017 Received: (at 27250) by debbugs.gnu.org; 7 Jun 2017 19:26:43 +0000 Received: from localhost ([127.0.0.1]:33563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIgbL-0007DF-K7 for submit@debbugs.gnu.org; Wed, 07 Jun 2017 15:26:43 -0400 Received: from o172.p8.mailjet.com ([87.253.233.172]:43773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <9199849a.AEQALUYyuKIAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZOFNw@bnc3.mailjet.com>) id 1dIgbK-0007D7-9K for 27250@debbugs.gnu.org; Wed, 07 Jun 2017 15:26:42 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=OJHJSxFD9TxFGQgBILmsOMA2hpk=; b=FnzfgUVbsoGA+3yZOCFSq+6AfEcHsRRb474MPV9unV2aAdcWIj1Jbxz9Q aaGFLLpLb+zXRPXsOArzl5OdS5laqvi0UdIEmIgp9XKZCs82phOUTDD3Spsc +VGMIFpoOekoYosupuZ+ZUyx43Ygo/+Tg1zmGWQR+oTCG7LbGHS5IY= Message-Id: <9199849a.AEQALUYyuKIAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZOFNw@mailjet.com> MIME-Version: 1.0 From: Arun Isaac To: Arun Isaac Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Thu, 08 Jun 2017 00:56:16 +0530 In-reply-to: References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEQALUYyuKIAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZOFNwlh1T1aLFQ0eq8JPj-r2VZAAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 27250 Cc: nee , 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > I must admit I am mystified. I hope I didn't mess up somehow while > applying your patch. I will reapply your patch to a fresh branch and > try again. I tried in a fresh branch, and it works now. I must have messed up something. Once I verify crawl-tiles also builds successfully, I'll push. Thanks! = From debbugs-submit-bounces@debbugs.gnu.org Thu Jun 08 11:16:36 2017 Received: (at 27250) by debbugs.gnu.org; 8 Jun 2017 15:16:36 +0000 Received: from localhost ([127.0.0.1]:35260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIzAq-0000eH-By for submit@debbugs.gnu.org; Thu, 08 Jun 2017 11:16:36 -0400 Received: from o103.p9.mailjet.com ([87.253.234.103]:32790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dIzAo-0000e9-RB for 27250@debbugs.gnu.org; Thu, 08 Jun 2017 11:16:35 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=D4jy965vHIyJ3hWT7ONL8frwuTg=; b=r1ECedtvjxk4lcnEAODsB77fpIYlHbAr5iHqLxkwM+ydTLpbfah7xD3vT p/e+Irn5nPDMj5Ee1gOJQNsKRcRn5WqKhNRokBF51QCSQAIikhgsR1m0ZrMi SNewS0t6iCLuXXsLFINU5xYEcFNEjzjHrMgYipH6wWjRy881Dj0Aas= Message-Id: MIME-Version: 1.0 From: Arun Isaac To: Leo Famulari Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Thu, 08 Jun 2017 20:46:21 +0530 In-reply-to: <20170607192017.GA6971@jasmine> References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> <20170607192017.GA6971@jasmine> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEMALQ-MP9sAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZOWpPjMsGHnjwQVOxTCdGJoHXVQAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.2 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: > Another option is that the tests are affected by differences in the host > kernel or filesystem. That too. @nee: [...] Content analysis details: (2.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see ] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [87.253.234.103 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 1.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [87.253.234.103 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid X-Debbugs-Envelope-To: 27250 Cc: nee , 27250@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.2 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: > Another option is that the tests are affected by differences in the host > kernel or filesystem. That too. @nee: [...] Content analysis details: (2.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [87.253.234.103 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [87.253.234.103 listed in wl.mailspike.net] 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see ] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 1.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 T_DKIM_INVALID DKIM-Signature header exists but is not valid > Another option is that the tests are affected by differences in the host > kernel or filesystem. That too. @nee: I am now facing similar problems with crawl-tiles as well. I am going out of town tonight. I'll be back on Saturday, and explore this more fully. Sorry for the delay. = From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 10 07:39:47 2017 Received: (at 27250) by debbugs.gnu.org; 10 Jun 2017 11:39:48 +0000 Received: from localhost ([127.0.0.1]:37837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJek7-0007wd-QA for submit@debbugs.gnu.org; Sat, 10 Jun 2017 07:39:47 -0400 Received: from o151.p9.mailjet.com ([87.253.234.151]:54063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJek5-0007wU-57 for 27250@debbugs.gnu.org; Sat, 10 Jun 2017 07:39:45 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=b5+cKZMSTqfb5gXWdnJV12ae9H0=; b=aC/TKZDM/5aGSrR3ElSZQrIciUcKpIqilQj2NoMaxZ3Rt014W/0P35jd0 j7krN2hzbRSBQgqO+zHgmYZvyLLXzDyWb7T0WENfQLNEW22+UYD+aWQ+BF8P 6zrxxNloBwKIeTBCcSJRqoa2ohCvqrj0QDuIZgT2v2wjwQUAmWWTLg= Message-Id: MIME-Version: 1.0 From: Arun Isaac To: 27250@debbugs.gnu.org Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Sat, 10 Jun 2017 17:09:32 +0530 In-reply-to: References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> <20170607192017.GA6971@jasmine> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEAALOqVmtYAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZO9p_Lc2WphWcQBaeUuvZPv6x4AAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 27250 Cc: nee , Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) I'm unable to figure out the issue. This being just a simple update patch, I think I'll just push it, and we'll see what happens at the build servers. If there are subsequent problems, we'll fix it up later. WDYT? = From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 10 15:10:58 2017 Received: (at 27250) by debbugs.gnu.org; 10 Jun 2017 19:10:58 +0000 Received: from localhost ([127.0.0.1]:39359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJlmj-0000Qo-St for submit@debbugs.gnu.org; Sat, 10 Jun 2017 15:10:58 -0400 Received: from cock.li ([185.100.85.212]:34468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJlmf-0000QP-C5 for 27250@debbugs.gnu.org; Sat, 10 Jun 2017 15:10:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on cock.li X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50, NO_RECEIVED, NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1497121846; bh=lfpr2gbCzkb3bGlUc5+Abb2d1jb4PWmG8UqS21Cfc7o=; h=Subject:To:References:From:Date:In-Reply-To:From; b=Qd+WAP5H7Mz6/wQYK+xtj9yGIVKSOY5qzudUCVyvg/vpRx79Pl41XWr2TsJYy4H0h VMhlIxoCQR6W73b68xd9GrB/Toe0rjMdH1Y5MyT7Ruwdpc6WB6ZBVhAb7KgRZBoB6L zALn+BQ46TwqHCon+fFyHRzXHSxJWlX+MKpf7mTY075ZJ+bRGRWR6zCe3eY1WBlZb0 fAFC+Z3kA54x7hRSmP5yXQJLdqKXtZeIVPdfgWrdXF2gRVNiqiW6NDBu8mBXI5C9wC kSmad9qIVfo9ukuFQvV+/BbU04vFL+1eaRlk7s4rJgQmm58y9OrvPF4d58nonpkd5B 0H2Kk2XryK8qg== To: 27250@debbugs.gnu.org References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> <20170607192017.GA6971@jasmine> <5e315f5d.AEAALOqVmtgAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZO9qA@mailjet.com> From: nee Message-ID: <0fd6dfc7-6863-6271-5661-f34e782247ba@cock.li> Date: Sat, 10 Jun 2017 21:10:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <5e315f5d.AEAALOqVmtgAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZO9qA@mailjet.com> Content-Type: multipart/mixed; boundary="------------80700EFFA20D841FEF27EF16" Content-Language: en-GB X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 27250 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This is a multi-part message in MIME format. --------------80700EFFA20D841FEF27EF16 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Am 10.06.2017 um 13:39 schrieb Arun Isaac: > > I'm unable to figure out the issue. This being just a simple update > patch, I think I'll just push it, and we'll see what happens at the > build servers. If there are subsequent problems, we'll fix it up > later. WDYT? > Okay, maybe the buildfarm can give us some hints about this problem. In the meantime there was another commit updating crawl to 0.20. I rebased my patch to it. Please use this one. I tested it with --rounds=2 and didn't run into any problems. I also rebuilt 0.19.5 again and noticed that the 0.20 release adds 2 new test cases. I haven't looked into them, but that could narrow down the location of the problem. --------------80700EFFA20D841FEF27EF16 Content-Type: text/x-patch; name="0001-gnu-crawl-Add-a-patch-to-fix-savegame-upgrades.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-gnu-crawl-Add-a-patch-to-fix-savegame-upgrades.patch" >From 5954d907008c07a06bdbfb129383eaf7813ea358 Mon Sep 17 00:00:00 2001 From: nee Date: Sat, 10 Jun 2017 20:27:58 +0200 Subject: [PATCH] gnu: crawl: Add a patch to fix savegame upgrades. * gnu/packages/games.scm (crawl)[source]: Add a patch to fix savegame upgrades. * gnu/packages/patches/crawl-upgrade-saves.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/games.scm | 3 +- gnu/packages/patches/crawl-upgrade-saves.patch | 83 ++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/crawl-upgrade-saves.patch diff --git a/gnu/local.mk b/gnu/local.mk index 686c3c639..ddf05c706 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -550,6 +550,7 @@ dist_patch_DATA = \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cracklib-CVE-2016-6318.patch \ %D%/packages/patches/cracklib-fix-buffer-overflow.patch \ + %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ %D%/packages/patches/crossmap-allow-system-pysam.patch \ %D%/packages/patches/csound-header-ordering.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a76ab1ddc..4a5b94ab7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4049,7 +4049,8 @@ fish. The whole game is accompanied by quiet, comforting music.") version "-nodeps.tar.xz"))) (sha256 (base32 - "0127dgldij2h4m7cf32yy9ndv4vcz03g4km71lmxrsi5mw7ljgpd")))) + "0127dgldij2h4m7cf32yy9ndv4vcz03g4km71lmxrsi5mw7ljgpd")) + (patches (search-patches "crawl-upgrade-saves.patch")))) (build-system gnu-build-system) (inputs `(("lua51" ,lua-5.1) diff --git a/gnu/packages/patches/crawl-upgrade-saves.patch b/gnu/packages/patches/crawl-upgrade-saves.patch new file mode 100644 index 000000000..301942dc3 --- /dev/null +++ b/gnu/packages/patches/crawl-upgrade-saves.patch @@ -0,0 +1,83 @@ +Store the crawl version in the textdatabases in SAVEDIR and +upgrade the databases when the crawl version changes. + +By default crawl checks for a mtime difference on files in DATADIR to see if an +upgrade is required, but guix nulls all file dates, +and crawl would never upgrade saves. + +--- a/source/database.cc 2016-05-31 09:56:08.000000000 +0200 ++++ a/source/database.cc 2017-06-05 03:00:19.270632107 +0200 +@@ -25,6 +25,7 @@ + #include "syscalls.h" + #include "threads.h" + #include "unicode.h" ++#include "version.h" + + // TextDB handles dependency checking the db vs text files, creating the + // db, loading, and destroying the DB. +@@ -55,6 +56,7 @@ + vector _input_files; + DBM* _db; + string timestamp; ++ string version; + TextDB *_parent; + const char* lang() { return _parent ? Options.lang_name : 0; } + public: +@@ -165,7 +167,7 @@ + + TextDB::TextDB(const char* db_name, const char* dir, ...) + : _db_name(db_name), _directory(dir), +- _db(nullptr), timestamp(""), _parent(0), translation(0) ++ _db(nullptr), timestamp(""), version(""), _parent(0), translation(0) + { + va_list args; + va_start(args, dir); +@@ -187,7 +189,7 @@ + : _db_name(parent->_db_name), + _directory(parent->_directory + Options.lang_name + "/"), + _input_files(parent->_input_files), // FIXME: pointless copy +- _db(nullptr), timestamp(""), _parent(parent), translation(nullptr) ++ _db(nullptr), timestamp(""), version(""), _parent(parent), translation(nullptr) + { + } + +@@ -202,6 +204,9 @@ + return false; + + timestamp = _query_database(*this, "TIMESTAMP", false, false, true); ++ version = _query_database(*this, "VERSION", false, false, true); ++ if (version.empty()) ++ return false; + if (timestamp.empty()) + return false; + +@@ -245,6 +250,9 @@ + string ts; + bool no_files = true; + ++ if (string(Version::Long) != version) ++ return true; ++ + for (const string &file : _input_files) + { + string full_input_path = _directory + file; +@@ -261,7 +269,7 @@ + ts += buf; + } + +- if (no_files && timestamp.empty()) ++ if (no_files && timestamp.empty() && version.empty()) + { + // No point in empty databases, although for simplicity keep ones + // for disappeared translations for now. +@@ -321,7 +329,10 @@ + _store_text_db(full_input_path, _db); + } + } ++ ++ string current_version = string(Version::Long); + _add_entry(_db, "TIMESTAMP", ts); ++ _add_entry(_db, "VERSION", current_version); + + dbm_close(_db); + _db = 0; -- 2.13.1 --------------80700EFFA20D841FEF27EF16-- From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 12 05:36:54 2017 Received: (at 27250-done) by debbugs.gnu.org; 12 Jun 2017 09:36:54 +0000 Received: from localhost ([127.0.0.1]:41844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKLmI-0000k6-6f for submit@debbugs.gnu.org; Mon, 12 Jun 2017 05:36:54 -0400 Received: from o174.p9.mailjet.com ([87.253.234.174]:34756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <12f38aa8.AEEALuIrCGEAAAAAAAAAAAPJcbUAAAACwQwAAAAAAAW9WABZPmCy@bnc3.mailjet.com>) id 1dKLmG-0000jw-Pu for 27250-done@debbugs.gnu.org; Mon, 12 Jun 2017 05:36:53 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:cc:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=ggWmYuNz7jBCLkoQo1+lxOpophQ=; b=dqaZpL+sfBIpSEbfohijT6wsbdVnpXguAePNBe4yxDtuo+xuAw8uYIXGq ZnnyZ0MuLxiGf1RVt63xpDluG3LyCSCgwXOZ5bV/MHWMvI5WXkMDInypAadx 0A5ta2c4GOHccQHSSfnDvZ5cOuMMclC9LtxwGZ6ejqz9y4GCcathv0= Message-Id: <12f38aa8.AEEALuIrCGEAAAAAAAAAAAPJcbUAAAACwQwAAAAAAAW9WABZPmCy@mailjet.com> MIME-Version: 1.0 From: Arun Isaac To: nee Subject: Re: bug#27250: [PATCH] gnu: crawl: Update to 0.20.0. Date: Mon, 12 Jun 2017 15:06:42 +0530 In-reply-to: <0fd6dfc7-6863-6271-5661-f34e782247ba@cock.li> References: <9de7211f-6ab6-7a7d-c2a9-ad65f95bbfe4@cock.li> <92906ae2.AEUAK6w8Z7gAAAAAAAAAAAPHYWoAAAACwQwAAAAAAAW9WABZNWdE@mailjet.com> <51e0342f.AEUAK9NcTPcAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZNmdv@mailjet.com> <20170607192017.GA6971@jasmine> <5e315f5d.AEAALOqVmtgAAAAAAAAAAAO0_XAAAAACwQwAAAAAAAW9WABZO9qA@mailjet.com> <0fd6dfc7-6863-6271-5661-f34e782247ba@cock.li> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEEALuIrCGEAAAAAAAAAAAPJcbUAAAACwQwAAAAAAAW9WABZPmCyH5Jgtw4JQoKOxoRsF5OengAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 27250-done Cc: 27250-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Pushed! crawl and crawl-tiles built successfully on my machine at least once. Let's see what happens on the build farm. = From unknown Fri Aug 15 15:36:08 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 10 Jul 2017 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator