diff --git a/security/doas/Makefile b/security/doas/Makefile index 8006f40e5e0b..7180fd0237fc 100644 --- a/security/doas/Makefile +++ b/security/doas/Makefile @@ -1,54 +1,54 @@ PORTNAME= doas -PORTVERSION= 6.3p10 +PORTVERSION= 6.3p12 CATEGORIES= security MAINTAINER= jsmith@resonatingmedia.com COMMENT= Simple sudo alternative to run commands as another user WWW= https://github.com/slicer69/doas/ LICENSE= BSD2CLAUSE ISCL LICENSE_COMB= multi LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE USES= cpe gmake CPE_VENDOR= doas_project CPE_VERSION= ${PORTVERSION:C/p.+//} CPE_UPDATE= ${PORTVERSION:C/[^p]*//} USE_GITHUB= yes GH_ACCOUNT= slicer69 MAKE_ENV+= TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"' BINMODE= 4755 SUB_FILES= pkg-message PLIST_FILES= bin/doas \ bin/doasedit \ bin/vidoas \ etc/doas.conf.sample \ share/man/man1/doas.1.gz \ share/man/man5/doas.conf.5.gz \ share/man/man8/doasedit.8.gz \ share/man/man8/vidoas.8.gz # These are upstream's default paths that are set for the GLOBAL_PATH variable # in doas.h since the 6.1 release. Those paths are then used for target user's # PATH variable instead of those of the original user. # # See also: # * https://github.com/slicer69/doas/blob/6.1/doas.h#L36 # * https://github.com/slicer69/doas/releases/tag/6.1 _GLOBAL_PATH?= ${LOCALBASE}/sbin:${LOCALBASE}/bin:/usr/sbin:/usr/bin:/sbin:/bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/vidoas.final ${STAGEDIR}${PREFIX}/bin/vidoas ${INSTALL_SCRIPT} ${WRKSRC}/doasedit ${STAGEDIR}${PREFIX}/bin/doasedit ${INSTALL_MAN} ${WRKSRC}/doas.1.final ${STAGEDIR}${PREFIX}/share/man/man1/doas.1 ${INSTALL_MAN} ${WRKSRC}/doas.conf.5.final ${STAGEDIR}${PREFIX}/share/man/man5/doas.conf.5 ${INSTALL_MAN} ${WRKSRC}/vidoas.8.final ${STAGEDIR}${PREFIX}/share/man/man8/vidoas.8 ${INSTALL_MAN} ${WRKSRC}/doasedit.8 ${STAGEDIR}${PREFIX}/share/man/man8/doasedit.8 ${INSTALL_DATA} ${WRKSRC}/doas.conf.sample ${STAGEDIR}${PREFIX}/etc/doas.conf.sample .include diff --git a/security/doas/distinfo b/security/doas/distinfo index b8bf4e6739d3..5a0be4612ac3 100644 --- a/security/doas/distinfo +++ b/security/doas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714579988 -SHA256 (slicer69-doas-6.3p10_GH0.tar.gz) = 60d01561936ba7737b30d836e6a5002ed4864676cc4982ee72c4463b8d1fae1c -SIZE (slicer69-doas-6.3p10_GH0.tar.gz) = 34291 +TIMESTAMP = 1715361640 +SHA256 (slicer69-doas-6.3p12_GH0.tar.gz) = e4f37745345c12d4e0c8c03c8237791729cf047dbd7b2455f8de60e2f82ac1b0 +SIZE (slicer69-doas-6.3p12_GH0.tar.gz) = 34396 diff --git a/security/doas/files/patch-doasedit b/security/doas/files/patch-doasedit index 61cad710e13e..53e910bf09c7 100644 --- a/security/doas/files/patch-doasedit +++ b/security/doas/files/patch-doasedit @@ -1,11 +1,11 @@ ---- doasedit.orig 2021-09-13 18:56:31 UTC +--- doasedit.orig 2024-05-10 17:16:18 UTC +++ doasedit @@ -30,7 +30,7 @@ then exit 3 fi -temp_file=$(mktemp --tmpdir doasedit.XXXXXXXX) +temp_file=$(mktemp -t /tmp) - if [ ! $? ] + if [ ! -r "$temp_file" ] then - echo "Could not create temporary file." + echo "Was unable to create temporary file."