From patchwork Sun Jul 28 17:09:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Sergio_Pastor_P=C3=A9rez?= X-Patchwork-Id: 29586 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 D1E1927BBE9; Sun, 28 Jul 2024 18:21:16 +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.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,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 C0ECA27BBE2 for ; Sun, 28 Jul 2024 18:21:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sY7Zn-00017j-F0; Sun, 28 Jul 2024 13:20:55 -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 1sY7Zj-00016I-Fl for guix-patches@gnu.org; Sun, 28 Jul 2024 13:20:51 -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 1sY7Zi-0001m0-Uh for guix-patches@gnu.org; Sun, 28 Jul 2024 13:20:51 -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:Date:From:To:Subject; bh=t9qK0vO6oXTBW9XWRsElhsFxwEnuiMaXtUybEHYkeOw=; b=ImafDuy4VvqEg982Ib8KSjmgiEDl+oSLKjZjXKDaJYu8OVzyeKOMCfWyxC1MpHvRbLlRnBQSoHZ/pFGHHIHAkQ/+MWTnfEXxrfWCFru7CGhW41IzdctRX7YREhvhjnF+cWmyHZTzLoF9tKgW35HWSIt8JK56ANUDPFHJw15fc8/sE0uRSdNLygcx8yYj7pPmly3rBpd46k0TA8A8Jd+pVetXfxX/hd3qfEQM590HRE3Pj7EEpUrpKZ2N0cMzAtB5KZaDsnlbSEQ+PKV4weqcEAb1mWc59G3vUm7dT82+snTn+m7s8pvHVGZrrsDiZr7xXfc47nf1OXWACY9E2jTPKw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sY7Zu-0006tS-2o for guix-patches@gnu.org; Sun, 28 Jul 2024 13:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72342] [PATCH] services: syncthing: incorrect guessing of HOME variable Resent-From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Jul 2024 17:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72342 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72342@debbugs.gnu.org Cc: Sergio Pastor =?utf-8?b?UMOpcmV6?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172218720826414 (code B ref -1); Sun, 28 Jul 2024 17:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2024 17:20:08 +0000 Received: from localhost ([127.0.0.1]:44316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sY7Z2-0006rx-56 for submit@debbugs.gnu.org; Sun, 28 Jul 2024 13:20:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:35310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sY7Yy-0006ro-Ue for submit@debbugs.gnu.org; Sun, 28 Jul 2024 13:20:07 -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 1sY7Ym-0000rd-SF for guix-patches@gnu.org; Sun, 28 Jul 2024 13:19:53 -0400 Received: from mail-vi1eur02olkn20800.outbound.protection.outlook.com ([2a01:111:f403:2e07::800] helo=EUR02-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sY7Yj-0001Qo-HN for guix-patches@gnu.org; Sun, 28 Jul 2024 13:19:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lZ04Wvqiz7tYT3Rd0NZGI7NzI0hj/VkLBxhl/8cbV4ubQGqKEr2o6Q9jn/XEKp3o++qsSxTG4jtFtIuXlEFclAN7o9O2Kq9Ng63w4f6pNzs1ZW8854YahM7x0O7MZc33lL1NWWqVJmphV1n8oOjB4CDZyQEJ9u5mc2P/6LmjnJdYH1zKu/Lc1CG/OxSW6s6hD5vU7tZInYkkbONdCGF6XIGDPVsUmYOngrDDEFkOxOpcOIYdVjHPDoKogKAucjbDWI3J9O4el8EbqNdZQFzuCvYa9/p9dN0PZ2Hm2R4FibSTFxWkoHcTPDgG44A4UqnsupxJsTfFEogOIeOXMjY94A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t9qK0vO6oXTBW9XWRsElhsFxwEnuiMaXtUybEHYkeOw=; b=xYKblJtSpkoTPVZV0wfKUgzhDhKD5/R+quGsMEeeFQM3wHqQSleZUOUjqtXFqlW9Zm/iclxhWWteJkbz4VpEz9tzTpXV/varz47+TUJyVWQQnZJg/5c/KREiCtcnAPPizdVwOIRvBhUnAtFfO7xeKf9qJoh32ujIVkML8MQ1Q0ujhmWcsWXZJOIgMQCcmySa3yVgbMShlHFjGmwbZAazB45HRigHssUYjDwvBA0Vl0aMM8t4GkZa3CrFRkbWlwSXHPRgvxUNv7sftOPQr+mbLIdNRlxlpN2EmKiBBLi3LiBns73pVQpELqRyIzOSFfwrdvNUTACt32YL9b6uc0V5aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=OUTLOOK.ES; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t9qK0vO6oXTBW9XWRsElhsFxwEnuiMaXtUybEHYkeOw=; b=bMl27ThS+pbYnOzXQPV437IVGwMpWXWLQLocCG29BaHsUHcMYRnhLNUuAWF8TfGkTmpwlLsMO0cySGqkDI1vbnq88vFFKf4+tgXc8x5AFxqrhXoOunwCnhMmatoZbP9LIxosiYI5xOwSr/yTIYngFQS2QAvamXWE6wGqyHGCaDPysmV9grUlnB1xRyl6GUEX7BuDiHs9AXKW8W1iP4nOinayGHrx51UyoA2vIxHBpQ2jlDYR0rHRLitSf4CNi7aWrQfrJ9Ez7V6i2gt1ooDpJX7qLdpmj+2uscm+kPjprtoJcq1tU8tBU+EcHLr5wN3qe/Jqm24e5Bfp5EC240VdTg== Received: from PAXP251MB0348.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:20b::10) by PAXP251MB0517.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:28e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7807.23; Sun, 28 Jul 2024 17:14:45 +0000 Received: from PAXP251MB0348.EURP251.PROD.OUTLOOK.COM ([fe80::1f4f:1f6b:1817:f03f]) by PAXP251MB0348.EURP251.PROD.OUTLOOK.COM ([fe80::1f4f:1f6b:1817:f03f%7]) with mapi id 15.20.7762.020; Sun, 28 Jul 2024 17:14:45 +0000 From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Date: Sun, 28 Jul 2024 19:09:41 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 X-TMN: [v7+Itv2fDTUUnoJ7EuMblBDalh31kO8b] X-ClientProxiedBy: MA2P292CA0030.ESPP292.PROD.OUTLOOK.COM (2603:10a6:250::7) To PAXP251MB0348.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:20b::10) X-Microsoft-Original-Message-ID: <658ef2fc063a63834e9e79f8e0bd1a18ba6b5177.1722186580.git.sergio.pastorperez@outlook.es> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXP251MB0348:EE_|PAXP251MB0517:EE_ X-MS-Office365-Filtering-Correlation-Id: 82129802-cd91-4c16-1fd7-08dcaf28c704 X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|19110799003|5072599006|461199028|1602099012|3412199025|440099028|4302099013|1710799026; X-Microsoft-Antispam-Message-Info: /OlAI4hB0cMNb1OcnvTG1TGaBVdjgaRBgfhQLhF4j0qd2e5IJ8+yqB1cBluYpc7OArz3YoY6YBXtxQQpMZ/jKT9x64jcdFh1hbIbspAOHESQZu3EYrHh+SoI6jR/2bAFpm8isjsGonoJf3U8oycprNRuYcF5/D1hhFG9ScaB8tBxMFwhyzd3lbiaspuYyjsKL9nBUe7d0tRz+bfhbU2AS3AiRJeBBRsCAGJ2LHRiqW6dCkbz7Il0THOYax9OllgmzEWey5hj0XFTyMIip6pZRKR6hs/0qCOhGFk7K0YJKAiCMx0cio65/Gcx/gKNitYdC5DKzZvjUanPqgfhEidH/0i02UqOfS3jIpSTGMgm9ei6gAWDS78m0J8CYP8ZZfautD7HoV6Des0v2K4YcVbN289lQxOJt7QeM0LZ+7V8B2Ws89LKUl058s0qwE45RYjBoyvyH7KoHpC+hqAoQuzgHHxi2uj/u1PUjkil+cPW3XqxJ3qDjEEWFeBdz3yoysvdccz7jsE/uNdEMN9dAs7ReJbqXIH6vtOPVzOJ0u0hWb6jmRPUC3NVdJvdvBIfEXMP3YgV9Zeq/KQesJGzRTrEJ1/GMJnvCe+ttrjtsN9ViL1gSWV3c6MG5JnrHpONkbimsQinj529SyKPsbUSLDvOhxxkTxEI7ZEb+saSxzfdHOdp2CElTvFVfvcobXoFK3osTmsu3XLtYVyPxvOsM8TnjWFpOyEjBqldmbLU+jt71RhDZSqTQVTG1rse0KnsXPdUffpDW8Eodex136tjjJ753utrsacoqYViWP1dA8WqxwIuCivZKMEBOZJJ+KRXsGfGhmbwSvzotFf+JxN/2sIHAofGlenkfvS/IbzDWkwUFes= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 37F844Vm61I09Rz+68VpK9KgSh+KVFelg3kR4d8RSKeHol0QfFUC1qcXf4DFPXo3Md38+AVUXUTeiSwOG6qHJrqWbw53NWUVLJfD01NvOqUWToGxKirktvRqidIvkY3W//ufZlMY1KEdJhMY8HWMiA3jrU+suMBe1l6QEpUbw+25MW+M54VI4nuipkSPzVNzi815waeSS87P07jndhTP5s+KrgtCDGgxzphq2OiFZIeDZMXPQtv3YMUOwO5qhz9pZYuQZHj2VQj6gyAqpDoul5dSdjIi6UiD6SDsW3hswqgBdF1jqnaIZVU7bC8d538OwcQGYQBkCH9ki5Kq2SHch6rG0dlGgbwznH5iRurXmoL5mHhHZrNHTql0YVJrupCQtTwilehPu4Y/7F6kp3No3Ve3E1mMHkqajG04FCdoic+zZ692GjR6Goo0TRa0L1lWkdq00sO0r3V1eB14fr8WtONXQJKIC7opTfUEO07EO0425k6zGL3b616YZCDRLpfqH00KSiidv97iE/eoKaSg49Htsl58XkH10AYpYuQePbilgNTnzTS947+CpCPhdU/be2HTf+a/UOwumE8mcehOZa3MujPtXHPQBE7GtgLE2xBeWPE3HZ0kxBxqHX3la9SQToHOiYNCp+m77laAgyzCi34MNEt2CbakAckCjxjLdf02HKYc3a5lROt+hVvzdIcO3c7NQsYBAPAGhgos5V4BQ2+hAxDsav78i/EJUjBUwCTZpOSDIMl6dUP49BKpyxdCKRcKkNXOqExeHohcrMW7BzB/vmeD1bJxX3ZryxJRLTyLtM2LmlQO8wACBAXLbHHYXa3DUZVm406IJ0//KmOjqcnYZimXXTARjDvDd/aifAyV4aGje2URP0gn2s2FDxjpLr75rHZX4Z/vnhXjAxjCxMs56ZO5dGhyk+KGlJ6+tGYMyfey2YvWjioDdDxidq2eRaKgIvGVolJph+4cjZ17RKLvIn12UUV1AUdw0SpTJy9wH3YTpfal4K9xA9/9tm5sjc8kVW688Lv4fIvLOTVryBnjAy9mUey2yzHgJq7Aj9nHy2GO2eaIo4yLUX3KmJGrqUjdif28mf5mIX5TeaeQOMIvUVogwfITbKVz79BLbHTwwDQ7pOrndYRaQibyT+NIMi+wRWQYVFWBIsNkRxozfAGbx3dAx1ML+PZ3joV3F8sUaWlnRkUxl7JDW+7zCQ5RD5ssV6HCOekzZ1yShzMgc/kN7YDxACwziaorO8ecVgAOTjrqnsVfPzGMnRCPLy7b X-OriginatorOrg: sct-15-20-7741-18-msonline-outlook-53ebb.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 82129802-cd91-4c16-1fd7-08dcaf28c704 X-MS-Exchange-CrossTenant-AuthSource: PAXP251MB0348.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2024 17:14:45.5331 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP251MB0517 Received-SPF: pass client-ip=2a01:111:f403:2e07::800; envelope-from=sergio.pastorperez@outlook.es; helo=EUR02-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Fixed the issue described here: https://lists.gnu.org/archive/html/help-guix/2024-01/msg00034.html Fix `syncthing-shepherd-service` failing to guess the correct `HOME` environment variable when it's `` does not have a value for the `home` or `user` fields. Change-Id: I102bfe5feba1ebb349a0cde1c987c0c10ebbab7a --- Hello. Ludo asked[1] to send a patch to fix `home-syncthing-service-type` not guessing the correct value for the `HOME` environment variable. Since the discussions seems stalled, here you have the patch. [1]https://lists.gnu.org/archive/html/help-guix/2024-01/msg00050.html Have a great day! Sergio. gnu/services/syncthing.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) base-commit: fdc6274de5b1d617fcabb3f3af9d2c0dd2a6520d diff --git a/gnu/services/syncthing.scm b/gnu/services/syncthing.scm index 9bb623186b..a7a9c6aadd 100644 --- a/gnu/services/syncthing.scm +++ b/gnu/services/syncthing.scm @@ -73,7 +73,15 @@ (define syncthing-shepherd-service #:user #$(and (not home-service?) user) #:group #$(and (not home-service?) group) #:environment-variables - (append (list (string-append "HOME=" (or #$home (passwd:dir (getpw #$user)))) + (append + (list + (string-append "HOME=" + (or #$home + (passwd:dir + (getpw (if (and #$home-service? + (not #$user)) + (getuid) + #$user))))) "SSL_CERT_DIR=/etc/ssl/certs" "SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt") (filter (negate ;XXX: 'remove' is not in (guile)