From ad67d20869d7c7168941bc3d20218cb45ed82b5f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 21 Oct 2020 14:58:50 -0400 Subject: gnu: certbot, python-acme: Update to 1.8.0. * gnu/packages/tls.scm (certbot, python-acme): Update 1.8.0. --- gnu/packages/tls.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 82e6321de6..d6b43d8d8f 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Nikita ;;; Copyright © 2016 Hartmut Goebel @@ -586,13 +586,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.3.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "03fjmg0fgfy7xfn3i8rzn9i0i4amajmijkash84qb8mlphgrxpn0")))) + "0b80qmlchf8f071nrrh4ihq64cwicn9rshs34snp73952iyhd3dd")))) (build-system python-build-system) (arguments `(#:phases @@ -643,7 +643,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri "certbot" version)) (sha256 (base32 - "1n5i0k6kwmd6wvivshfl3k4djwcpwx390c39xmr2hhrgpk5r285w")))) + "1r2k54d2k2smn4c3lpd0z6gdzfqk4654kwbh1p8wqhv5mwbcads8")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit v1.2.3 From 2496b92e6cfeda2d97c1e12642114423cb829e07 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Nov 2020 10:09:37 +0200 Subject: gnu: openssl: Fix cross compiling for mips64el-linux. * gnu/packages/tls.scm (openssl)[arguments]: When cross compiling add case for mips64el-linux. --- gnu/packages/tls.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index d6b43d8d8f..dfcd09d93c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -347,6 +347,8 @@ required structures.") "linux-x86") ((string-prefix? "x86_64" target) "linux-x86_64") + ((string-prefix? "mips64el" target) + "linux-mips64") ((string-prefix? "arm" target) "linux-armv4") ((string-prefix? "aarch64" target) -- cgit v1.2.3 From d4dbcb81bc6abb27217fe5ec65a584a7a08ab196 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 8 Nov 2020 10:12:48 +0200 Subject: gnu: openssl: Fix indentation. * gnu/packages/tls.scm (openssl): Fix indentation of package definition. --- gnu/packages/tls.scm | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index dfcd09d93c..c4420978b8 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -334,27 +334,27 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases - ,@(if (%current-target-system) - '((add-before - 'configure 'set-cross-compile - (lambda* (#:key target outputs #:allow-other-keys) - (setenv "CROSS_COMPILE" (string-append target "-")) - (setenv "CONFIGURE_TARGET_ARCH" - (cond - ((string-prefix? "i586" target) - "hurd-x86") - ((string-prefix? "i686" target) - "linux-x86") - ((string-prefix? "x86_64" target) - "linux-x86_64") - ((string-prefix? "mips64el" target) - "linux-mips64") - ((string-prefix? "arm" target) - "linux-armv4") - ((string-prefix? "aarch64" target) - "linux-aarch64"))) - #t))) - '()) + ,@(if (%current-target-system) + '((add-before + 'configure 'set-cross-compile + (lambda* (#:key target outputs #:allow-other-keys) + (setenv "CROSS_COMPILE" (string-append target "-")) + (setenv "CONFIGURE_TARGET_ARCH" + (cond + ((string-prefix? "i586" target) + "hurd-x86") + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "mips64el" target) + "linux-mips64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64"))) + #t))) + '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -365,8 +365,8 @@ required structures.") (string-append (assoc-ref %build-inputs "coreutils") "/bin/env"))) (invoke ,@(if (%current-target-system) - '("./Configure") - '("./config")) + '("./Configure") + '("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -378,9 +378,9 @@ required structures.") (string-append "--prefix=" out) (string-append "-Wl,-rpath," lib) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. -- cgit v1.2.3 From c8535c252776ce7da3310c549d211df74f30559b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 21 Nov 2020 22:05:44 +0200 Subject: gnu: openssl: Fix cross compiling for powerpc targets. * gnu/packages/tls.scm (openssl)[arguments]: Add cross compile target cases for powerpc64le-linux, powerpc64-linux and powerpc-linux. --- gnu/packages/tls.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/tls.scm') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c4420978b8..00b0bf6ddb 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -352,7 +352,13 @@ required structures.") ((string-prefix? "arm" target) "linux-armv4") ((string-prefix? "aarch64" target) - "linux-aarch64"))) + "linux-aarch64") + ((string-prefix? "powerpc64le" target) + "linux-ppc64le") + ((string-prefix? "powerpc64" target) + "linux-ppc64") + ((string-prefix? "powerpc" target) + "linux-ppc"))) #t))) '()) (replace 'configure -- cgit v1.2.3