From patchwork Sat Jun 24 12:20:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51251 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 1B5B327BBE9; Sat, 24 Jun 2023 13:22:18 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0FE1727BBE2 for ; Sat, 24 Jun 2023 13:22:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD2HD-00037F-Ta; Sat, 24 Jun 2023 08:22:03 -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 1qD2HC-00036a-4R for guix-patches@gnu.org; Sat, 24 Jun 2023 08:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qD2HB-0005CQ-Rp for guix-patches@gnu.org; Sat, 24 Jun 2023 08:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD2HB-0006Qg-NL for guix-patches@gnu.org; Sat, 24 Jun 2023 08:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64264] [PATCH 1/2] gnu: signify: Update to 31. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Jun 2023 12:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64264 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64264@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 64264-submit@debbugs.gnu.org id=B64264.168760927124642 (code B ref 64264); Sat, 24 Jun 2023 12:22:01 +0000 Received: (at 64264) by debbugs.gnu.org; 24 Jun 2023 12:21:11 +0000 Received: from localhost ([127.0.0.1]:40042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD2GN-0006PN-2T for submit@debbugs.gnu.org; Sat, 24 Jun 2023 08:21:11 -0400 Received: from araneo.si ([90.157.193.204]:40362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD2GK-0006PE-LS for 64264@debbugs.gnu.org; Sat, 24 Jun 2023 08:21:09 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 0a6c8dc4 for <64264@debbugs.gnu.org>; Sat, 24 Jun 2023 12:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=Gc1VthsGLnhzZmgbv5KGM /fEOVY=; b=AZhtQ5OSant1a1CUceu2tdEb6cJVNaUwabjtJg7OUjILjGKiJA5MJ DjQVmCoZgEi0b4vbRtGBczU7WYRJV662IO6M1wH5Nq746eiMCHdNFmpsqE3OSti9 Gk/N6FoZHbTBm6GqHmVorsqkzMtVRXbyFkXmFczXwRfB7s50YfSp40c4QR7wuB1x hb9EsI4A6ILwqBUoRYhpw7yWD17dMBMr5GACXyd8CwntZoaFPlI5wlnOWr05XvB1 DjFAHs80n+1xZ8qqLyBPZDH7mZOiRxN/wYHFQtSGMfRSuRJNLsKcFlRuDjitttfG bBFs/spUf5Ynyn+paQa8jAg0p7Q2tLz2w== Received: by araneo.si (OpenSMTPD) with ESMTPSA id bdf60e8d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 12:21:07 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 14:20:41 +0200 Message-Id: <5b86c6447551aba1ae7aa134f1751b058d0fee7c.1687609092.git.timotej.lazar@araneo.si> X-Mailer: git-send-email 2.40.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/crypto.scm (signify): Update to 31. [source]: Add snippet to delete bundled libbsd. [license]: Drop bsd-4 as it was replaced with bsd-3. --- gnu/packages/crypto.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 9b89c7d545..655320a470 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -216,7 +216,7 @@ (define-public libmd (define-public signify (package (name "signify") - (version "30") + (version "31") (home-page "https://github.com/aperezdc/signify") (source (origin (method url-fetch) @@ -224,7 +224,9 @@ (define-public signify "/download/v" version "/signify-" version ".tar.xz")) (sha256 (base32 - "11l67j04gyxnlw6zrzsygqs5cgsc1sww1rh0apl05yay131hd17n")))) + "0x1bipfphnyvf2kl7n9q4gawaglma79368vb8whama6lxsggsm8i")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "libbsd")))) (build-system gnu-build-system) ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). @@ -245,7 +247,7 @@ (define-public signify OpenBSD tool of the same name.") ;; This package includes third-party code that was originally released under ;; various non-copyleft licenses. See the source files for clarification. - (license (list license:bsd-3 license:bsd-4 license:expat license:isc + (license (list license:bsd-3 license:expat license:isc license:public-domain (license:non-copyleft "file://base64.c" "See base64.c in the distribution for From patchwork Sat Jun 24 12:20:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 51252 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 7745C27BBE9; Sat, 24 Jun 2023 13:22:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4F64427BBE2 for ; Sat, 24 Jun 2023 13:22:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qD2HG-000386-Hc; Sat, 24 Jun 2023 08:22:06 -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 1qD2HC-00036s-U7 for guix-patches@gnu.org; Sat, 24 Jun 2023 08:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qD2HC-0005CZ-Lk for guix-patches@gnu.org; Sat, 24 Jun 2023 08:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qD2HC-0006Qn-5C for guix-patches@gnu.org; Sat, 24 Jun 2023 08:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64264] [PATCH 2/2] gnu: signify: Use new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Jun 2023 12:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64264 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64264@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 64264-submit@debbugs.gnu.org id=B64264.168760927524657 (code B ref 64264); Sat, 24 Jun 2023 12:22:02 +0000 Received: (at 64264) by debbugs.gnu.org; 24 Jun 2023 12:21:15 +0000 Received: from localhost ([127.0.0.1]:40046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD2GQ-0006Pd-FQ for submit@debbugs.gnu.org; Sat, 24 Jun 2023 08:21:15 -0400 Received: from araneo.si ([90.157.193.204]:40362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qD2GN-0006PE-2D for 64264@debbugs.gnu.org; Sat, 24 Jun 2023 08:21:11 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id d1786697 for <64264@debbugs.gnu.org>; Sat, 24 Jun 2023 12:21:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=l3qK5bUu1RieNextrNAaT pWPWwI=; b=AY+HZ298OuRB8E9DfxRLWTYMVkgMsDFFWe8DQRwJvBdOTPubii/Xn x+0PfY088GjDUgokWxWkfyLr/IfMmo6WTNMrd+UWhXK5MLuPJaWurZSsaubWkOHZ +GijKJ7UtE3N3/1JZZcX5VSF3LlcwyOkDDx0t+OmpmJ6t5/K9bdRPz/x4NL+Aa6c t4EY9m4THy3d5BTqh+4jOWajQL+69GAj6R4aNoeQ9W6xSjY8A0it2RUxesOb5WnU ILF4FJPLDqFOMRgiqwKGmzm7LMU/joUGP6g5so7HNr8qH6xKDdQHXdVC+dTGchXH ckK8BWqKhU3CP0Tg7co/uDp0ykTyx9sYQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 7a8d1736 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 24 Jun 2023 12:21:08 +0000 (UTC) From: Timotej Lazar Date: Sat, 24 Jun 2023 14:20:42 +0200 Message-Id: X-Mailer: git-send-email 2.40.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/crypto.scm (signify)[arguments]: Use gexps. --- gnu/packages/crypto.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 655320a470..3a753831f5 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -231,12 +231,12 @@ (define-public signify ;; TODO Build with libwaive (described in README.md), to implement something ;; like OpenBSD's pledge(). (arguments - `(#:make-flags - (list ,(string-append "CC=" (cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (native-inputs (list pkg-config)) (inputs