From a124bbd2f41410e1c33654f4ff9865765baf28a7 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Fri, 13 Nov 2015 22:50:36 +0800 Subject: gnu: Adjust formatting as recommended by 'guix lint'. * gnu/packages/aidc.scm (barcode, qrencode), gnu/packages/bash.scm (bash, bash-completion), gnu/packages/busybox.scm (busybox), gnu/packages/cdrom.scm (cdparanoia), gnu/packages/cmake.scm (cmake), gnu/packages/conkeror.scm (conkeror), gnu/packages/cook.scm (cook), gnu/packages/curl.scm (curl), gnu/packages/docbook.scm (docbook-xsl), gnu/packages/enlightenment.scm (enlightenment), gnu/packages/games.scm (abbaye), gnu/packages/geeqie.scm (exiv2), gnu/packages/gimp.scm (gegl), gnu/packages/gl.scm (glu, freeglut, ftgl), gnu/packages/glib.scm (glib), gnu/packages/gnome.scm (orbit2, gconf, geocode-glib), gnu/packages/gstreamer.scm (gstreamer, gst-plugins-base), gnu/packages/linux.scm (util-linux), gnu/packages/lisp.scm (gcl, ecl), gnu/packages/maths.scm (gnuplot, hdf5), gnu/packages/ssh.scm (dropbear), gnu/packages/web.scm (json-c): Remove tabulations and trailing white spaces or reformat to fit within 80 columns. * gnu/packages/audio.scm (aubio), gnu/packages/emacs.scm (emacs-s), gnu/packages/engineering.scm (geda-gaf), gnu/packages/games.scm (dosbox), gnu/packages/gnome.scm (gusb), gnu/packages/gtk.scm (gtk+), gnu/packages/guile.scm (guile-wisp), gnu/packages/hurd.scm (hurd-headers), gnu/packages/wm.scm (i3-wm): Adjust synopsis or description. --- gnu/packages/ssh.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 7a62d0bde..0a57d26be 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -325,7 +325,8 @@ especially over Wi-Fi, cellular, and long-distance links.") (source (origin (method url-fetch) (uri (string-append - "http://matt.ucc.asn.au/" name "/releases/" name "-" version ".tar.bz2")) + "http://matt.ucc.asn.au/" name "/releases/" + name "-" version ".tar.bz2")) (sha256 (base32 "1bjpbg2vi5f332q4bqxkidkjfxsqmnqvp4g1wyh8d99b8gg94nar")))) (build-system gnu-build-system) -- cgit v1.3 From 821f4dc287a678669615e7eb52580aab26120aea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 23 Nov 2015 10:50:55 +0100 Subject: gnu: Fix a few 'source-file-name' lint warnings. * gnu/packages/firmware.scm (ath9k-htc-firmware)[source](file-name): New field. * gnu/packages/gnunet.scm (guile-gnunet)[source](file-name): New field. * gnu/packages/guile.scm (guile-next)[source](file-name): New field. (guile-minikanren)[source](file-name): New field (guile-gdbm-ffi)[source](file-name): New field. * gnu/packages/ssh.scm (guile-ssh)[source](file-name): New field. --- gnu/packages/firmware.scm | 1 + gnu/packages/gnunet.scm | 1 + gnu/packages/guile.scm | 3 +++ gnu/packages/ssh.scm | 1 + 4 files changed, 6 insertions(+) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 97f2975e5..271fb49dd 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -38,6 +38,7 @@ (sha256 (base32 "16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23")) + (file-name (string-append name "-" version "-checkout")) (patches (list (search-patch "ath9k-htc-firmware-objcopy.patch"))))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 40ad0a245..f809665c8 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -263,6 +263,7 @@ privacy-preserving, decentralized public key infrastructure.") (uri (git-reference (url "git://git.sv.gnu.org/guix/gnunet.git") (commit commit))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0k6mn28isjlxrnvbnblab3nh2xqx1b7san8k98kc35ap9lq0iz8w")))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 871433231..6d2341a42 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -200,6 +200,7 @@ without requiring the source code to be rewritten.") (uri (git-reference (url "git://git.sv.gnu.org/guile.git") (commit "e5bccb6e5df3485152bc6501e1f36275e09c6352"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0z7ywryfcargrpz8hdrz6sfs06c2h2y9baqin3mbjvvg96a5bx47")))) @@ -471,6 +472,7 @@ http:://json.org specification. These are the main features: (uri (git-reference (url "https://github.com/ijp/minikanren.git") (commit "e844d85512f8c055d3f96143ee506007389a25e3"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6")))) @@ -628,6 +630,7 @@ inspired by the SCSH regular expression system.") (uri (git-reference (url "https://github.com/ijp/guile-gdbm.git") (commit "fa1d5b6231d0e4d096687b378c025f2148c5f246"))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1j8wrsw7v9w6qkl47xz0rdikg50v16nn6kbs3lgzcymjzpa7babj")))) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 0a57d26be..2f4f8a28a 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -184,6 +184,7 @@ Additionally, various channel-specific options can be negotiated.") (uri (git-reference (url "https://github.com/artyom-poptsov/libguile-ssh.git") (commit (string-append "v" version)))) + (file-name (string-append name "-" version "-checkout")) (sha256 (base32 "1ld2khzylaylhqfsfcvbxs95frvm8pkr7dq40ia1wwn9c349fcdv")))) -- cgit v1.3 From a9ee11d5ab61d6dd64113d71c5a9c8511c1d050d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Nov 2015 10:57:03 +0100 Subject: gnu: openssh: Use modify-phases syntax. * gnu/packages/ssh.scm (openssh)[arguments]: Use modify-phases syntax. --- gnu/packages/ssh.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2f4f8a28a..26729ea90 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -129,26 +129,25 @@ a server that supports the SSH-2 protocol.") (arguments `(#:test-target "tests" #:phases - (alist-cons-after - 'configure 'reset-/var/empty - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("PRIVSEP_PATH=/var/empty") - (string-append "PRIVSEP_PATH=" out "/var/empty"))))) - (alist-cons-before - 'check 'patch-tests - (lambda _ - ;; remove 't-exec' regress target which requires user 'sshd' - (substitute* "regress/Makefile" - (("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post) - (string-append pre post)))) - (alist-replace - 'install - (lambda* (#:key (make-flags '()) #:allow-other-keys) - ;; install without host keys and system configuration files - (zero? (apply system* "make" "install-nosysconf" make-flags))) - %standard-phases))))) + (modify-phases %standard-phases + (add-after 'configure 'reset-/var/empty + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("PRIVSEP_PATH=/var/empty") + (string-append "PRIVSEP_PATH=" out "/var/empty"))) + #t))) + (add-before 'check 'patch-tests + (lambda _ + ;; remove 't-exec' regress target which requires user 'sshd' + (substitute* "regress/Makefile" + (("^(REGRESS_TARGETS=.*) t-exec(.*)" all pre post) + (string-append pre post))) + #t)) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + ;; install without host keys and system configuration files + (zero? (apply system* "make" "install-nosysconf" make-flags))))))) (synopsis "Client and server for the secure shell (ssh) protocol") (description "The SSH2 protocol implemented in OpenSSH is standardised by the -- cgit v1.3 From 36f26211bbb2c4dffe33427d4e65d5225a586a5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Nov 2015 11:35:50 +0100 Subject: gnu: openssh: Install ssh-copy-id. * gnu/packages/ssh.scm (openssh)[arguments]: Install "ssh-copy-id" and documentation. Fixes . Reported by Florian Paul Schmidt . --- gnu/packages/ssh.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 26729ea90..5c222a22a 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -145,9 +145,19 @@ a server that supports the SSH-2 protocol.") (string-append pre post))) #t)) (replace 'install - (lambda* (#:key (make-flags '()) #:allow-other-keys) + (lambda* (#:key outputs (make-flags '()) #:allow-other-keys) ;; install without host keys and system configuration files - (zero? (apply system* "make" "install-nosysconf" make-flags))))))) + (and (zero? (apply system* "make" "install-nosysconf" make-flags)) + (begin + (install-file "contrib/ssh-copy-id" + (string-append (assoc-ref outputs "out") + "/bin/")) + (chmod (string-append (assoc-ref outputs "out") + "/bin/ssh-copy-id") #o555) + (install-file "contrib/ssh-copy-id.1" + (string-append (assoc-ref outputs "out") + "/share/man/man1/")) + #t))))))) (synopsis "Client and server for the secure shell (ssh) protocol") (description "The SSH2 protocol implemented in OpenSSH is standardised by the -- cgit v1.3 From d1e08856e05bbef43c5940a33472437d4e830e53 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 3 Dec 2015 12:41:28 +0200 Subject: gnu: openssh: Update to 7.1p1. * gnu/packages/ssh.scm (openssh): Update to 7.1p1. --- gnu/packages/ssh.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 5c222a22a..cb8570a74 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver +;;; Copyright © 2015 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -110,7 +111,7 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "7.0p1") + (version "7.1p1") (source (origin (method url-fetch) (uri (let ((tail (string-append name "-" version ".tar.gz"))) @@ -121,7 +122,7 @@ a server that supports the SSH-2 protocol.") (string-append "http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/" tail)))) (sha256 (base32 - "1rc52jyc5v5b8j9kvasrnz9vnj9b0i7fw4nqac8wix0r794k4ngx")))) + "0a44mnr8bvw41zg83xh4sb55d8nds29j95gxvxk5qg863lnns2pw")))) (build-system gnu-build-system) (inputs `(("groff" ,groff) ("openssl" ,openssl) -- cgit v1.3