From cb418ca64c8ac1177b2c47954bb5a72cb4b52dc9 Mon Sep 17 00:00:00 2001
From: tlaurion <insurgo@riseup.net>
Date: Wed, 19 Sep 2018 06:33:18 -0400
Subject: [PATCH] gpg2 library fixes

---
 modules/gpg2    | 4 ++--
 modules/libksba | 2 +-
 modules/npth    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gpg2 b/modules/gpg2
index 96fe3b03..ea3ca07e 100644
--- a/modules/gpg2
+++ b/modules/gpg2
@@ -44,7 +44,7 @@ gpg2_configure := ./configure \
 	--disable-wks-server \
 	--disable-wks-tools \
 	--disable-gnutls \
-	--disable-dirmgnr \
+	--disable-dirmngr \
 
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries
@@ -54,6 +54,6 @@ gpg2_target := $(MAKE_JOBS) \
 		DESTDIR="$(INSTALL)" \
 		install
 
-gpg2_output := g10/gpg
+gpg2_output := g10/gpg agent/gpg-agent scd/scdaemon
 
 gpg2_depends := libgpg-error libgcrypt libksba libassuan npth libusb-compat $(musl_dep)
diff --git a/modules/libksba b/modules/libksba
index fa427d33..d3529133 100644
--- a/modules/libksba
+++ b/modules/libksba
@@ -19,6 +19,6 @@ libksba_target := $(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
 	install \
 
-libksba_libraries := src/.libs/libksba.so
+libksba_libraries := src/.libs/libksba.so.8
 
 libksba_depends := libgpg-error $(musl_dep)
diff --git a/modules/npth b/modules/npth
index 4ba238a3..70708cc6 100644
--- a/modules/npth
+++ b/modules/npth
@@ -19,6 +19,6 @@ npth_target := $(MAKE_JOBS) \
 	$(CROSS_TOOLS) \
 	install \
 
-npth_libraries := src/.libs/libnpth.so
+npth_libraries := src/.libs/libnpth.so.0
 
 npth_depends := libgpg-error $(musl_dep)