From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Geerinckx-Rice Subject: [PATCH 2/2] gnu: encfs: Update to 1.9. Date: Sun, 11 Sep 2016 03:13:46 +0200 Message-ID: <1473556426-19703-2-git-send-email-me@tobias.gr> References: <1473556426-19703-1-git-send-email-me@tobias.gr> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bitLM-0007ag-Ta for guix-devel@gnu.org; Sat, 10 Sep 2016 21:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bitLK-0000Ge-In for guix-devel@gnu.org; Sat, 10 Sep 2016 21:13:59 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:60646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bitLK-0000Fr-D6 for guix-devel@gnu.org; Sat, 10 Sep 2016 21:13:58 -0400 Received: from localhost.localdomain (ptr-2hj4tbtvcl90gksez4q3j88hr.ip6.access.telenet.be [IPv6:2a02:1811:b680:8200:645c:531:638:5bff]) (Authenticated sender: me@tobias.gr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 469EB17209B for ; Sun, 11 Sep 2016 03:13:56 +0200 (CEST) In-Reply-To: <1473556426-19703-1-git-send-email-me@tobias.gr> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/crypto.scm (encfs): Update to 1.9. [source]: Remove bundled TinyXML2 in a snippet. [build-system]: Switch to cmake-build-system. [arguments]: Remove autotools-related phases and configure-flags. Don't use bundled TinyXML2. [native-inputs]: Remove autoconf, automake, libtool, and pkg-config. Add expect. [inputs]: Remove boost and rlog, while adding attr and tinyxml2. [license]: Add expat licence for new easylogging++.h file. --- gnu/packages/crypto.scm | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 055551f..ea1eba1 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -23,6 +23,7 @@ (define-module (gnu packages crypto) #:use-module (gnu packages) + #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) #:use-module (gnu packages gettext) @@ -34,11 +35,14 @@ #:use-module (gnu packages perl) #:use-module (gnu packages readline) #:use-module (gnu packages serialization) + #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) (define-public libsodium @@ -185,7 +189,7 @@ communication.") (define-public encfs (package (name "encfs") - (version "1.8.1") + (version "1.9") (source (origin (method url-fetch) @@ -194,27 +198,25 @@ communication.") version "/encfs-" version ".tar.gz")) (sha256 (base32 - "1lfmcsk187qr6ahy8c8959p7jrk9d5rd9kcsx572850ca3zmf0la")))) - (build-system gnu-build-system) + "1gzlhq2dlwan3hll414wqinj92lb05wd4j370j190dgcalaxplih")) + (modules '((guix build utils))) + ;; Remove bundled dependencies in favour of proper inputs. + (snippet '(for-each delete-file-recursively + (find-files "internal" "tinyxml2"))))) + (build-system cmake-build-system) (arguments - `(#:configure-flags '("--with-boost-serialization=boost_wserialization" - "--with-boost-filesystem=boost_filesystem") - #:phases (modify-phases %standard-phases - (add-before 'configure 'autoconf - (lambda _ - (zero? (system* "autoreconf" "-vfi"))))))) + `(#:configure-flags (list "-DUSE_INTERNAL_TINYXML=OFF"))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gnu-gettext) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config))) + `(("gettext" ,gnu-gettext) + + ;; Test dependencies. + ("expect" ,expect) + ("perl" ,perl))) (inputs - `(("boost" ,boost) + `(("attr" ,attr) ("fuse" ,fuse) ("openssl" ,openssl) - ("rlog" ,rlog))) + ("tinyxml2" ,tinyxml2))) (home-page "https://vgough.github.io/encfs") (synopsis "Encrypted virtual file system") (description @@ -223,8 +225,9 @@ created under an EncFS mount point is stored as a separate encrypted file on the underlying file system. Like most encrypted file systems, EncFS is meant to provide security against off-line attacks, such as a drive falling into the wrong hands.") - (license (list license:lgpl3+ ;encfs library - license:gpl3+)))) ;command-line tools + (license (list license:expat ; internal/easylogging++.h + license:lgpl3+ ; encfs library + license:gpl3+)))) ; command-line tools (define-public keyutils (package -- 2.7.4