From 1fa806ec6150a20babf2319aecea1d016682a759 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.eu>
Date: Wed, 7 Sep 2016 22:28:11 +0200
Subject: [PATCH] opendoas: update to 6.0.

---
 srcpkgs/opendoas/files/doas.pam         |  3 +--
 srcpkgs/opendoas/patches/makefile.patch | 21 ---------------------
 srcpkgs/opendoas/template               |  6 +++---
 3 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/opendoas/patches/makefile.patch

diff --git a/srcpkgs/opendoas/files/doas.pam b/srcpkgs/opendoas/files/doas.pam
index 981704abd97..dfe4d5897bb 100644
--- a/srcpkgs/opendoas/files/doas.pam
+++ b/srcpkgs/opendoas/files/doas.pam
@@ -1,6 +1,5 @@
 #%PAM-1.0
-#auth            sufficient      pam_timestamp.so timestamp_timeout=300 verbose
-#session         optional        pam_timestamp.so timestamp_timeout=300
 auth            include         system-auth
 account         include         system-auth
 session         include         system-auth
+session         optional        pam_umask.so     usergroups umask=022
diff --git a/srcpkgs/opendoas/patches/makefile.patch b/srcpkgs/opendoas/patches/makefile.patch
deleted file mode 100644
index e145e99aa7e..00000000000
--- a/srcpkgs/opendoas/patches/makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git bsd.prog.mk bsd.prog.mk
-index 03dcfb8..93032d2 100644
---- bsd.prog.mk
-+++ bsd.prog.mk
-@@ -18,14 +18,14 @@ ${PROG}: ${OBJS} libopenbsd.a
- 
- install: ${PROG} ${PAM_DOAS} ${MAN}
- 	mkdir -p -m 0755 ${DESTDIR}${BINDIR}
--	[ -n "${PAM_DOAS}" ] && mkdir -p -m 0755 ${DESTDIR}${PAMDIR}
-+	[ -n "${PAM_DOAS}" ] && mkdir -p -m 0755 ${DESTDIR}${PAMDIR} || true
- 	mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man1
- 	mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man5
- 	cp -f ${PROG} ${DESTDIR}${BINDIR}
- 	chown ${BINOWN}:${BINGRP} ${DESTDIR}${BINDIR}/${PROG}
- 	chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG}
- 	[ -n "${PAM_DOAS}" ] && cp ${PAM_DOAS} ${DESTDIR}${PAMDIR}/doas || true
--	[ -n "${PAM_DOAS}" ] && chmod 0644 ${DESTDIR}${PAMDIR}/doas
-+	[ -n "${PAM_DOAS}" ] && chmod 0644 ${DESTDIR}${PAMDIR}/doas || true
- 	cp -f doas.1 ${DESTDIR}${MANDIR}/man1
- 	cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
- 
diff --git a/srcpkgs/opendoas/template b/srcpkgs/opendoas/template
index 2198bc78391..01954375076 100644
--- a/srcpkgs/opendoas/template
+++ b/srcpkgs/opendoas/template
@@ -1,6 +1,6 @@
 # Template file for 'opendoas'
 pkgname=opendoas
-version=0.3.2
+version=6.0
 revision=1
 wrksrc="OpenDoas-$version"
 build_style=configure
@@ -10,10 +10,10 @@ hostmakedepends="bison"
 makedepends="$(vopt_if 'pam' 'pam-devel')"
 short_desc="Portable OpenBSD doas to execute commands as another user"
 maintainer="Duncaen <duncaen@voidlinux.eu>"
-license="BSD"
+license="ISC, BSD"
 homepage="https://github.com/Duncaen/OpenDoas"
 distfiles="https://github.com/Duncaen/OpenDoas/archive/v${version}.tar.gz"
-checksum=2d985dbfae31e9c7b422f059d5914ff5bd5d38f2cce1962ad825ffbf0fbd291d
+checksum=59b5ce734591e0e5142f9cb27aaa56a4d5ce470d1f7ad85e9679cd91d2dd2058
 
 build_options="pam"
 build_options_default="pam"