2
0

Bump version

This commit is contained in:
Arti Zirk 2020-11-18 16:59:38 +02:00
parent 456c9a9657
commit 1e8db51470
3 changed files with 8 additions and 56 deletions

View File

@ -1,6 +1,6 @@
pkgbase = gnupg-scdaemon-shared-access pkgbase = gnupg-scdaemon-shared-access
pkgdesc = This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access pkgdesc = This package adds shared-access option that uses PCSC_SHARE_SHARED for pcsc_connect in scdaemon when using pcsc backend for smartcard access
pkgver = 2.2.23 pkgver = 2.2.24
pkgrel = 1 pkgrel = 1
url = https://www.gnupg.org/ url = https://www.gnupg.org/
install = install install = install
@ -25,26 +25,24 @@ pkgbase = gnupg-scdaemon-shared-access
optdepends = pcsclite: scdaemon optdepends = pcsclite: scdaemon
provides = gnupg provides = gnupg
provides = dirmngr provides = dirmngr
provides = gnupg=2.2.23 provides = gnupg=2.2.24
provides = gnupg2=2.2.23 provides = gnupg2=2.2.24
conflicts = gnupg conflicts = gnupg
conflicts = dirmngr conflicts = dirmngr
conflicts = gnupg2 conflicts = gnupg2
source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.23.tar.bz2 source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.24.tar.bz2
source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.23.tar.bz2.sig source = https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.24.tar.bz2.sig
source = drop-import-clean.patch source = drop-import-clean.patch
source = avoid-beta-warning.patch source = avoid-beta-warning.patch
source = do-not-rebuild-defsincdate.patch
source = scdaemon_shared-access.patch source = scdaemon_shared-access.patch
validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 validpgpkeys = D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959 validpgpkeys = 46CC730865BB5C78EBABADCF04376F3EE0856959
validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28 validpgpkeys = 5B80C5754298F0CB55D8ED6ABCEF7E294B092E28
validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA validpgpkeys = 6DAA6E64A76D2840571B4902528897B826403ADA
sha256sums = 10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c sha256sums = 9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46
sha256sums = SKIP sha256sums = SKIP
sha256sums = 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc sha256sums = 02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc
sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d sha256sums = 22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d
sha256sums = bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee
sha256sums = aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc sha256sums = aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc
pkgname = gnupg-scdaemon-shared-access pkgname = gnupg-scdaemon-shared-access

View File

@ -6,7 +6,7 @@
_pkgname=gnupg _pkgname=gnupg
pkgname=gnupg-scdaemon-shared-access pkgname=gnupg-scdaemon-shared-access
pkgver=2.2.23 pkgver=2.2.24
pkgrel=1 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' 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/' url='https://www.gnupg.org/'
@ -26,13 +26,11 @@ validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig} source=("https://gnupg.org/ftp/gcrypt/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"{,.sig}
'drop-import-clean.patch' 'drop-import-clean.patch'
'avoid-beta-warning.patch' 'avoid-beta-warning.patch'
'do-not-rebuild-defsincdate.patch'
"scdaemon_shared-access.patch") "scdaemon_shared-access.patch")
sha256sums=('10b55e49d78b3e49f1edb58d7541ecbdad92ddaeeb885b6f486ed23d1cd1da5c' sha256sums=('9090b400faae34f08469d78000cfec1cee5b9c553ce11347cc96ef16eab98c46'
'SKIP' 'SKIP'
'02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc' '02d375f0045f56f7dd82bacdb5ce559afd52ded8b75f6b2673c39ec666e81abc'
'22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d' '22fdf9490fad477f225e731c417867d9e7571ac654944e8be63a1fbaccd5c62d'
'bb4dcba0328af6271ccfe992a64d8daa9f0a691ba52978491647f1dea05675ee'
'aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc') 'aa46b372830dd8ed355a86a1677c50c6be8178f847c09b7291f47a1dc3ea02dc')
install=install install=install
@ -47,7 +45,6 @@ prepare() {
patch -p1 -i ../drop-import-clean.patch patch -p1 -i ../drop-import-clean.patch
# improve reproducibility # improve reproducibility
patch -p1 -i ../do-not-rebuild-defsincdate.patch
rm doc/gnupg.info* rm doc/gnupg.info*
./autogen.sh ./autogen.sh

View File

@ -1,43 +0,0 @@
From 3e8ff68502bf5de333db7213d9e27e0b9e8cc36e Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 29 Aug 2016 12:34:42 -0400
Subject: [PATCH 7/7] avoid regenerating defsincdate (use shipped file)
upstream ships doc/defsincdate in its tarballs. but doc/Makefile.am
tries to rewrite doc/defsincdate if it notices that any of the files
have been modified more recently, and it does so assuming that we're
running from a git repo.
However, we'd rather ship the documents cleanly without regenerating
defsincdate -- we don't have a git repo available (debian builds from
upstream tarballs) and any changes to the texinfo files (e.g. from
debian/patches/) might result in different dates on the files than we
expect after they're applied by dpkg or quilt or whatever, which makes
the datestamp unreproducible.
---
doc/Makefile.am | 7 -------
1 file changed, 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d47d83ede..c0a81b0b9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -177,15 +177,6 @@
dist-hook: defsincdate
-defsincdate: $(gnupg_TEXINFOS)
- : >defsincdate ; \
- if test -e $(top_srcdir)/.git; then \
- (cd $(srcdir) && git log -1 --format='%ct' \
- -- $(gnupg_TEXINFOS) 2>/dev/null) >>defsincdate; \
- elif test x"$SOURCE_DATE_EPOCH" != x; then \
- echo "$SOURCE_DATE_EPOCH" >>defsincdate ; \
- fi
-
defs.inc : defsincdate Makefile mkdefsinc
incd="`test -f defsincdate || echo '$(srcdir)/'`defsincdate"; \
./mkdefsinc -C $(srcdir) --date "`cat $$incd 2>/dev/null`" \
--
2.27.0