security/pleaser: update to 0.4.1

Upstream provides no changelog, but NetBSD fixes have been merged.
Drop patch

4 files changed, 25 insertions, 128 deletions

diff --git a/security/pleaser/Makefile b/security/pleaser/Makefile
index 95953843071..ab2179aee22 100644
--- a/security/pleaser/Makefile
+++ b/security/pleaser/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2021/04/24 18:52:58 pin Exp $
+# $NetBSD: Makefile,v 1.10 2021/04/25 19:58:20 pin Exp $
 
-DISTNAME=	please-0.4.0
-PKGNAME=	pleaser-0.4.0
+DISTNAME=	please-0.4.1
+PKGNAME=	pleaser-0.4.1
 CATEGORIES=	security
 MASTER_SITES=	https://gitlab.com/edneville/please/-/archive/v${PKGVERSION_NOREV}/
 
@@ -12,7 +12,7 @@ LICENSE=	gnu-gpl-v3
 
 .include "cargo-depends.mk"
 
-WRKSRC=		${WRKDIR}/please-v0.4.0-d7209c091e843edcd3148ae77cd27608b316f244
+WRKSRC=		${WRKDIR}/please-v0.4.1-11a9aa87dd631fc981d2ee3c56a0ab956a0fd173
 USE_LANGUAGES+=	c	# rust, but needs a toolchain to link
 
 SUBST_CLASSES+=		prefix
diff --git a/security/pleaser/cargo-depends.mk b/security/pleaser/cargo-depends.mk
index 5341b6b449b..81906e91a3e 100644
--- a/security/pleaser/cargo-depends.mk
+++ b/security/pleaser/cargo-depends.mk
@@ -1,26 +1,20 @@
-# $NetBSD: cargo-depends.mk,v 1.5 2021/04/24 18:52:58 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.6 2021/04/25 19:58:20 pin Exp $
 
-CARGO_CRATE_DEPENDS+=	addr2line-0.14.1
-CARGO_CRATE_DEPENDS+=	adler-0.2.3
 CARGO_CRATE_DEPENDS+=	aho-corasick-0.7.15
 CARGO_CRATE_DEPENDS+=	autocfg-1.0.1
-CARGO_CRATE_DEPENDS+=	backtrace-0.3.56
 CARGO_CRATE_DEPENDS+=	bitflags-1.2.1
 CARGO_CRATE_DEPENDS+=	cc-1.0.67
 CARGO_CRATE_DEPENDS+=	cfg-if-1.0.0
 CARGO_CRATE_DEPENDS+=	chrono-0.4.19
-CARGO_CRATE_DEPENDS+=	error-chain-0.11.0
+CARGO_CRATE_DEPENDS+=	error-chain-0.12.4
 CARGO_CRATE_DEPENDS+=	getopts-0.2.21
 CARGO_CRATE_DEPENDS+=	getrandom-0.1.16
-CARGO_CRATE_DEPENDS+=	gimli-0.23.0
 CARGO_CRATE_DEPENDS+=	libc-0.2.86
 CARGO_CRATE_DEPENDS+=	log-0.4.14
 CARGO_CRATE_DEPENDS+=	memchr-2.3.4
-CARGO_CRATE_DEPENDS+=	miniz_oxide-0.4.3
 CARGO_CRATE_DEPENDS+=	nix-0.19.1
 CARGO_CRATE_DEPENDS+=	num-integer-0.1.44
 CARGO_CRATE_DEPENDS+=	num-traits-0.2.14
-CARGO_CRATE_DEPENDS+=	object-0.23.0
 CARGO_CRATE_DEPENDS+=	once_cell-1.6.0
 CARGO_CRATE_DEPENDS+=	pam-0.7.0
 CARGO_CRATE_DEPENDS+=	pam-sys-0.5.6
@@ -32,13 +26,13 @@ CARGO_CRATE_DEPENDS+=	rand_hc-0.2.0
 CARGO_CRATE_DEPENDS+=	regex-1.4.3
 CARGO_CRATE_DEPENDS+=	regex-syntax-0.6.22
 CARGO_CRATE_DEPENDS+=	rpassword-5.0.1
-CARGO_CRATE_DEPENDS+=	rustc-demangle-0.1.18
-CARGO_CRATE_DEPENDS+=	syslog-4.0.1
+CARGO_CRATE_DEPENDS+=	syslog-5.0.0
 CARGO_CRATE_DEPENDS+=	thread_local-1.1.3
 CARGO_CRATE_DEPENDS+=	time-0.1.44
 CARGO_CRATE_DEPENDS+=	unicode-width-0.1.8
 CARGO_CRATE_DEPENDS+=	users-0.8.1
 CARGO_CRATE_DEPENDS+=	users-0.10.0
+CARGO_CRATE_DEPENDS+=	version_check-0.9.3
 CARGO_CRATE_DEPENDS+=	wasi-0.9.0+wasi-snapshot-preview1
 CARGO_CRATE_DEPENDS+=	wasi-0.10.0+wasi-snapshot-preview1
 CARGO_CRATE_DEPENDS+=	winapi-0.3.9
diff --git a/security/pleaser/distinfo b/security/pleaser/distinfo
index 292410b74e6..156a794b00e 100644
--- a/security/pleaser/distinfo
+++ b/security/pleaser/distinfo
@@ -1,13 +1,5 @@
-$NetBSD: distinfo,v 1.10 2021/04/24 18:52:58 pin Exp $
+$NetBSD: distinfo,v 1.11 2021/04/25 19:58:20 pin Exp $
 
-SHA1 (addr2line-0.14.1.crate) = 5e02a34c470fcb872eee8ee11037f0dce619404a
-RMD160 (addr2line-0.14.1.crate) = a152b28f56c4bcf8fcbb9575764b2d85fe0d6256
-SHA512 (addr2line-0.14.1.crate) = f665deccae566ec2754cd43fc1d8fc05db11320af54d0561a612faad769234e8b3b8c0235f90f86027a4db9b7ef2915c86398005c949e2c096fac8e53f3f441e
-Size (addr2line-0.14.1.crate) = 31201 bytes
-SHA1 (adler-0.2.3.crate) = ae30cb68d1f00d7a099ad4edfd4092e16b3a2342
-RMD160 (adler-0.2.3.crate) = 61a93e93ee0eb717ccb04763b23e17c89bba51ca
-SHA512 (adler-0.2.3.crate) = 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
-Size (adler-0.2.3.crate) = 12168 bytes
 SHA1 (aho-corasick-0.7.15.crate) = f5054e1316a7f59bc37b647faa72a8e800fc17af
 RMD160 (aho-corasick-0.7.15.crate) = 003b3030dbd9c452279e3f01802edff67d4c14d5
 SHA512 (aho-corasick-0.7.15.crate) = e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
@@ -16,10 +8,6 @@ SHA1 (autocfg-1.0.1.crate) = 32909de2e5ae5ba6c1730cdf0e361213e7e86e2d
 RMD160 (autocfg-1.0.1.crate) = 8122557dfbad780c74329228c0fb9fc4ff46bd63
 SHA512 (autocfg-1.0.1.crate) = 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 Size (autocfg-1.0.1.crate) = 12908 bytes
-SHA1 (backtrace-0.3.56.crate) = 6a7106f16af763134bd843309c4c8a153277e113
-RMD160 (backtrace-0.3.56.crate) = 076e3405ce6a749b71c9f4b06ec4439c7b130110
-SHA512 (backtrace-0.3.56.crate) = 0baf075eb3a964f27306863c19a2961121b52758b58d12ec7dfb508fbae2f3136e8be21d2d9f63ca5b54d4e9db78d9cdbe65fa27b31c42b65c182ccd79a0d7e6
-Size (backtrace-0.3.56.crate) = 73377 bytes
 SHA1 (bitflags-1.2.1.crate) = b7d3a9b30a05e14231cb55271c6ffa45cc1279cd
 RMD160 (bitflags-1.2.1.crate) = 186b1893055eb415978ca547b0775aaa617a00fd
 SHA512 (bitflags-1.2.1.crate) = ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -36,10 +24,10 @@ SHA1 (chrono-0.4.19.crate) = 952546f575691ba821719c94611feaa8138ac259
 RMD160 (chrono-0.4.19.crate) = ce48628eec0eee11665e5cee7452da8c1ebec795
 SHA512 (chrono-0.4.19.crate) = a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 Size (chrono-0.4.19.crate) = 155663 bytes
-SHA1 (error-chain-0.11.0.crate) = c7c5493a4bae755b443463f2e28b21335db7b417
-RMD160 (error-chain-0.11.0.crate) = ab22c9a4adbe3934e93616db538c98ca22717ad7
-SHA512 (error-chain-0.11.0.crate) = a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
-Size (error-chain-0.11.0.crate) = 27207 bytes
+SHA1 (error-chain-0.12.4.crate) = 385bdfd26530db33ace0fffcf900d549df03fb37
+RMD160 (error-chain-0.12.4.crate) = 6ad30a99c78621d216de2cf3dd734a551da3d22e
+SHA512 (error-chain-0.12.4.crate) = c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
+Size (error-chain-0.12.4.crate) = 29274 bytes
 SHA1 (getopts-0.2.21.crate) = 9dd990ef7bee1b18b41f4e44d342b397134b0a38
 RMD160 (getopts-0.2.21.crate) = 9584128851c5564984b1603741961447d57436ec
 SHA512 (getopts-0.2.21.crate) = 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
@@ -48,10 +36,6 @@ SHA1 (getrandom-0.1.16.crate) = ef6ee6ddbc3b1f40c8202a934d8cafb50d2233dc
 RMD160 (getrandom-0.1.16.crate) = 531b3a9da432114e08beb70828f6291f32cdd3e1
 SHA512 (getrandom-0.1.16.crate) = c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 Size (getrandom-0.1.16.crate) = 25077 bytes
-SHA1 (gimli-0.23.0.crate) = 45fea182ce86e5c803f31a0f8ff917a23b211e7f
-RMD160 (gimli-0.23.0.crate) = b4d8bd59839440da29d2de0d7bb35b72100874ed
-SHA512 (gimli-0.23.0.crate) = b5dce7b563ce7b8dd6cfec5258793323d370f217779d0d57265bbbe2b1eb2704dbf0f25c189ae6e9079989b6ac7d5341e10fe49457577e482a3904c745c89b5a
-Size (gimli-0.23.0.crate) = 702175 bytes
 SHA1 (libc-0.2.86.crate) = 65cf6875812c96570d2c2c9f888bd5aa05a1082d
 RMD160 (libc-0.2.86.crate) = f3d74258800f32db91a0a53e97d9ba456b371f6e
 SHA512 (libc-0.2.86.crate) = b5a0c94b3717a620cb47b27d2f3bbfe04fce475c3e2feaab8bc4b14c8aaee190d47a61f0dabf26ed9e525e96e6aa611f4dd29b16e13b678898f88352d86c1b74
@@ -64,10 +48,6 @@ SHA1 (memchr-2.3.4.crate) = 4eb4ea3572d3246dc6719835ee8ba36aec83e782
 RMD160 (memchr-2.3.4.crate) = c72bdb98f3f929c4958776a0cccb8369d8c307c8
 SHA512 (memchr-2.3.4.crate) = 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
 Size (memchr-2.3.4.crate) = 23077 bytes
-SHA1 (miniz_oxide-0.4.3.crate) = f2eb5b235308bb36d619fcef155713e6cb254229
-RMD160 (miniz_oxide-0.4.3.crate) = 3a620eff42c59947c10cab7ebaab10a6a501c820
-SHA512 (miniz_oxide-0.4.3.crate) = 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
-Size (miniz_oxide-0.4.3.crate) = 50058 bytes
 SHA1 (nix-0.19.1.crate) = 6b280f446780baf2bd17938226d448254c5a5331
 RMD160 (nix-0.19.1.crate) = 2e10a390bb206f7aed107d95b3b5bc02b5c11594
 SHA512 (nix-0.19.1.crate) = 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
@@ -80,10 +60,6 @@ SHA1 (num-traits-0.2.14.crate) = 3d371b7b5aed56baba62fda8599dc959b5f7017a
 RMD160 (num-traits-0.2.14.crate) = 8da7275c05ff3c746f360f7dc78b7edb3682af68
 SHA512 (num-traits-0.2.14.crate) = c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 Size (num-traits-0.2.14.crate) = 45476 bytes
-SHA1 (object-0.23.0.crate) = cd917a9907728b27267f588ed93a98aec7f16af8
-RMD160 (object-0.23.0.crate) = f7921a8caf1f82631e759fb7f34d6d628ece868e
-SHA512 (object-0.23.0.crate) = 6352624a9071bef53e4b7209b3f8cd5168d54174962565d76f8eb9201dc84dc3b26f08c81ac954bc9d4c55032a022abb35d160817bb434ef27f76949290bc7ef
-Size (object-0.23.0.crate) = 203889 bytes
 SHA1 (once_cell-1.6.0.crate) = 2ff54ea38cb3a7d8a4d5018a5fee4a70f2e64573
 RMD160 (once_cell-1.6.0.crate) = b078f08a8c74a38ae7f222ef7303c516fbbc7317
 SHA512 (once_cell-1.6.0.crate) = 14b42a4d871491f6a1c4ee814719837a8a00e54da80bea6a2653e272d8c66da2a7b1f5e6195e20085d6af39e6e4b5aa739ee4749b6887fb1f233280689b2f59e
@@ -96,10 +72,10 @@ SHA1 (pam-sys-0.5.6.crate) = 026da526179fe07837aa221581426c817fb0d1cf
 RMD160 (pam-sys-0.5.6.crate) = c9ce1a53a6fff2c79da80d83acf068130494afbc
 SHA512 (pam-sys-0.5.6.crate) = f1aeb09fe4ed8a2a330d5a176c3f6a8b10c7fde6215f09212485b9170c3738686193b306c658d38373bff622522d58e319517613c2778db6e08c729cef8d5a07
 Size (pam-sys-0.5.6.crate) = 12738 bytes
-SHA1 (please-0.4.0.tar.gz) = d6fad3037939e2ae72a9f9ae3ed8507765002820
-RMD160 (please-0.4.0.tar.gz) = 0ba0b4ebc848851974260a0bb58a9a2ee4f4fc31
-SHA512 (please-0.4.0.tar.gz) = 5690a648d73fc6097e0d337fe93ee6b7300954ecbc890b2399a4f1a00db44c127c003d3903f311d6e81ed0fa2cc2fca07ae72189e21cb1f6a4bb3401a7eab68f
-Size (please-0.4.0.tar.gz) = 44837 bytes
+SHA1 (please-0.4.1.tar.gz) = e2e5523a8cdc236b137890bc620f1784d4bd3b29
+RMD160 (please-0.4.1.tar.gz) = 99e64d50603846ecc84c077f2c12c4c501c0a6e7
+SHA512 (please-0.4.1.tar.gz) = 63fabf0a648a17473e3aac83b34b0bad8c62f691ed2a337cf9628f48bd24fe5f78f36491770d273d5837c0c72c6c5ffe8f13923054a120df9c8ee4cc490011b2
+Size (please-0.4.1.tar.gz) = 44670 bytes
 SHA1 (ppv-lite86-0.2.10.crate) = 7a665cbfcc1d0a172d7d1d05a9596b7f3d6b83aa
 RMD160 (ppv-lite86-0.2.10.crate) = 01d542acbb34f9c86111d6be7a2195dd95011fe6
 SHA512 (ppv-lite86-0.2.10.crate) = c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
@@ -132,14 +108,10 @@ SHA1 (rpassword-5.0.1.crate) = d8a24164eb5371933fadb5961a677eedd0cbaa6e
 RMD160 (rpassword-5.0.1.crate) = 3a19028c9070b08ed5b0d95a597df018bed24417
 SHA512 (rpassword-5.0.1.crate) = bcd20c2920734a2f281b9ff924138605ea409d0bea9721ee96100f45eed14dffe65a8bdc8feed7c36d3564c8d902e78e0d2306b3736d03b8f195a9d212792feb
 Size (rpassword-5.0.1.crate) = 11109 bytes
-SHA1 (rustc-demangle-0.1.18.crate) = 7d338889663083f4c9dc4900429e7eea0f7f3324
-RMD160 (rustc-demangle-0.1.18.crate) = 48622371e8fa207adcd8fa5c3a8e04fdf5ec5e49
-SHA512 (rustc-demangle-0.1.18.crate) = 93ebaf7630c99b6c83712452aca26a42d9a173aad8ba7e85954f65e7867486519013aae1afb0006a0507fc3d6a4688df783ca091779bc0f316c5b8c4be95b793
-Size (rustc-demangle-0.1.18.crate) = 19913 bytes
-SHA1 (syslog-4.0.1.crate) = f5e156a3ebec77566844749da7cb476b333db9df
-RMD160 (syslog-4.0.1.crate) = 7fd1e9ffa5a4e3afe5feb7da8f5cf46ac5268559
-SHA512 (syslog-4.0.1.crate) = faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
-Size (syslog-4.0.1.crate) = 7131 bytes
+SHA1 (syslog-5.0.0.crate) = 3f6126af1bd6cb5fd6f0b339836a02617b63f5bf
+RMD160 (syslog-5.0.0.crate) = a165633101ab5b8489983ccc47e621892376420f
+SHA512 (syslog-5.0.0.crate) = f9af518b1f61ad1c3c82ade5ae1450b649fac4f3f992ae877ad07e63cd86ffe4cc97252e0323907985618aa3da95a049420c52c18b6fd8eb4473a3b52fd4737c
+Size (syslog-5.0.0.crate) = 9014 bytes
 SHA1 (thread_local-1.1.3.crate) = baf6445ca0eb4c8648956b600f7b6de5e2e87cdb
 RMD160 (thread_local-1.1.3.crate) = 03205ad411f85bcdbab880f44b55f286e3cb59d9
 SHA512 (thread_local-1.1.3.crate) = 89fe00c005b2bcbb77f2286475dc04f1400b3cd3bc165162f70c1a91f7fe98132f5d0a65e5f1bb36fd8c33617e6d548f3a68df7a2302ea3a177717c71fc112b6
@@ -160,6 +132,10 @@ SHA1 (users-0.8.1.crate) = 8c9b66290258f7131d045763500ad6740ba6fa5e
 RMD160 (users-0.8.1.crate) = 418dc4ea17232bc0a78ee04e081e993557bb7597
 SHA512 (users-0.8.1.crate) = 04de8d9943d9b929ddf060e08f7a019662a0ce9fb7423a8c09c81d52462bf86988f99c29f51d19ff2c72f53cc9d2179f3a57a68e544611427a1c016cf8a474b0
 Size (users-0.8.1.crate) = 18406 bytes
+SHA1 (version_check-0.9.3.crate) = 2977f079bc9add3eb4917480d8962a5cb82f670a
+RMD160 (version_check-0.9.3.crate) = 86f7ac2fb4d8bb621f9cec2d750fce5f7fb65847
+SHA512 (version_check-0.9.3.crate) = 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+Size (version_check-0.9.3.crate) = 12547 bytes
 SHA1 (wasi-0.10.0+wasi-snapshot-preview1.crate) = 1e619deea4a6d2aa1edbd450060d149b9f4f8d3a
 RMD160 (wasi-0.10.0+wasi-snapshot-preview1.crate) = 5f49eac8985ca1724c17c215ac5512a7421f7ac1
 SHA512 (wasi-0.10.0+wasi-snapshot-preview1.crate) = 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
@@ -180,4 +156,3 @@ SHA1 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = eadfdb146024d37b6887b5b9cb6a69
 RMD160 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 300417853d251d91cadb9650992a6aa98248619f
 SHA512 (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 Size (winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 bytes
-SHA1 (patch-src_util.rs) = cc673fdd46e168008526753f6bb6f46d644af51a
diff --git a/security/pleaser/patches/patch-src_util.rs b/security/pleaser/patches/patch-src_util.rs
deleted file mode 100644
index 97d4a5c10ea..00000000000
--- a/security/pleaser/patches/patch-src_util.rs
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-src_util.rs,v 1.1 2021/04/24 18:52:59 pin Exp $
-
-NetBSD fixes by Ed Neville
-
---- src/util.rs.orig	2021-04-24 10:42:56.777765681 +0000
-+++ src/util.rs
-@@ -839,6 +839,31 @@ pub fn get_editor() -> String {
-     editor.to_string()
- }
- 
-+/// handler.authenticate without the root privs part for linux
-+#[cfg(target_os = "linux")]
-+pub fn handler_shim<T: pam::Converse>(
-+    _ro: &RunOptions,
-+    handler: &mut Authenticator<T>,
-+) -> Result<(), pam::PamError> {
-+    handler.authenticate()
-+}
-+
-+/// handler.authenticate needs esc_privs on netbsd
-+#[cfg(not(target_os = "linux"))]
-+pub fn handler_shim<T: pam::Converse>(
-+    ro: &RunOptions,
-+    handler: &mut Authenticator<T>,
-+) -> Result<(), pam::PamError> {
-+    if !esc_privs() {
-+        std::process::exit(1);
-+    }
-+    let auth = handler.authenticate();
-+    if !drop_privs(&ro) {
-+        std::process::exit(1);
-+    }
-+    auth
-+}
-+
- /// read password of user via rpassword
- /// should pam require a password, and it is successful, then we set a token
- pub fn challenge_password(ro: &RunOptions, entry: EnvOptions, service: &str) -> bool {
-@@ -876,7 +901,7 @@ pub fn challenge_password(ro: &RunOption
-         let mut handler = Authenticator::with_handler(service, convo).expect("Cannot init PAM");
- 
-         loop {
--            let auth = handler.authenticate();
-+            let auth = handler_shim(&ro, &mut handler);
- 
-             if auth.is_ok() {
-                 if handler.get_handler().passwd.is_some() {
-@@ -1231,6 +1256,7 @@ pub fn create_token_dir() -> bool {
-     true
- }
- 
-+#[cfg(target_os = "linux")]
- pub fn boot_secs() -> libc::timespec {
-     let mut tp = libc::timespec {
-         tv_sec: 0 as i64,
-@@ -1240,6 +1266,16 @@ pub fn boot_secs() -> libc::timespec {
-     tp
- }
- 
-+#[cfg(not(target_os = "linux"))]
-+pub fn boot_secs() -> libc::timespec {
-+    let mut tp = libc::timespec {
-+        tv_sec: 0 as i64,
-+        tv_nsec: 0,
-+    };
-+    unsafe { libc::clock_gettime(libc::CLOCK_MONOTONIC, &mut tp) };
-+    tp
-+}
-+
- /// does the user have a valid token
- /// return false if time stamp is in the future
- /// return true if token was set within 600 seconds of wall and boot time