From patchwork Fri Sep 20 19:03:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien 'neox' Bourmault X-Patchwork-Id: 68180 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 B7B1327BBEA; Fri, 20 Sep 2024 20:05:13 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,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 72DEE27BBE2 for ; Fri, 20 Sep 2024 20:05:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srivv-0003iy-GY; Fri, 20 Sep 2024 15:04:47 -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 1srivs-0003i4-MP for guix-patches@gnu.org; Fri, 20 Sep 2024 15:04:44 -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 1srivs-0001m2-DA for guix-patches@gnu.org; Fri, 20 Sep 2024 15:04:44 -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=SITGMNM4yvBpT3NOZxg/2/N8fzJeArlYlkpvQs89/js=; b=kM1eTnR5NxQV5Bo7A+Ns7JilljJk23V0qZcyFjuwZvE+kfGm6dNruqsj15XIwCAFIHJDkcp6Zu2kFSZF8yFmkHOhtZqTdswEPZKHyT78ZfFw8UnUSJeWrM8Ck0xdsOuLYnnq6MOmFx/YUuar5lIngFvab+ohD7dW14ujkXtG+39X10SEZo1T154/9kU2Q1z8hAauacTwMNC8q5dF3UJm9pjwPtnB3We1AMtMXuQxLe3IlCNrsuihxuHatk5iHGC7aLi/zEi6MvQHZkCMN7mMQykznFNmLCcA8pzGJC6k97UpZA4sYP6iUDCdJYUICrOB2ILeSb/USLLu6/rt7N+TeA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sriwB-0005vU-Fg for guix-patches@gnu.org; Fri, 20 Sep 2024 15:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73392] [PATCH 1/2] gnu: sane-backends-minimal: fix lock path for plustek backend Resent-From: neox Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 19:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73392 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73392@debbugs.gnu.org Cc: Adrien 'neox' Bourmault X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172685906722683 (code B ref -1); Fri, 20 Sep 2024 19:05:03 +0000 Received: (at submit) by debbugs.gnu.org; 20 Sep 2024 19:04:27 +0000 Received: from localhost ([127.0.0.1]:36360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srivb-0005tm-7M for submit@debbugs.gnu.org; Fri, 20 Sep 2024 15:04:27 -0400 Received: from lists.gnu.org ([209.51.188.17]:45244) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srivX-0005tZ-Fx for submit@debbugs.gnu.org; Fri, 20 Sep 2024 15:04:23 -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 1srivE-0003fM-25 for guix-patches@gnu.org; Fri, 20 Sep 2024 15:04:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srivD-0001kB-Ka; Fri, 20 Sep 2024 15:04:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=SITGMNM4yvBpT3NOZxg/2/N8fzJeArlYlkpvQs89/js=; b=keFl1TaQYR8iyB0js/7o o2bySTqWsBoN9HQ8IKt6qwUySMz7cbK00harplHcWPSzAItj1/Xz2BMBZ/mOKddYr/eMvDSbFo2pi IW04af32ZZffagKlFC57/G2vTG2U1cC8xbRksW87jGkI/LQiuua7JzsxGC+g6jAePoAiLY5qu05FT JMxZijEJiIlvF6diWvMqWbXmGlF5WFF+yDFSIJj6eJAkfkDxSA2jBzyDN/MwAxR9OvzTrQ/hPPTjq 46N82KzhczWwq2r1EW6MROwJOmXpcPuF7pLmUsDsaI2WO0s1+VLd+Ftm7HpYyFvwQjHjSclwOROjT kOkfqTZjjOFVrw==; From: neox Date: Fri, 20 Sep 2024 21:03:32 +0200 Message-ID: <5c51a9beba46c7f611fe90cc824f0fcbf2505600.1726827449.git.neox@gnu.org> X-Mailer: git-send-email 2.46.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 From: Adrien 'neox' Bourmault * gnu/packages/scanner.scm (sane-backends-minimal) [arguments]<#:configure-flags>: add "--with-lockdir=/var/lock/sane" [arguments]<#:phases>: add disable-lockdir-creation to prevent creating the lockpath during install Change-Id: I338c16cd4c0bfa0d165c9906b0f1f87ab79a4f75 Signed-off-by: Adrien 'neox' Bourmault --- gnu/packages/scanner.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index a2faaa2728..a20d27ad2a 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -136,7 +136,8 @@ (define-public sane-backends-minimal (inputs (list libusb)) (arguments - `(#:phases + `(#:configure-flags '("--with-lockdir=/var/lock/sane") ;; Avoid errors with plustek + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'zap-unnecessary-git-dependency (lambda _ @@ -145,6 +146,12 @@ (define-public sane-backends-minimal (("/bin/sh") (which "sh"))) (with-output-to-file ".tarball-version" (lambda _ (format #t ,version))))) + (add-before 'configure 'disable-lockdir-creation + (lambda _ + ;; Modify the Makefile.am to prevent the creation of the lock dir + (substitute* "backend/Makefile.am" + (("^install-lockpath:.*$") + "install-lockpath: # pass")))) (add-before 'configure 'disable-backends (lambda _ (setenv "BACKENDS" " ") From patchwork Fri Sep 20 19:03:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien 'neox' Bourmault X-Patchwork-Id: 68179 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 2EFFE27BBE9; Fri, 20 Sep 2024 20:05:05 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 4F13227BBE2 for ; Fri, 20 Sep 2024 20:05:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srivw-0003j9-RR; Fri, 20 Sep 2024 15:04:48 -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 1srivu-0003ib-P8 for guix-patches@gnu.org; Fri, 20 Sep 2024 15:04:46 -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 1srivt-0001mF-7V for guix-patches@gnu.org; Fri, 20 Sep 2024 15:04:45 -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=0bWR2krmzD221EFq5rP/IpgjBZZyPz9xyoT9/ogyu0k=; b=FKZrw2sP8zGLFzbzSnOKuyScnY8lqD5LeYE7MPnhMuMuJGM5EtGsoDijHUIwj88XJh9MVNp5dmmTJBy/9VgUUEWobQmyt6pcwSOT6u1vjniO5LrQNIXruVczyAzCPgeJ7El9IbC65mzNU52ItA6EcfOxceWk15G4BcLkQLciwsloYEeMzrmmwqoiqT3lSP+cstsDQj2EUQj/9NwoIEfoxATNwb1CQHq4xsNDTeDNFZyjpS7BT6VPP2j06VOeKC3mlcH1VhDQrNxJ7R0y+Q9XiVDtXz5Qxqbg31RoeqMotJwvEzSOUOqz7cENy6M1BQsQA7Reczeogb7g5raQeEbRWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sriwC-0005vj-AI for guix-patches@gnu.org; Fri, 20 Sep 2024 15:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73393] [PATCH 2/2] services: sane-service-type: create lock path for plustek backend Resent-From: neox Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Sep 2024 19:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73393@debbugs.gnu.org Cc: Adrien 'neox' Bourmault X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172685908722726 (code B ref -1); Fri, 20 Sep 2024 19:05:04 +0000 Received: (at submit) by debbugs.gnu.org; 20 Sep 2024 19:04:47 +0000 Received: from localhost ([127.0.0.1]:36364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srivu-0005uS-J3 for submit@debbugs.gnu.org; Fri, 20 Sep 2024 15:04:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:54886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1srivt-0005uK-6g for submit@debbugs.gnu.org; Fri, 20 Sep 2024 15:04:45 -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 1srivZ-0003gq-45 for guix-patches@gnu.org; Fri, 20 Sep 2024 15:04:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srivY-0001lF-1W; Fri, 20 Sep 2024 15:04:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=0bWR2krmzD221EFq5rP/IpgjBZZyPz9xyoT9/ogyu0k=; b=juLkFoYxoCo4XaSikYQH SfGQ9deJm2R29hPLnMw6xWK+9Ibh+wFCw+FvV+Fd9BWutHtZ9JSqHDs4dNeGsNL3pDELQ+PmxW1p2 vaKbYWqtDlaS1SxLfK+GOOOkrutEOCvtzjo+dgnQtrs7bvfXK3lrwcjzHacCdWU+XH0lDr29janOA NVvEirwkeNAIibmAT2qT4nYreUTxItkgb5MQ+DCfLhKBOwdRM/yFTduWBexlqRdqUgMvX+PW+IcwL m2I2k63JZIlnR+0+snT+Ix+eDt+ycYpOL9QHLhHX8Awn2kadFH3xATr2hmXHweb/FtYAVGDZkOiWf i8O9MzO1ax5NCw==; From: neox Date: Fri, 20 Sep 2024 21:03:33 +0200 Message-ID: <3ad4ed8a692d86a9bef0b2ea56921ae2bf882957.1726827449.git.neox@gnu.org> X-Mailer: git-send-email 2.46.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 From: Adrien 'neox' Bourmault * gnu/services/desktop.scm (sane-service-type): extend with an activation service to create the lockpath and give the right permissions Change-Id: I187886d12b5f0b4fe21b03de178ea2187205387a Signed-off-by: Adrien 'neox' Bourmault --- gnu/services/desktop.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 274aeeef9b..9eae4178fb 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1408,6 +1408,17 @@ (define %sane-accounts ;; The '60-libsane.rules' udev rules refers to the "scanner" group. (list (user-group (name "scanner") (system? #t)))) +(define %sane-activation + #~(begin + (use-modules (guix build utils)) + (let ((lockpath "/var/lock/sane") + (gid (vector-ref (getgrnam "scanner") 2))) + ;; Create the lock directory at runtime and give right perms + (mkdir-p lockpath) + (chown lockpath -1 gid) + (chmod lockpath #o770)) + #t)) + (define sane-service-type (service-type (name 'sane) @@ -1418,6 +1429,8 @@ (define sane-service-type (default-value sane-backends-minimal) (extensions (list (service-extension udev-service-type list) + (service-extension activation-service-type + (const %sane-activation)) (service-extension account-service-type (const %sane-accounts))))))