Re: [PATCH] openssh: install ssh-copy-id.
Ricardo Wurmus skribis: > and this is after: > > $ guix size /gnu/store/65rd6p154y13dqcbkbimnwjq39k8dnym-openssh-7.0p1 > store item total > self > /gnu/store/65rd6p154y13dqcbkbimnwjq39k8dnym-openssh-7.0p1 91.5 > 3.9 4.3% > /gnu/store/zmqhwsl9vvxr4ihdnhwwpc3dpgmpsgsy-openssl-1.0.2d 73.0 > 12.3 13.4% > /gnu/store/54wpn20cik292k5hl4nxsivv614xl8c2-zlib-1.2.7 61.1 > 0.3 0.4% > /gnu/store/zy233badri3sffqi2s2kq8md6qz65iiz-gcc-4.9.3-lib 60.7 > 22.9 25.0% > /gnu/store/311nvir0pz1mhf0mgsmfrw00qfj7yq0j-bash-4.3.39 52.0 > 6.3 6.9% > /gnu/store/92f66z198h876byrjwwbgzv9rfsdm048-readline-6.345.7 > 1.2 1.3% > /gnu/store/5ljf8bnl2z5ykrrcs8352b9lh8j6139h-ncurses-6.0 44.5 > 6.6 7.3% > /gnu/store/qv7bk62c22ms9i11dhfl71hnivyc82k2-glibc-2.22 37.9 > 36.5 39.9% > /gnu/store/7jhakv1r1nbs2sr2f7ammq256w7niarh-bash-static-4.3.39 1.4 > 1.4 1.5% > > There are new references to bash, readline, and ncurses. It’s a bash > script, so a new reference to bash is expected. OK, sounds reasonable. > I wonder why it also retains references to readline and ncurses, > though. These are indirect references (Bash depends on Readline.) Thanks, Ludo’.
Re: [PATCH] openssh: install ssh-copy-id.
Ludovic Courtès writes: >> From baf260ebda0a70ec3c7d6f35e1c1bb64a37f0aac Mon Sep 17 00:00:00 2001 >> From: Ricardo Wurmus >> Date: Fri, 27 Nov 2015 11:35:50 +0100 >> Subject: [PATCH 2/2] gnu: openssh: Install ssh-copy-id. >> >> * gnu/packages/ssh.scm (openssh)[arguments]: Install "ssh-copy-id" and >> documentation. > > Please add “Fixes” and “Reported by” lines. Done. I have pushed both commits. > Could you check whether that increases the size of the closure? That > would be the case if ‘ssh-copy-id’ is a Perl script for instance. This is before the patch: store item totalself /gnu/store/xlgw7bx4payq017zcjyrs68hwixybkn0-openssh-7.0p1 77.3 3.9 5.1% /gnu/store/zmqhwsl9vvxr4ihdnhwwpc3dpgmpsgsy-openssl-1.0.2d 73.0 12.3 15.9% /gnu/store/54wpn20cik292k5hl4nxsivv614xl8c2-zlib-1.2.7 61.1 0.3 0.5% /gnu/store/zy233badri3sffqi2s2kq8md6qz65iiz-gcc-4.9.3-lib 60.7 22.9 29.6% /gnu/store/qv7bk62c22ms9i11dhfl71hnivyc82k2-glibc-2.22 37.9 36.5 47.2% /gnu/store/7jhakv1r1nbs2sr2f7ammq256w7niarh-bash-static-4.3.39 1.4 1.4 1.8% and this is after: $ guix size /gnu/store/65rd6p154y13dqcbkbimnwjq39k8dnym-openssh-7.0p1 store item totalself /gnu/store/65rd6p154y13dqcbkbimnwjq39k8dnym-openssh-7.0p1 91.5 3.9 4.3% /gnu/store/zmqhwsl9vvxr4ihdnhwwpc3dpgmpsgsy-openssl-1.0.2d 73.0 12.3 13.4% /gnu/store/54wpn20cik292k5hl4nxsivv614xl8c2-zlib-1.2.7 61.1 0.3 0.4% /gnu/store/zy233badri3sffqi2s2kq8md6qz65iiz-gcc-4.9.3-lib 60.7 22.9 25.0% /gnu/store/311nvir0pz1mhf0mgsmfrw00qfj7yq0j-bash-4.3.39 52.0 6.3 6.9% /gnu/store/92f66z198h876byrjwwbgzv9rfsdm048-readline-6.345.7 1.2 1.3% /gnu/store/5ljf8bnl2z5ykrrcs8352b9lh8j6139h-ncurses-6.0 44.5 6.6 7.3% /gnu/store/qv7bk62c22ms9i11dhfl71hnivyc82k2-glibc-2.22 37.9 36.5 39.9% /gnu/store/7jhakv1r1nbs2sr2f7ammq256w7niarh-bash-static-4.3.39 1.4 1.4 1.5% There are new references to bash, readline, and ncurses. It’s a bash script, so a new reference to bash is expected. I wonder why it also retains references to readline and ncurses, though. ~~ Ricardo
Re: [PATCH] openssh: install ssh-copy-id.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 11/27/2015 11:38 AM, Ricardo Wurmus wrote: > This fixes bug #22024. > Wow, thanks :) Flo - -- https://fps.io -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQEcBAEBCAAGBQJWWIXZAAoJEA5f4Coltk8ZlksH/18HM9V/ao40QXgVw06D0lO2 8xeVcGXmCJV5Nv4S7juZQyAfGZliMZQE5W17BZy8b4wprBIFM6JlUf5sydj4a4Bh h2nZL/jHMscgTGuQlFqeO+TVwJGNL3Oj/lUoS5zDZXNwHYFfqwU0wOoOra724pF6 UQvAgJU8oDAf9gXoK0FX+GgYQrZRyJsErTM6LGJ/ykLNrETkL7F1sjLX6TjNVhN8 4N7UahP7l6tI2658vWemHVyBdbTRPr9VDryDOx+bXMis7eIGiNc22ZvrxoGLUc2F GfM1OpS1XBpkH4IBK9B6ZXAgJjde1nPwIReeNqhJb7/hFwLiNTrkEir0f8ed1Pg= =U2Ow -END PGP SIGNATURE-
Re: [PATCH] openssh: install ssh-copy-id.
Woow, that was fast! :-) Ricardo Wurmus skribis: > From 65c9863898e1ddc2a1443b557003f0cbc25442d8 Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Fri, 27 Nov 2015 10:57:03 +0100 > Subject: [PATCH 1/2] gnu: openssh: Use modify-phases syntax. > > * gnu/packages/ssh.scm (openssh)[arguments]: Use modify-phases syntax. OK! > From baf260ebda0a70ec3c7d6f35e1c1bb64a37f0aac Mon Sep 17 00:00:00 2001 > From: Ricardo Wurmus > Date: Fri, 27 Nov 2015 11:35:50 +0100 > Subject: [PATCH 2/2] gnu: openssh: Install ssh-copy-id. > > * gnu/packages/ssh.scm (openssh)[arguments]: Install "ssh-copy-id" and > documentation. Please add “Fixes” and “Reported by” lines. Could you check whether that increases the size of the closure? That would be the case if ‘ssh-copy-id’ is a Perl script for instance. Thanks, Ludo’.
[PATCH] openssh: install ssh-copy-id.
This fixes bug #22024. >From 65c9863898e1ddc2a1443b557003f0cbc25442d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Nov 2015 10:57:03 +0100 Subject: [PATCH 1/2] 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(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2f4f8a2..26729ea 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 -- 2.1.0 >From baf260ebda0a70ec3c7d6f35e1c1bb64a37f0aac Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Nov 2015 11:35:50 +0100 Subject: [PATCH 2/2] gnu: openssh: Install ssh-copy-id. * gnu/packages/ssh.scm (openssh)[arguments]: Install "ssh-copy-id" and documentation. --- gnu/packages/ssh.scm | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 26729ea..5c222a2 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 -- 2.1.0