Tue Aug 18 09:39:23 2020 UTC ()
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.


(schmonz)
diff -r1.115 -r1.116 pkgsrc/security/gnupg2/Makefile
diff -r1.61 -r1.62 pkgsrc/security/gnupg2/distinfo
diff -r0 -r1.1 pkgsrc/security/gnupg2/patches/patch-common_sysutils.c
cvs diff -r1.115 -r1.116 pkgsrc/security/gnupg2/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnupg2/Makefile 2020/07/24 10:47:45 1.115
+++ pkgsrc/security/gnupg2/Makefile 2020/08/18 09:39:23 1.116
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.115 2020/07/24 10:47:45 adam Exp $ 1# $NetBSD: Makefile,v 1.116 2020/08/18 09:39:23 schmonz Exp $
2 2
3DISTNAME= gnupg-2.2.21 3DISTNAME= gnupg-2.2.21
4PKGNAME= ${DISTNAME:S/gnupg-/gnupg2-/} 4PKGNAME= ${DISTNAME:S/gnupg-/gnupg2-/}
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ 6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/
7MASTER_SITES+= http://mirrors.dotsrc.org/gcrypt/gnupg/ 7MASTER_SITES+= http://mirrors.dotsrc.org/gcrypt/gnupg/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= ada@netbsdfr.org 10MAINTAINER= ada@netbsdfr.org
11HOMEPAGE= https://www.gnupg.org/ 11HOMEPAGE= https://www.gnupg.org/
12COMMENT= GnuPG with OpenPGP and S/MIME capabilities 12COMMENT= GnuPG with OpenPGP and S/MIME capabilities
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
@@ -27,26 +27,27 @@ CONFIGURE_ARGS+= --disable-ntbtls @@ -27,26 +27,27 @@ CONFIGURE_ARGS+= --disable-ntbtls
27CONFIGURE_ARGS+= --enable-g13 27CONFIGURE_ARGS+= --enable-g13
28CONFIGURE_ARGS+= --enable-gpg-is-gpg2 28CONFIGURE_ARGS+= --enable-gpg-is-gpg2
29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
30CONFIGURE_ARGS+= --localstatedir=${VARBASE} 30CONFIGURE_ARGS+= --localstatedir=${VARBASE}
31# SunOS does have getaddrinfo() and the code knows how to use it 31# SunOS does have getaddrinfo() and the code knows how to use it
32CONFIGURE_ARGS.SunOS+= ac_cv_func_getaddrinfo=yes 32CONFIGURE_ARGS.SunOS+= ac_cv_func_getaddrinfo=yes
33 33
34TEST_TARGET= check 34TEST_TARGET= check
35 35
36LDFLAGS.NetBSD+= -lintl 36LDFLAGS.NetBSD+= -lintl
37LDFLAGS.Darwin+= -lintl -lresolv 37LDFLAGS.Darwin+= -lintl -lresolv
38LDFLAGS.FreeBSD+= -lintl 38LDFLAGS.FreeBSD+= -lintl
39LDFLAGS.SunOS+= -lintl -lsocket 39LDFLAGS.SunOS+= -lintl -lsocket
 40LDFLAGS.Linux+= -lrt
40 41
41.include "options.mk" 42.include "options.mk"
42 43
43BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.15 44BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.15
44.include "../../databases/sqlite3/buildlink3.mk" 45.include "../../databases/sqlite3/buildlink3.mk"
45.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
46BUILDLINK_API_DEPENDS.npth+= npth>=1.2 47BUILDLINK_API_DEPENDS.npth+= npth>=1.2
47.include "../../devel/npth/buildlink3.mk" 48.include "../../devel/npth/buildlink3.mk"
48.include "../../devel/readline/buildlink3.mk" 49.include "../../devel/readline/buildlink3.mk"
49BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.7 50BUILDLINK_API_DEPENDS.libgcrypt+= libgcrypt>=1.7
50.include "../../security/libgcrypt/buildlink3.mk" 51.include "../../security/libgcrypt/buildlink3.mk"
51BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.28 52BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.28
52.include "../../security/libgpg-error/buildlink3.mk" 53.include "../../security/libgpg-error/buildlink3.mk"
cvs diff -r1.61 -r1.62 pkgsrc/security/gnupg2/distinfo (expand / switch to unified diff)

--- pkgsrc/security/gnupg2/distinfo 2020/07/24 10:47:45 1.61
+++ pkgsrc/security/gnupg2/distinfo 2020/08/18 09:39:23 1.62
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.61 2020/07/24 10:47:45 adam Exp $ 1$NetBSD: distinfo,v 1.62 2020/08/18 09:39:23 schmonz Exp $
2 2
3SHA1 (gnupg-2.2.21.tar.bz2) = 4af4c6fe5f9dd7d866243f715b32775500468943 3SHA1 (gnupg-2.2.21.tar.bz2) = 4af4c6fe5f9dd7d866243f715b32775500468943
4RMD160 (gnupg-2.2.21.tar.bz2) = f76d952e0d7a18b9a3c4bad6ba077c85defbb8c2 4RMD160 (gnupg-2.2.21.tar.bz2) = f76d952e0d7a18b9a3c4bad6ba077c85defbb8c2
5SHA512 (gnupg-2.2.21.tar.bz2) = b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9 5SHA512 (gnupg-2.2.21.tar.bz2) = b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9
6Size (gnupg-2.2.21.tar.bz2) = 6813160 bytes 6Size (gnupg-2.2.21.tar.bz2) = 6813160 bytes
 7SHA1 (patch-common_sysutils.c) = 569c12e21172c1521284922244b2f4f361c945d6
File Added: pkgsrc/security/gnupg2/patches/patch-common_sysutils.c
$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>