Disable checking diglen in sign files

This commit is contained in:
eabdullin 2024-08-21 11:04:06 +03:00
parent cd65c04269
commit adae6877c5
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,25 @@
From d3602ba36bbedae57ef644819071edf698fc6c23 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Wed, 21 Aug 2024 11:02:32 +0300
Subject: [PATCH] Disable checking diglen in sign files
---
sign/rpmsignfiles.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.c
index b143c5b..34cda48 100644
--- a/sign/rpmsignfiles.c
+++ b/sign/rpmsignfiles.c
@@ -42,8 +42,6 @@ const char *key, char *keypass, uint32_t *siglenp)
/* some entries don't have a digest - we return an empty signature */
memset(zeros, 0, diglen);
- if (memcmp(zeros, fdigest, diglen) == 0)
- return strdup("");
/* prepare file signature */
memset(signature, 0, MAX_SIGNATURE_LENGTH);
--
2.39.3 (Apple Git-146)

View File

@ -48,7 +48,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist} Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}.alma.1
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2 Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2
%if %{with bdb} && %{with int_bdb} %if %{with bdb} && %{with int_bdb}
@ -130,6 +130,9 @@ Patch1000: rpm-4.16.1.3-hashtab-use-after-free-fix.patch
Patch1001: rpm-4.16.1.3-find_debuginfo_vendor_opts.patch Patch1001: rpm-4.16.1.3-find_debuginfo_vendor_opts.patch
Patch1002: 0001-Macroize-find-debuginfo-script-location.patch Patch1002: 0001-Macroize-find-debuginfo-script-location.patch
# AlmaLinux patches
Patch5001: 0001-Disable-checking-diglen-in-sign-files.patch
# Partially GPL/LGPL dual-licensed and some bits with BSD # Partially GPL/LGPL dual-licensed and some bits with BSD
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
License: GPLv2+ License: GPLv2+
@ -657,6 +660,9 @@ fi
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Wed Aug 21 2024 Eduard Abdullin <eabdullin@almalinux.org> - 4.16.1.3-29.alma.1
- Disable checking diglen in sign files
* Wed Dec 13 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-29 * Wed Dec 13 2023 Florian Festi <ffesti@redhat.com> - 4.16.1.3-29
- Actually add --verifydb to the man page (RHEL-14591) - Actually add --verifydb to the man page (RHEL-14591)
- Don't warn about missing user/group on skipped files (RHEL-18037) - Don't warn about missing user/group on skipped files (RHEL-18037)
@ -1217,4 +1223,3 @@ fi
* Thu Aug 10 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.90-0.git14000.1 * Thu Aug 10 2017 Panu Matilainen <pmatilai@redhat.com> - 4.13.90-0.git14000.1
- Rebase to rpm 4.13.90 aka 4.14.0-alpha (#1474836) - Rebase to rpm 4.13.90 aka 4.14.0-alpha (#1474836)