From 911bbac649d782895b6ac10f26a87629d4393bf0 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Fri, 30 Oct 2020 17:02:58 +0100 Subject: gnu: Add mkp224o. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (mkp224o): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/crypto.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu/packages/crypto.scm') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index a45d2741e6..1a9cb5c80f 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Hendur Saga +;;; Copyright © 2020 pukkamustard ;;; ;;; This file is part of GNU Guix. ;;; @@ -1287,3 +1288,38 @@ (define-public hash-extender SHA-256, SHA-512, and WHIRLPOOL hashes.") (home-page "https://github.com/iagox86/hash_extender") (license license:bsd-3)))) + +(define-public mkp224o + (package + (name "mkp224o") + (version "1.5.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cathugger/mkp224o") + (commit (string-append "v" version)))) + (sha256 + (base32 + "0b2cn96wg4l8jkkqqp8l2295xlmm2jc8nrw6rdqb5g0zkpfmrxbb")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (bindir (string-append outdir "/bin"))) + (install-file "mkp224o" bindir) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf))) + (inputs + `(("libsodium" ,libsodium))) + (synopsis "Tor hidden service v3 name generator") + (description "@code{mkp224o} generates valid ed25519 (hidden service +version 3) onion addresses. It allows one to produce customized vanity .onion +addresses using a brute-force method.") + (home-page "https://github.com/cathugger/mkp224o") + (license license:cc0))) -- cgit v1.2.3 From d057a9c423e8144865fefd7c8475d61e3263eeb7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 5 Nov 2020 22:00:22 +0100 Subject: gnu: libscrypt: Add a :static output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crypto.scm (libscrypt)[outputs]: Add "static" to this new field. [arguments]: Add an ‘install:static’ phase. --- gnu/packages/crypto.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/crypto.scm') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 1a9cb5c80f..b8ca0134b3 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -571,12 +571,19 @@ (define-public libscrypt (base32 "1d76ys6cp7fi4ng1w3mz2l0p9dbr7ljbk33dcywyimzjz8bahdng")))) (build-system gnu-build-system) + (outputs (list "out" "static")) (arguments `(#:make-flags (list (string-append "PREFIX=" %output) "CC=gcc") #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) ; no configure script + (add-after 'install 'install:static + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (install-file "libscrypt.a" lib) + #t)))))) (home-page "https://lolware.net/libscrypt.html") (synopsis "Password hashing library") (description "@code{libscrypt} implements @code{scrypt} key derivation -- cgit v1.2.3 From 675c520c40b5223bfa0ec851be110f257ba8704d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Nov 2020 03:51:21 +0100 Subject: gnu: libolm: Update to 3.2.1. * gnu/packages/crypto.scm (libolm): Update to 3.2.1. --- gnu/packages/crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/crypto.scm') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b8ca0134b3..c5aa1f53f9 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1230,7 +1230,7 @@ (define-public minisign (define-public libolm (package (name "libolm") - (version "3.1.5") + (version "3.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -1238,7 +1238,7 @@ (define-public libolm (commit version))) (sha256 (base32 - "030g0jmmvhx2dh32k708sz6cdd5q1wz48i4gigh6dclqk10w28lm")) + "14b5cplcnbf2baq0lvz4f97m6swxpb13rvxdajxyw3s4mbvasia4")) (file-name (git-file-name name version)))) (arguments `(#:phases -- cgit v1.2.3 From b0ff82461c81560eb7e215c4a435a2dd4882e6bb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Nov 2020 04:06:37 +0100 Subject: gnu: libolm: Fix (run) the tests. * gnu/packages/crypto.scm (libolm)[arguments]: Invoke ctest from within the right directory. --- gnu/packages/crypto.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/crypto.scm') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index c5aa1f53f9..aa6f80f731 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1240,13 +1240,14 @@ (define-public libolm (base32 "14b5cplcnbf2baq0lvz4f97m6swxpb13rvxdajxyw3s4mbvasia4")) (file-name (git-file-name name version)))) + (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "ctest" "build/tests")))))) - (build-system cmake-build-system) + (with-directory-excursion "tests" + (invoke "ctest" "."))))))) (synopsis "Implementation of the olm and megolm cryptographic ratchets") (description "The libolm library implements the Double Ratchet cryptographic ratchet. It is written in C and C++11, and exposed as a C -- cgit v1.2.3 From 3aec121e95581e34a47e3a2d175af97579961206 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Tue, 17 Nov 2020 09:52:04 -0600 Subject: gnu: tomb: Update to 2.8. Fixes CVE-2020-28638. * gnu/packages/crypto.scm (tomb): Update to 2.8 [source]: Remove obsolete patch. * gnu/packages/patches/tomb-fix-errors-on-open.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/crypto.scm | 9 ++++---- gnu/packages/patches/tomb-fix-errors-on-open.patch | 25 ---------------------- 3 files changed, 4 insertions(+), 31 deletions(-) delete mode 100644 gnu/packages/patches/tomb-fix-errors-on-open.patch (limited to 'gnu/packages/crypto.scm') diff --git a/gnu/local.mk b/gnu/local.mk index d2c3a471e7..d4d10bc32b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1650,7 +1650,6 @@ dist_patch_DATA = \ %D%/packages/patches/tk-find-library.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ - %D%/packages/patches/tomb-fix-errors-on-open.patch \ %D%/packages/patches/tup-unbundle-dependencies.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index aa6f80f731..1b51366d7e 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2016, 2017, 2019 Eric Bavier +;;; Copyright © 2016, 2017, 2019, 2020 Eric Bavier ;;; Copyright © 2017 Pierre Langlois ;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Arun Isaac @@ -444,15 +444,14 @@ (define-public ssss (define-public tomb (package (name "tomb") - (version "2.7") + (version "2.8") (source (origin (method url-fetch) - (uri (string-append "https://files.dyne.org/tomb/" + (uri (string-append "https://files.dyne.org/tomb/releases/" "Tomb-" version ".tar.gz")) (sha256 (base32 - "0x3al02796vx1cvy6y6h685c367qx70dwv471g0hmks2gr10f0cn")) - (patches (search-patches "tomb-fix-errors-on-open.patch")))) + "0bggzzqmpfiknr76lyl8iszybrcpyqlbgiqk47fxq08h2b5ln1ic")))) (build-system gnu-build-system) (native-inputs `(("sudo" ,sudo))) ;presence needed for 'check' phase (inputs diff --git a/gnu/packages/patches/tomb-fix-errors-on-open.patch b/gnu/packages/patches/tomb-fix-errors-on-open.patch deleted file mode 100644 index 5f41c9ee8f..0000000000 --- a/gnu/packages/patches/tomb-fix-errors-on-open.patch +++ /dev/null @@ -1,25 +0,0 @@ -Description: Avoid error messages when opening a new tomb - Make sure control file exists and has user ownership before user writes to it. -Author: Sven Geuer -Bug: https://github.com/dyne/Tomb/issues/369 -Last-Update: 2019-11-04 ---- a/tomb -+++ b/tomb -@@ -2197,14 +2197,15 @@ - # {{{ Open - - _update_control_file() { -- # replaces a control file with new contents and gives it user ownership -+ # make sure a control file exists, gives it user ownership -+ # and replaces it with new contents - # stdin = contents - # $1 = path to control file - # $2 = contents - [[ "$2" = "" ]] && return 1 - _sudo touch "$1" -- print "$2" > "$1" - _sudo chown ${_UID}:${_GID} "$1" -+ print "$2" > "$1" - _verbose "updated control file $1 = $2" - } - -- cgit v1.2.3