Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (75755d039fb6c8086dbc7b4fdfec19786adc18a4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (75755d039fb6c8086dbc7b4fdfec19786adc18a4)
  • Date: Sun, 13 Jul 2025 21:48:06 +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.23/pkcs7.patch | 29 --------------
doc/mupdf/patches-1.23/shared_libs.patch | 24 -----------
doc/mupdf/patches-1.26/pkcs7.patch | 29 ++++++++++++++
doc/mupdf/patches-1.26/shared_libs.patch | 64
+++++++++++++++++++++++++++++++
6 files changed, 99 insertions(+), 55 deletions(-)

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

doc/mupdf: version 1.26.3

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index f32109e..c5951ea 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,6 +1,6 @@
SPELL=mupdf
- VERSION=1.25.6
-
SOURCE_HASH=sha512:74aa127f7d7e91c8a51c04e130d113e0fcf444a09a8e96420bd66847b20a4fb92fad9e95376f3a7d9a91b3391ef4b44e5fb6a0bee38476d4ecf9e5ae34d9ed74
+ VERSION=1.26.3
+
SOURCE_HASH=sha512:242b02e90e1e758cf8d6ffc34f6799011a1d599689cc2ae9330c14968769347e1e4201775258248e5cbb80fb7cffd690e938f73f202713752b5320ef8186c176
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.gz
SOURCE_URL=(https://mupdf.com/downloads/archive/$SOURCE)
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 2281c66..f23abad 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2025-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.26.3
+ * patches-1.23/* -> patches-1.26/*
+
2025-04-02 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.25.6

diff --git a/doc/mupdf/patches-1.23/pkcs7.patch
b/doc/mupdf/patches-1.23/pkcs7.patch
deleted file mode 100644
index 342da08..0000000
--- a/doc/mupdf/patches-1.23/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.23/shared_libs.patch
b/doc/mupdf/patches-1.23/shared_libs.patch
deleted file mode 100644
index cfac6dd..0000000
--- a/doc/mupdf/patches-1.23/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.26/pkcs7.patch
b/doc/mupdf/patches-1.26/pkcs7.patch
new file mode 100644
index 0000000..342da08
--- /dev/null
+++ b/doc/mupdf/patches-1.26/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.26/shared_libs.patch
b/doc/mupdf/patches-1.26/shared_libs.patch
new file mode 100644
index 0000000..ba8bc35
--- /dev/null
+++ b/doc/mupdf/patches-1.26/shared_libs.patch
@@ -0,0 +1,64 @@
+diff --git a/Makefile b/Makefile
+index 557f28e..7edc4ae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -310,12 +310,28 @@ ifeq ($(shared),yes)
+ $(SYMLINK_CMD) $(notdir $<) $@
+ endif
+ endif
++ THIRD_LIB = $(OUT)/libmupdf-third.$(SO)
++ $(THIRD_LIB) : $(THIRD_OBJ)
++ $(LINK_SO_CMD) $(THIRD_LIBS) $(LIBCRYPTO_LIBS) $(LIBS)
++
++ifneq ($(USE_SYSTEM_GLUT),yes)
++ THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.$(SO)
++ $(THIRD_GLUT_LIB) : $(THIRD_GLUT_OBJ)
++ $(LINK_SO_CMD) $(THIRD_GLUT_LIBS) $(LIBCRYPTO_LIBS) $(LIBS)
++endif
++
++THREAD_LIB = $(OUT)/libmupdf-threads.$(SO)
++$(THREAD_LIB) : $(THREAD_OBJ)
++ $(LINK_SO_CMD) $(THREAD_LIBS) $(LIBCRYPTO_LIBS) $(LIBS)
++
++PKCS7_LIB = $(OUT)/libmupdf-pkcs7.$(SO)
++$(PKCS7_LIB) : $(PKCS7_OBJ)
++ $(LINK_SO_CMD) $(PKCS7_LIBS) $(LIBCRYPTO_LIBS) $(LIBS)
+ else
+ MUPDF_LIB = $(OUT)/libmupdf.a
+ THIRD_LIB = $(OUT)/libmupdf-third.a
+ $(MUPDF_LIB) : $(MUPDF_OBJ)
+ $(THIRD_LIB) : $(THIRD_OBJ)
+-endif
+
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+ THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+@@ -327,6 +343,7 @@ $(THREAD_LIB) : $(THREAD_OBJ)
+
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
++endif
+
+ # --- Main tools and viewers ---
+
+@@ -451,7 +451,7 @@ SO_INSTALL_MODE ?= 644
+
+ third: $(THIRD_LIB)
+ extra-libs: $(THIRD_GLUT_LIB)
+-libs: $(MUPDF_LIB) $(THIRD_LIB) $(COMMERCIAL_LIBS)
++libs: $(MUPDF_LIB) $(THIRD_LIB) $(COMMERCIAL_LIBS) $(THREAD_LIB)
$(PKCS7_LIB)
+ commercial-libs: $(COMMERCIAL_LIBS)
+ tools: $(TOOL_APPS)
+ apps: $(TOOL_APPS) $(VIEW_APPS)
+@@ -470,6 +470,12 @@ install-libs: libs install-headers
+ install -d $(DESTDIR)$(libdir)
+ ifeq ($(shared),yes)
+ install -m $(SO_INSTALL_MODE) $(OUT)/libmupdf.$(SO)$(SO_VERSION)
$(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION)
++ install -m $(SO_INSTALL_MODE) $(THIRD_LIB) $(DESTDIR)$(libdir)
++ install -m $(SO_INSTALL_MODE) $(THREAD_LIB) $(DESTDIR)$(libdir)
++ install -m $(SO_INSTALL_MODE) $(PKCS7_LIB) $(DESTDIR)$(libdir)
++ ifneq ($(USE_SYSTEM_GLUT),yes)
++ install -m $(SO_INSTALL_MODE) $(THIRD_GLUT_LIB) $(DESTDIR)$(libdir)
++ endif
+ ifneq ($(OS),OpenBSD)
+ ln -sf libmupdf.$(SO)$(SO_VERSION)
$(DESTDIR)$(libdir)/libmupdf.$(SO)$(SO_VERSION_MAJOR)
+ ln -sf libmupdf.$(SO)$(SO_VERSION) $(DESTDIR)$(libdir)/libmupdf.$(SO)


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (75755d039fb6c8086dbc7b4fdfec19786adc18a4), Pavel Vinogradov, 07/13/2025

Archive powered by MHonArc 2.6.24.

Top of Page