From 66f3b818f7517a75fddcf8590e82f33591171f9f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 30 May 2011 21:38:04 +0200
Subject: [PATCH] openssl: cleanup, install config, fix build and install

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/security/openssl/build   | 8 +-------
 packages/security/openssl/install | 4 ++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/security/openssl/build b/packages/security/openssl/build
index 30e7976668..ac8ba3680a 100755
--- a/packages/security/openssl/build
+++ b/packages/security/openssl/build
@@ -45,16 +45,10 @@ esac
 cd $PKG_BUILD
 ./Configure \
   --prefix=/usr \
+  --openssldir=/etc/ssl \
   zlib-dynamic \
   threads \
   shared \
-  no-idea \
-  no-mdc2 \
-  no-rc5 \
-  no-krb5 \
-  no-ec \
-  no-ecdh \
-  no-ecdsa \
   $TARGET
 
 $SED -i -e "s:-march=[-a-z0-9] ::" \
diff --git a/packages/security/openssl/install b/packages/security/openssl/install
index 9e4ed6ad97..f41c106f26 100755
--- a/packages/security/openssl/install
+++ b/packages/security/openssl/install
@@ -22,9 +22,13 @@
 
 . config/options $1
 
+mkdir -p $INSTALL/etc/ssl
+  cp -P $PKG_BUILD/apps/openssl.cnf $INSTALL/etc/ssl
+
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/libcrypto.so* $INSTALL/usr/lib
   cp -P $PKG_BUILD/libssl.so* $INSTALL/usr/lib
 
 mkdir -p $INSTALL/usr/lib/ssl/engines
   cp -P $PKG_BUILD/engines/*.so $INSTALL/usr/lib/ssl/engines
+  cp -P $PKG_BUILD/engines/ccgost/*.so $INSTALL/usr/lib/ssl/engines