From 14254fa5a4e0d9d2084c309abc3cc128950f6919 Mon Sep 17 00:00:00 2001
From: Kristian Lein-Mathisen <address@hidden>
Date: Tue, 19 May 2015 13:31:21 +0200
Subject: [PATCH] bugfix: migrates from ##sys#expand-home-path =>
 pathname-expand

the ##sys#expand-home-path procedure was removed from core around
chicken 4.9.0.1, and put in a separate egg. let's use that egg (or not
expand at all?)

without this patch, ssl-load-certificate-chain! and friends will
segfault! it's trying to call an unbound procedure: ##sys#expand-home-path
---
 openssl.meta |  1 +
 openssl.scm  | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/openssl.meta b/openssl.meta
index b27c8a2..5904c83 100644
--- a/openssl.meta
+++ b/openssl.meta
@@ -5,5 +5,6 @@
  (author "Thomas Chust")
  (license "BSD")
  (category net)
+ (depends pathname-expand)
  (doc-from-wiki)
  (files "openssl.scm" "openssl.release-info" "openssl.meta" "openssl.setup"))
diff --git a/openssl.scm b/openssl.scm
index db693fe..f7665d4 100644
--- a/openssl.scm
+++ b/openssl.scm
@@ -42,10 +42,9 @@
    ##sys#current-thread
    ##sys#size
    ##sys#setslot
-   ##sys#check-string
-   ##sys#expand-home-path))
+   ##sys#check-string))
 
-(use srfi-18 tcp)
+(use srfi-18 tcp pathname-expand)
 
 #>
 #include <errno.h>
@@ -583,7 +582,7 @@ EOF
   (unless (eq?
 	   ((foreign-lambda
 	     int "SSL_CTX_use_certificate_chain_file" c-pointer c-string)
-	    (ssl-unwrap-context obj) (##sys#expand-home-path pathname))
+	    (ssl-unwrap-context obj) (pathname-expand pathname))
 	   1)
     (ssl-abort 'ssl-load-certificate-chain! #f pathname)))
 
@@ -602,7 +601,7 @@ EOF
 	     "  return(SSL_CTX_use_PrivateKey_file("
 	     "           (SSL_CTX *)ctx, path, "
 	     "           (asn1 ? SSL_FILETYPE_ASN1 : SSL_FILETYPE_PEM)));\n")
-	    (ssl-unwrap-context obj) (##sys#expand-home-path pathname)
+	    (ssl-unwrap-context obj) (pathname-expand pathname)
 	    rsa? asn1?)
 	   1)
     (ssl-abort 'ssl-load-private-key! #f pathname rsa? asn1?)))
@@ -626,8 +625,8 @@ EOF
 	   ((foreign-lambda
 	     int "SSL_CTX_load_verify_locations" c-pointer c-string c-string)
 	    (ssl-unwrap-context obj)
-	    (if pathname (##sys#expand-home-path pathname) #f)
-	    (if dirname (##sys#expand-home-path dirname) #f))
+	    (if pathname (pathname-expand pathname) #f)
+	    (if dirname (pathname-expand dirname) #f))
 	   1)
     (ssl-abort 'ssl-load-verify-root-certificates! #f pathname dirname)))
 
@@ -637,7 +636,7 @@ EOF
   (ssl-clear-error)
   (cond
    (((foreign-lambda c-pointer "SSL_load_client_CA_file" c-string)
-     (##sys#expand-home-path pathname))
+     (pathname-expand pathname))
     => (cut
 	(foreign-lambda
 	 void "SSL_CTX_set_client_CA_list" c-pointer c-pointer)
-- 
2.4.1