From patchwork Mon Mar 31 22:10:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 41108 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 0635527BBE9; Mon, 31 Mar 2025 23:13:44 +0100 (BST) 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=unavailable 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 DAEAD27BBE2 for ; Mon, 31 Mar 2025 23:13:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzNN4-0000On-BQ; Mon, 31 Mar 2025 18:12:42 -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 1tzNMV-0000D5-IY for guix-patches@gnu.org; Mon, 31 Mar 2025 18:12:09 -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 1tzNMV-0006zD-2y for guix-patches@gnu.org; Mon, 31 Mar 2025 18:12:07 -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=mjSQ5iqM8VOCLAc6ZqdkzrR7reMJRKzgOx7d7lDMtnc=; b=KVsFBmlXSBOewVd+se1txA9xXeuE15wm+s32yseDIQZvE8FPk3jZ4lpUOsKBPF1UALM2/HywhuN80K8HnlKL6GY11BLyYQ70aWNKMHaWg5xRUnnDjA8tbQZy29I/Mr73lup3bRiqn/AQvs2LL/KoS1hLAtL8v/CeDb+2vJBrmWMOA0g5XJ22mHP1cyO0wbXPslSSmHeqCzxXtHKauGHbxNjEr3i30zr1fSCHVCk5YLdRE6HxHItFSLgNyuEHrofm6AUGvcSL+tdTs9TtF8gcWTcVbNZPGY9zg8w1DekTXM4RT0MsaOfegIZIjBVthQp6DmSLUQQmu/gHoRgr+FeD7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tzNMU-0000bi-Uh for guix-patches@gnu.org; Mon, 31 Mar 2025 18:12:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77186] [PATCH v2 07/14] 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: Mon, 31 Mar 2025 22:12:06 +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.17434590721991 (code B ref 77186); Mon, 31 Mar 2025 22:12:06 +0000 Received: (at 77186) by debbugs.gnu.org; 31 Mar 2025 22:11:12 +0000 Received: from localhost ([127.0.0.1]:43362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tzNLb-0000Vs-Ez for submit@debbugs.gnu.org; Mon, 31 Mar 2025 18:11:12 -0400 Received: from wolfsden.cz ([37.205.8.62]:40996) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1tzNL4-0000QD-KP for 77186@debbugs.gnu.org; Mon, 31 Mar 2025 18:10:42 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 6030A379998; Mon, 31 Mar 2025 22:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459037; bh=3XtKA9Zrv2uss1fHbAHSt5eNszKPTc1NgYkzhICxV9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ki/odJ6vslLev3nIGv/XklweMFb5LE/T6p0cyX/a2onhRQ0M08bKClMGB61LrSAxd cRFVZEvSoxzSQpVqdcEeUvxZ5rLXvSwSTLfrPwDCUadGRL5d6MQooSP9//FUbinmJo //NUYklV59T6d8j431bmpwyTlASgMfjXYFORLAk0QEY8Qm8RiuFV5tMB9ASsDXuN/m LsMmZjpdRjNOUI72JXprSCDbaNbQFxwll/p+isG6PMVLv3nd7ECZHBD+6nfoctFA3R l4IJKwa2eVEkHAtOn4BJ4v9yvXPTp7Fwb8i8KNFyqSoIOPFKzeakaA89PEgEMwS/FW fZUuBB6aHlZguU7nf32K2lUtMijvXpyswAeorG4j0Jd9Hw0ilkkuNH2M6zNyvdZzKG ZTS5tIa85qn6Kn9uNg0m9QeSTVgXch1MARD0VuA4Nrf+J9CjCfQAYrvGTB0FeSWqoK WBrQCOFKhr4YIPTQV/nhHbFIPAHUzEwnrUMbe3TTf0sMxn+Nr8/gQMYtrvesduEE+f 3xw15Gx+bCqPL7QY2oBj5bmkiPToZsb8y1nyLjLBpF1NgLE+jNDGPjuknYmHo2WMX6 kGHmKw4yV/FjqJfFj3EJEtnrYeqZdKMQN/kxbe9bjt3aqbR7fteI5d+G+kG6nFRn8F eeqkjl411MP0vCGxUorCnU/4= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 15046378FC4; Mon, 31 Mar 2025 22:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1743459036; bh=3XtKA9Zrv2uss1fHbAHSt5eNszKPTc1NgYkzhICxV9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KFLct0FUbCvMprac/COpMZpUoe3onm1XbTa3EkxEQO0COLF0NWgtuqwIeKmDhwsot 48FgDxUW5PEhSX+B1bUi5XjCFfW2FC3UfTFmZR5a/j0C1bY+Zep/HbYwKsrYXeviI1 n9ikD/3SaFiWENM987ELosMq4XscWkKdWqw4hcSfIJgr66DPf6vyeoyrmXGmD3lPl6 XU0W0Rxa5OIgP3wGnHXfIxFMp0MEOjJ/DW9h8igX+pdWzlXAElsvFYu5vFpr/nyYeC 3loxoYQdbfQElwyF0WwWb3VjnmYQBnGNoFbpEodKKg/BQoY7mnltnmQ748gHuebon2 SBHucR+U+X93/Pedji3IDkQsxWj/c26ujy+OzO4G/McknJyMKoeTBJgmxG++KC1uT4 6W/8VLISEC9Ah3e83CsEMvucHVWZb8w8ovsr/rScvmPHh6BSKiQnakPItkRcgsAvmM GbJ3TV3O26P4+N5cozBifITw1m3m03TeGxZ6CV/y1ESH0SixzGD4nbab7W1WLQUvZg ZsPG3MDzmhdjUVrB481iq87712id3LaxLyumRb6HBpiXfO+ZNlxcLtlV0O09hRcLCy irNLlOQgPdAFZWKVBd1wmMKEMYeC5O4vpQYF959InJefphSajq0s90WtdJpS2JJUUq zl+mizGmrjTcgj4H/8fPFi8M= From: Tomas Volf <~@wolfsden.cz> Date: Tue, 1 Apr 2025 00:10:13 +0200 Message-ID: <8031b4bf4c723a6811f87e3ffc0df14651fa557d.1743459020.git.~@wolfsden.cz> X-Mailer: git-send-email 2.49.0 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 | 6 +++--- gnu/services/version-control.scm | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c8f244e0fa..cd624d3d57 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2025 Artyom V. Poptsov ;;; Copyright © 2025 Dariqq +;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2365,11 +2366,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 87f134cb23..e39bb509c2 100644 --- a/gnu/services/version-control.scm +++ b/gnu/services/version-control.scm @@ -429,15 +429,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.