From 1ffac77cc79f9cddafe6c79cecba25e69575a001 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Thu, 16 Jun 2016 11:50:01 +0200
Subject: [PATCH 1/2] openssh-7.1: Set path for `xauth`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently the warning below is shown, logging in over SSH.

```
> ssh deinemuddah
Warning: No xauth data; using fake authentication data for X11 forwarding.
```

As a result, forwarding X programs does not work anymore.

```
> xclock
Error: Can't open display:
```

The problem is, that the xauth binary is hard-coded into the SSHD binary
during build time, and set to `/usr/X11R6/bin/xauth`.

```
> strings /usr/sbin/sshd | grep X11R
/usr/X11R6/bin/xauth
```

So manually set it to `/usr/bin/xauth`, as this is where it’s stored in
Mariux.

Debian does the same [1].

[1] https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/tree/debian/rules#99
---
 openssh-7.1_p2-0.bee | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openssh-7.1_p2-0.bee b/openssh-7.1_p2-0.bee
index a1f5b5545..2e529692b 100755
--- a/openssh-7.1_p2-0.bee
+++ b/openssh-7.1_p2-0.bee
@@ -11,7 +11,8 @@ mee_configure() {
         --sysconfdir=${SYSCONFDIR} \
         --with-md5-passwords \
         --with-privsep-path=/var/lib/sshd \
-        --with-pam
+        --with-pam \
+        --with-xauth=/usr/bin/xauth
 }
 
 mee_install_post() {

From f8ad0ae6fce2b9bfaa88c341ac4f5d5ef6bfa8e9 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Thu, 16 Jun 2016 11:51:26 +0200
Subject: [PATCH 2/2] openssh-7.1: Fix path to ssh-copy-id manual

The file could not be found, as the path is incorrect, missing a `${S}`.
So add this.
---
 openssh-7.1_p2-0.bee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openssh-7.1_p2-0.bee b/openssh-7.1_p2-0.bee
index 2e529692b..f27c1ac32 100755
--- a/openssh-7.1_p2-0.bee
+++ b/openssh-7.1_p2-0.bee
@@ -19,7 +19,7 @@ mee_install_post() {
     mv ${D}${SYSCONFDIR}/ssh_config ${D}${SYSCONFDIR}/ssh_config.example
     mv ${D}${SYSCONFDIR}/sshd_config ${D}${SYSCONFDIR}/sshd_config.example
     install -v -m755 ${S}/contrib/ssh-copy-id ${D}/${BINDIR}
-    install -v -m644 contrib/ssh-copy-id.1 \
+    install -v -m644 ${S}/contrib/ssh-copy-id.1 \
                      ${MANDIR}/man1
     install -v -m755 -d ${DOCDIR}
     install -v -m644 ${S}/{INSTALL,LICENCE,OVERVIEW,README*} \