gnu: encfs: Update to 1.9.
* 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. Move under *inputs. [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.master
parent
931bd7f6ce
commit
b6f87ec003
|
@ -26,6 +26,7 @@
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
#:use-module (gnu packages admin)
|
#:use-module (gnu packages admin)
|
||||||
#:use-module (gnu packages aidc)
|
#:use-module (gnu packages aidc)
|
||||||
|
#:use-module (gnu packages attr)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
#:use-module (gnu packages cryptsetup)
|
#:use-module (gnu packages cryptsetup)
|
||||||
|
@ -42,11 +43,14 @@
|
||||||
#:use-module (gnu packages search)
|
#:use-module (gnu packages search)
|
||||||
#:use-module (gnu packages serialization)
|
#:use-module (gnu packages serialization)
|
||||||
#:use-module (gnu packages shells)
|
#:use-module (gnu packages shells)
|
||||||
|
#:use-module (gnu packages tcl)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
|
#:use-module (gnu packages xml)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system gnu))
|
#:use-module (guix build-system gnu))
|
||||||
|
|
||||||
(define-public libsodium
|
(define-public libsodium
|
||||||
|
@ -193,7 +197,7 @@ communication.")
|
||||||
(define-public encfs
|
(define-public encfs
|
||||||
(package
|
(package
|
||||||
(name "encfs")
|
(name "encfs")
|
||||||
(version "1.8.1")
|
(version "1.9")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -202,27 +206,26 @@ communication.")
|
||||||
version "/encfs-" version ".tar.gz"))
|
version "/encfs-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1lfmcsk187qr6ahy8c8959p7jrk9d5rd9kcsx572850ca3zmf0la"))))
|
"1gzlhq2dlwan3hll414wqinj92lb05wd4j370j190dgcalaxplih"))
|
||||||
(build-system gnu-build-system)
|
(modules '((guix build utils)))
|
||||||
(arguments
|
;; Remove bundled dependencies in favour of proper inputs.
|
||||||
`(#:configure-flags '("--with-boost-serialization=boost_wserialization"
|
(snippet '(for-each delete-file-recursively
|
||||||
"--with-boost-filesystem=boost_filesystem")
|
(find-files "internal" "^tinyxml2-[0-9]"
|
||||||
#:phases (modify-phases %standard-phases
|
#:directories? #t)))))
|
||||||
(add-before 'configure 'autoconf
|
(build-system cmake-build-system)
|
||||||
(lambda _
|
|
||||||
(zero? (system* "autoreconf" "-vfi")))))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("autoconf" ,autoconf)
|
`(("gettext" ,gnu-gettext)
|
||||||
("automake" ,automake)
|
|
||||||
("gettext" ,gnu-gettext)
|
;; Test dependencies.
|
||||||
("libtool" ,libtool)
|
("expect" ,expect)
|
||||||
("perl" ,perl)
|
("perl" ,perl)))
|
||||||
("pkg-config" ,pkg-config)))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("boost" ,boost)
|
`(("attr" ,attr)
|
||||||
("fuse" ,fuse)
|
("fuse" ,fuse)
|
||||||
("openssl" ,openssl)
|
("openssl" ,openssl)
|
||||||
("rlog" ,rlog)))
|
("tinyxml2" ,tinyxml2)))
|
||||||
|
(arguments
|
||||||
|
`(#:configure-flags (list "-DUSE_INTERNAL_TINYXML=OFF")))
|
||||||
(home-page "https://vgough.github.io/encfs")
|
(home-page "https://vgough.github.io/encfs")
|
||||||
(synopsis "Encrypted virtual file system")
|
(synopsis "Encrypted virtual file system")
|
||||||
(description
|
(description
|
||||||
|
@ -231,8 +234,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
|
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
|
to provide security against off-line attacks, such as a drive falling into
|
||||||
the wrong hands.")
|
the wrong hands.")
|
||||||
(license (list license:lgpl3+ ;encfs library
|
(license (list license:expat ; internal/easylogging++.h
|
||||||
license:gpl3+)))) ;command-line tools
|
license:lgpl3+ ; encfs library
|
||||||
|
license:gpl3+)))) ; command-line tools
|
||||||
|
|
||||||
(define-public keyutils
|
(define-public keyutils
|
||||||
(package
|
(package
|
||||||
|
|
Reference in New Issue