[PR PATCH] gnupg2-scdaemon: use versioned pcsclite library

[PR PATCH] gnupg2-scdaemon: use versioned pcsclite library

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is a new pull request by zdtcd against master on the void-packages repository

https://github.com/zdtcd/void-packages gnupg2-scdaemon-musl
https://github.com/void-linux/void-packages/pull/14809

gnupg2-scdaemon: use versioned pcsclite library
Fix: #14808

A patch file from https://github.com/void-linux/void-packages/pull/14809.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnupg2-scdaemon-musl-14809.patch --]
[-- Type: text/x-diff, Size: 1578 bytes --]

From 07b77130162b22774453f9912d6c4df05ef156c1 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Sun, 29 Sep 2019 12:32:46 +0700
Subject: [PATCH] gnupg2-scdaemon: use versioned pcsclite library

Fix: #14808
---
 srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch | 11 +++++++++++
 srcpkgs/gnupg2/template                             |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch

diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
new file mode 100644
index 00000000000..0f12e5f446f
--- /dev/null
+++ b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch
@@ -0,0 +1,11 @@
+--- scd/scdaemon.c.orig	2019-09-29 12:18:47.810111976 +0700
++++ scd/scdaemon.c	2019-09-29 12:20:38.079117234 +0700
+@@ -189,7 +189,7 @@
+ #define DEFAULT_PCSC_DRIVER "winscard.dll"
+ #elif defined(__APPLE__)
+ #define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
+-#elif defined(__GLIBC__)
++#elif defined(__linux__)
+ #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
+ #else
+ #define DEFAULT_PCSC_DRIVER "libpcsclite.so"
diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template
index 12ef73e7ed5..7b8037886bc 100644
--- a/srcpkgs/gnupg2/template
+++ b/srcpkgs/gnupg2/template
@@ -1,7 +1,7 @@
 # Template file for 'gnupg2'
 pkgname=gnupg2
 version=2.2.17
-revision=2
+revision=3
 wrksrc="gnupg-${version}"
 build_style=gnu-configure
 configure_args="--with-libgcrypt-prefix=${XBPS_CROSS_BASE}

Re: [PR PATCH] [Merged]: gnupg2-scdaemon: use versioned pcsclite library

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

There's a merged pull request on the void-packages repository

gnupg2-scdaemon: use versioned pcsclite library
https://github.com/void-linux/void-packages/pull/14809

Description:
Fix: #14808