gnupg: update patch offsets

This commit is contained in:
Henrik Grimler 2021-12-27 23:29:37 +01:00
parent 1c44694187
commit ace360e2b6
4 changed files with 14 additions and 16 deletions

View File

@ -1,12 +1,11 @@
diff -u -r ../gnupg-2.1.6/agent/agent.h ./agent/agent.h
--- ../gnupg-2.1.6/agent/agent.h 2015-06-30 16:26:08.000000000 -0400
+++ ./agent/agent.h 2015-07-06 08:39:31.806515184 -0400
@@ -310,7 +310,7 @@
--- ./agent/agent.h.orig 2021-08-18 19:22:01.000000000 +0200
+++ ./agent/agent.h 2021-12-27 23:14:49.262199822 +0100
@@ -378,7 +378,7 @@
agent_Lunderscore (ctrl_t ctrl, const char *string) \
{ \
return ctrl? i18n_localegettext (ctrl->lc_messages, string) \
- /* */: gettext (string); \
+ /* */: string; \
}
#else
#define L_(a) (a)

View File

@ -1,7 +1,6 @@
diff -uNr gnupg-2.2.26/common/dotlock.c gnupg-2.2.26.mod/common/dotlock.c
--- gnupg-2.2.26/common/dotlock.c 2020-12-21 18:37:58.000000000 +0200
+++ gnupg-2.2.26.mod/common/dotlock.c 2021-01-07 14:46:45.154990185 +0200
@@ -620,6 +620,10 @@
--- ./common/dotlock.c.orig 2021-01-11 12:55:18.000000000 +0100
+++ ./common/dotlock.c 2021-12-27 23:14:49.318866495 +0100
@@ -622,6 +622,10 @@
static int
use_hardlinks_p (const char *tname)
{

View File

@ -1,7 +1,7 @@
diff -uNr gnupg-2.3.1/dirmngr/certcache.c gnupg-2.3.1.mod/dirmngr/certcache.c
--- gnupg-2.3.1/dirmngr/certcache.c 2021-03-15 08:50:31.000000000 +0000
+++ gnupg-2.3.1.mod/dirmngr/certcache.c 2021-05-04 16:09:43.499444329 +0000
@@ -674,11 +674,8 @@
--- ./dirmngr/certcache.c.orig 2021-10-06 10:35:51.000000000 +0200
+++ ./dirmngr/certcache.c 2021-12-27 23:14:49.432199839 +0100
@@ -690,11 +690,8 @@
#ifdef DEFAULT_TRUST_STORE_FILE
{ DEFAULT_TRUST_STORE_FILE }
#else

View File

@ -1,6 +1,6 @@
--- ./doc/mkdefsinc.c.orig 2021-09-01 10:39:31.217492425 +0200
+++ ./doc/mkdefsinc.c 2021-09-01 10:41:07.165492356 +0200
@@ -290,8 +290,8 @@
--- ./doc/mkdefsinc.c.orig 2017-03-17 09:34:37.000000000 +0100
+++ ./doc/mkdefsinc.c 2021-12-27 23:14:49.542199850 +0100
@@ -286,8 +286,8 @@
}
n = strlen (opt_date) + strlen (month) + 2 + 1;
p = xmalloc (n);