mupdf: reinstate patch pieces that didn't want to be removed

This commit is contained in:
sthen 2022-11-08 12:46:25 +00:00
parent 47fafaa565
commit 1fff5d9f34
2 changed files with 26 additions and 0 deletions

View File

@ -2,6 +2,7 @@ COMMENT = graphic library, pdf parser, viewer and utilities
# bump and test textproc/zathura/plugins/mupdf if updating
V = 1.21.0
REVISION = 0
DISTNAME = mupdf-$V-source
PKGNAME = mupdf-${V:S/-rc/rc/}

View File

@ -0,0 +1,25 @@
- avoid (harmless) compiler warning about incompatible function pointer types
- add default_paths to STORE for checking signatures (aka /etc/ssl/cert.pem)
Index: source/helpers/pkcs7/pkcs7-openssl.c
--- source/helpers/pkcs7/pkcs7-openssl.c.orig
+++ source/helpers/pkcs7/pkcs7-openssl.c
@@ -203,7 +203,7 @@ static int stream_free(BIO *b)
return 1;
}
-static long stream_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
+static long stream_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
{
return 1;
}
@@ -513,6 +513,9 @@ check_certificate(fz_context *ctx, pdf_pkcs7_verifier
X509_STORE_add_cert(st, c);
}
}
+
+ /* Add default paths */
+ X509_STORE_set_default_paths(st);
res = pk7_verify_cert(st, pk7sig);