Skip to contentSkip to conversation

package/dillo: fix openssl support

PATCH New Peter Seiderer 2 participants 2 messages Jan 9, 2020 – Jan 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/dillo: fix openssl support

Add two patches to fix openssl support:

- 0003-Fix-openssl-detection.patch (suggested by Jonathan Kimmitt)
- 0004-Support-OpenSSL-1.1.0.patch (taken from upstream)

---
 .../dillo/0003-Fix-openssl-detection.patch    | 29 ++++++++++++++++
 .../dillo/0004-Support-OpenSSL-1.1.0.patch    | 33 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 package/dillo/0003-Fix-openssl-detection.patch
 create mode 100644 package/dillo/0004-Support-OpenSSL-1.1.0.patch
package/dillo/0003-Fix-openssl-detection.patch new file +29 -0
new file mode 100644
index 0000000000..0578718c2b
@@ -0,0 +1,29 @@
+From 96dde9dedf806256cdc6cbf5cacbd5c8d74e6288 Mon Sep 17 00:00:00 2001
+From: Jonathan Kimmitt <[email protected]>
+Date: Thu, 9 Jan 2020 22:01:42 +0100
+Subject: [PATCH 3/4] Fix openssl detection
+
+SSL_library_init is now a define, use OPENSSL_init_ssl instead.
+
+Signed-off-by: Jonathan Kimmitt <[email protected]>
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 66b5e9f..206fd53 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -276,7 +276,7 @@ if test "x$enable_ssl" = "xyes"; then
+ 
+   if test "x$ssl_ok" = "xyes"; then
+     old_libs="$LIBS"
+-    AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
++    AC_CHECK_LIB(ssl, OPENSSL_init_ssl, ssl_ok=yes, ssl_ok=no, -lcrypto)
+     LIBS="$old_libs"
+   fi
+ 
+-- 
+2.24.1
+
package/dillo/0004-Support-OpenSSL-1.1.0.patch new file +33 -0
new file mode 100644
index 0000000000..57518cf5c5
@@ -0,0 +1,33 @@
+From ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001
+From: Johannes Hofmann <[email protected]>
+Date: Thu, 9 Jan 2020 22:07:15 +0100
+Subject: [PATCH 4/4] Support OpenSSL 1.1.0
+
+taken-from: pkgsrc (Ryo ONODERA)
+submitted-by: Jun Ebihara <[email protected]>
+
+Upstream: https://hg.dillo.org/dillo/rev/b171b8610400
+Signed-off-by: Peter Seiderer <[email protected]>
+---
+ dpi/https.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dpi/https.c b/dpi/https.c
+index 766b3af..025cfc4 100644
+--- a/dpi/https.c
++++ b/dpi/https.c
+@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection)
+       case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
+          /*Either self signed and untrusted*/
+          /*Extract CN from certificate name information*/
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+          if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
++#else
++         if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
++#endif
+             strcpy(buf, "(no CN given)");
+          } else {
+             char *cn_end;
+-- 
+2.24.1
+
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/dillo: fix openssl support

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Add two patches to fix openssl support:
- 0003-Fix-openssl-detection.patch (suggested by Jonathan Kimmitt)
- 0004-Support-OpenSSL-1.1.0.patch (taken from upstream)

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard