From fca71e01a1407901ff5130fb0a29a579776c92cd Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Tue, 18 Aug 2020 09:39:23 +0000
Subject: Provide a definition of IN_EXCL_UNLINK for Linux < 2.6.36, and link
 with -lrt. Fixes build on CentOS 6. Still builds on CentOS 7, Debian 9 and
 10, Devuan 3.

---
 security/gnupg2/Makefile                        |  3 ++-
 security/gnupg2/distinfo                        |  3 ++-
 security/gnupg2/patches/patch-common_sysutils.c | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 security/gnupg2/patches/patch-common_sysutils.c

(limited to 'security/gnupg2')

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index a2dd9523b6b..13e880cf29a 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2020/07/24 10:47:45 adam Exp $
+# $NetBSD: Makefile,v 1.116 2020/08/18 09:39:23 schmonz Exp $
 
 DISTNAME=	gnupg-2.2.21
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg2-/}
@@ -37,6 +37,7 @@ LDFLAGS.NetBSD+=	-lintl
 LDFLAGS.Darwin+=	-lintl -lresolv
 LDFLAGS.FreeBSD+=	-lintl
 LDFLAGS.SunOS+=		-lintl -lsocket
+LDFLAGS.Linux+=		-lrt
 
 .include "options.mk"
 
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 701ee2af09a..3d2153ef280 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.61 2020/07/24 10:47:45 adam Exp $
+$NetBSD: distinfo,v 1.62 2020/08/18 09:39:23 schmonz Exp $
 
 SHA1 (gnupg-2.2.21.tar.bz2) = 4af4c6fe5f9dd7d866243f715b32775500468943
 RMD160 (gnupg-2.2.21.tar.bz2) = f76d952e0d7a18b9a3c4bad6ba077c85defbb8c2
 SHA512 (gnupg-2.2.21.tar.bz2) = b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9
 Size (gnupg-2.2.21.tar.bz2) = 6813160 bytes
+SHA1 (patch-common_sysutils.c) = 569c12e21172c1521284922244b2f4f361c945d6
diff --git a/security/gnupg2/patches/patch-common_sysutils.c b/security/gnupg2/patches/patch-common_sysutils.c
new file mode 100644
index 00000000000..03b3aef4744
--- /dev/null
+++ b/security/gnupg2/patches/patch-common_sysutils.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-common_sysutils.c,v 1.1 2020/08/18 09:39:23 schmonz Exp $
+
+Provide a definition of IN_EXCL_UNLINK for Linux < 2.6.36.
+From https://github.com/gpg/gnupg/pull/2
+
+--- common/sysutils.c.orig	2018-10-22 17:26:18.000000000 +0000
++++ common/sysutils.c
+@@ -68,6 +68,9 @@
+ #endif
+ #ifdef HAVE_INOTIFY_INIT
+ # include <sys/inotify.h>
++# ifndef IN_EXCL_UNLINK
++#  define IN_EXCL_UNLINK 0x04000000
++# endif
+ #endif /*HAVE_INOTIFY_INIT*/
+ #ifdef HAVE_NPTH
+ # include <npth.h>
-- 
cgit v1.2.3