Add gcr, p11kit and certdata packages

[hvlinux.git] / stage3 / pkg / openssl

diff --git a/stage3/pkg/openssl b/stage3/pkg/openssl
index 132dc4f..863696e 100644 (file)
--- a/stage3/pkg/openssl
+++ b/stage3/pkg/openssl
@@ -1,32 +1,21 @@
 #!/bin/bash
 
-hvconfig_pre()
+hvbuild()
 {
     cd ${LFS_TMP}/${PACKAGE}
-    decompress_package ${OPENSSL_ROOT_CERTS} ./
-}
 
-hvbuild()
-{
     MAKEDEPPROG=gcc CC=gcc ./config \
         --prefix=/usr \
         --openssldir=/etc/ssl \
+        --libdir=lib \
         shared \
         zlib-dynamic
 
     MAKEDEPPROG=gcc CC=gcc make
 
     # Install man pages in /usr/share/man instead of /etc/ssl/man
-    make MANDIR=/usr/share/man install
+    make MANDIR=/usr/share/man LIBDIR=lib install
     install -v -d -m755 /usr/share/doc/${PACKAGE}
     cp -v -r doc/{HOWTO,README,*.{txt,html,gif}} \
         /usr/share/doc/${PACKAGE}
-
-    cp -rv certs /etc/ssl
-
-    # Create a single file that contains all of the installed certificates:
-    for pem in /etc/ssl/certs/*.pem; do
-        cat $pem
-        echo ""
-    done > /etc/ssl/ca-bundle.crt
 }