opendoas: Track upstream tip.

Upstream merged a PR honoring --sysconfdir path for doas.conf.
Suggestions from Greg Troxel.

diff --git a/opendoas/Makefile b/opendoas/Makefile
index 3f3fba0e201c78a4f31f0a411a9ea48f34214343..1a388d0c4aeae9a95007bb07bad629b0d61642f5 100644 (file)
--- a/opendoas/Makefile
+++ b/opendoas/Makefile
@@ -4,7 +4,7 @@ DISTNAME=       OpenDoas-6.6.1
 PKGNAME=       ${DISTNAME:tl}
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=duncaen/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+GITHUB_TAG=    84ccfe0b9ac591199d0464ede10a4130c8a3482d
 
 MAINTAINER=    sunil@nimmagadda.net
 HOMEPAGE=      https://github.com/duncaen/opendoas
@@ -13,7 +13,7 @@ LICENSE=      isc
 
 CONFLICTS=     doas-[0-9]*
 
-WRKSRC=                ${WRKDIR}/OpenDoas-${PKGVERSION_NOREV}
+WRKSRC=                ${WRKDIR}/OpenDoas-${GITHUB_TAG}
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Fixing hardcoded paths.
@@ -30,7 +30,6 @@ USE_TOOLS=    gmake yacc
 BUILD_TARGET=  default
 
 CFLAGS+=       -D_OPENBSD_SOURCE=1
-CFLAGS+=       -DDOAS_CONF="\"${PKG_SYSCONFDIR}/doas.conf\""
 
 SPECIAL_PERMS+=        bin/doas ${SETUID_ROOT_PERMS}
 

diff --git a/opendoas/distinfo b/opendoas/distinfo
index a936b77b79b9f39ea59b6c477b7f035228ab6feb..be8787aa3adbf7ad9b6d514f835a3c185c69b7f3 100644 (file)
--- a/opendoas/distinfo
+++ b/opendoas/distinfo
@@ -1,10 +1,10 @@
 $NetBSD$
 
-SHA1 (OpenDoas-6.6.1.tar.gz) = 4509c04803c27e8c9940322e51dc4b9184360c4a
-RMD160 (OpenDoas-6.6.1.tar.gz) = b938edf57caf8cf90df3393f0c9c2cf0ee95e851
-SHA512 (OpenDoas-6.6.1.tar.gz) = 390e0e139a2641be22c4493c3ed755d9cb4091f4ab8d590123b7c8c4f2f116cea3b3500926ff191fb98d92192ca9e92118cbcbeb463a7833763e00c65603e678
-Size (OpenDoas-6.6.1.tar.gz) = 30783 bytes
+SHA1 (OpenDoas-6.6.1-84ccfe0b9ac591199d0464ede10a4130c8a3482d.tar.gz) = ca667704b05604c3d25e0e9416999182335dffc0
+RMD160 (OpenDoas-6.6.1-84ccfe0b9ac591199d0464ede10a4130c8a3482d.tar.gz) = e428e96df32d3d680dc755b80047e64098902476
+SHA512 (OpenDoas-6.6.1-84ccfe0b9ac591199d0464ede10a4130c8a3482d.tar.gz) = 34c3755bebf43c4142e35683e59b2fa12cf4fdc028f3350ed22b1dc95a86e293fa8a1c22a69d956949b4a4c38f080017cacc19bdb0abdf646809e57a057fb3ff
+Size (OpenDoas-6.6.1-84ccfe0b9ac591199d0464ede10a4130c8a3482d.tar.gz) = 30797 bytes
 SHA1 (patch-bsd.prog.mk) = 78db9daba2593e6481c1da29ad96bee4d87785b9
 SHA1 (patch-configure) = e144a8009b96a00da0320cffc477f36c32c1cfc1
-SHA1 (patch-doas.c) = 7c9ac462d1a370286d1299d5eaf666a34fef7ec4
+SHA1 (patch-doas.c) = de7bc8c1312cb186f44fe3f071a34e87dea0f478
 SHA1 (patch-pam.c) = 35df55b83d0071aba476d61dd80ec3e7081f5d4a

diff --git a/opendoas/patches/patch-doas.c b/opendoas/patches/patch-doas.c
index e159e9f2a7a34b4a5e3810a03ddde1cbe6e6ae05..5491eab669a3334454fc779b134c8b7af5ffb4a1 100644 (file)
--- a/opendoas/patches/patch-doas.c
+++ b/opendoas/patches/patch-doas.c
@@ -1,28 +1,18 @@
 $NetBSD$
 
 setresuid/setresguid are not supported on NetBSD.
-Do not hard code config file path.
 
---- doas.c.orig        2020-11-01 09:47:52.740280363 +0000
+--- 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)
++#define setresgid(a, b, c)     setgid(a)
++#define setresuid(a, b, c)     setuid(a)
 +#endif
 +
  static void __dead
  usage(void)
  {
-@@ -325,7 +330,7 @@ main(int argc, char **argv)
-       if (geteuid())
-               errx(1, "not installed setuid");
- 
--      parseconfig("/etc/doas.conf", 1);
-+      parseconfig(DOAS_CONF, 1);
- 
-       /* cmdline is used only for logging, no need to abort on truncate */
-       (void)strlcpy(cmdline, argv[0], sizeof(cmdline));