[oe-commits] org.oe.dev packages/openssh/openssh_4.6p1.bb : package sftp-server seperately from

[xora commit]

packages/openssh/openssh_4.6p1.bb : package sftp-server seperately from
sftp and make it not depend on anything from openssl.

This will allow images to ship it as default without pulling in OpenSSL

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 0f6db70a3ff4e230c5e3e710682fa171814afbd2
ViewMTN: http://monotone.openembedded.org/revision/info/0f6db70a3ff4e230c5e3e710682fa171814afbd2
Files:
1
packages/openssh/files/sftp-server-nolibcrypto.patch
packages/openssh/openssh_4.6p1.bb
Diffs:

#
# mt diff -r91c6cc22e5f156001f26d29e37aedb256368526d -r0f6db70a3ff4e230c5e3e710682fa171814afbd2
#
# 
# 
# add_file "packages/openssh/files/sftp-server-nolibcrypto.patch"
#  content [485b76bc2a787612d9a03d9cc81a22ca3bba9523]
# 
# patch "packages/openssh/openssh_4.6p1.bb"
#  from [b6dd08fb7fd9e64409034815aef2658608f0968f]
#    to [10c9d7afb3cf9de6cae64ac94cf32103fa96bce6]
# 
============================================================
--- packages/openssh/files/sftp-server-nolibcrypto.patch	485b76bc2a787612d9a03d9cc81a22ca3bba9523
+++ packages/openssh/files/sftp-server-nolibcrypto.patch	485b76bc2a787612d9a03d9cc81a22ca3bba9523
@@ -0,0 +1,13 @@
+Index: openssh-4.6p1/Makefile.in
+===================================================================
+--- openssh-4.6p1.orig/Makefile.in	2007-10-16 11:27:24.000000000 +0100
++++ openssh-4.6p1/Makefile.in	2007-10-16 11:27:46.000000000 +0100
+@@ -160,7 +160,7 @@
+ 	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
+ 
+ sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
+-	$(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
++	$(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat
+ 
+ sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
+ 	$(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)
============================================================
--- packages/openssh/openssh_4.6p1.bb	b6dd08fb7fd9e64409034815aef2658608f0968f
+++ packages/openssh/openssh_4.6p1.bb	10c9d7afb3cf9de6cae64ac94cf32103fa96bce6
@@ -14,9 +14,10 @@ LICENSE = "BSD"
 used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
+           file://sftp-server-nolibcrypto.patch;patch=1 \
            file://sshd_config \
 	   file://ssh_config \
            file://init"
@@ -56,13 +57,14 @@ do_install_append() {
 	rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var
 }
 
-PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc"
+PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server"
 FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug"
 FILES_openssh-scp = "${bindir}/scp.${PN}"
 FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config"
 FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen"
 FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config"
-FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server"
+FILES_openssh-sftp = "${bindir}/sftp"
+FILES_openssh-sftp-server = "${libdir}exec/sftp-server"
 FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*"
 
 RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd"