download.lst | 4 +-
external/poppler/disable-nss-and-gpgmepp.patch.1 | 36 ++++++++++++-----------
2 files changed, 21 insertions(+), 19 deletions(-)
New commits:
commit 00b2beb5427f53d90efcadefe50c1320c0501535
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Mar 25 20:59:08 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Sep 9 12:25:48 2024 +0200
poppler: upgrade to release 24.03.0
Change-Id: Icd063dcc9a034e88283ddf16be64091a32f3453f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165292
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173037
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/download.lst b/download.lst
index 8dcaf91dee65..95eb5b1dbedc 100644
--- a/download.lst
+++ b/download.lst
@@ -543,8 +543,8 @@ LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
-POPPLER_TARBALL := poppler-23.09.0.tar.xz
+POPPLER_SHA256SUM :=
bafbf0db5713dec25b5d16eb2cd87e4a62351cdc40f050c3937cd8dd6882d446
+POPPLER_TARBALL := poppler-24.03.0.tar.xz
POPPLER_DATA_SHA256SUM :=
c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
# three static lines
diff --git a/external/poppler/disable-nss-and-gpgmepp.patch.1
b/external/poppler/disable-nss-and-gpgmepp.patch.1
index 01b442f53a1c..1d7f7f933433 100644
--- a/external/poppler/disable-nss-and-gpgmepp.patch.1
+++ b/external/poppler/disable-nss-and-gpgmepp.patch.1
@@ -11,7 +11,7 @@ disable NSS/GPGMEPP dependent code.
#include "SignatureInfo.h"
#include "CertificateInfo.h"
#include "XRef.h"
-@@ -577,7 +577,7 @@
+@@ -578,7 +578,7 @@
{
return static_cast<FormFieldSignature
*>(field)->validateSignature(doVerifyCert, forceRevalidation, validationTime,
ocspRevocationCheck, enableAIA);
}
@@ -20,12 +20,12 @@ disable NSS/GPGMEPP dependent code.
// update hash with the specified range of data from the file
static bool hashFileRange(FILE *f, CryptoSign::SigningInterface *handler,
Goffset start, Goffset end)
{
-@@ -607,10 +607,12 @@
+@@ -608,10 +608,12 @@
delete[] buf;
return true;
}
+#endif
-
+
bool FormWidgetSignature::signDocument(const std::string &saveFilename, const
std::string &certNickname, const std::string &password, const GooString
*reason, const GooString *location, const std::optional<GooString>
&ownerPassword,
const std::optional<GooString>
&userPassword)
{
@@ -33,44 +33,46 @@ disable NSS/GPGMEPP dependent code.
auto backend = CryptoSign::Factory::createActive();
if (!backend) {
return false;
-@@ -698,6 +700,8 @@
+@@ -697,8 +699,8 @@
+ signatureField->setSignature(*signature);
+
fclose(file);
-
- return true;
+-
+- return true;
+#endif
+ return false;
}
-
- bool FormWidgetSignature::signDocumentWithAppearance(const std::string
&saveFilename, const std::string &certNickname, const std::string &password,
const GooString *reason, const GooString *location,
-@@ -2316,6 +2320,7 @@
-
+
+ static std::tuple<double, double> calculateDxDy(int rot, const PDFRectangle
*rect)
+@@ -2355,6 +2357,7 @@
+
void
FormFieldSignature::hashSignedDataBlock(CryptoSign::VerificationInterface
*handler, Goffset block_len)
{
+#if 0
if (!handler) {
return;
}
-@@ -2335,6 +2340,7 @@
+@@ -2374,6 +2377,7 @@
i += BLOCK_SIZE;
}
}
+#endif
}
-
+
FormSignatureType FormWidgetSignature::signatureType() const
-@@ -2349,6 +2355,7 @@
-
+@@ -2388,6 +2392,7 @@
+
SignatureInfo *FormFieldSignature::validateSignature(bool doVerifyCert, bool
forceRevalidation, time_t validationTime, bool ocspRevocationCheck, bool
enableAIA)
{
+#if 0
auto backend = CryptoSign::Factory::createActive();
if (!backend) {
return signature_info;
-@@ -2425,6 +2432,7 @@
+@@ -2464,6 +2469,7 @@
const CertificateValidationStatus cert_val_state =
signature_handler->validateCertificate(std::chrono::system_clock::from_time_t(validationTime),
ocspRevocationCheck, enableAIA);
signature_info->setCertificateValStatus(cert_val_state);
-
+
+#endif
return signature_info;
}
-
+
