Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 10:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix addsign check to skip PUBKEYS addition

Browse source
This commit is contained in:
law 2015-04-07 18:42:52 +03:00
parent de344f782a
commit fcde224967
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rpm-5.4.10-fix-addsign-check.patch Normal file
View file

@ -0,0 +1,20 @@
diff -ur rpm-5.4.10/build/pack.c rpm-5.4.10.new/build/pack.c
--- rpm-5.4.10/build/pack.c 2012-05-20 00:24:58.000000000 +0400
+++ rpm-5.4.10.new/build/pack.c 2015-04-07 17:54:36.410943594 +0300
@@ -649,7 +649,7 @@
char buf[BUFSIZ];
Header h;
Header sigh = NULL;
- int addsig = 0;
+ int addsig = (passPhrase && passPhrase[0]);
int isSource;
rpmRC rc = RPMRC_OK;
size_t nbr;
@@ -859,7 +859,6 @@
(void) rpmAddSignature(sigh, sigtarget, RPMSIGTAG_MD5, passPhrase);
sigtag = RPMSIGTAG_GPG;
- addsig = (passPhrase && passPhrase[0]);
if (addsig) {
rpmlog(RPMLOG_NOTICE, _("Generating signature: %d\n"), sigtag);

4
rpm.spec
View file

@ -492,6 +492,9 @@ Patch513: rpm-5.4.10-payload-no-hashed-inode.patch
# KDE5 support in find_lang
Patch514: rpm-5.4.10-find-lang-kde5.patch
# Fix addsign check to skip PUBKEYS addition (to ensure reproducibility)
Patch515: rpm-5.4.10-fix-addsign-check.patch
BuildRequires: autoconf >= 2.57
BuildRequires: bzip2-devel
BuildRequires: automake >= 1.8
@ -904,6 +907,7 @@ This package contains the RPM API documentation generated in HTML format.
%patch512 -p1 -b .hardlink-segfault-fix
%patch513 -p1 -b .payload-no-hashed-inode
%patch514 -p1 -b .kde5-find-lang
%patch515 -p1 -b .fix-addsign-check
#required by P55, P80, P81, P94..
./autogen.sh