rpms/poppler
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS poppler-21.01.0-24.el9

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-03-30 10:54:07 -04:00
parent cd309eabcf
commit 2ed99bbf37
3 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
SOURCES/poppler-21.01.0-check-bitmap-in-combine.patch Normal file
View File

@ -0,0 +1,30 @@
From 1f151565bbca5be7449ba8eea6833051cc1baa41 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Mon, 31 Mar 2025 14:35:49 +0200
Subject: Move isOk check to inside JBIG2Bitmap::combine
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index cf9e0c98..4e81d4a8 100644
--- poppler-21.01.0/poppler/JBIG2Stream.cc
+++ poppler-21.01.0/poppler/JBIG2Stream.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Raj Kumar <rkumar@archive.org>
// Copyright (C) 2006 Paul Walmsley <paul@booyaka.com>
-// Copyright (C) 2006-2010, 2012, 2014-2020 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2010, 2012, 2014-2020, 2025 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2009 David Benjamin <davidben@mit.edu>
// Copyright (C) 2011 Edward Jiang <ejiang@google.com>
// Copyright (C) 2012 William Bader <williambader@hotmail.com>
@@ -766,6 +766,10 @@ void JBIG2Bitmap::combine(JBIG2Bitmap *b
unsigned int src0, src1, src, dest, s1, s2, m1, m2, m3;
bool oneByte;
+ if (unlikely(!isOk())) {
+ return;
+ }
+
// check for the pathological case where y = -2^31
if (y < -0x7fffffff) {
return;

19
SOURCES/poppler-21.01.0-fix-pdfsig-man-page.patch Normal file
View File

@ -0,0 +1,19 @@
From 56453310d4241a917a4d2ff27fa76c2878f87508 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 26 Mar 2021 13:10:19 +0100
Subject: utils: New paragraph for "-sign" in pdfsig.1
Create new paragraph for "-sign" option in pdfsig.1 man page.
diff --git a/utils/pdfsig.1 b/utils/pdfsig.1
index e1f974c8..cbb21882 100644
--- a/utils/pdfsig.1
+++ b/utils/pdfsig.1
@@ -39,6 +39,7 @@ Do not validate the certificate.
.TP
.B \-dump
Dump all signatures into current directory.
+.TP
.B \-sign " number"
Sign the document in the signature field with the given number.
.TP

21
SPECS/poppler.spec
View File

@ -3,7 +3,7 @@
Summary: PDF rendering library
Name: poppler
Version: 21.01.0
Release: 21%{?dist}
Release: 24%{?dist}
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
URL: http://poppler.freedesktop.org/
Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
@ -53,6 +53,13 @@ Patch13: poppler-21.01.0-copy-filename.patch
# https://issues.redhat.com/browse/RHEL-44333
Patch14: poppler-21.01.0-pdfinfo-dests.patch
# https://issues.redhat.com/browse/RHEL-131795
# https://issues.redhat.com/browse/RHEL-131792
Patch15: poppler-21.01.0-check-bitmap-in-combine.patch
# https://issues.redhat.com/browse/RHEL-126070
Patch16: poppler-21.01.0-fix-pdfsig-man-page.patch
BuildRequires: make
BuildRequires: cmake
BuildRequires: gcc-c++
@ -246,6 +253,18 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
%{_mandir}/man1/*
%changelog
* Mon Dec 22 2025 Marek Kasik <mkasik@redhat.com> - 21.01.0-24
- Fix pdfsig's man page
- Resolves: RHEL-126070
* Wed Dec 17 2025 Marek Kasik <mkasik@redhat.com> - 21.01.0-23
- Bump release for build inheritance
- Resolves: RHEL-131792
* Mon Dec 15 2025 Marek Kasik <mkasik@redhat.com> - 21.01.0-22
- Check bitmap in combine()
- Resolves: RHEL-131795, RHEL-131792
* Fri Jul 26 2024 Marek Kasik <mkasik@redhat.com> - 21.01.0-21
- Fix crash in broken documents when using -dests
- Resolves: RHEL-44333