From ca3d8b05f00472e3f15ddfb2274ffc5b02e9170e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 29 2020 07:09:29 +0000
Subject: import rpm-4.11.3-45.el7


---

diff --git a/SOURCES/rpm-4.14.x-PGP-handle-no-EOL-at-EOF.patch b/SOURCES/rpm-4.14.x-PGP-handle-no-EOL-at-EOF.patch
new file mode 100644
index 0000000..d4bdb46
--- /dev/null
+++ b/SOURCES/rpm-4.14.x-PGP-handle-no-EOL-at-EOF.patch
@@ -0,0 +1,29 @@
+From 655c4c72a3467037abd51aab29f0300e97caf54c Mon Sep 17 00:00:00 2001
+From: Stepan Broz <sbroz@redhat.com>
+Date: Thu, 25 Jul 2019 11:00:47 +0200
+Subject: [PATCH] rpmpgp: Handle EOF without EOL better at END PGP
+
+---
+ rpmio/rpmpgp.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
+index 061751a4d..46cd0f31a 100644
+--- a/rpmio/rpmpgp.c
++++ b/rpmio/rpmpgp.c
+@@ -1289,9 +1289,10 @@ static pgpArmor decodePkts(uint8_t *b, uint8_t **pkt, size_t *pktlen)
+ 		goto exit;
+ 	    }
+ 	    t += (sizeof("-----")-1);
+-	    if (t >= te) continue;
++	    /* Handle EOF without EOL here, *t == '\0' at EOF */
++	    if (*t && (t >= te)) continue;
+ 	    /* XXX permitting \r here is not RFC-2440 compliant <shrug> */
+-	    if (!(*t == '\n' || *t == '\r')) continue;
++	    if (!(*t == '\n' || *t == '\r' || *t == '\0')) continue;
+ 
+ 	    crcdec = NULL;
+ 	    crclen = 0;
+-- 
+2.26.2
+
diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec
index 3018662..d49a2fc 100644
--- a/SPECS/rpm.spec
+++ b/SPECS/rpm.spec
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}43%{?dist}
+Release: %{?snapver:0.%{snapver}.}45%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2
@@ -104,6 +104,8 @@ Patch199: rpm-4.11.x-dependson.patch
 Patch200: rpm-4.11.x-filter-soname-deps.patch
 Patch201: rpm-4.11.x-do-not-filter-ld64.patch
 
+Patch202: rpm-4.14.x-PGP-handle-no-EOL-at-EOF.patch
+
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -392,6 +394,8 @@ Requires: rpm-libs%{_isa} = %{version}-%{release}
 %patch200 -p1 -b .filter-soname-deps
 %patch201 -p1 -b .dont-filter-ld64
 
+%patch202 -p1 -b .PGP-no-EOL
+
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
 %patch304 -p1 -b .ldflags
@@ -653,6 +657,12 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Tue Jun 02 2020 Michal Domonkos <mdomonko@redhat.com> - 4.11.3-45
+- Actually apply the previous patch
+
+* Wed May 27 2020 Michal Domonkos <mdomonko@redhat.com> - 4.11.3-44
+- Accept PGP public keys with missing EOL (#1840006)
+
 * Fri Oct 04 2019 Panu Matilainen <pmatilai@redhat.com> - 4.11.3-43
 - Fix packages getting removed on failed update via dnf (#1710691)