From 3a50e32ab2fdd61c7a9c5956478fcd566386d6a6 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 4 Jun 2004 12:38:58 +0000
Subject: openssl/openssh fixes

BKrev: 40c06d62lPK7koYZrzTvdKhIk8HSWg
---
 openssh/openssh_3.8p1.oe            |  5 +++++
 openssl/openssl-0.9.7d/debian.patch |  0
 openssl/openssl_0.9.7d.oe           | 12 +++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 openssl/openssl-0.9.7d/debian.patch

diff --git a/openssh/openssh_3.8p1.oe b/openssh/openssh_3.8p1.oe
index f0228c8391..e590a02bd6 100644
--- a/openssh/openssh_3.8p1.oe
+++ b/openssh/openssh_3.8p1.oe
@@ -36,3 +36,8 @@ do_configure_prepend () {
 do_compile_append () {
 	install -m 0644 ${WORKDIR}/sshd_config ${S}/
 }
+
+PACKAGES =+ " openssh-scp "
+
+FILES_openssh-scp = "/usr/bin/scp"
+RDEPENDS_openssh += " openssh-scp"
diff --git a/openssl/openssl-0.9.7d/debian.patch b/openssl/openssl-0.9.7d/debian.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openssl/openssl_0.9.7d.oe b/openssl/openssl_0.9.7d.oe
index ae9c7aab09..4cf16767cb 100644
--- a/openssl/openssl_0.9.7d.oe
+++ b/openssl/openssl_0.9.7d.oe
@@ -1,7 +1,8 @@
 SECTION = "libs"
 DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
 
-SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
+	   file://debian.patch;patch=1"
 S = "${WORKDIR}/openssl-${PV}"
 
 AR_append = " r"
@@ -51,13 +52,14 @@ do_compile () {
 
 do_stage () {
 	cp --dereference -R include/openssl ${STAGING_INCDIR}/
-	oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
-	oe_libinstall -a -so libssl ${STAGING_LIBDIR}
+	oe_libinstall -a -so ${S}/libcrypto ${STAGING_LIBDIR}
+	oe_libinstall -a -so ${S}/libssl ${STAGING_LIBDIR}
 }
 
 do_install () {
-	install -d ${D}/${libdir}/pkgconfig
+	install -m 0755 -d ${D}/${libdir}/pkgconfig
 	oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
-	chmod u+rx ${D}/${libdir}/pkgconfig
 	chmod 644 ${D}/${libdir}/pkgconfig/openssl.pc
+	oe_libinstall -so ${S}/libcrypto ${D}/${libdir}
+	oe_libinstall -so ${S}/libssl ${D}/${libdir}
 }
-- 
cgit v1.2.3