X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id EDE96DC0E90 for ; Sun, 21 Feb 2016 19:36:44 +0000 (UTC) Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id AB647DC07A4 for ; Sun, 21 Feb 2016 19:36:44 +0000 (UTC) Received: from mfilter23-d.gandi.net (mfilter23-d.gandi.net [217.70.178.151]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 4F0CAA80C8; Sun, 21 Feb 2016 20:36:42 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter23-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter23-d.gandi.net (mfilter23-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Z7eQEhvFm8Jw; Sun, 21 Feb 2016 20:36:40 +0100 (CET) X-Originating-IP: 82.236.42.167 Received: from localhost.localdomain (bip.im [82.236.42.167]) (Authenticated sender: marc.vertes@ugrid.net) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 3A973A80BF; Sun, 21 Feb 2016 20:36:40 +0100 (CET) From: Marc Vertes To: alpine-aports@lists.alpinelinux.org Cc: Marc Vertes Subject: [alpine-aports] [PATCH] testing/mongodb: fix bug #5117 where mongo fails at start Date: Sun, 21 Feb 2016 19:36:23 +0000 Message-Id: <1456083383-9196-1-git-send-email-marc.vertes@ugrid.net> X-Mailer: git-send-email 2.7.1 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: The check for recursion has been disabled, as it makes mongo shell aborting at start. There may be a better fix, perhaps ensuring that recursion is OK under musl, and maybe increasing stack space ? --- testing/mongodb/APKBUILD | 7 ++++++- testing/mongodb/mongo-fix-recursion.patch | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 testing/mongodb/mongo-fix-recursion.patch diff --git a/testing/mongodb/APKBUILD b/testing/mongodb/APKBUILD index 9911519..14476cf 100644 --- a/testing/mongodb/APKBUILD +++ b/testing/mongodb/APKBUILD @@ -19,6 +19,7 @@ source="http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz backtrace.patch fix-asio-strerror_r.patch boost160.patch + mongo-fix-recursion.patch mongodb.confd mongodb.initd @@ -31,7 +32,8 @@ source="http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz # 2. Use system allocator as tc-malloc doesn't build # 2. Use as much system libs as possible, boost doesn't compile foe example # -# TODO: proper elf-netive-class fix +# TODO: proper fix for recursion check and/or stack management in mongo shell +# TODO: proper elf-native-class fix # TODO: check if there are more libs could be replaced by system counterparts (see libpcap does't use, for example) # TODO: proper fix for heap usage # Right now code patched to always return 0 for heap usage statistics. That is necessary because musl malloc info @@ -96,6 +98,7 @@ md5sums="a9f150f8bead9e8afd3ab28492167073 mongodb-src-r3.2.1.tar.gz 86a988b5d4402227d177b8a1167008e8 backtrace.patch cd0833592e3a23e729ebd71eb756318c fix-asio-strerror_r.patch 1df24dc2aa6b8f4c6da22f097a921ebb boost160.patch +8161b9a08aef17dd171fc4979b50315f mongo-fix-recursion.patch 7d2f94bed7bfacd32fcd52dfd931f077 mongodb.confd 792a0b53b3e843cf14176c5beb8cdfe1 mongodb.initd 49df78833de4cb6e2b9b1ab9da52c3ac mongodb.logrotate @@ -107,6 +110,7 @@ sha256sums="50431a3ba5ab68bd0bed4a157a8528ca27753a63cf101f13135255e4e9d42f15 mo 300d9f6b819730de54018d4b418eb7f921ba9c83fad4958a040544b076160848 backtrace.patch ec6d404221f02706ef2e52e00e414e98666dcc3606e78c9b3d33dfbd42a1eae7 fix-asio-strerror_r.patch 0e9da35f4303e53daf51e78961c517895f2d12f4fa49298f01e1665e15246d73 boost160.patch +d9822952baf5a265e1440ee284e0890aa83cfd7b52438fadb4f311f1d440ef27 mongo-fix-recursion.patch a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d mongodb.confd 7e39fbd4dc18dba21c8767931683f4795e58e0e91b9f9a5842539923ded453c9 mongodb.initd 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 mongodb.logrotate @@ -118,6 +122,7 @@ b9fdacb273d5a4e1e60735846b262287f84ca6cbded9393d182f69158d3162a50cae5d834f76860d 7d097f497cb910c9cb81086cd8c222e43456d1a6de4adfe3e97a4d99add454279350fdeb7305dab84b3deca04afd824036d4065ee0fb8cdd8c03e96d98ee86af backtrace.patch f829b1ad542db3ee776d444243b8b47ab4e48a7386d9b199d7b1adafd31556cf173a5683b78ee735d6a69999ad9af5ad152fde955bbe8865f7910718991ce97c fix-asio-strerror_r.patch 385c82875174caae433a3b381eb10f98a6fed0c8943788ddefff1de80a898e480bdbbf094a7783285cf2ae11ce3fc6878e57d58183d05be2f0837b206aaa4da6 boost160.patch +209a062524a447f54ccf2da9f22fc2946d08b6e119eb1f91d4b4420fdc1de15fd5d91974e284edcecd1b4a4b3bea82bd80e361125a57d9ade0b4503c920d3d9f mongo-fix-recursion.patch 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 mongodb.confd 2cb295ac0eb44acb4533c86d6d0988d5f760361a43cff7845713f3e2cf0e37023d23790a2926c613bf2b0668060c0b68d59000db52daaacd8af10e701a8b4192 mongodb.initd 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 mongodb.logrotate diff --git a/testing/mongodb/mongo-fix-recursion.patch b/testing/mongodb/mongo-fix-recursion.patch new file mode 100644 index 0000000..ba147a2 --- /dev/null +++ b/testing/mongodb/mongo-fix-recursion.patch @@ -0,0 +1,23 @@ +--- a/src/third_party/mozjs-38/extract/js/src/jsfriendapi.h ++++ b/src/third_party/mozjs-38/extract/js/src/jsfriendapi.h +@@ -972,6 +972,12 @@ + * a little more from it). + */ + ++// Under alpinelinux (musl libc), mongo shell fails immediately with ++// "too much recursion". ++// fix the real cause instead of disabling the check. ++#if 1 ++#define JS_CHECK_RECURSION_LIMIT(cx, limit, onerror) ++#else + #define JS_CHECK_RECURSION_LIMIT(cx, limit, onerror) \ + JS_BEGIN_MACRO \ + int stackDummy_; \ +@@ -980,6 +986,7 @@ + onerror; \ + } \ + JS_END_MACRO ++#endif + + #define JS_CHECK_RECURSION(cx, onerror) \ + JS_CHECK_RECURSION_LIMIT(cx, js::GetNativeStackLimit(cx), onerror) -- 2.7.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---