Bump version and sync PKGBUILD with upstream

2 files changed, 3 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c2c60a2bb59d..3ad45b88b35b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=gnupg
 pkgname=gnupg-scdaemon-shared-access
-pkgver=2.2.19
+pkgver=2.2.20
 pkgrel=1
 pkgdesc='This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access'
 url='https://www.gnupg.org/'
@@ -26,7 +26,7 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
 source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig}
         "self-sigs-only.patch"
         "scdaemon_shared-access.patch")
-sha256sums=('242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0'
+sha256sums=('04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30'
             'SKIP'
             '0130c43321c16f53ab2290833007212f8a26b1b73bd4edc2b2b1c9db2b2d0218'
             'aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc')
@@ -39,7 +39,7 @@ provides=('gnupg' 'dirmngr' "gnupg=${pkgver}" "gnupg2=${pkgver}")
 prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
-        patch -R -p1 -i ../self-sigs-only.patch
+	patch -R -p1 -i ../self-sigs-only.patch
 	patch -p1 -t -N < "${srcdir}/scdaemon_shared-access.patch"
 }
 
diff --git a/install b/install
index 95cb351edc4d..1f19b99feb2d 100644
--- a/install
+++ b/install
@@ -26,16 +26,6 @@ post_install() {
 	_global_units enable
 }
 
-post_upgrade() {
-	if (( $(vercmp $2 2.1.13-1) < 0 )); then
-		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
-	fi
-
-	if (( $(vercmp $2 2.1.21-3) < 0 )); then
-		_global_units enable
-	fi
-}
-
 pre_remove() {
 	_global_units disable
 }