CVS commit: pkgsrc

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jan  9 04:01:32 UTC 2017

Modified Files:
        pkgsrc/mk/defaults: options.description
        pkgsrc/sysutils/checkpassword: Makefile
        pkgsrc/sysutils/checkpassword-pam: Makefile
Added Files:
        pkgsrc/sysutils/checkpassword: options.mk

Log Message:
Add checkpassword-suid option, off by default.


To generate a diff of this commit:
cvs rdiff -u -r1.519 -r1.520 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/checkpassword/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/checkpassword/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/checkpassword-pam/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.519 pkgsrc/mk/defaults/options.description:1.520
--- pkgsrc/mk/defaults/options.description:1.519        Tue Sep 13 16:07:14 2016
+++ pkgsrc/mk/defaults/options.description      Mon Jan  9 04:01:32 2017
@@ -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.

Index: pkgsrc/sysutils/checkpassword/Makefile
diff -u pkgsrc/sysutils/checkpassword/Makefile:1.16 pkgsrc/sysutils/checkpassword/Makefile:1.17
--- pkgsrc/sysutils/checkpassword/Makefile:1.16 Thu Oct  9 14:06:57 2014
+++ pkgsrc/sysutils/checkpassword/Makefile      Mon Jan  9 04:01:32 2017
@@ -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-check
 
 DJB_RESTRICTED=                YES
 
+CHECKPASSWORD_BIN=     bin/checkpassword
+
 INSTALLATION_DIRS=     bin
 
 do-install:

Index: pkgsrc/sysutils/checkpassword-pam/Makefile
diff -u pkgsrc/sysutils/checkpassword-pam/Makefile:1.8 pkgsrc/sysutils/checkpassword-pam/Makefile:1.9
--- pkgsrc/sysutils/checkpassword-pam/Makefile:1.8      Thu Oct  9 14:06:57 2014
+++ pkgsrc/sysutils/checkpassword-pam/Makefile  Mon Jan  9 04:01:32 2017
@@ -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 a
 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"

Added files:

Index: pkgsrc/sysutils/checkpassword/options.mk
diff -u /dev/null pkgsrc/sysutils/checkpassword/options.mk:1.1
--- /dev/null   Mon Jan  9 04:01:32 2017
+++ pkgsrc/sysutils/checkpassword/options.mk    Mon Jan  9 04:01:32 2017
@@ -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