public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/podofo] rawhide: Update to 1.1.2
@ 2026-09-18 19:49 Sandro Mani
  0 siblings, 0 replies; only message in thread
From: Sandro Mani @ 2026-09-18 19:49 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/podofo
Branch : rawhide
Commit : 83b93df247d0229e47cbafdcea39a19ae2623fc7
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-09-18T21:49:25+02:00
Stats  : +44/-112 in 9 file(s)
URL    : https://src.fedoraproject.org/rpms/podofo/c/83b93df247d0229e47cbafdcea39a19ae2623fc7?branch=rawhide

Log:
Update to 1.1.2

---
diff --git a/.gitignore b/.gitignore
index 02f6e5d..01ed57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ podofo-0.8.1.tar.gz
 /podofo-resources-e3b10e69f58be5d50d90935907058388ff56af7e.tar.gz
 /podofo-1.1.1.tar.gz
 /podofo-resources-1e0740f2183e01d6f8516399031f6dbccbe8cd0f.tar.gz
+/podofo-1.1.2.tar.gz
+/podofo-resources-f3e6e289db3cb7fe0a1a21e65430f221fe598882.tar.gz

diff --git a/5ba0d826d325e5864d6adf4dea951124cf835adf.patch b/5ba0d826d325e5864d6adf4dea951124cf835adf.patch
deleted file mode 100644
index 8eeb99f..0000000
--- a/5ba0d826d325e5864d6adf4dea951124cf835adf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN --no-dereference podofo-1.1.1/src/podofo/private/OpenSSLInternal.cpp podofo-1.1.1-new/src/podofo/private/OpenSSLInternal.cpp
---- podofo-1.1.1/src/podofo/private/OpenSSLInternal.cpp	2026-07-21 18:27:46.761242565 +0200
-+++ podofo-1.1.1-new/src/podofo/private/OpenSSLInternal.cpp	2026-07-21 18:27:46.764693313 +0200
-@@ -92,7 +92,8 @@ void ssl::AddSigningCertificateV2(CMS_Si
-     unsigned char* buf = nullptr;
-     MY_ESS_SIGNING_CERT_V2 certV2{ };
-     ASN1_OCTET_STRING hashstr{ };
--    ASN1_OCTET_STRING_set(&hashstr, (const unsigned char*)hash.data(), (int)hash.size());
-+    hashstr.data = (unsigned char*)hash.data();
-+    hashstr.length = (int)hash.size();
-     MY_ESS_CERT_ID_V2 certIdV2{ };
- 
-     certIdV2.hash_alg = x509Algor.get();

diff --git a/aff6aa3866623cdce9dbefaee439dfc17b2d817c.patch b/aff6aa3866623cdce9dbefaee439dfc17b2d817c.patch
deleted file mode 100644
index 523a15c..0000000
--- a/aff6aa3866623cdce9dbefaee439dfc17b2d817c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN --no-dereference podofo-1.1.1/src/podofo/private/OpenSSLInternal.cpp podofo-1.1.1-new/src/podofo/private/OpenSSLInternal.cpp
---- podofo-1.1.1/src/podofo/private/OpenSSLInternal.cpp	2026-06-09 00:17:13.000000000 +0200
-+++ podofo-1.1.1-new/src/podofo/private/OpenSSLInternal.cpp	2026-07-21 18:27:46.697742779 +0200
-@@ -165,6 +165,7 @@ void ssl::cmsAddSigningTime(CMS_SignerIn
-         ASN1_TIME_free(ans1time);
-         PODOFO_RAISE_ERROR_INFO(PdfErrorCode::OpenSSLError, "Error setting SigningTime");
-     }
-+    ASN1_TIME_free(ans1time);
- }
- 
- void ssl::DoSign(const bufferview& input, const bufferview& pkey,

diff --git a/c45b4b742274ad38011b7804df7f2340b544c29e.patch b/c45b4b742274ad38011b7804df7f2340b544c29e.patch
deleted file mode 100644
index 5c0c856..0000000
--- a/c45b4b742274ad38011b7804df7f2340b544c29e.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -rupN --no-dereference podofo-1.1.1/src/podofo/private/OpenSSLInternal_CmsDigest.cpp podofo-1.1.1-new/src/podofo/private/OpenSSLInternal_CmsDigest.cpp
---- podofo-1.1.1/src/podofo/private/OpenSSLInternal_CmsDigest.cpp	2026-06-09 00:17:13.000000000 +0200
-+++ podofo-1.1.1-new/src/podofo/private/OpenSSLInternal_CmsDigest.cpp	2026-07-21 18:27:46.831597189 +0200
-@@ -196,7 +196,9 @@ void encodePKCS1(X509_ALGOR* digestAlg,
-     MY_X509_SIG sig;
-     X509_ALGOR algor{ };
-     ASN1_TYPE parameter{ };
--    ASN1_OCTET_STRING digest{ };
-+    unique_ptr<ASN1_OCTET_STRING, decltype(&ASN1_OCTET_STRING_free)> digest(ASN1_OCTET_STRING_new(), ASN1_OCTET_STRING_free);
-+    if (digest == nullptr)
-+        PODOFO_RAISE_ERROR_INFO(PdfErrorCode::OpenSSLError, "Error ASN1_OCTET_STRING_new: Out of memory");
- 
-     sig.algor = digestAlg;
-     sig.algor = &algor;
-@@ -205,9 +207,8 @@ void encodePKCS1(X509_ALGOR* digestAlg,
-     parameter.value.ptr = NULL;
-     sig.algor->parameter = &parameter;
- 
--    sig.digest = &digest;
--    sig.digest->data = const_cast<unsigned char*>(hash);
--    sig.digest->length = hashLen;
-+    ASN1_OCTET_STRING_set(digest.get(), hash, (int)hashLen);
-+    sig.digest = digest.get();
- 
-     // This is the expansion of IMPLEMENT_ASN1_FUNCTIONS
-     // NOTE: buf must be a local null pointer otherwise
-diff -rupN --no-dereference podofo-1.1.1/src/podofo/private/OpenSSLInternal.cpp podofo-1.1.1-new/src/podofo/private/OpenSSLInternal.cpp
---- podofo-1.1.1/src/podofo/private/OpenSSLInternal.cpp	2026-07-21 18:27:46.827805987 +0200
-+++ podofo-1.1.1-new/src/podofo/private/OpenSSLInternal.cpp	2026-07-21 18:27:46.831358783 +0200
-@@ -4,6 +4,7 @@
- #include <podofo/private/PdfDeclarationsPrivate.h>
- #include "OpenSSLInternal.h"
- 
-+#include <openssl/rsa.h>
- #if OPENSSL_VERSION_MAJOR >= 3
- #include <openssl/provider.h>
- #endif // OPENSSL_VERSION_MAJOR >= 3
-@@ -91,13 +92,14 @@ void ssl::AddSigningCertificateV2(CMS_Si
- 
-     unsigned char* buf = nullptr;
-     MY_ESS_SIGNING_CERT_V2 certV2{ };
--    ASN1_OCTET_STRING hashstr{ };
--    hashstr.data = (unsigned char*)hash.data();
--    hashstr.length = (int)hash.size();
--    MY_ESS_CERT_ID_V2 certIdV2{ };
-+    unique_ptr<ASN1_OCTET_STRING, decltype(&ASN1_OCTET_STRING_free)> hashstr(ASN1_OCTET_STRING_new(), ASN1_OCTET_STRING_free);
-+    if (hashstr == nullptr)
-+        PODOFO_RAISE_ERROR_INFO(PdfErrorCode::OpenSSLError, "Error ASN1_OCTET_STRING_new: Out of memory");
-+    ASN1_OCTET_STRING_set(hashstr.get(), (const unsigned char*)hash.data(), (int)hash.size());
- 
-+    MY_ESS_CERT_ID_V2 certIdV2{ };
-     certIdV2.hash_alg = x509Algor.get();
--    certIdV2.hash = &hashstr;
-+    certIdV2.hash = hashstr.get();
-     certV2.cert_ids = sk_MY_ESS_CERT_ID_V2_new_null();
-     if (!sk_MY_ESS_CERT_ID_V2_push(certV2.cert_ids, &certIdV2))
-     {
-@@ -159,14 +161,12 @@ unsigned ssl::GetSignedHashSize(EVP_PKEY
- void ssl::cmsAddSigningTime(CMS_SignerInfo* si, const date::sys_seconds& timestamp)
- {
-     auto time = chrono::system_clock::to_time_t(timestamp);
--    auto ans1time = X509_time_adj(nullptr, 0, &time);
-+    unique_ptr<ASN1_TIME, decltype(&ASN1_TIME_free)> asn1time(X509_time_adj(nullptr, 0, &time), ASN1_TIME_free);
-     if (CMS_signed_add1_attr_by_NID(si, NID_pkcs9_signingTime,
--        ans1time->type, ans1time, -1) <= 0)
-+        ASN1_STRING_type(asn1time.get()), asn1time.get(), -1) <= 0)
-     {
--        ASN1_TIME_free(ans1time);
-         PODOFO_RAISE_ERROR_INFO(PdfErrorCode::OpenSSLError, "Error setting SigningTime");
-     }
--    ASN1_TIME_free(ans1time);
- }
- 
- void ssl::DoSign(const bufferview& input, const bufferview& pkey,

diff --git a/podofo.spec b/podofo.spec
index 9e65f31..a260693 100644
--- a/podofo.spec
+++ b/podofo.spec
@@ -5,11 +5,11 @@
 %endif
 
 #global pre rc1
-%global podofo_resources_commit 1e0740f2183e01d6f8516399031f6dbccbe8cd0f
+%global podofo_resources_commit f3e6e289db3cb7fe0a1a21e65430f221fe598882
 
 Name:           podofo
-Version:        1.1.1
-Release:        5%{?dist}
+Version:        1.1.2
+Release:        1%{?dist}
 Summary:        Tools and libraries to work with the PDF file format
 
 License:        (LGPL-2.0-or-later or MPL-2.0) and MIT and Apache-2.0 and BSD-3-Clause and BSL-1.0
@@ -20,11 +20,11 @@ Source1:        https://github.com/podofo/podofo-resources/archive/%{podofo_reso
 # Downstream patch for CVE-2019-20093
 # https://sourceforge.net/p/podofo/tickets/75/
 Patch1:         podofo_CVE-2019-20093.patch
-# Backport tentative support for openssl-4.x and dependent patches
-Patch2:         https://github.com/podofo/podofo/commit/aff6aa3866623cdce9dbefaee439dfc17b2d817c.patch
-Patch3:         https://github.com/podofo/podofo/commit/5ba0d826d325e5864d6adf4dea951124cf835adf.patch
-Patch4:         https://github.com/podofo/podofo/commit/c45b4b742274ad38011b7804df7f2340b544c29e.patch
-
+# Backport fmtlib commit "Fix fallback uint128 bitwise not"
+# https://github.com/fmtlib/fmt/commit/588b3a0f8f6a8bcf2a959cae882d5b2703e86737
+Patch2:         podofo_fmtlib.patch
+# Fix build (bcrypt library name case sensitivity)
+Patch3:         podofo_build.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
@@ -193,7 +193,7 @@ rm -rf %{buildroot}%{mingw64_datadir}
 %files
 %doc AUTHORS.md CHANGELOG.md README.md TODO.md
 %license COPYING.LGPL COPYING.MPL
-%{_libdir}/*.so.1.1.1
+%{_libdir}/*.so.1.1.2
 %{_libdir}/*.so.4
 
 %files devel
@@ -223,6 +223,9 @@ rm -rf %{buildroot}%{mingw64_datadir}
 
 
 %changelog
+* Fr Sep 18 2026 Sandro Mani <manisandro@gmail.com> - 1.1.2-1
+- Update to 1.1.2
+
 * Wed Sep 16 2026 Sandro Mani <manisandro@gmail.com> - 1.1.1-5
 - Rebuild (mingw-libxml2)
 

diff --git a/podofo_CVE-2019-20093.patch b/podofo_CVE-2019-20093.patch
index 0b04757..b540a37 100644
--- a/podofo_CVE-2019-20093.patch
+++ b/podofo_CVE-2019-20093.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference podofo-1.1.1/tools/podofoimgextract/ImageExtractor.cpp podofo-1.1.1-new/tools/podofoimgextract/ImageExtractor.cpp
---- podofo-1.1.1/tools/podofoimgextract/ImageExtractor.cpp	2026-06-09 00:17:13.000000000 +0200
-+++ podofo-1.1.1-new/tools/podofoimgextract/ImageExtractor.cpp	2026-07-21 18:27:46.629255500 +0200
+diff -rupN --no-dereference podofo-1.1.2/tools/podofoimgextract/ImageExtractor.cpp podofo-1.1.2-new/tools/podofoimgextract/ImageExtractor.cpp
+--- podofo-1.1.2/tools/podofoimgextract/ImageExtractor.cpp	2026-08-19 11:17:01.000000000 +0200
++++ podofo-1.1.2-new/tools/podofoimgextract/ImageExtractor.cpp	2026-09-18 19:25:18.340627442 +0200
 @@ -88,6 +88,11 @@ void ImageExtractor::ExtractImage(const
          //long lBitsPerComponent = pObject->GetDictionary().GetKey( PdfName("BitsPerComponent" ) )->GetNumber();
          // TODO: Handle colorspaces

diff --git a/podofo_build.patch b/podofo_build.patch
new file mode 100644
index 0000000..b61baa6
--- /dev/null
+++ b/podofo_build.patch
@@ -0,0 +1,12 @@
+diff -rupN --no-dereference podofo-1.1.2/CMakeLists.txt podofo-1.1.2-new/CMakeLists.txt
+--- podofo-1.1.2/CMakeLists.txt	2026-08-19 11:17:01.000000000 +0200
++++ podofo-1.1.2-new/CMakeLists.txt	2026-09-18 19:25:18.477600166 +0200
+@@ -125,7 +125,7 @@ endif()
+ if(WIN32)
+     # Core win32 libraries come with CMAKE_C(XX)_IMPLICIT_LINK_LIBRARIES
+     set(PODOFO_HAVE_WIN32GDI TRUE)
+-    list(APPEND PLATFORM_SYSTEM_LIBRARIES ws2_32 crypt32 Bcrypt)
++    list(APPEND PLATFORM_SYSTEM_LIBRARIES ws2_32 crypt32 bcrypt)
+ endif()
+ 
+ # Set minimum required standard C++17, but also enforce it

diff --git a/podofo_fmtlib.patch b/podofo_fmtlib.patch
new file mode 100644
index 0000000..f50fab7
--- /dev/null
+++ b/podofo_fmtlib.patch
@@ -0,0 +1,13 @@
+diff -rupN --no-dereference podofo-1.1.2/3rdparty/fmtlib/fmt/format.h podofo-1.1.2-new/3rdparty/fmtlib/fmt/format.h
+--- podofo-1.1.2/3rdparty/fmtlib/fmt/format.h	2026-08-19 11:17:01.000000000 +0200
++++ podofo-1.1.2-new/3rdparty/fmtlib/fmt/format.h	2026-09-18 19:25:18.408004670 +0200
+@@ -326,6 +326,9 @@ class uint128 {
+       -> uint128 {
+     return {lhs.hi_ & rhs.hi_, lhs.lo_ & rhs.lo_};
+   }
++  friend constexpr auto operator~(const uint128& n) -> uint128 {
++    return {~n.hi_, ~n.lo_};
++  }
+   friend FMT_CONSTEXPR auto operator+(const uint128& lhs, const uint128& rhs)
+       -> uint128 {
+     auto result = uint128(lhs);

diff --git a/sources b/sources
index f8b05f3..93394ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (podofo-1.1.1.tar.gz) = 429cce822d9b2a4158540d01c61ce7dd2e543413cd5b2d188a9b33d7aa063c138382568383b3bccda0d787495992d1cac10a6321b92a639661f60e241ac7c484
-SHA512 (podofo-resources-1e0740f2183e01d6f8516399031f6dbccbe8cd0f.tar.gz) = 3444e346bff9cd291072165e158378000ed06c3e60a108df741679f2a5ede883f858d292b215db70526659e3dadede2a683358db33e8496c1dc02bb5336ec86f
+SHA512 (podofo-1.1.2.tar.gz) = 7a9f61f786c9eed0673a65369a4a940cb24d4bb1e20a16d2023917571834f79332c19dae8f86cda5b2b7f3acb27540303774e9c36f23dc2d5ab0a1bff2f887a1
+SHA512 (podofo-resources-f3e6e289db3cb7fe0a1a21e65430f221fe598882.tar.gz) = 530967d3401cf7b8c5169c3f57ac240d56a459db12df9d383a1009399f6cfed864964ab6ab33912f88879316b9a2a0b0bc700e0c98b272f5577eac088bdd7123

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-18 19:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-18 19:49 [rpms/podofo] rawhide: Update to 1.1.2 Sandro Mani

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox