From 9c06699720ab0e3d1227ff7d04eac7b15bb72304 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 26 Jun 2016 23:51:46 +0200 Subject: [PATCH] opendoas: update to 0.3.1. --- srcpkgs/opendoas/patches/makefile.patch | 21 +++++++++++++++++++++ srcpkgs/opendoas/template | 12 ++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/opendoas/patches/makefile.patch diff --git a/srcpkgs/opendoas/patches/makefile.patch b/srcpkgs/opendoas/patches/makefile.patch new file mode 100644 index 00000000000..e145e99aa7e --- /dev/null +++ b/srcpkgs/opendoas/patches/makefile.patch @@ -0,0 +1,21 @@ +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 25de48be1f1..700f9d85048 100644 --- a/srcpkgs/opendoas/template +++ b/srcpkgs/opendoas/template @@ -1,18 +1,22 @@ # Template file for 'opendoas' pkgname=opendoas -version=0.2 +version=0.3.1 revision=1 wrksrc="OpenDoas-$version" build_style=configure -conf_files="/etc/pam.d/doas" +configure_args="$(vopt_if 'pam' '' '--without-pam')" +conf_files="$(vopt_if 'pam' '/etc/pam.d/doas')" hostmakedepends="bison" -makedepends="pam-devel" +makedepends="$(vopt_if 'pam' 'pam-devel')" short_desc="Portable OpenBSD doas to execute commands as another user" maintainer="Duncaen " license="BSD" homepage="https://github.com/Duncaen/OpenDoas" distfiles="https://github.com/Duncaen/OpenDoas/archive/v${version}.tar.gz" -checksum=67ed58ba9e5f7cf838945d0601fc468a2bd03e2993269dd65f575fc2975ee259 +checksum=4473210c91b2bbcc711a05d99fd547420abb55858cf8dca84a6c9089c8787acc + +build_options="pam" +build_options_default="pam" pre_configure() { cp ${FILESDIR}/doas.pam pam.d__doas__linux