From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id CEEKJSHbPmO8/AAAbAwnHQ (envelope-from ) for ; Thu, 06 Oct 2022 15:41:53 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 6Eb8JCHbPmMYEgAA9RJhRA (envelope-from ) for ; Thu, 06 Oct 2022 15:41:53 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2529A3DF17 for ; Thu, 6 Oct 2022 15:41:53 +0200 (CEST) Received: from localhost ([::1]:58644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ogR8J-0002Cz-Kr for larch@yhetil.org; Thu, 06 Oct 2022 09:41:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ogQty-00016E-IK for bug-guix@gnu.org; Thu, 06 Oct 2022 09:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60324) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ogQty-0003lv-6m for bug-guix@gnu.org; Thu, 06 Oct 2022 09:27:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ogQtx-000759-OT for bug-guix@gnu.org; Thu, 06 Oct 2022 09:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#25957: gitolite broken: created repositories keep references to /usr/bin for hooks Resent-From: "Thompson, David" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 06 Oct 2022 13:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25957 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: zimoun Cc: Efraim Flashner , 25957@debbugs.gnu.org Received: via spool by 25957-submit@debbugs.gnu.org id=B25957.166506281827214 (code B ref 25957); Thu, 06 Oct 2022 13:27:01 +0000 Received: (at 25957) by debbugs.gnu.org; 6 Oct 2022 13:26:58 +0000 Received: from localhost ([127.0.0.1]:59402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ogQtu-00074s-52 for submit@debbugs.gnu.org; Thu, 06 Oct 2022 09:26:58 -0400 Received: from mail-lj1-f178.google.com ([209.85.208.178]:45869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ogQtr-00074b-Qd for 25957@debbugs.gnu.org; Thu, 06 Oct 2022 09:26:57 -0400 Received: by mail-lj1-f178.google.com with SMTP id f9so2194270ljk.12 for <25957@debbugs.gnu.org>; Thu, 06 Oct 2022 06:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=worcester-edu.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=uCYmuAw+4wWs7QbXTqYkskCSNh1IzuAyE7AqPJQAkr4=; b=j9zG/HrLa38aN8tdR1b/s5rmBdx1Xz0BAW2qdeEueemzZorOka2/tBeqUqCro+X3eS 9rVT46Fiu5/Y6kzjgAj7BKFjkk2GZiHuYx+c5FSvOT6+azNuF+QVESjVaquT2G39mHnd SpXyMrzt4iSXwdIc9n8CLXevfNcV6TwlBhZIqoYSdLXduULL3gcaxgpWORlgXxgDHWCr M7hDDijKYoQMFTdoYwHm6CsIKU5JY75JARYyGpsPzZQg/KYIqMW2W9Ac6xVrOzgzbdHy rOT9a1WUlTiBRY7umK46jHqVQLioTJrz0MhTPk06zdJ+JDes5cOHFOTlk4QpWU9D/5/J 4V6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uCYmuAw+4wWs7QbXTqYkskCSNh1IzuAyE7AqPJQAkr4=; b=OuHPgp6FH6gRijuckbEiYEDd7ZezvTaO51E9K+Wk8kPBSRnUp62xEIEUXoxC6lR5pz ki+cIjvxIEiOwwsUrzfsl/xShneVpHuy+5oq7qA6oZlwa5cc1oUNEO18va5suyyJThGd kNqBOdPfBQD06vzXM1SkWOfAhZFvF2XdGMCeP7rtJKafsDS6kBtzKFxlDARMBuD62kcc 0dyBtRzz104Q27DS35ARhC7+r2SxzR+txdMMn39eWNi9zk4BujTpKJT6FvfTibjsXGk6 7SvS/KX8vvxg2amz6aVM/kIDWSTJjfO4RPIeeg5U+oUXuxvf/hDXYDtRBGYz99k7BVUD B3pA== X-Gm-Message-State: ACrzQf0Q3CF6fNjqOgGsLi4RhC3AVVCjV2pDuwMnM3D6dUzZSnVH8fkJ pKgzmkuUNmrPzaX0E8Dp3BL98KzQg/ivZ7rm88djZw== X-Google-Smtp-Source: AMsMyM6w39opIqhsP5cRTo+6vttbJ+5jfnXGwhWaZhMXeoQjtFWxYDIqedTNR4h4ALktezKMb4+gB0MKVImLqll8c54= X-Received: by 2002:a05:651c:1548:b0:26c:61b3:7129 with SMTP id y8-20020a05651c154800b0026c61b37129mr1635342ljp.381.1665062809688; Thu, 06 Oct 2022 06:26:49 -0700 (PDT) MIME-Version: 1.0 References: <6a325301e7cc55ee08652c67e49c3eb8a0802baa.camel@telenet.be> <871qsqtewp.fsf@gmail.com> In-Reply-To: <871qsqtewp.fsf@gmail.com> From: "Thompson, David" Date: Thu, 6 Oct 2022 09:26:38 -0400 Message-ID: Content-Type: multipart/mixed; boundary="0000000000004d05d505ea5da530" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665063713; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=uCYmuAw+4wWs7QbXTqYkskCSNh1IzuAyE7AqPJQAkr4=; b=G4yRUSntSzJertL3CbwHrDFr/G3m/uSkK2uDRYW09EAREyZ5kSmE9qLcKfVs4RDgoYgx1i Q1+McbpdGaQHqzv9jYeSvZcuyCb0Kegc3kBpXPsnoT02QtddkY8a1kEdFFS0RmE0lRSESc DBXwP/a1GPxI8B0GfBmpJfEEOfKBTB1ZEokmclJ4ffjFHdATwQDCUs3zHkLsHjm3VuXX/2 DIjhAAqdFWz7zTKbs/gVjO1JcgrgIDEveAgWUz6w9JHEWBTj77xXMIrLQkv/obV4/cdiLh TJvhQomO7CYF2DVk3ZZ+kFqRX7rbGYxq7+3RYjfY8XDO0NIr1a5xrWHXWT4LtA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665063713; a=rsa-sha256; cv=none; b=BgQolA9KkhNKIKvZWhfogs0u3k5e1phDbrWG0DI/rCbtcCGEdmcrs377XF8BZOteLfrzUc kYu5PrPMBkEG/qbKQ7yVmXhGd0QGxjvNjE2f7GRLZFVI7fzjYJ54Fl4jpeyx1ikmtqfXrf z0XYbn+kQMklhSphn43E0JyoShm1gM2WopFCJeYb3JyTCs7nO7DOnX2snY/LSTzOYnBDBI KRAOvuuT5Yp6liZHVrJk2wRP4u1i4P6FIGMTmmShZlFqaCBHkXZdwJD9k+RDa/EgjPKsgE 1ESTk1jYZy0KxtTznMNckCbSDQdxU0oSNuYvrF0Lr3L5Q+GBCTlvBdksGmlf+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=worcester-edu.20210112.gappssmtp.com header.s=20210112 header.b="j9zG/HrL"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=worcester-edu.20210112.gappssmtp.com header.s=20210112 header.b="j9zG/HrL"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2529A3DF17 X-Spam-Score: 3.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: M0159J0bsSTF --0000000000004d05d505ea5da530 Content-Type: text/plain; charset="UTF-8" Hello again Simon and Efraim, On Mon, Sep 5, 2022 at 5:33 AM zimoun wrote: > > Hi, > > On dim., 04 sept. 2022 at 09:26, "Thompson, David" wrote: > > > Thanks! I made one minor tweak to sort the inputs list alphabetically > > and pushed as commit 1aa46a7e29c5bd892219fe20fefb883d2103e29e. > > Cool! > > > I also pushed a follow-up commit > > e4ccfcb22ad96e71ca4dfad95af5aa6229ed9869 that swaps out 'git' for > > 'git-minimal', saving about 75MiB in the package closure. > > Neat! > > > I think, technically speaking, this bug has been resolved. There are > > no longer /usr/bin, /usr/sbin, etc. references in our gitolite > > package, so extensions should work as long as the user adds the > > relevant packages to their user or system profile. I will keep this > > bug open for the moment, though, since I haven't gotten to the final > > patch I said I would submit which will make those optional > > dependencies easy to add via the gitolite service. Stay tuned! > > Ok, thanks for almost closing this old bugs. :-) Some news: I have updated the gitolite package to use G-expressions. The package builds and the gitolite system test passes so I pushed that change to master a little while ago. That patch has made the (hopefully) final step in this saga easier. The attached patch introduces a 'make-gitolite' procedure that can be used to add arbitrary packages to the wrappers for the gitolite and gitolite-shell programs. The return value of this procedure can be used in the gitolite service configuration to enable the desired optional features like Redis or git-annex. The base package inputs are unchanged and the gitolite system test still passes. What do you think? - Dave --0000000000004d05d505ea5da530 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-gnu-version-control-Add-make-gitolite-procedure.patch" Content-Disposition: attachment; filename="0001-gnu-version-control-Add-make-gitolite-procedure.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l8x3byzk0 RnJvbSAzZjNlMmQwMDJjYjhjNzQwMDgxZDU4ZTgzYjZlODkyMzZkMTFmMTVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEYXZpZCBUaG9tcHNvbiA8ZHRob21wc29uMkB3b3JjZXN0ZXIu ZWR1PgpEYXRlOiBUaHUsIDYgT2N0IDIwMjIgMDg6NDU6NDggLTA0MDAKU3ViamVjdDogW1BBVENI XSBnbnU6IHZlcnNpb24tY29udHJvbDogQWRkIG1ha2UtZ2l0b2xpdGUgcHJvY2VkdXJlLgoKKiBn bnUvcGFja2FnZXMvdmVyc2lvbi1jb250cm9sLnNjbSAobWFrZS1naXRvbGl0ZSk6IE5ldyBwcm9j ZWR1cmUuCihnaXRvbGl0ZSk6IFVzZSBtYWtlLWdpdG9saXRlLgoqIGRvYy9ndWl4LnRleGkgKEdp dG9saXRlIHNlcnZpY2UpOiBEb2N1bWVudCBob3cgdG8gdXNlIG1ha2UtZ2l0b2xpdGUuCi0tLQog ZG9jL2d1aXgudGV4aSAgICAgICAgICAgICAgICAgICAgfCAxNSArKysrKysrKysrKysrKy0KIGdu dS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wuc2NtIHwgMTUgKysrKysrKysrKystLS0tCiAyIGZp bGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZG9jL2d1aXgudGV4aSBiL2RvYy9ndWl4LnRleGkKaW5kZXggNTIzNzExYmRmNi4uNTMzYjEy ZDczOCAxMDA2NDQKLS0tIGEvZG9jL2d1aXgudGV4aQorKysgYi9kb2MvZ3VpeC50ZXhpCkBAIC0z NTI4NSw3ICszNTI4NSwyMCBAQCBEYXRhIHR5cGUgcmVwcmVzZW50aW5nIHRoZSBjb25maWd1cmF0 aW9uIGZvciBAY29kZXtnaXRvbGl0ZS1zZXJ2aWNlLXR5cGV9LgogCiBAdGFibGUgQGFzaXMKIEBp dGVtIEBjb2Rle3BhY2thZ2V9IChkZWZhdWx0OiBAdmFye2dpdG9saXRlfSkKLUdpdG9saXRlIHBh Y2thZ2UgdG8gdXNlLgorR2l0b2xpdGUgcGFja2FnZSB0byB1c2UuICBUaGVyZSBhcmUgb3B0aW9u YWwgR2l0b2xpdGUgZGVwZW5kZW5jaWVzIHRoYXQKK2FyZSBub3QgaW5jbHVkZWQgaW4gdGhlIGRl ZmF1bHQgcGFja2FnZSwgc3VjaCBhcyBSZWRpcyBhbmQgZ2l0LWFubmV4LgorVGhlc2UgZmVhdHVy ZXMgY2FuIGJlIG1hZGUgYXZhaWxhYmxlIGJ5IHVzaW5nIHRoZSBAY29kZXttYWtlLWdpdG9saXRl fQorcHJvY2VkdXJlIGluIHRoZSBAY29kZXsoZ251IHBhY2thZ2VzIHZlcnNpb24tY29udHJvbH0p IG1vZHVsZSB0byBwcm9kdWNlCithIHZhcmlhbnQgb2YgR2l0b2xpdGUgd2l0aCB0aGUgZGVzaXJl ZCBhZGRpdGlvbmFsIGRlcGVuZGVuY2llcy4KKworVGhlIGZvbGxvd2luZyBjb2RlIHJldHVybnMg YSBwYWNrYWdlIGluIHdoaWNoIHRoZSBSZWRpcyBhbmQgZ2l0LWFubmV4Citwcm9ncmFtcyBjYW4g YmUgaW52b2tlZCBieSBHaXRvbGl0ZSdzIHNjcmlwdHM6CisKK0BleGFtcGxlCisodXNlLW1vZHVs ZXMgKGdudSBwYWNrYWdlcyBkYXRhYmFzZXMpCisgICAgICAgICAgICAgKGdudSBwYWNrYWdlcyBo YXNrZWxsLWFwcHMpKQorKG1ha2UtZ2l0b2xpdGUgKGxpc3QgcmVkaXMgZ2l0LWFubmV4KSkKK0Bl bmQgZXhhbXBsZQogCiBAaXRlbSBAY29kZXt1c2VyfSAoZGVmYXVsdDogQHZhcntnaXR9KQogVXNl ciB0byB1c2UgZm9yIEdpdG9saXRlLiAgVGhpcyB3aWxsIGJlIHVzZXIgdGhhdCB5b3UgdXNlIHdo ZW4gYWNjZXNzaW5nCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvdmVyc2lvbi1jb250cm9sLnNj bSBiL2dudS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wuc2NtCmluZGV4IGJkMGFkNzBjZTguLjY4 MzU4Y2MxZDEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wuc2NtCisr KyBiL2dudS9wYWNrYWdlcy92ZXJzaW9uLWNvbnRyb2wuc2NtCkBAIC0xMzcsNyArMTM3LDggQEAg KGRlZmluZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB2ZXJzaW9uLWNvbnRyb2wpCiAgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIHRscykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMpCiAg ICM6dXNlLW1vZHVsZSAoaWNlLTkgbWF0Y2gpCi0gICM6dXNlLW1vZHVsZSAoc3JmaSBzcmZpLTEp KQorICAjOnVzZS1tb2R1bGUgKHNyZmkgc3JmaS0xKQorICAjOmV4cG9ydCAobWFrZS1naXRvbGl0 ZSkpCiAKIChkZWZpbmUtcHVibGljIGJyZWV6eQogICAocGFja2FnZQpAQCAtMTQ4Miw3ICsxNDgz LDkgQEAgKGRlZmluZS1wdWJsaWMgZ2l0LXRlc3Qtc2VxdWVuY2UKIGFsc28gd2FsayBlYWNoIHNp ZGUgb2YgYSBtZXJnZSBhbmQgdGVzdCB0aG9zZSBjaGFuZ2VzIGluZGl2aWR1YWxseS4iKQogICAg ICAgKGxpY2Vuc2UgKGxpY2Vuc2U6eDExLXN0eWxlICJmaWxlOi8vTElDRU5TRSIpKSkpKQogCi0o ZGVmaW5lLXB1YmxpYyBnaXRvbGl0ZQorKGRlZmluZSogKG1ha2UtZ2l0b2xpdGUgIzpvcHRpb25h bCAoZXh0cmEtaW5wdXRzICcoKSkpCisgICJNYWtlIGEgZ2l0b2xpdGUgcGFja2FnZSBvYmplY3Qg d2l0aCBFWFRSQS1JTlBVVFMgYWRkZWQgdG8gdGhlIGJpbmFyeQord3JhcHBlcnMsIHRvIGJlIHVz ZWQgZm9yIG9wdGlvbmFsIGdpdG9saXRlIGV4dGVuc2lvbnMuIgogICAocGFja2FnZQogICAgIChu YW1lICJnaXRvbGl0ZSIpCiAgICAgKHZlcnNpb24gIjMuNi4xMiIpCkBAIC0xNTc0LDEwICsxNTc3 LDEyIEBAIChkZWZpbmUtcHVibGljIGdpdG9saXRlCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIChsaXN0ICMkb3V0cHV0CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICMkY29yZXV0aWxzCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICMkZmluZHV0aWxzCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICMkZ2l0KSkpKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIyRnaXQKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIyRAZXh0cmEtaW5wdXRzKSkpKSkKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgJygiL2Jpbi9naXRvbGl0ZSIgIi9iaW4vZ2l0b2xpdGUtc2hl bGwiKSkpKSkpKQogICAgIChpbnB1dHMKLSAgICAgKGxpc3QgYmFzaC1taW5pbWFsIGNvcmV1dGls cyBmaW5kdXRpbHMgZ2l0IGluZXR1dGlscyBvcGVuc3NoIHBlcmwpKQorICAgICAoYXBwZW5kIChs aXN0IGJhc2gtbWluaW1hbCBjb3JldXRpbHMgZmluZHV0aWxzIGdpdCBpbmV0dXRpbHMgb3BlbnNz aCBwZXJsKQorICAgICAgICAgICAgIGV4dHJhLWlucHV0cykpCiAgICAgKGhvbWUtcGFnZSAiaHR0 cHM6Ly9naXRvbGl0ZS5jb20iKQogICAgIChzeW5vcHNpcyAiR2l0IGFjY2VzcyBjb250cm9sIGxh eWVyIikKICAgICAoZGVzY3JpcHRpb24KQEAgLTE1ODUsNiArMTU5MCw4IEBAIChkZWZpbmUtcHVi bGljIGdpdG9saXRlCiBjb250cm9sIHRvIEdpdCByZXBvc2l0b3JpZXMuIikKICAgICAobGljZW5z ZSBsaWNlbnNlOmdwbDIpKSkKIAorKGRlZmluZS1wdWJsaWMgZ2l0b2xpdGUgKG1ha2UtZ2l0b2xp dGUpKQorCiAoZGVmaW5lLXB1YmxpYyBnaXRpbGUKICAgKHBhY2thZ2UKICAgICAobmFtZSAiZ2l0 aWxlIikKLS0gCjIuMzcuMgoK --0000000000004d05d505ea5da530--