From d5bc81af43f17f2c1511ce94440ac3c488fb0459 Mon Sep 17 00:00:00 2001
From: Catena cyber <35799796+catenacyber@users.noreply.github.com>
Date: Thu, 26 Aug 2021 21:17:18 +0200
Subject: [PATCH] Fix gnupg patch (#6316)

* Fix gnupg patch

* Moved from xenial to focal
---
 projects/gnupg/Dockerfile     |  2 +-
 projects/gnupg/fuzzgnupg.diff | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/projects/gnupg/Dockerfile b/projects/gnupg/Dockerfile
index 5eeb6ff6d..5392d97b2 100644
--- a/projects/gnupg/Dockerfile
+++ b/projects/gnupg/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y make autoconf automake libtool gettext
 # Install automake 1.16.3 from future. See:
 # * https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=6ca540715139899137e1f86c7e1dcbd0288f15b3
 # * https://packages.ubuntu.com/en/hirsute/automake
-RUN sed -i -e 's/xenial/hirsute/g' /etc/apt/sources.list
+RUN sed -i -e 's/focal/hirsute/g' /etc/apt/sources.list
 RUN apt-get update && apt-get install -y --reinstall automake
 
 RUN git clone --depth 1 git://git.gnupg.org/libgpg-error.git libgpg-error
diff --git a/projects/gnupg/fuzzgnupg.diff b/projects/gnupg/fuzzgnupg.diff
index 0cab2e6cd..f736fae29 100644
--- a/projects/gnupg/fuzzgnupg.diff
+++ b/projects/gnupg/fuzzgnupg.diff
@@ -1,5 +1,5 @@
 diff --git a/configure.ac b/configure.ac
-index a3207dc9f..627c93285 100644
+index 7b398f3df..ee69b3063 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -991,6 +991,15 @@ if test x"$use_tofu" = xyes ; then
@@ -19,7 +19,7 @@ index a3207dc9f..627c93285 100644
  
  if test x"$use_tofu" = xyes ; then
 @@ -2149,6 +2158,7 @@ tests/migrations/Makefile
- tests/gpgsm/Makefile
+ tests/tpm2dtests/Makefile
  tests/gpgme/Makefile
  tests/pkits/Makefile
 +tests/fuzz/Makefile
@@ -176,15 +176,15 @@ index 8dd18b2e2..9f5db89f9 100644
  	      /* Note: check_signature only checks that the signature
  		 is good.  It does not fail if the key is revoked.  */
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 624334c63..fbace1381 100644
+index f29b68a53..e788c9916 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -24,7 +24,13 @@ else
  tpm2dtests =
  endif
  
--SUBDIRS = gpgscm openpgp migrations gpgsm gpgme pkits $(tpm2dtests) .
-+SUBDIRS = gpgscm openpgp migrations gpgsm gpgme pkits $(tpm2dtests)
+-SUBDIRS = gpgscm openpgp cms migrations gpgme pkits $(tpm2dtests) .
++SUBDIRS = gpgscm openpgp cms migrations gpgme pkits $(tpm2dtests)
 +
 +if MAINTAINER_MODE
 +SUBDIRS += fuzz