mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00
Code Issues Releases Activity

- Add patch, which fixes X509 cert API detection for OpenSSL >= 1.1.x

Browse Source 
and LibreSSL
- Bump PORTREVISION

While I'm here, unset GSTREAMER option, it causes build failure

Obtained from:	Upstream repository
This commit is contained in:
Olivier Duchateau 2016-12-04 12:13:40 +00:00
parent f4c27a622a
commit bc9545394e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=427776
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/netsurf/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= netsurf
PORTVERSION= 3.6
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://download.netsurf-browser.org/netsurf/releases/source/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@ -50,7 +51,8 @@ SHEBANG_FILES= utils/split-messages.pl
perl_CMD= ${SETENV} perl
OPTIONS_DEFINE= GSTREAMER
GSTREAMER_USE= GSTREAMER=yes
OPTIONS_EXCLUDE= GSTREAMER
GSTREAMER_USE= GSTREAMER=yes, good
.include <bsd.port.pre.mk>

64
www/netsurf/files/patch-content_fetchers_curl.c Normal file
View File

@ -0,0 +1,64 @@
--- content/fetchers/curl.c.orig 2016-11-19 13:37:41 UTC
+++ content/fetchers/curl.c
@@ -128,6 +128,28 @@ static char fetch_error_buffer[CURL_ERRO
static char fetch_proxy_userpwd[100];
+/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed
+ * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way
+ */
+#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x1010000fL))
+static int ns_X509_up_ref(X509 *cert)
+{
+ cert->references++;
+ return 1;
+}
+
+static void ns_X509_free(X509 *cert)
+{
+ cert->references--;
+ if (cert->references == 0) {
+ X509_free(cert);
+ }
+}
+#else
+#define ns_X509_up_ref X509_up_ref
+#define ns_X509_free X509_free
+#endif
+
/**
* Initialise a cURL fetcher.
*/
@@ -438,7 +460,7 @@ fetch_curl_verify_callback(int verify_ok
*/
if (!fetch->cert_data[depth].cert) {
fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx);
- fetch->cert_data[depth].cert->references++;
+ ns_X509_up_ref(fetch->cert_data[depth].cert);
fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx);
}
@@ -815,10 +837,7 @@ static void fetch_curl_free(void *vf)
}
for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) {
- f->cert_data[i].cert->references--;
- if (f->cert_data[i].cert->references == 0) {
- X509_free(f->cert_data[i].cert);
- }
+ ns_X509_free(f->cert_data[i].cert);
}
free(f);
@@ -986,10 +1005,7 @@ curl_start_cert_validate(struct curl_fet
X509_get_pubkey(certs[depth].cert));
/* and clean up */
- certs[depth].cert->references--;
- if (certs[depth].cert->references == 0) {
- X509_free(certs[depth].cert);
- }
+ ns_X509_free(certs[depth].cert);
}
msg.type = FETCH_CERT_ERR;