From patchwork Sat Mar 22 12:28:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: 45mg <45mg.writes@gmail.com> X-Patchwork-Id: 40602 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 448AB27BBEA; Sat, 22 Mar 2025 12:30:25 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 A9CD227BBE2 for ; Sat, 22 Mar 2025 12:30:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvxzM-0008EW-7n; Sat, 22 Mar 2025 08:30:10 -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 1tvxzI-00089R-D3 for guix-patches@gnu.org; Sat, 22 Mar 2025 08:30:04 -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 1tvxzH-0006Pb-4W for guix-patches@gnu.org; Sat, 22 Mar 2025 08:30:04 -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=Swcy941LZ0kOKm5HQLiD9ds7IJohB5Ayb0GP45L09zo=; b=i8qGpqQ9tu9tTY5PtTM16t2rYvs+xZ65R4RM9fR1VjtotqCdcx1gV/iotsWpuao4wbw7x0T8EJgkTl23pLz6BoeKw4srY2xm9NIS5aukHyI7e78tKBi3cVqlVrE36u545lNbfxlT1OIiyk69W8BaVAXscUtdLyxtAtHbG9FruEurjJQHCj6wKm0NodrC6GmkLb4f6RoMbfLlUof3mnNE96NixjCe2AkMm33Ey/HmJK38NGIQITehpr+2LmU+bpuej90HtPOpc2XY8bQ6gzWumTKIekXQjQUGflUs1Ja68bfPFb+QgCQ6xePHXJydSvGt3M3x4eoAzDtYTKcyftYN8Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvxzG-0002b3-Oc for guix-patches@gnu.org; Sat, 22 Mar 2025 08:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77174] [PATCH 2/2] gnu: Add fscrypt. Resent-From: 45mg <45mg.writes@gmail.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 12:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77174 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 77174@debbugs.gnu.org Cc: 45mg <45mg.writes@gmail.com> Received: via spool by 77174-submit@debbugs.gnu.org id=B77174.17426465739893 (code B ref 77174); Sat, 22 Mar 2025 12:30:02 +0000 Received: (at 77174) by debbugs.gnu.org; 22 Mar 2025 12:29:33 +0000 Received: from localhost ([127.0.0.1]:41410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvxyi-0002ZL-Mm for submit@debbugs.gnu.org; Sat, 22 Mar 2025 08:29:33 -0400 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:51625) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <45mg.writes@gmail.com>) id 1tvxyT-0002Yi-JZ for 77174@debbugs.gnu.org; Sat, 22 Mar 2025 08:29:14 -0400 Received: by mail-pj1-x1042.google.com with SMTP id 98e67ed59e1d1-30332dfc821so65015a91.3 for <77174@debbugs.gnu.org>; Sat, 22 Mar 2025 05:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742646547; x=1743251347; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Swcy941LZ0kOKm5HQLiD9ds7IJohB5Ayb0GP45L09zo=; b=d/7nFduZTwGa/ILr7e5tnbF0xaVi9kM+ts/clmIEr0YelqhlJknMhKbHwaNzEosHSu Mf0DN1y7TvGz1ZW6zn9CaKUxXw8GNK5owt+JLlfPoNUctIXkKft/G0E2xlxN9FfQi83v CzLiI9hDHKvW2ZOzUUDHSFbkUfYlhf5ZYJKDO4DvyU/CtCHNscrBLUY8xu9NcU7wuk/e fCp8QoJD+wMmQznBoVM+bG8gTMJRAV5LbVltqnb778hSDOkLJD9GmZ8D5RhzhI+84IIO RKM+7yMuYyMmLFvusOAsqel7CXYnr0U0J3B3UKDKd6KmqByJEJWv8dgoXEry89zXLUMO mWaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742646547; x=1743251347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Swcy941LZ0kOKm5HQLiD9ds7IJohB5Ayb0GP45L09zo=; b=LIcuUXQBV3GXweJGQ3P2VNOoMyj5kiP5X43ANzMnmuy6ZZKFADycSDKilnjr9UAUVb Pyfc8wjWjUf5pG8pkBkL8Fi8A8QT0t0o23Rx4zc8lqncbSVaRB25Xualh3kmsrjxV3e7 RsfKZsdLuPklMeyiwI0RLFsJhIS5T31WjQJvDz+Sz5PWmRSKZjJbIuf1EDGNUSJzChUv Wk99fE9OQpTtUkf9cRpIHAYmR7ho4UWPGcjBFTim1IPd4EpoyUyuY+jquzhZL1UnfcNz qMunLDhIo7L433R1MDk15jf0YXAPRzgpHy3pJtOqJQAW5CHZDk3SPxPjXSM1L6ytTLgD tPVA== X-Gm-Message-State: AOJu0YwPwn4EuoBFJeDi8oqKLgFHkK2Yw0MkZ1zsB9ebB/NTd/9/IWID gIz+9OQq+tIUAIrhWDtsnay4t4BRV06FwfloD6Q2mXVGyILEuS3Ybjm1OD1n X-Gm-Gg: ASbGncv5MK5i1EpJbk0mlmXYVRZn5oIJiiNKUX23AH6n/aKCFPilVJKp4iY7Sb/ueNu PkCdsdgIv6cFWRx0xDvd4z+qtMO0e9d+bRDUjb+/g6QU5ZnLyZytCqT56prhjVgHRmKKfzR/38f 6GoitoLRYZplAPgVwOx1dhwGxMKpQfz0DYnzv5vuvtuB5U6vO4cfT+RkizoqNMYH9mzHFdVtBqk SdSlb5x+4/uCA8yXMQom1Z+vyezrAXU/1ch+giUsDum7vzlhFWI3q/l45TpQqye0eNvtMBnSYkS sgyXj0BmYsQYtXcjuGhDqHg0knS55BsFGM36WVj91IJpFA5GUcjbjl3PVcPvl2tZqtM= X-Google-Smtp-Source: AGHT+IEYGsINZ/jbiGuAFSz0FjXrudFnaneKFZkSXqMSXGuNWNYGKZuqxho/cEtTQLd94BVGrqHQWA== X-Received: by 2002:a05:6a21:788b:b0:1f5:8179:4f47 with SMTP id adf61e73a8af0-1fe42f557edmr12988819637.20.1742646546606; Sat, 22 Mar 2025 05:29:06 -0700 (PDT) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af8a28467e9sm2972887a12.37.2025.03.22.05.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Mar 2025 05:29:06 -0700 (PDT) From: 45mg <45mg.writes@gmail.com> Date: Sat, 22 Mar 2025 17:58:51 +0530 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 * gnu/packages/golang-crypto.scm (fscrypt): New variable. Change-Id: I7df45a9345726480518c598583a10b6e905e8a1f --- gnu/packages/golang-crypto.scm | 74 +++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 17567219e4..61a911a494 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2024 Superfly Johnson ;;; Copyright © 2025 Roman Scherer ;;; Copyright © 2025 Sharlatan Hellseher +;;; Copyright © 2025 45mg <45mg.writes@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ (define-module (gnu packages golang-crypto) #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) @@ -57,8 +59,11 @@ (define-module (gnu packages golang-crypto) #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) + #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages password-utils) - #:use-module (gnu packages specifications)) + #:use-module (gnu packages specifications) + #:use-module (gnu packages version-control)) ;;; Commentary: ;;; @@ -2608,6 +2613,73 @@ (define-public age (define-public age-keygen (deprecated-package "age-keygen" age)) +(define-public fscrypt + (package + (name "fscrypt") + (version "0.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/fscrypt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15b89g7imv4691aq16xn9q6nh6fcdldkxmvysc7igm6a8p1n6bai")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/google/fscrypt" + #:install-source? #f + #:test-flags + #~(list "-skip" + (string-join (list + ;; These tests expect to be able to find /home, + ;; /mnt and /tmp. + "TestLoadReadOnlyMount" + "TestReadWriteMountIsPreferredOverReadOnlyMount" + "TestLoadAmbiguousMounts" + "TestRootSubtreeIsPreferred") "|")) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'fix-version-detection + ;; We don't have .git in the build directory. + (lambda _ + (substitute* "src/github.com/google/fscrypt/Makefile" + (("\\$\\(shell git describe --tags\\)") + (string-append "v" #$version))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (with-directory-excursion "src/github.com/google/fscrypt" + (invoke "make" + "-j" (if parallel-build? + (number->string (parallel-job-count)) + "1") + (string-append "CC=" #$(cc-for-target)))))) + (replace 'install + (lambda _ + (with-directory-excursion "src/github.com/google/fscrypt" + (invoke "make" "install" + (string-append "PREFIX=" #$output)))))))) + (propagated-inputs (list go-github-com-client9-misspell + go-github-com-pkg-errors + go-github-com-urfave-cli + go-github-com-wadey-gocovmerge + go-golang-org-x-crypto + go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-tools + go-google-golang-org-protobuf + go-honnef-co-go-tools)) + (native-inputs (list gnu-make linux-pam m4)) + (home-page "https://github.com/google/fscrypt") + (synopsis "Go tool for managing Linux filesystem encryption") + (description "@command{fscrypt} is a high-level tool for the management of +Linux native filesystem encryption. It manages metadata, key generation, key +wrapping, PAM integration, and provides a uniform interface for creating and +modifying encrypted directories.") + (license license:asl2.0))) + (define-public go-jwker (package/inherit go-github-com-jphastings-jwker (name "go-jwker")