openssl/openssh updates from below0

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@119 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/obsolete-buildroot/make/openssl.mk b/obsolete-buildroot/make/openssl.mk
index 0e1de34..e20c8b9 100644 (file)
--- a/obsolete-buildroot/make/openssl.mk
+++ b/obsolete-buildroot/make/openssl.mk
@@ -68,7 +68,7 @@ openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a
 
 openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
 
 
 openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
 

-$(LIBSSL_IPK): uclibc $(STAGING_DIR)/usr/lib/libcrypto.so.0.9.7
+$(LIBSSL_IPK): uclibc $(STAGING_DIR)/usr/lib/libcrypto.a

        mkdir -p $(OPENSSL_IPK_DIR)/CONTROL
        cp $(SOURCE_DIR)/libssl.control $(OPENSSL_IPK_DIR)/CONTROL/control
        mkdir -p $(OPENSSL_IPK_DIR)/usr/lib
        mkdir -p $(OPENSSL_IPK_DIR)/CONTROL
        cp $(SOURCE_DIR)/libssl.control $(OPENSSL_IPK_DIR)/CONTROL/control
        mkdir -p $(OPENSSL_IPK_DIR)/usr/lib

diff --git a/obsolete-buildroot/sources/openssh.client.control b/obsolete-buildroot/sources/openssh.client.control
index 6d55328..3585250 100644 (file)
--- a/obsolete-buildroot/sources/openssh.client.control
+++ b/obsolete-buildroot/sources/openssh.client.control
@@ -4,7 +4,7 @@ Version: 3.8p1-1
 Architecture: mipsel
 Maintainer: below0
 Section: net
 Architecture: mipsel
 Maintainer: below0
 Section: net

-Depends: zlib openssl
+Depends: zlib libssl

 Source: Embedded in the main OpenWrt buildroot
 Description: The OpenSSH client. Allows for access to remote systems via the SSH protocol.
  Includes: ssh, scp
 Source: Embedded in the main OpenWrt buildroot
 Description: The OpenSSH client. Allows for access to remote systems via the SSH protocol.
  Includes: ssh, scp

diff --git a/obsolete-buildroot/sources/openssh.server.control b/obsolete-buildroot/sources/openssh.server.control
index 6c83c4a..943da93 100644 (file)
--- a/obsolete-buildroot/sources/openssh.server.control
+++ b/obsolete-buildroot/sources/openssh.server.control
@@ -4,7 +4,7 @@ Version: 3.8p1-1
 Architecture: mipsel
 Maintainer: below0
 Section: net
 Architecture: mipsel
 Maintainer: below0
 Section: net

-Depends: zlib openssl
+Depends: zlib libssl

 Source: Embedded in the main OpenWrt buildroot
 Description: The OpenSSH server daemon. 
   Allows for access to the system via the SSH client. 
 Source: Embedded in the main OpenWrt buildroot
 Description: The OpenSSH server daemon. 
   Allows for access to the system via the SSH client.