From patchwork Sun Mar 23 10:34:23 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: 40725 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 4014627BBEA; Sun, 23 Mar 2025 10:36:45 +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 AEAAC27BBE2 for ; Sun, 23 Mar 2025 10:36:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twIgj-000354-Ji; Sun, 23 Mar 2025 06:36:17 -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 1twIgf-00033t-4e for guix-patches@gnu.org; Sun, 23 Mar 2025 06:36:13 -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 1twIgU-0005qX-Uh for guix-patches@gnu.org; Sun, 23 Mar 2025 06:36:11 -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=QRiREBxwfwJof+8f8nxQOereJlwxorQ20TmP3luE/0I=; b=NMHoqjgwaZ7IcoIChXSZ8IsiWbBTFvJ6bXl+Qgw22cPW3iKfCLv3psTpYkk8oUEas86U9h8kKNkzgkvgRCu4itbJXNHe1fY/4Yll527vBrjzdK0mJSBZ279a99lNOBrfTTnw3AooXUZ7imxLyUkTEujtzptk5J1oa35ZheJqWwVhOMZ1/7a4Y0KYfflsmQSqQKEcaqzXTzJ6RQKvpO+gu4pDffr/N+szL3JKdnehGHI3boksp4cg3Ut/WU873ZoLMipj84uLSYEQn/YkanZR7jz1lMFRF2xt8ip3kMfVjlxVEpkfeTFFxPpYMYYbBB1A0ur6St/NPO0mV9lrCHEaAg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1twIgU-000270-Q8 for guix-patches@gnu.org; Sun, 23 Mar 2025 06:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77203] [PATCH 3/4] gnu: Add fscrypt. Resent-From: 45mg <45mg.writes@gmail.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Mar 2025 10:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77203 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77203@debbugs.gnu.org Cc: 45mg <45mg.writes@gmail.com> Received: via spool by 77203-submit@debbugs.gnu.org id=B77203.17427261297861 (code B ref 77203); Sun, 23 Mar 2025 10:36:02 +0000 Received: (at 77203) by debbugs.gnu.org; 23 Mar 2025 10:35:29 +0000 Received: from localhost ([127.0.0.1]:47868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1twIfw-00022g-R8 for submit@debbugs.gnu.org; Sun, 23 Mar 2025 06:35:29 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:59783) 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 1twIfU-0001sO-VA for 77203@debbugs.gnu.org; Sun, 23 Mar 2025 06:35:01 -0400 Received: by mail-pl1-x641.google.com with SMTP id d9443c01a7336-22548a28d0cso53780165ad.3 for <77203@debbugs.gnu.org>; Sun, 23 Mar 2025 03:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742726095; x=1743330895; 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=QRiREBxwfwJof+8f8nxQOereJlwxorQ20TmP3luE/0I=; b=TtRX7XOrPZpwrS+Fk8XE+nhlZloP3IeycGUTm/bcSZmLTBmSMIiRYIaFpIAB2iqk6A RBmSUISS5JdardwNgh+3ZZ9vCJDfs87PY/JkKBgegvgp8KI69wS7P2gajaIw6hg8DGlU 19OwfAElmUmeNQ5jRWN9w35OSANZbhvEk2K001PNxVF8uJK44MrPTbveT6vCWOfkjhCd O8vz6PezPx+BPEf3/wwmG+C40ZcKfbR0yOyxk6Y11tD6SW/5E8GeRt51LOn1hhl9pN0m bDpkYvCB9J0eKC1gLbbC6TjvP9tomfoJt7icVEDXDK7hpja3JDPqXdTpDjBhJndRPLWq vb8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742726095; x=1743330895; 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=QRiREBxwfwJof+8f8nxQOereJlwxorQ20TmP3luE/0I=; b=d0QmPVufsY9ZwHxcTZPwwVyRC1oavG0aIEJ2q4NC8wiZCYp0huK71rgfKYKpg2EfFq VOy38F8kBH7UGsxSRoqNBNiSWYvms1I78ddK2QTj+blr1gAcV6Ph+xSFrqHvS5L6deBE dxJX1XUj3TggwzRE5NWbg4f6Ygso8ziPgO9d4LSMBjymrMjMLskwhij+5nJMEF2NACet GhpDQ23jvb/DH/wlFOXLM5IWdXtrSpNfsDoyRHiYDtPPmQw1n/AAESk/obJm6NX/K57g iMC17axu+E5hVvtpvG/r3gGej8dgCVoL95k7mto53sIDGBzZqSaOEm98Hta/ObTJfpog qqag== X-Gm-Message-State: AOJu0Yx8/naeAjxJRgh7EEw7yDmMxEvDGpyZ+IO11OZxsiHBut0ux79B F01s3AyvUoQ6S23Ruwg6vmn3W+ntn2fP1XzL1a+3S5wacguPX6n6sv0qjM+6 X-Gm-Gg: ASbGncuqt6olnOP4/lRI+BPoV/R3EkJQWhZWIRzpyHr/R1smEFytxKNwYaCIkiAtpVO 2sjtBSbE9dn9e1dVfT9+UW/RPJp0yjRs/1npZTzmTG8VYKTi/bnnNi6N+4e5oQWLYdwC00Xq2hw RsnaXZkR0h9PqERv4OqXDonMngKpc2hrUThrrBgw87wbPtLArP78Ey23OpBlVqZwc41Msaj5Egs uMzt66ns2dkj+cmlSwI1s9dAsfW11nSIIgE+J3WZFHB3F+n5UewV2ZfU2HELR0w+5ixvxOCjusI Y2ZgaNVMJY7MW9Xbs6dhbkZgI90WDlf545Cny0h/IutjAX4ND262ljSMAkZNaeTh5oE= X-Google-Smtp-Source: AGHT+IEw2z+ffESAhzk9wcnRyAzTcIMD0rZpEfPGR08bJlD/m2b/1+Z/pMOyBCkkw1ax0OMCHxjirg== X-Received: by 2002:a05:6a00:4648:b0:732:a24:7354 with SMTP id d2e1a72fcca58-739059557bfmr13877118b3a.4.1742726094675; Sun, 23 Mar 2025 03:34:54 -0700 (PDT) Received: from localhost.localdomain (utm3.nitt.edu. [14.139.162.2]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fab52csm5494692b3a.20.2025.03.23.03.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Mar 2025 03:34:54 -0700 (PDT) From: 45mg <45mg.writes@gmail.com> Date: Sun, 23 Mar 2025 16:04:23 +0530 Message-ID: <19f066863519516b9d67656a2cf29b4b1a45796e.1742726021.git.45mg.writes@gmail.com> 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 * 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")