Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

Chronological Thread  
    < 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 (ac8ae8afffb342639a698b6549b1ed6890302ef1)
  • Date: Fri, 26 Jun 2026 13:17:12 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

doc/mupdf/DETAILS | 6 +-
doc/mupdf/HISTORY | 4 +
doc/mupdf/patches-1.27/pkcs7.patch | 29 -------------
doc/mupdf/patches-1.27/shared_libs.patch | 65
-------------------------------
doc/mupdf/patches-1.28/pkcs7.patch | 29 +++++++++++++
doc/mupdf/patches-1.28/shared_libs.patch | 65
+++++++++++++++++++++++++++++++
6 files changed, 101 insertions(+), 97 deletions(-)

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

doc/mupdf: version 1.28.0, SECURITY_PATCH++

diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index f0cd72d..8048bf4 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,7 +1,7 @@
SPELL=mupdf
- VERSION=1.27.2
-
SOURCE_HASH="sha256:553867b135303dc4c25ab67c5f234d8e900a0e36e66e8484d99adc05fe1e8737:UPSTREAM_HASH"
- SECURITY_PATCH=1
+ VERSION=1.28.0
+
SOURCE_HASH="sha256:21c7f064903154f1c3a7458bee81f130fc36f9b5147ea13328f9980e02d2dea2:UPSTREAM_HASH"
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION-source.tar.gz
SOURCE_URL=(https://mupdf.com/downloads/archive/$SOURCE)
# Watch: https://github.com/ArtifexSoftware/mupdf/tags/ tags/([0-9.]+)[.]tar
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index aac779a..2c4a679 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,7 @@
+2026-06-26 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.28.0, SECURITY_PATCH++
+ * patches-1.27/* -> patches-1.28/*
+
2026-02-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.27.2, switched to UPSTREAM_HASH

diff --git a/doc/mupdf/patches-1.27/pkcs7.patch
b/doc/mupdf/patches-1.27/pkcs7.patch
deleted file mode 100644
index 342da08..0000000
--- a/doc/mupdf/patches-1.27/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.27/shared_libs.patch
b/doc/mupdf/patches-1.27/shared_libs.patch
deleted file mode 100644
index a84ba6a..0000000
--- a/doc/mupdf/patches-1.27/shared_libs.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -341,6 +341,23 @@ 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
- ifneq ($(THIRD_OBJ),)
-@@ -349,7 +366,6 @@ else
- endif
- $(MUPDF_LIB) : $(MUPDF_OBJ)
- $(THIRD_LIB) : $(THIRD_OBJ)
--endif
-
- ifneq ($(USE_SYSTEM_GLUT),yes)
- THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
-@@ -361,6 +377,7 @@ $(THREAD_LIB) : $(THREAD_OBJ)
-
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-+endif
-
- # --- Main tools and viewers ---
-
-@@ -471,7 +488,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)
-@@ -490,6 +507,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)
diff --git a/doc/mupdf/patches-1.28/pkcs7.patch
b/doc/mupdf/patches-1.28/pkcs7.patch
new file mode 100644
index 0000000..342da08
--- /dev/null
+++ b/doc/mupdf/patches-1.28/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.28/shared_libs.patch
b/doc/mupdf/patches-1.28/shared_libs.patch
new file mode 100644
index 0000000..a84ba6a
--- /dev/null
+++ b/doc/mupdf/patches-1.28/shared_libs.patch
@@ -0,0 +1,65 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -341,6 +341,23 @@ 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
+ ifneq ($(THIRD_OBJ),)
+@@ -349,7 +366,6 @@ else
+ endif
+ $(MUPDF_LIB) : $(MUPDF_OBJ)
+ $(THIRD_LIB) : $(THIRD_OBJ)
+-endif
+
+ ifneq ($(USE_SYSTEM_GLUT),yes)
+ THIRD_GLUT_LIB = $(OUT)/libmupdf-glut.a
+@@ -361,6 +377,7 @@ $(THREAD_LIB) : $(THREAD_OBJ)
+
+ PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
++endif
+
+ # --- Main tools and viewers ---
+
+@@ -471,7 +488,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)
+@@ -490,6 +507,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 (ac8ae8afffb342639a698b6549b1ed6890302ef1), Pavel Vinogradov, 06/26/2026

Archive powered by MHonArc 2.6.24.

Top of Page