From 87a53f5ccd49a71e0c8dcd9a1fca7d0433c142b0 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Sat, 19 Dec 2020 20:48:29 -0500
Subject: [PATCH] removed make-gnupg2, deprecated

---
 helpers/make-gnupg2 | 106 --------------------------------------------
 1 file changed, 106 deletions(-)
 delete mode 100644 helpers/make-gnupg2

diff --git a/helpers/make-gnupg2 b/helpers/make-gnupg2
deleted file mode 100644
index 166b9b3..0000000
--- a/helpers/make-gnupg2
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-#
-#    Copyright (C) 2019  Ruben Rodriguez <ruben@trisquel.info>
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=2
-
-. ./config
-
-# This hack is needed for using multi-applet security keys in opengpg and PIV mode simultaneously
-# https://gpgtools.lighthouseapp.com/projects/66001/tickets/690-add-support-to-scdaemon-for-shared-access-mode
-patch -p1 << EOF
-# Add the option "shared-access" to scdaemon.
-# If set, pcsc_connect is called with PCSC_SHARE_SHARED instead of PCSC_SHARE_EXCLUSIVE.
-
-
---- a/scd/apdu.c	
-+++ b/scd/apdu.c
-@@ -793,7 +793,7 @@ connect_pcsc_card (int slot)
- 
-   err = pcsc_connect (reader_table[slot].pcsc.context,
-                       reader_table[slot].rdrname,
--                      PCSC_SHARE_EXCLUSIVE,
-+                      opt.shared_access ? PCSC_SHARE_SHARED : PCSC_SHARE_EXCLUSIVE,
-                       PCSC_PROTOCOL_T0|PCSC_PROTOCOL_T1,
-                       &reader_table[slot].pcsc.card,
-                       &reader_table[slot].pcsc.protocol);
---- a/scd/scdaemon.c	
-+++ b/scd/scdaemon.c
-@@ -99,6 +99,7 @@ enum cmd_and_opt_values
-   oDenyAdmin,
-   oDisableApplication,
-   oEnablePinpadVarlen,
-+  oSharedAccess,
-   oListenBacklog
- };
- 
-@@ -157,6 +158,8 @@ static ARGPARSE_OPTS opts[] = {
-                 N_("use variable length input for pinpad")),
-   ARGPARSE_s_s (oHomedir,    "homedir",      "@"),
- 
-+  ARGPARSE_s_n (oSharedAccess, "shared-access", N_("use PCSC_SHARE_SHARED for pcsc_connect")),
-+
-   ARGPARSE_end ()
- };
- 
-@@ -597,6 +598,8 @@ main (int argc, char **argv )
- 
-         case oEnablePinpadVarlen: opt.enable_pinpad_varlen = 1; break;
- 
-+        case oSharedAccess: opt.shared_access = 1; break;
-+
-         default:
-           pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
-           break;
-@@ -695,6 +695,7 @@ main (int argc, char **argv )
-       es_printf ("disable-pinpad:%lu:\n", GC_OPT_FLAG_NONE );
-       es_printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0);
-       es_printf ("enable-pinpad-varlen:%lu:\n", GC_OPT_FLAG_NONE );
-+      es_printf ("shared-access:%lu:\n", GC_OPT_FLAG_NONE );
- 
-       scd_exit (0);
-     }
---- a/scd/scdaemon.h	
-+++ b/scd/scdaemon.h
-@@ -62,6 +62,8 @@ struct
-   strlist_t disabled_applications;  /* Card applications we do not
-                                        want to use. */
-   unsigned long card_timeout; /* Disconnect after N seconds of inactivity.  */
-+
-+  int shared_access;
- } opt;
- 
- 
---- a/tools/gpgconf-comp.c
-+++ b/tools/gpgconf-comp.c        
-@@ -648,6 +648,9 @@ static gc_option_t gc_options_scdaemon[] =
-    { "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-      "gnupg", "|N|disconnect the card after N seconds of inactivity",
-      GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON },
-+   { "shared-access", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC,
-+     "gnupg", "use PCSC_SHARE_SHARED for pcsc_connect",
-+     GC_ARG_TYPE_NONE, GC_BACKEND_SCDAEMON },
- 
-    { "Debug",
-      GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED,
-EOF
-
-changelog "Add support to scdaemon for shared access mode"
-
-compile
-