From ed678f36b0bd9d632bcc2176cbe02d317503b5d4 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 14 Jul 2018 03:12:30 -0500
Subject: user/gnupg: pull in, take, bump, fix up, add -lang

---
 .../0001-Include-sys-select.h-for-FD_SETSIZE.patch | 31 +++++++++++++++
 user/gnupg/APKBUILD                                | 46 ++++++++++++++++++++++
 user/gnupg/fix-i18n.patch                          | 12 ++++++
 3 files changed, 89 insertions(+)
 create mode 100644 user/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch
 create mode 100644 user/gnupg/APKBUILD
 create mode 100644 user/gnupg/fix-i18n.patch

(limited to 'user')

diff --git a/user/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch b/user/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch
new file mode 100644
index 000000000..a835f3927
--- /dev/null
+++ b/user/gnupg/0001-Include-sys-select.h-for-FD_SETSIZE.patch
@@ -0,0 +1,31 @@
+From d2f3053e156a8dfc3e2e7f8fa814f671d851b26f Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 4 Jul 2014 08:15:21 +0000
+Subject: [PATCH] Include sys/select.h for FD_SETSIZE
+
+This fixes the following compile error with musl libc:
+watchgnupg.c:225:18: error: 'FD_SETSIZE' undeclared (first use in this
+function)
+   else if (fd >= FD_SETSIZE)
+                  ^
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ tools/watchgnupg.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
+index 4f4d54d..7aede22 100644
+--- a/tools/watchgnupg.c
++++ b/tools/watchgnupg.c
+@@ -28,6 +28,7 @@
+ #include <stdarg.h>
+ #include <assert.h>
+ #include <unistd.h>
++#include <sys/select.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <netinet/in.h>
+-- 
+2.0.1
+
diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD
new file mode 100644
index 000000000..622ee6358
--- /dev/null
+++ b/user/gnupg/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=gnupg
+pkgver=2.2.9
+pkgrel=0
+pkgdesc="GNU Privacy Guard 2 - PGP replacement"
+url="https://www.gnupg.org/"
+arch="all"
+license="GPL"
+depends="pinentry"
+makedepends="bzip2-dev gnutls-dev libassuan-dev libgcrypt-dev libgpg-error-dev
+	libksba-dev npth-dev openldap-dev sqlite-dev zlib-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
+	0001-Include-sys-select.h-for-FD_SETSIZE.patch
+	fix-i18n.patch"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--enable-nls \
+		--enable-bzip2 \
+		--enable-tofu
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="96faf227bef78fee99ff20606f3ce74eddc407c3864b928f8676a80f50dfaf2dd291eaeeaa0d291a254275a87e4f8506df9ed31c1cfc7652999208c292a16922  gnupg-2.2.9.tar.bz2
+c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7  0001-Include-sys-select.h-for-FD_SETSIZE.patch
+b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b  fix-i18n.patch"
diff --git a/user/gnupg/fix-i18n.patch b/user/gnupg/fix-i18n.patch
new file mode 100644
index 000000000..00d71dd5c
--- /dev/null
+++ b/user/gnupg/fix-i18n.patch
@@ -0,0 +1,12 @@
+--- gnupg-2.1.7/common/i18n.c.orig	2015-08-31 20:40:18.752742866 +0300
++++ gnupg-2.1.7/common/i18n.c	2015-08-31 20:40:41.806336224 +0300
+@@ -85,8 +85,8 @@
+   bindtextdomain (PACKAGE_GT, gnupg_localedir ());
+   textdomain (PACKAGE_GT);
+ #else
+-# ifdef ENABLE_NLS
+   setlocale (LC_ALL, "" );
++# ifdef ENABLE_NLS
+   bindtextdomain (PACKAGE_GT, LOCALEDIR);
+   textdomain (PACKAGE_GT);
+ # endif
-- 
cgit v1.2.3-60-g2f50