summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorPavel Vinogradov2019-07-30 21:04:05 -0400
committerPavel Vinogradov2019-07-30 21:04:05 -0400
commitd815bffcda8054a4638a9553ab4ce455497ef4f2 (patch)
treeddd69f9871fa1c782e6ac75edcd10f7273d41e0b /doc
parent1f922ef5697bfa12f2c1af21a5eef18dfda53fb1 (diff)
doc/mupdf: version 1.16.0
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/mupdf/DETAILS8
-rw-r--r--doc/mupdf/HISTORY4
-rw-r--r--doc/mupdf/patches-1.15/pkcs7.patch29
-rw-r--r--doc/mupdf/patches-1.15/shared_libs.patch40
4 files changed, 8 insertions, 73 deletions
diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 7b2404bd9b..86049c8093 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
SPELL=mupdf
if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
- VERSION=1.16.0-rc1
- SOURCE_HASH=sha1:09631ec38b05ae68b62a1c733ddac6e28f6260e0:UPSTREAM_HASH
+ VERSION=1.16.0
+ SOURCE_HASH=sha1:540a58e11017b254a5966d8e23861800b3b1a28e:UPSTREAM_HASH
else
- VERSION=1.15.0
- SOURCE_HASH=sha1:dc5b40405b9a497e37370e26b2a8b115c944fe8a:UPSTREAM_HASH
+ VERSION=1.16.0
+ SOURCE_HASH=sha1:540a58e11017b254a5966d8e23861800b3b1a28e:UPSTREAM_HASH
fi
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.xz
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index f027dd6c25..70f9c2a6c9 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2019-07-30 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.16.0
+ * patches-1.15/{pkcs7.patch,shared_libs.patch}: removed
+
2019-07-24 Pavel Vinogradov <public@sourcemage.org>
* DETAILS: version 1.16.0-rc1 for rc branch
* patches-1.16/{pkcs7.patch,shared_libs.patch}: added, copy of
diff --git a/doc/mupdf/patches-1.15/pkcs7.patch b/doc/mupdf/patches-1.15/pkcs7.patch
deleted file mode 100644
index 342da086b2..0000000000
--- a/doc/mupdf/patches-1.15/pkcs7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c
---- a/source/helpers/pkcs7/pkcs7-openssl.c
-+++ b/source/helpers/pkcs7/pkcs7-openssl.c
-@@ -517,11 +517,12 @@
- {
- EVP_PKEY *pkey = NULL;
- X509 *x509 = NULL;
-+ STACK_OF(PKCS12_SAFEBAG) *bags;
- switch (M_PKCS12_bag_type(bag))
- {
- case NID_keyBag:
- {
-- const PKCS8_PRIV_KEY_INFO *p8 = PKCS12_SAFEBAG_get0_p8inf(bag);
-+ const PKCS8_PRIV_KEY_INFO *p8 = PKCS12_decrypt_skey(bag, pw, (int)strlen(pw));
- pkey = EVP_PKCS82PKEY(p8);
- }
- break;
-@@ -543,7 +544,10 @@
- break;
-
- case NID_safeContentsBag:
-- add_from_bags(pX509, pPkey, PKCS12_SAFEBAG_get0_safes(bag), pw);
-+ bags = sk_PKCS12_SAFEBAG_new_null();
-+ sk_PKCS12_SAFEBAG_push(bags, bag);
-+ add_from_bags(pX509, pPkey, bags, pw);
-+ sk_PKCS12_SAFEBAG_free(bags);
- break;
- }
-
diff --git a/doc/mupdf/patches-1.15/shared_libs.patch b/doc/mupdf/patches-1.15/shared_libs.patch
deleted file mode 100644
index 4905964bdd..0000000000
--- a/doc/mupdf/patches-1.15/shared_libs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -20,8 +20,8 @@
- # Do not specify CFLAGS or LIBS on the make invocation line - specify
- # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
- # set a variable that was set on the command line.
--CFLAGS += $(XCFLAGS) -Iinclude
--LIBS += $(XLIBS) -lm
-+CFLAGS += $(XCFLAGS) -Iinclude -fPIC
-+LIBS += $(XLIBS) $(THIRD_LIBS) -lm
-
- ifneq ($(threading),no)
- ifeq ($(HAVE_PTHREAD),yes)
-@@ -190,17 +190,20 @@
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
--THREAD_LIB = $(OUT)/libmupdf-threads.a
-+MUPDF_LIB = $(OUT)/libmupdf.so
-+THIRD_LIB = $(OUT)/libmupdf-third.so
-+THREAD_LIB = $(OUT)/libmupdf-threads.so
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB)
-+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined
- $(THIRD_LIB) : $(THIRD_OBJ)
-+ $(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined
- $(THREAD_LIB) : $(THREAD_OBJ)
-+ $(LINK_CMD) -pthread -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
--INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
-
- # --- Main tools and viewers ---
-