sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c7488116851dc7030bcd12504348bf70a7ca0558)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c7488116851dc7030bcd12504348bf70a7ca0558)
Date: Fri, 14 Apr 2023 21:26:35 +0000

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

doc/mupdf/DETAILS | 4 ++--
doc/mupdf/HISTORY | 4 ++++
doc/mupdf/patches-1.21/pkcs7.patch | 29 -----------------------------
doc/mupdf/patches-1.21/shared_libs.patch | 24 ------------------------
doc/mupdf/patches-1.22/pkcs7.patch | 29 +++++++++++++++++++++++++++++
doc/mupdf/patches-1.22/shared_libs.patch | 24 ++++++++++++++++++++++++
6 files changed, 59 insertions(+), 55 deletions(-)

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

doc/mupdf: version 1.22.0

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index ad12ab5..6024486 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,6 +1,6 @@
SPELL=mupdf
- VERSION=1.21.1
-
SOURCE_HASH=sha512:11eeea409e0b44d3f754a44b00b15522c2ae2d94171b8c7067efa7acbb1d597eefe1e27607fab90a56bf6c73579bbfb77b7599080fc2504a5881aaf7cc1957c7
+ VERSION=1.22.0
+
SOURCE_HASH=sha512:ba073b977306420343c969e6fec37cca4559031ad06cfdee2356edfdfa013ebe7654175aff931684fa48a935bf87f68537754b5e83f767517bc428ac07709a59
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.gz
SOURCE_URL=(http://mupdf.com/downloads/archive/$SOURCE)
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 176f41a..7acb8c8 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2023-04-14 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.22.0
+ * patches-1.21/* -> patches-1.22/*
+
2023-03-22 Pavel Vinogradov <public AT sourcemage.org>
* BUILD, INSTALL: build shared libraries only, added parallelism
* DEPENDS: libx11, libxext and GLUT are optional now
diff --git a/doc/mupdf/patches-1.21/pkcs7.patch
b/doc/mupdf/patches-1.21/pkcs7.patch
deleted file mode 100644
index 342da08..0000000
--- a/doc/mupdf/patches-1.21/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.21/shared_libs.patch
b/doc/mupdf/patches-1.21/shared_libs.patch
deleted file mode 100644
index cfac6dd..0000000
--- a/doc/mupdf/patches-1.21/shared_libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 557f28e..7edc4ae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -277,13 +277,15 @@ MUPDF_LIB_IMPORT = $(OUT)/libmupdf_$(SO).a
- LIBS_TO_INSTALL_IN_BIN = $(MUPDF_LIB)
- LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB_IMPORT)
- else
--LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB)
-+LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
$(PKCS7_LIB)
- endif
- ifneq ($(USE_SYSTEM_GLUT),yes)
--THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
-+THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.$(SO)
-+LIBS_TO_INSTALL_IN_LIB += $(THIRD_GLUT_LIB)
- endif
--THREAD_LIB = $(OUT)/libmupdf-threads.a
--PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-+THIRD_LIB = $(OUT)/libmupdf-third.$(SO)
-+THREAD_LIB = $(OUT)/libmupdf-threads.$(SO)
-+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.$(SO)
-
- $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
diff --git a/doc/mupdf/patches-1.22/pkcs7.patch
b/doc/mupdf/patches-1.22/pkcs7.patch
new file mode 100644
index 0000000..342da08
--- /dev/null
+++ b/doc/mupdf/patches-1.22/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.22/shared_libs.patch
b/doc/mupdf/patches-1.22/shared_libs.patch
new file mode 100644
index 0000000..cfac6dd
--- /dev/null
+++ b/doc/mupdf/patches-1.22/shared_libs.patch
@@ -0,0 +1,24 @@
+diff --git a/Makefile b/Makefile
+index 557f28e..7edc4ae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -277,13 +277,15 @@ MUPDF_LIB_IMPORT = $(OUT)/libmupdf_$(SO).a
+ LIBS_TO_INSTALL_IN_BIN = $(MUPDF_LIB)
+ LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB_IMPORT)
+ else
+-LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB)
++LIBS_TO_INSTALL_IN_LIB = $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
$(PKCS7_LIB)
+ endif
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+-THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
++THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.$(SO)
++LIBS_TO_INSTALL_IN_LIB += $(THIRD_GLUT_LIB)
+ endif
+-THREAD_LIB = $(OUT)/libmupdf-threads.a
+-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
++THIRD_LIB = $(OUT)/libmupdf-third.$(SO)
++THREAD_LIB = $(OUT)/libmupdf-threads.$(SO)
++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.$(SO)
+
+ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (c7488116851dc7030bcd12504348bf70a7ca0558), Pavel Vinogradov, 04/14/2023