From f5df766cee42aee94adfe2a3519ac7a9d4b5dedd Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Sat, 22 Feb 2020 19:23:46 +0300
Subject: [PATCH] libc-client rebuild

---
 .../files/1006_openssl1.1_autoverify.patch    | 58 +++++++++++++++++++
 network/misc/libc-client/pspec.xml            | 10 +++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 network/misc/libc-client/files/1006_openssl1.1_autoverify.patch

diff --git a/network/misc/libc-client/files/1006_openssl1.1_autoverify.patch b/network/misc/libc-client/files/1006_openssl1.1_autoverify.patch
new file mode 100644
index 0000000000..087e747d59
--- /dev/null
+++ b/network/misc/libc-client/files/1006_openssl1.1_autoverify.patch
@@ -0,0 +1,58 @@
+Description: Support OpenSSL 1.1
+ When building with OpenSSL 1.1 and newer, use the new built-in
+ hostname verification instead of code that doesn't compile due to
+ structs having been made opaque.
+Bug-Debian: https://bugs.debian.org/828589
+
+--- a/src/osdep/unix/ssl_unix.c
++++ b/src/osdep/unix/ssl_unix.c
+@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
+ 				/* disable certificate validation? */
+   if (flags & NET_NOVALIDATECERT)
+     SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL);
+-  else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
++  else {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000      
++      X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context);
++      X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
++      X509_VERIFY_PARAM_set1_host(param, host, 0);
++#endif
++
++      SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify);
+ 				/* set default paths to CAs... */
++  }
+   SSL_CTX_set_default_verify_paths (stream->context);
+ 				/* ...unless a non-standard path desired */
+   if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL))
+@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM *
+   if (SSL_write (stream->con,"",0) < 0)
+     return ssl_last_error ? ssl_last_error : "SSL negotiation failed";
+ 				/* need to validate host names? */
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+   if (!(flags & NET_NOVALIDATECERT) &&
+       (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con),
+ 				host))) {
+@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM *
+     sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???");
+     return ssl_last_error = cpystr (tmp);
+   }
++#endif
+   return NIL;
+ }
+ 
+@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_
+  * Returns: NIL if validated, else string of error message
+  */
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static char *ssl_validate_cert (X509 *cert,char *host)
+ {
+   int i,n;
+@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce
+   else ret = "Unable to locate common name in certificate";
+   return ret;
+ }
++#endif
+ 
+ /* Case-independent wildcard pattern match
+  * Accepts: base string
diff --git a/network/misc/libc-client/pspec.xml b/network/misc/libc-client/pspec.xml
index de412b4bcf..2ab9f7326d 100644
--- a/network/misc/libc-client/pspec.xml
+++ b/network/misc/libc-client/pspec.xml
@@ -29,7 +29,8 @@
             <!--Patch level="1">imap-2007-paths.patch</Patch-->
             <Patch level="1">imap-2007e-authmd5.patch</Patch>
             <Patch level="1">imap-2007e-shared.patch</Patch>
-            <Patch level="1">uw-imap-2004c-amd64-so-fix.patch</Patch>
+            <Patch level="1">uw-imap-2004c-amd64-so-fix.patch</Patch>			
+            <Patch level="1">1006_openssl1.1_autoverify.patch</Patch>
         </Patches>
     </Source>
 
@@ -45,6 +46,13 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2020-02-22</Date>
+            <Version>2007f</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2018-09-09</Date>
             <Version>2007f</Version>