Another pass of .oe cleanups.

BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ

3 files changed, 69 insertions, 33 deletions

diff --git a/openssh/openssh_3.7.1p1.oe b/openssh/openssh_3.7.1p1.oe
index 97b4d45d28..b932c282f4 100644
--- a/openssh/openssh_3.7.1p1.oe
+++ b/openssh/openssh_3.7.1p1.oe
@@ -1,29 +1,29 @@
 DEPENDS = "virtual/libc zlib openssl"
 SECTION = "net"
-DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH)\
- Ssh (Secure Shell) is a program for logging into a remote machine\
- and for executing commands on a remote machine.\
- It provides secure encrypted communications between two untrusted\
- hosts over an insecure network.  X11 connections and arbitrary TCP/IP\
- ports can also be forwarded over the secure channel.\
- It is intended as a replacement for rlogin, rsh and rcp, and can be\
- used to provide applications with a secure communication channel.
+DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
+Ssh (Secure Shell) is a program for logging into a remote machine \
+and for executing commands on a remote machine. \
+It provides secure encrypted communications between two untrusted \
+hosts over an insecure network.  X11 connections and arbitrary TCP/IP \
+ports can also be forwarded over the secure channel. \
+It is intended as a replacement for rlogin, rsh and rcp, and can be \
+used to provide applications with a secure communication channel."
 
-SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-	  file://${FILESDIR}/configure.patch;patch=1 \
-	  file://${FILESDIR}/scp-nossl.patch;patch=1
+SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/scp-nossl.patch;patch=1"
 
 inherit autotools
 
-sysconfdir_append=/ssh
-export ASKPASS_PROGRAM = ${bindir}/ssh-askpass
-export LD = ${CC}
+sysconfdir_append = /ssh
+export ASKPASS_PROGRAM = "${bindir}/ssh-askpass"
+export LD = "${CC}"
 CFLAGS_prepend = "-I${S} "
 CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
 LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
-EXTRA_OECONF = --disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
-	       --with-rand-helper=no --without-pam
-EXTRA_OEMAKE = '"STRIP_OPT="'
+EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
+	       --with-rand-helper=no --without-pam"
+EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {
 	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
diff --git a/openssh/openssh_3.7.1p2.oe b/openssh/openssh_3.7.1p2.oe
index 4054331cef..b932c282f4 100644
--- a/openssh/openssh_3.7.1p2.oe
+++ b/openssh/openssh_3.7.1p2.oe
@@ -1,29 +1,29 @@
 DEPENDS = "virtual/libc zlib openssl"
 SECTION = "net"
-DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH)\
- Ssh (Secure Shell) is a program for logging into a remote machine\
- and for executing commands on a remote machine.\
- It provides secure encrypted communications between two untrusted\
- hosts over an insecure network.  X11 connections and arbitrary TCP/IP\
- ports can also be forwarded over the secure channel.\
- It is intended as a replacement for rlogin, rsh and rcp, and can be\
- used to provide applications with a secure communication channel.
+DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
+Ssh (Secure Shell) is a program for logging into a remote machine \
+and for executing commands on a remote machine. \
+It provides secure encrypted communications between two untrusted \
+hosts over an insecure network.  X11 connections and arbitrary TCP/IP \
+ports can also be forwarded over the secure channel. \
+It is intended as a replacement for rlogin, rsh and rcp, and can be \
+used to provide applications with a secure communication channel."
 
-SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
-	  file://${FILESDIR}/configure.patch;patch=1 \
-	  file://${FILESDIR}/scp-nossl.patch;patch=1
+SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/scp-nossl.patch;patch=1"
 
 inherit autotools
 
 sysconfdir_append = /ssh
-export ASKPASS_PROGRAM = ${bindir}/ssh-askpass
-export LD = ${CC}
+export ASKPASS_PROGRAM = "${bindir}/ssh-askpass"
+export LD = "${CC}"
 CFLAGS_prepend = "-I${S} "
 CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
 LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
-EXTRA_OECONF = --disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
-	       --with-rand-helper=no --without-pam
-EXTRA_OEMAKE = '"STRIP_OPT="'
+EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
+	       --with-rand-helper=no --without-pam"
+EXTRA_OEMAKE = "'STRIP_OPT='"
 
 do_configure_prepend () {
 	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
diff --git a/openssh/openssh_3.8p1.oe b/openssh/openssh_3.8p1.oe
index e69de29bb2..b932c282f4 100644
--- a/openssh/openssh_3.8p1.oe
+++ b/openssh/openssh_3.8p1.oe
@@ -0,0 +1,36 @@
+DEPENDS = "virtual/libc zlib openssl"
+SECTION = "net"
+DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
+Ssh (Secure Shell) is a program for logging into a remote machine \
+and for executing commands on a remote machine. \
+It provides secure encrypted communications between two untrusted \
+hosts over an insecure network.  X11 connections and arbitrary TCP/IP \
+ports can also be forwarded over the secure channel. \
+It is intended as a replacement for rlogin, rsh and rcp, and can be \
+used to provide applications with a secure communication channel."
+
+SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/scp-nossl.patch;patch=1"
+
+inherit autotools
+
+sysconfdir_append = /ssh
+export ASKPASS_PROGRAM = "${bindir}/ssh-askpass"
+export LD = "${CC}"
+CFLAGS_prepend = "-I${S} "
+CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
+LDFLAGS_prepend = "-L${S} -L${S}/openbsd-compat "
+EXTRA_OECONF = "--disable-suid-ssh --with-ssl=${STAGING_LIBDIR}/ssl \
+	       --with-rand-helper=no --without-pam"
+EXTRA_OEMAKE = "'STRIP_OPT='"
+
+do_configure_prepend () {
+	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
+		cp aclocal.m4 acinclude.m4
+	fi
+}
+
+do_compile_append () {
+	install -m 0644 ${FILESDIR}/sshd_config ${S}/
+}