From patchwork Thu Feb 7 10:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rutger Helling X-Patchwork-Id: 977 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 8DBE316BCC; Thu, 7 Feb 2019 10:20:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 093E116B13 for ; Thu, 7 Feb 2019 10:20:11 +0000 (GMT) Received: from localhost ([127.0.0.1]:37219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grgmv-0001dy-H4 for patchwork@mira.cbaines.net; Thu, 07 Feb 2019 05:20:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grgms-0001cA-0x for guix-patches@gnu.org; Thu, 07 Feb 2019 05:20:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grgmq-0005uG-0E for guix-patches@gnu.org; Thu, 07 Feb 2019 05:20:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grgmp-0005nH-5Y for guix-patches@gnu.org; Thu, 07 Feb 2019 05:20:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1grgmo-0000SR-O0 for guix-patches@gnu.org; Thu, 07 Feb 2019 05:20:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34366] [PATCH] gnu: cryptsetup: Update to 2.0.6. Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Feb 2019 10:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34366 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34366@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15495347751713 (code B ref -1); Thu, 07 Feb 2019 10:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Feb 2019 10:19:35 +0000 Received: from localhost ([127.0.0.1]:36577 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1grgmM-0000RY-Ve for submit@debbugs.gnu.org; Thu, 07 Feb 2019 05:19:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1grgmJ-0000RL-Pl for submit@debbugs.gnu.org; Thu, 07 Feb 2019 05:19:33 -0500 Received: from lists.gnu.org ([209.51.188.17]:59083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grgmE-000549-JJ for submit@debbugs.gnu.org; Thu, 07 Feb 2019 05:19:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grgmD-0001To-KG for guix-patches@gnu.org; Thu, 07 Feb 2019 05:19:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grgmC-00052s-Nx for guix-patches@gnu.org; Thu, 07 Feb 2019 05:19:25 -0500 Received: from mx.kolabnow.com ([95.128.36.41]:61288) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grgmC-000523-Au for guix-patches@gnu.org; Thu, 07 Feb 2019 05:19:24 -0500 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 963F66F1 for ; Thu, 7 Feb 2019 11:19:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1549534755; x=1551349156; bh=hYjxcnA2laKk0ruoK8A yVJZVM18AlS8ul5xCMalu6dY=; b=WqM5Ox8V0jIHbWw/cODqCgPEmyaAAwHTjMl wjnvfsSLAVZ7dR5alMRCh2+kPf2/y7ytx6wK5jgK3eFry72WnlDuXWGkivqOGf4J RRv558Qv2qQ9lJCOSVNfkwSGaVWOnmOTkNxtKWT1s0E1gx4OpdJXKLCW/9PpisqA bivQwyaHGQpx8hgxdpU1O5n3lj6QdGb/BXqx2SxG1/nBI873Y3RFjcYNdJsNqSFi z2NRGTNHSNSzBfbJomxF+2pPUxmfR1hOj98XzXlXgBamyEIjtRBsYodw6gduNWOE cvsqdO53r8PLDW6ZEHpcMSZFCgIPhtBeGQlhZbpBvCI/o7Am72FOoCESnsowUTti xIe73HIpCeMw3u1AFL662CK10s7f5RrARao98+od3YgcCDemUS0bMfiRGMaPzP05 YOPDLBqdXghkuQk1DDOMqyajv8Cl+HFpBM28OQiW5zgO57PP4BQ3L6DLVftYGNxW LTcVx6zOmGTmUTItPxfm5krN/tqjycqJ7KQ8HZQ3wM/S+2Ra45w52lLgrgVIoQ8v H+A8VEzSCn9YqM+7pkY5YiAMV4xNgbUhra/fiqNHjOeQVDc3UViyXTn/jL5J1LNV Lfh+JCE77wLR1Ue2OvWy9QPdB1ya4VuGXuAyfx3Zfa/APO/oVEqI8VzXz9+0LEqx eI4r4IbY= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eI2FESwCmyaW for ; Thu, 7 Feb 2019 11:19:15 +0100 (CET) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id A03C4226 for ; Thu, 7 Feb 2019 11:19:15 +0100 (CET) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 895A12720 for ; Thu, 7 Feb 2019 11:19:15 +0100 (CET) Date: Thu, 7 Feb 2019 11:19:02 +0100 From: Rutger Helling Message-ID: <20190207111902.36bd0753@mykolab.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches Hey Guix, here's an update for cryptsetup. Note that although it seems to run fine I haven't been able to test it with an initramfs (yet). From 3d7e4ac45a20a93dc3e206fc4cb4049ead634d0a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Thu, 7 Feb 2019 10:55:53 +0100 Subject: [PATCH] gnu: cryptsetup: Update to 2.0.6. * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.0.6. [inputs]: Add json-c. [native-inputs]: Add pkg-config. * gnu/packages/cryptsetup.scm (cryptsetup-static)[arguments]: Add --disable-blkid configure flag. Strip new cryptsetup-reencrypt and integritysetup binaries of references too. [inputs]: Add json-c. --- gnu/packages/cryptsetup.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index 9df26edc7..4b5498649 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Ludovic Courtès +;;; Copyright © 2019 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,14 +26,16 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages gnupg) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages python) + #:use-module (gnu packages web) #:use-module (gnu packages linux)) (define-public cryptsetup (package (name "cryptsetup") - (version "1.7.5") + (version "2.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -40,15 +43,17 @@ "/" name "-" version ".tar.xz")) (sha256 (base32 - "1gail831j826lmpdx2gsc83lp3br6wfnwh3vqwxaa1nn1lfwsc1b")))) + "0c1x125s7p4ps13spsqrcsd9dclz01vsrchmypq9msp7y3hgllbw")))) (build-system gnu-build-system) (inputs - `(("libgcrypt" ,libgcrypt) + `(("json-c" ,json-c) + ("libgcrypt" ,libgcrypt) ("lvm2" ,lvm2) ("util-linux" ,util-linux) ("popt" ,popt))) (native-inputs - `(("python" ,python-wrapper))) + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (synopsis "Hard disk encryption tool") (description "LUKS (Linux Unified Key Setup)/Cryptsetup provides a standard on-disk @@ -80,6 +85,7 @@ files). This assumes LIBRARY uses Libtool." (arguments '(#:configure-flags '("--disable-shared" "--enable-static-cryptsetup" + "--disable-blkid" ;; Enabling results in linking errors. ;; 'libdevmapper.a' pulls in libpthread, libudev and libm. "LIBS=-ludev -pthread -lm") @@ -109,7 +115,10 @@ files). This assumes LIBRARY uses Libtool." ".static") file) (remove-store-references file)) - '("sbin/cryptsetup" "sbin/veritysetup")) + '("sbin/cryptsetup" + "sbin/cryptsetup-reencrypt" + "sbin/integritysetup" + "sbin/veritysetup")) #t)))))))) (inputs (let ((libgcrypt-static @@ -117,7 +126,8 @@ files). This assumes LIBRARY uses Libtool." (inherit (static-library libgcrypt)) (propagated-inputs `(("libgpg-error-host" ,(static-library libgpg-error))))))) - `(("libgcrypt" ,libgcrypt-static) + `(("json-c" ,json-c) + ("libgcrypt" ,libgcrypt-static) ("lvm2" ,lvm2-static) ("util-linux" ,util-linux "static") ("util-linux" ,util-linux) -- 2.20.1