From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 sKwgKEe7EGMyAAAAbAwnHQ (envelope-from ) for ; Thu, 01 Sep 2022 16:01:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KN9EJ0e7EGPU/QAAG6o9tA (envelope-from ) for ; Thu, 01 Sep 2022 16:01:43 +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 B722DFC36 for ; Thu, 1 Sep 2022 16:01:13 +0200 (CEST) Received: from localhost ([::1]:59076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTkkq-0005S5-Ud for larch@yhetil.org; Thu, 01 Sep 2022 10:01:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTkkg-0005RL-NA for bug-guix@gnu.org; Thu, 01 Sep 2022 10:01:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTkkg-0001iW-E7 for bug-guix@gnu.org; Thu, 01 Sep 2022 10:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTkkg-0002Xx-2j for bug-guix@gnu.org; Thu, 01 Sep 2022 10:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#25957: [EXT] 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, 01 Sep 2022 14:01:02 +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: Efraim Flashner , Maxime Devos , zimoun , 25957@debbugs.gnu.org Received: via spool by 25957-submit@debbugs.gnu.org id=B25957.16620408159700 (code B ref 25957); Thu, 01 Sep 2022 14:01:02 +0000 Received: (at 25957) by debbugs.gnu.org; 1 Sep 2022 14:00:15 +0000 Received: from localhost ([127.0.0.1]:43777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTkju-0002WO-Lg for submit@debbugs.gnu.org; Thu, 01 Sep 2022 10:00:15 -0400 Received: from mail-lf1-f47.google.com ([209.85.167.47]:45801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTkjs-0002W7-Mx for 25957@debbugs.gnu.org; Thu, 01 Sep 2022 10:00:13 -0400 Received: by mail-lf1-f47.google.com with SMTP id w8so15487431lft.12 for <25957@debbugs.gnu.org>; Thu, 01 Sep 2022 07:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=worcester-edu.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date; bh=EvaorlmA5uk3ndQ45BlMiPbS2v4c/Qeiq06Ul3FUkA0=; b=YI7C8wgwe0RjSCnbYLSOSt3nMf2gtLdToiictPmKQPfIqgKmpGC9Vi13dZ40O7I4gE NMKZJIrPsC5dAeySggp+oYxOdxARGuI0P0PdfZ1qOs2+qU3LaGYZGs5+dg8APh5J2ETG 2QE0ejEYeRQ/4uUJH8HPxJLwgiSUXvXgpri1pI+aOauFm6Dl7v7StRJin24waD8hkZba lsnOK9m+LiJFKbLMdx2ll3iuo3VrIhoCf67cBzXhEHvwnfOXjlW/QIZgnGOnL200ypOd S6RvVEElPdBGxIC7rpXZn95Gn9Yhl17DXdq0HwdVR0MOJNIZ70k+j+uTVVRRe4w5JYpd AGqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date; bh=EvaorlmA5uk3ndQ45BlMiPbS2v4c/Qeiq06Ul3FUkA0=; b=wdQWYRgOlY261QsDMaf/dpGfBv+2RgGR8E+iwzois6jnWYOGlWnoQwaHO3lguZQLzQ t62tKFGM6+IPTh6Hma9NwOJcxR1U5tnMVznlNGyA46VQyLsvLVdXhoOw+0sI9AVccKaK ghj3srprG9yMP8l0xeiZkv/B+GVW0tfc/i4bL0xnpoQutEgU8WfbQf7KQ/GOmNoFfV8s 8LsrtpgRrGIShDES16W6YNIyVEF8pndnPHMgJ8+Fj9dzW1CSoHH3mFzQkYLsc8vDvNDG pMXM7ggeDYV5eXBnPlTjQyXULPGhCNfFHceVCSRjHmaMMOwMALJ3A3e9JplsJQrWtqlh IHXg== X-Gm-Message-State: ACgBeo1mPbOKu8h/Mkab3JTzcz55f8kMm/0jvR1wyNldIpf1Gfd5kOOD 9zf3ffbwAYYPTtFIwWGK+H4A1aoA0hLdaMb+8E9I7w== X-Google-Smtp-Source: AA6agR6o0noh63MseoHGqcN5wvMxr1PnET9nsLE7aNUUyYyHAIgljoStYPIaZyUgoQxOGsdz88otFoLqCzIpUBk/KGg= X-Received: by 2002:a05:6512:3fc:b0:494:663f:c017 with SMTP id n28-20020a05651203fc00b00494663fc017mr7292445lfq.472.1662040806610; Thu, 01 Sep 2022 07:00:06 -0700 (PDT) MIME-Version: 1.0 References: <20170303215819.bttmrfsbhlxyipmy@abyayala> <20170303222743.wf777eedaauuof3f@abyayala> <20170304133242.towlmzdcm6x43hvi@abyayala> <86k0ff9has.fsf_-_@gmail.com> <8635l01x7a.fsf@gmail.com> <86lex10wwr.fsf@gmail.com> <6a325301e7cc55ee08652c67e49c3eb8a0802baa.camel@telenet.be> In-Reply-To: From: "Thompson, David" Date: Thu, 1 Sep 2022 09:59:55 -0400 Message-ID: Content-Type: text/plain; charset="UTF-8" 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-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1662040873; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=EvaorlmA5uk3ndQ45BlMiPbS2v4c/Qeiq06Ul3FUkA0=; b=se0XEceL8qlFRhLIveLOUmHn8Wkyd7NfscbTgf0RRnbv4AomE+crqoW3AsK8ACaYul11gx 23oaqO9dhBDC+5yvGK4exrGCk/UWyJ0H+M0/vpSfknRW/zoBo4g88Qw3hXFFeBnCA24W7v p0nE9xqo7rdrcsqspMbv4shgWkgWWUdFg6DOc2i1FwwjxNgGSbBnUtOroIGKbxXulrY2tH 57P5BbbGYNKWhZCaIQY/lG/d5Aa7jKNMT6vPSMD8U95QM0ccwvRcy7jkyHoCJWtaH6TSZ7 vwu6wk/OaB6VytZxzRugzO2pCHjfgUsEqqy0SCHMT42oDjg4B4f+qdbGWUoZCg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1662040873; a=rsa-sha256; cv=none; b=ePOpWtJeXIEsShex4GT3iu0EMu3xI+54jjG3Z50/EPFFxxR0D7a768a1PJZe0K73UOHdS7 HK1pqJK3EyG581FYRn0XPTg+aGqpJr389pjYlXfMLzEmLkbH7OEcebyAe6bxfEJgqW7m0J QC48tNAt84oeWaDNh4D6NOx8XFbQry0Bx9oU5oQxndRbP2u4gXXorO0grLajoVjXg7EGdx p6jyY8sk/yCKXY8MbWH/T5JZXrmfOTWI/7GnQhWbWWWpmuv39OrS5FwUQSPDPq09RD4YlL FL1JY3+xExKigpDNcqbIwOY+r74E7k4Dv2KrGOCV/OnlvWyu8dKCR+isQrDIFg== 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=YI7C8wgw; 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: 2.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=worcester-edu.20210112.gappssmtp.com header.s=20210112 header.b=YI7C8wgw; 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: B722DFC36 X-Spam-Score: 2.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: hn4L9f/43wzl Hi all, Reviving this old thread. On Mon, Mar 28, 2022 at 2:51 AM Efraim Flashner wrote: > > > > Seems like all we have to do is 'substitute*' a '/usr/bin/svnserve' > > into a '/gnu/store/...' (untested), so seems actionable to me. > > Alternatively, as Efraim wrote, let it search the $PATH (that might be > > useful if adding svnserve would increase the closure too much and it is > > an optional dependency in practice?). > > I spent some time looking at gitolite and the service. As I understand > it, with the exception of svnserve, it searches $PATH for a number of > different binaries, including git-annex. I believe that this would only > work if git-annex (and potentially other packages) are installed > globally. > > In addition, git (not git-minimal) and openssh are propagated inputs AND > wrapped. I haven't tested to see if wrapping only is enough. > > I think the best choice is to: > A: Replace /usr/bin/svnserve with svnserve so it will just search $PATH, > like it does with the other helpers. I see that you have done this. Thanks! We could also replace the reference to /usr/sbin/redis-server in src/lib/Gitolite/Cache.pm. That's the only other /usr reference I can find (that isn't in a comment) in the output. I have the patch ready if that sounds good to you. > B: Adjust the service so that it automatically creates a variant (or > just a wrapped version) of the package which is wrapped with a list of > additional packages so that they can be in gitolite's path. If I were > deploying this to an arm device I wouldn't want it wrapped with > git-annex since it doesn't build, but would definitely want it for an > x86_64 machine. The service configuration record could accept a list of addons like '(git-annex cache svnserve), with a default of no addons '(), and create a package that extends the gitolite package with the appropriate propagated inputs. Does that sound like what you had in mind? A more robust solution could modify the build to hardcode the store paths needed for the add-ons but given that we already propagate git and openssh I don't think it's necessary right now. > I suppose we should try to find someone who is using the gitolite > service and see if they can be our test subject for wrapping the package > with optional addons. I use the gitolite service and can be the test subject. I don't currently use any add-ons, but the redis one sounds easy enough to try and hey maybe it's a good excuse to finally learn how to use git-annex. As a longer term thing, it would be cool to revisit propagating git and openssh in this package. I punted on it back in 2015 for the reason stated in the source comments but maybe there's a reasonable and reliable way to directly embed the store paths now. - Dave