diff mbox

gnu: openssh: Enable kerberos features.

Message ID 1476725171-32188-1-git-send-email-jmd@gnu.org
State New
Headers show

Commit Message

John Darrington Oct. 17, 2016, 5:26 p.m. UTC
* gnu/packages/ssh.scm (openssh): New input mit-krb5.
---
 gnu/packages/ssh.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Leo Famulari Oct. 17, 2016, 7 p.m. UTC | #1
On Mon, Oct 17, 2016 at 07:26:11PM +0200, John Darrington wrote:
> * gnu/packages/ssh.scm (openssh): New input mit-krb5.

It should mention the addition to configure-flags and that mit-krb5 is
added to [inputs].

Otherwise LGTM. It increases the OpenSSH closure by ~4 MiB, to 117.9.
diff mbox

Patch

diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index c551f18..9fd1506 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -37,6 +37,7 @@ 
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages nettle)
+  #:use-module (gnu packages mit-krb5)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:autoload   (gnu packages protobuf) (protobuf)
@@ -126,15 +127,21 @@  a server that supports the SSH-2 protocol.")
    (inputs `(("groff" ,groff)
              ("openssl" ,openssl)
              ("pam" ,linux-pam)
+             ("mit-krb5" ,mit-krb5)
              ("zlib" ,zlib)
              ("xauth" ,xauth)))                   ;for 'ssh -X' and 'ssh -Y'
    (arguments
     `(#:test-target "tests"
-      #:configure-flags '("--sysconfdir=/etc/ssh"
+      #:configure-flags  `("--sysconfdir=/etc/ssh"
 
-                          ;; Default value of 'PATH' used by sshd.
+                           ;; Default value of 'PATH' used by sshd.
                           "--with-default-path=/run/current-system/profile/bin"
 
+                          ;; configure needs to find krb5-config
+                          ,(string-append "--with-kerberos5="
+                                          (assoc-ref %build-inputs "mit-krb5")
+                                          "/bin")
+
                           ;; Enable PAM support in sshd.
                           "--with-pam")