From patchwork Sat Mar 22 17:00:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 40624 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 60BD927BBEA; Sat, 22 Mar 2025 17:02:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 09AC927BBE2 for ; Sat, 22 Mar 2025 17:02:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tw2Ea-0006MM-2V; Sat, 22 Mar 2025 13:02:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tw2EV-0006Gw-Iy for guix-patches@gnu.org; Sat, 22 Mar 2025 13:02:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tw2EV-0005Cy-8x for guix-patches@gnu.org; Sat, 22 Mar 2025 13:02:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=avjgiUvRNi9nUVE2F1LT9A4k750Tq9K5MOlD2RPVblM=; b=f7//upLwGNWpLhpl896pQ98nD63r4Paxib6wh2Qn4FGgzOKOgpSZrK+RyhR3SiPRoRIe46c1f4x+E7gQCImQa9AiLnOWUg0uvj8VUzhFAXavSpe/J8J7HKw/97MBCs1FT8jqVlAK7TCUl1dnkF31yLUtooJKRy3HLw5/jJkjAK/YgblV+8apcRNo9Cg7ODDGN3k3xkn6jtRu8C5GdCg8z3+IWCrFgIpqlvtZK0lhNV74oOfSPd6Nozkv87ZkeNaRXA4gg8F5A4xOuMWU/2ZEOGW+DtqZ7zKh4UnVti3k/nn8DSL4rqXjRi5gvPbtbbDkrPcvvyMjaRWLgJjD4MggMw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tw2EV-0006gw-47 for guix-patches@gnu.org; Sat, 22 Mar 2025 13:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH 07/13] services: gitolite-service-type: Do not install gitolite package. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 17:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77186@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 77186-submit@debbugs.gnu.org id=B77186.174266286825556 (code B ref 77186); Sat, 22 Mar 2025 17:02:03 +0000 Received: (at 77186) by debbugs.gnu.org; 22 Mar 2025 17:01:08 +0000 Received: from localhost ([127.0.0.1]:45098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tw2Db-0006e8-Rt for submit@debbugs.gnu.org; Sat, 22 Mar 2025 13:01:08 -0400 Received: from wolfsden.cz ([37.205.8.62]:44904) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tw2DD-0006ap-Ej for 77186@debbugs.gnu.org; Sat, 22 Mar 2025 13:00:44 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 7AA4A3800B1; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=3eUo/1HUVaiIZp+QDwp2QAb7kYZ6Us72bagdz3/zBSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BPlxoBj0rBZMmbkIagcvTO6PLxQ2BeMCjl9SbVmgrfN3jYJto7V73XeAZqDg/z2pf 9h4Oj9ENW202qkh9QfYn1yYn2IyalcjJccI+ANE/ZEC29QnsoiUxsl8fhOHohJzANg PvdwP0/4yjyGjGabv9V5HYcmTy8DiIxub2z+JId1bf37IpOERpL75sVQ4YWrOsoJGh BY6RehxwUPbMmaaafgDz9zZx+UNdlPH8O+PWEIGpui/UaP0Do5ia89NkwsK6JdNHRi dQ3reg9KD6N9z9tr+2YZpFb1z+mT7hN/1U43Kw3n3fhnRhxMs8W6pKvjeKG+IMAw/C /bHkpeiSID56S6vkF0cxiDuhc30n2zjs5PjyukgZ49JKRbxOHFvN+gwYw9oktHeaQH pJ8V7lVYeZFLNPTv9DcwzCvDT2B5H6f+xiR8J0ZnjTNRTqjbVy5vdjCn1LMCGHi/Vg gZywpxvJ38URyGC8cRNtSuxo1gcDgvhd3AF61HAKyifACbCfbIhKPp1Lq392oLqvOr AkdlQTt+JM7Qy5Rptw4KIdWn0cCs9d+T8rPH0IxpCNcoGyM7lUuGa3/tJMbSt3WpCY wYT7M60h0hJmDa41Lw9pqynLLD1Lmq11+UA+nmmf+yfAC6jHF09lPIH9Zy6Q+/owFT OtkEFIePthsNPqyThFEuUjmg= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 0D4D4380137; Sat, 22 Mar 2025 17:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1742662842; bh=3eUo/1HUVaiIZp+QDwp2QAb7kYZ6Us72bagdz3/zBSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BPlxoBj0rBZMmbkIagcvTO6PLxQ2BeMCjl9SbVmgrfN3jYJto7V73XeAZqDg/z2pf 9h4Oj9ENW202qkh9QfYn1yYn2IyalcjJccI+ANE/ZEC29QnsoiUxsl8fhOHohJzANg PvdwP0/4yjyGjGabv9V5HYcmTy8DiIxub2z+JId1bf37IpOERpL75sVQ4YWrOsoJGh BY6RehxwUPbMmaaafgDz9zZx+UNdlPH8O+PWEIGpui/UaP0Do5ia89NkwsK6JdNHRi dQ3reg9KD6N9z9tr+2YZpFb1z+mT7hN/1U43Kw3n3fhnRhxMs8W6pKvjeKG+IMAw/C /bHkpeiSID56S6vkF0cxiDuhc30n2zjs5PjyukgZ49JKRbxOHFvN+gwYw9oktHeaQH pJ8V7lVYeZFLNPTv9DcwzCvDT2B5H6f+xiR8J0ZnjTNRTqjbVy5vdjCn1LMCGHi/Vg gZywpxvJ38URyGC8cRNtSuxo1gcDgvhd3AF61HAKyifACbCfbIhKPp1Lq392oLqvOr AkdlQTt+JM7Qy5Rptw4KIdWn0cCs9d+T8rPH0IxpCNcoGyM7lUuGa3/tJMbSt3WpCY wYT7M60h0hJmDa41Lw9pqynLLD1Lmq11+UA+nmmf+yfAC6jHF09lPIH9Zy6Q+/owFT OtkEFIePthsNPqyThFEuUjmg= From: Tomas Volf <~@wolfsden.cz> Date: Sat, 22 Mar 2025 18:00:27 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches It is not ideal to pollute the path with the binaries from the gitolite package, so adjust the package to support that and the service to no longer install it. * gnu/packages/version-control.scm (make-gitolite)[arguments]<#:phases> {'patch-scripts}: Use store file name of gitolite-shell. * gnu/services/version-control.scm (gitolite-service-type): Drop the extension of profile-service-type. Change-Id: I25459ccd80bda892b6d188b2b6fa99baee339cba --- gnu/packages/version-control.scm | 5 ++--- gnu/services/version-control.scm | 10 +--------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8f244e0fa..e06ac79506 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2365,11 +2365,10 @@ (define* (make-gitolite #:optional (extra-inputs '())) (string-append " " (search-input-file inputs "bin/grep") " "))) - ;; Avoid references to the store in authorized_keys. - ;; This works because gitolite-shell is in the PATH. (substitute* "src/triggers/post-compile/ssh-authkeys" (("\\$glshell \\$user") - "gitolite-shell $user")))) + (string-append + #$output "/bin/gitolite-shell $user"))))) (add-before 'install 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; Gitolite uses cat to test the readability of the diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm index b3196199e3..5e217ed170 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -428,15 +428,7 @@ (define gitolite-service-type (list (service-extension activation-service-type gitolite-activation) (service-extension account-service-type - gitolite-accounts) - (service-extension profile-service-type - ;; The Gitolite package in Guix uses - ;; gitolite-shell in the authorized_keys file, so - ;; gitolite-shell needs to be on the PATH for - ;; gitolite to work. - (lambda (config) - (list - (gitolite-configuration-package config)))))) + gitolite-accounts))) (description "Set up @command{gitolite}, a Git hosting tool providing access over SSH. By default, the @code{git} user is used, but this is configurable.