packages/gnupg2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup unused patch files

Browse Source 
Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
This commit is contained in:
yixiangzhike 2022-07-06 09:06:05 +08:00
parent 8acd3d21e0
commit 076a736f75
4 changed files with 4 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
common-Avoid-undefined-behavior-of-left-shift-operat.patch
View File

@ -1,52 +0,0 @@
From 8abf065307ff4a7ea873fe59f76173bf17dac241 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Thu, 16 Jul 2020 11:00:45 +0900
Subject: [PATCH] common: Avoid undefined behavior of left shift operator.
* common/iobuf.c (block_filter): Handle an error earlier.
Make sure it's unsigned.
--
GnuPG-bug-id: 4975
Suggested-by: lutianxiong <lutianxiong@huawei.com>
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
common/iobuf.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/common/iobuf.c b/common/iobuf.c
index 43f2e10..a00ee0b 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -909,16 +909,22 @@ block_filter (void *opaque, int control, iobuf_t chain, byte * buffer,
}
else if (c == 255)
{
- a->size = iobuf_get_noeof (chain) << 24;
- a->size |= iobuf_get_noeof (chain) << 16;
- a->size |= iobuf_get_noeof (chain) << 8;
- if ((c = iobuf_get (chain)) == -1)
+ size_t len = 0;
+ int i;
+
+ for (i = 0; i < 4; i++)
+ if ((c = iobuf_get (chain)) == -1)
+ break;
+ else
+ len = ((len << 8) | c);
+
+ if (i < 4)
{
log_error ("block_filter: invalid 4 byte length\n");
rc = GPG_ERR_BAD_DATA;
break;
}
- a->size |= c;
+ a->size = len;
a->partial = 2;
if (!a->size)
{
--
1.8.3.1

36
fix-a-memory-leak-in-g10.patch
View File

@ -1,36 +0,0 @@
From a861f9343d6e6d18064e4e54aeb914c5a10b2095 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 17 Apr 2019 09:58:07 +0900
Subject: [PATCH] g10: Fix a memory leak.
* g10/import.c (import): Care PNDING_PKT on error.
--
GnuPG-bug-id: 4461
Reported-by: Philippe Antoine
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
g10/import.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/g10/import.c b/g10/import.c
index 565086773..00bc47cc1 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -689,6 +689,13 @@ import (ctrl_t ctrl, IOBUF inp, const char* fname,struct import_stats_s *stats,
log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (rc));
release_kbnode (secattic);
+
+ /* When read_block loop was stopped by error, we have PENDING_PKT left. */
+ if (pending_pkt)
+ {
+ free_packet (pending_pkt, NULL);
+ xfree (pending_pkt);
+ }
return rc;
}
--
2.11.0

28
gnupg-2.2.23-insttools.patch
View File

@ -1,28 +0,0 @@
diff -up gnupg-2.2.23/tools/Makefile.am.insttools gnupg-2.2.23/tools/Makefile.am
--- gnupg-2.2.23/tools/Makefile.am.insttools 2020-08-13 11:01:57.000000000 +0200
+++ gnupg-2.2.23/tools/Makefile.am 2020-09-04 13:49:34.183246428 +0200
@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
sbin_SCRIPTS = addgnupghome applygnupgdefaults
if HAVE_USTAR
-# bin_SCRIPTS += gpg-zip
-noinst_SCRIPTS = gpg-zip
+bin_SCRIPTS = gpg-zip
+#noinst_SCRIPTS = gpg-zip
endif
if BUILD_WKS_TOOLS
diff -up gnupg-2.2.23/tools/Makefile.in.insttools gnupg-2.2.23/tools/Makefile.in
--- gnupg-2.2.23/tools/Makefile.in.insttools 2020-09-03 17:16:55.000000000 +0200
+++ gnupg-2.2.23/tools/Makefile.in 2020-09-04 13:49:34.183246428 +0200
@@ -618,8 +618,8 @@ libcommontlsnpth = ../common/libcommontl
AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS)
sbin_SCRIPTS = addgnupghome applygnupgdefaults
-# bin_SCRIPTS += gpg-zip
-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
+@HAVE_USTAR_TRUE@bin_PROGRAMS += gpg-zip
+#@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip
@BUILD_WKS_TOOLS_FALSE@gpg_wks_server =
@BUILD_WKS_TOOLS_TRUE@gpg_wks_server = gpg-wks-server
common_libs = $(libcommon)

5
gnupg2.spec
View File

@ -1,6 +1,6 @@
Name: gnupg2
Version: 2.3.6
Release: 1
Release: 2
Summary: Utility for secure communication and data storage
License: GPLv3+
@ -119,6 +119,9 @@ make check
%changelog
* Wed Jul 6 2022 yixiangzhike <yixiangzhike007@163.com> - 2.3.6-2
- cleanup unused patch files
* Mon Jun 27 2022 yixiangzhike <yixiangzhike007@163.com> - 2.3.6-1
- update to 2.3.6, need require new version libgpg-error(1.41) and libgcrypt(1.9.4)
- do not provide unused sks-keyserver CA certificate