summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2017-01-09 04:01:32 +0000
committerschmonz <schmonz@pkgsrc.org>2017-01-09 04:01:32 +0000
commit31a6baeb53197f9973b8be1eb58d6f4f22bf762e (patch)
tree684f7496f9aa9e8834248731fdaaaa02e06eb3ad
parent349ae4ace59a529f81f11878669af850e3499233 (diff)
downloadpkgsrc-31a6baeb53197f9973b8be1eb58d6f4f22bf762e.tar.gz
Add checkpassword-suid option, off by default.
-rw-r--r--mk/defaults/options.description1
-rw-r--r--sysutils/checkpassword-pam/Makefile6
-rw-r--r--sysutils/checkpassword/Makefile4
-rw-r--r--sysutils/checkpassword/options.mk10
4 files changed, 19 insertions, 2 deletions
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 4d6e58431d0..dfd3d4b076f 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -83,6 +83,7 @@ cerf Enable libcerf support.
cg Add support for the Cg compiler.
cgi Enable CGI support.
chasen Use ChaSen as the Japanese Morphological Analzer.
+checkpassword-suid Install checkpassword executable setuid root.
cjk Enable Chinese/Japanese/Korean support.
clamav Enable ClamAV support.
clang-static-analyzer Install the clang static analyzer.
diff --git a/sysutils/checkpassword-pam/Makefile b/sysutils/checkpassword-pam/Makefile
index ccd4fbcb0f1..b8e5b2ea77e 100644
--- a/sysutils/checkpassword-pam/Makefile
+++ b/sysutils/checkpassword-pam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/01/09 04:01:32 schmonz Exp $
#
DISTNAME= checkpassword-pam-0.99
@@ -12,6 +12,10 @@ COMMENT= PAM checkpassword-compatible authentication program
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+CHECKPASSWORD_BIN= bin/checkpassword-pam
+
+.include "../../sysutils/checkpassword/options.mk"
+
INSTALLATION_DIRS= bin ${PKGMANDIR}/man8
.include "../../mk/pam.buildlink3.mk"
diff --git a/sysutils/checkpassword/Makefile b/sysutils/checkpassword/Makefile
index db96f62737c..17efc921477 100644
--- a/sysutils/checkpassword/Makefile
+++ b/sysutils/checkpassword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/10/09 14:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2017/01/09 04:01:32 schmonz Exp $
#
DISTNAME= checkpassword-0.90
@@ -11,6 +11,8 @@ COMMENT= Simple, uniform password-checking interface to all root applications
DJB_RESTRICTED= YES
+CHECKPASSWORD_BIN= bin/checkpassword
+
INSTALLATION_DIRS= bin
do-install:
diff --git a/sysutils/checkpassword/options.mk b/sysutils/checkpassword/options.mk
new file mode 100644
index 00000000000..17e321b6460
--- /dev/null
+++ b/sysutils/checkpassword/options.mk
@@ -0,0 +1,10 @@
+# $NetBSD: options.mk,v 1.1 2017/01/09 04:01:32 schmonz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.checkpassword
+PKG_SUPPORTED_OPTIONS+= checkpassword-suid
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mcheckpassword-suid)
+SPECIAL_PERMS+= ${CHECKPASSWORD_BIN} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 4755
+.endif