Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 doc/mupdf/DETAILS                        |    4 +--
 doc/mupdf/HISTORY                        |    6 ++++
 doc/mupdf/patches-1.15/pkcs7.patch       |   29 ++++++++++++++++++++++
 doc/mupdf/patches-1.15/shared_libs.patch |   40 
+++++++++++++++++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)

New commits:
commit 8cc39e4a141e8cecd35c7876e6668777f0f0bf78
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    doc/mupdf: version 1.15.0-rc1 for rc branch

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 5e17839..970e14a 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,7 +1,7 @@
            SPELL=mupdf
 if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
-         VERSION=1.14.0
-     SOURCE_HASH=sha1:b682828373fb1ff9911de08a2b2af7178eb78dc1:UPSTREAM_HASH
+         VERSION=1.15.0-rc1
+     SOURCE_HASH=sha1:561fdfed2dee8eed11d61ce7643fc0df4d93f92d:UPSTREAM_HASH
 else
          VERSION=1.14.0
      SOURCE_HASH=sha1:b682828373fb1ff9911de08a2b2af7178eb78dc1:UPSTREAM_HASH
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 03ab1ea..8e200dc 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,9 @@
+2019-04-30 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.15.0-rc1 for rc branch
+       * patches-1.15/{pkcs7.patch,shared_libs.patch}: added, copy of
+         patches for 1.14.x
+
+shared_libs.patch
 2018-11-09 Pavel Vinogradov <public AT sourcemage.org>
        * BUILD, DEPENDS: made GLUT dependency optional, (cont'ed), removed
          glfw completely
diff --git a/doc/mupdf/patches-1.15/pkcs7.patch 
b/doc/mupdf/patches-1.15/pkcs7.patch
new file mode 100644
index 0000000..342da08
--- /dev/null
+++ b/doc/mupdf/patches-1.15/pkcs7.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..4905964
--- /dev/null
+++ b/doc/mupdf/patches-1.15/shared_libs.patch
@@ -0,0 +1,40 @@
+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 ---
+