opendoas: Build system, portability improvements.

[Sunil Nimmagadda <sunil%nimmagadda.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Sunil Nimmagadda <sunil%nimmagadda.net@localhost>
Pushed By:	skn
Date:		Fri Nov 13 10:56:56 2020 +0530
Changeset:	77606c03c15606a1fe07557c7ccdca4e4a473911

Modified Files:
	opendoas/Makefile
	opendoas/distinfo
Removed Files:
	opendoas/patches/patch-configure
	opendoas/patches/patch-doas.c

Log Message:
opendoas: Build system, portability improvements.

Remove CFLAGS.NetBSD, upstream defines it now.
Remove setresuid patches, upstream provides fallback mechanism.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=77606c03c15606a1fe07557c7ccdca4e4a473911

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 opendoas/Makefile                |  9 +++------
 opendoas/distinfo                | 10 ++++------
 opendoas/patches/patch-configure | 16 ----------------
 opendoas/patches/patch-doas.c    | 18 ------------------
 4 files changed, 7 insertions(+), 46 deletions(-)

diffs:
diff --git a/opendoas/Makefile b/opendoas/Makefile
index 0837e1c857..fc7dd4485c 100644
--- a/opendoas/Makefile
+++ b/opendoas/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	opendoas-6.6.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=duncaen/}
-GITHUB_TAG=	b1ae418af40289ea4f40449a819df26ee3bdd399
+GITHUB_TAG=	17629b9ce63dba6aa4146d483cd61448cddb1fa5
 
 MAINTAINER=	sunil%nimmagadda.net@localhost
 HOMEPAGE=	https://github.com/duncaen/opendoas
@@ -25,7 +25,7 @@ SUBST_SED.paths=	-e "s,/etc,${PKG_SYSCONFDIR},"
 SUBST_CLASSES+=		install
 SUBST_MESSAGE.install=	Let SPECIAL_PERMS handle permissions.
 SUBST_STAGE.install=	pre-install
-SUBST_FILES.install=	bsd.prog.mk
+SUBST_FILES.install=	GNUmakefile
 SUBST_SED.install=	-e "/chown/d"
 SUBST_SED.install+=	-e "/chmod/d"
 
@@ -35,10 +35,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 
 USE_TOOLS=	gmake yacc
-BUILD_TARGET=	default
-
-# Prefer NetBSD's libc version of reallocarray(3)
-CFLAGS.NetBSD+=	-D_OPENBSD_SOURCE=1
+MAKE_FILE=	GNUmakefile
 
 SPECIAL_PERMS+=	bin/doas ${SETUID_ROOT_PERMS}
 
diff --git a/opendoas/distinfo b/opendoas/distinfo
index fc1ba4dcfd..75d6b66244 100644
--- a/opendoas/distinfo
+++ b/opendoas/distinfo
@@ -1,8 +1,6 @@
 $NetBSD$
 
-SHA1 (opendoas-6.6.1-b1ae418af40289ea4f40449a819df26ee3bdd399.tar.gz) = 79ba73f3af80e0a8dc5b9ff46e019948f042395f
-RMD160 (opendoas-6.6.1-b1ae418af40289ea4f40449a819df26ee3bdd399.tar.gz) = 0c92d5883b4844737681bf65737c000045759512
-SHA512 (opendoas-6.6.1-b1ae418af40289ea4f40449a819df26ee3bdd399.tar.gz) = 4f08debea746498ffa9575dd7f3804c97fbbda504087761c4892429e126a23a8d7ff3dc843b8a4b6b0e8e5772cb5c98021d923e6c98923810bcbd4bd9bc74734
-Size (opendoas-6.6.1-b1ae418af40289ea4f40449a819df26ee3bdd399.tar.gz) = 30815 bytes
-SHA1 (patch-configure) = e144a8009b96a00da0320cffc477f36c32c1cfc1
-SHA1 (patch-doas.c) = de7bc8c1312cb186f44fe3f071a34e87dea0f478
+SHA1 (opendoas-6.6.1-17629b9ce63dba6aa4146d483cd61448cddb1fa5.tar.gz) = 153f481661215180e7cf043e2945491c67f4b183
+RMD160 (opendoas-6.6.1-17629b9ce63dba6aa4146d483cd61448cddb1fa5.tar.gz) = ee0cf9076220f748599678b49011f35fa390e7e6
+SHA512 (opendoas-6.6.1-17629b9ce63dba6aa4146d483cd61448cddb1fa5.tar.gz) = 2092a5aa3cfaa3af259a7f49e90c2337bfcccb5adc6a2710c56a81d8505ea83de0311edcf01b8bdf2ca6af5b188244a9d0c7a0034d06bfe7d28850b57396c357
+Size (opendoas-6.6.1-17629b9ce63dba6aa4146d483cd61448cddb1fa5.tar.gz) = 32344 bytes
diff --git a/opendoas/patches/patch-configure b/opendoas/patches/patch-configure
deleted file mode 100644
index 6b54398622..0000000000
--- a/opendoas/patches/patch-configure
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-setresuid isn't supported on NetBSD.
-
---- configure.orig	2020-11-01 11:52:06.488906380 +0000
-+++ configure
-@@ -340,7 +340,9 @@ int main(void) {
- 	setresuid(0, 0, 0);
- 	return 0;
- }'
-+if [ "$(uname)" != "NetBSD" ]; then
- check_func "setresuid" "$src" || die "system has no setresuid(2): not supported"
-+fi
- 
- #
- # Check for closefrom().
diff --git a/opendoas/patches/patch-doas.c b/opendoas/patches/patch-doas.c
deleted file mode 100644
index 5491eab669..0000000000
--- a/opendoas/patches/patch-doas.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-setresuid/setresguid are not supported on NetBSD.
-
---- doas.c.orig	2020-11-02 14:26:25.771778844 +0000
-+++ doas.c
-@@ -34,6 +34,11 @@
- #include "includes.h"
- #include "doas.h"
- 
-+#ifdef __netbsd__
-+#define setresgid(a, b, c)     setgid(a)
-+#define setresuid(a, b, c)     setuid(a)
-+#endif
-+
- static void __dead
- usage(void)
- {