svn commit: r305723 - head/security/sudo
Wesley Shields
wxs at FreeBSD.org
Thu Oct 11 13:36:48 UTC 2012
Author: wxs
Date: Thu Oct 11 13:36:47 2012
New Revision: 305723
URL: http://svn.freebsd.org/changeset/ports/305723
Log:
If OPIE option is on we can not pass --with-pam in CONFIGURE_ARGS. Make it
so that OPIE will pass --with-opie and if it is off we pass --with-pam. [1]
No functional changes with this, just a build fix.
While here use tabs where appropriate and cleanup pkg-descr. [2]
Feature safe: yes
Modified:
head/security/sudo/Makefile
head/security/sudo/pkg-descr (contents, props changed)
Modified: head/security/sudo/Makefile
==============================================================================
--- head/security/sudo/Makefile Thu Oct 11 13:35:55 2012 (r305722)
+++ head/security/sudo/Makefile Thu Oct 11 13:36:47 2012 (r305723)
@@ -29,8 +29,7 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/e
--with-tty-tickets \
--with-env-editor \
--with-logincap \
- --with-long-otp-prompt \
- --with-pam
+ --with-long-otp-prompt
OPTIONS_DEFINE= LDAP INSULTS DISABLE_ROOT_SUDO DISABLE_AUTH NOARGS_SHELL \
AUDIT OPIE NLS
@@ -41,7 +40,7 @@ DISABLE_ROOT_SUDO_DESC= Do not allow roo
DISABLE_AUTH_DESC= Do not require authentication by default
NOARGS_SHELL_DESC= Run a shell if no arguments are given
AUDIT_DESC= Enable BSM audit support
-OPIE_DESC= Enable one-time passwords
+OPIE_DESC= Enable one-time passwords (no PAM support)
LOGFAC?= local2
CONFIGURE_ARGS+= --with-logfac=${LOGFAC}
@@ -86,19 +85,21 @@ CONFIGURE_ARGS+=--disable-root-sudo
.endif
.if ${PORT_OPTIONS:MDISABLE_AUTH}
-CONFIGURE_ARGS+=--disable-authentication
+CONFIGURE_ARGS+= --disable-authentication
.endif
.if ${PORT_OPTIONS:MNOARGS_SHELL}
-CONFIGURE_ARGS+=--enable-noargs-shell
+CONFIGURE_ARGS+= --enable-noargs-shell
.endif
.if ${PORT_OPTIONS:MAUDIT}
-CONFIGURE_ARGS+=--with-bsm-audit
+CONFIGURE_ARGS+= --with-bsm-audit
.endif
.if ${PORT_OPTIONS:MOPIE}
-CONFIGURE_ARGS+=--with-opie
+CONFIGURE_ARGS+= --with-opie
+.else
+CONFIGURE_ARGS+= --with-pam
.endif
MAN5+= sudoers.5
Modified: head/security/sudo/pkg-descr
==============================================================================
--- head/security/sudo/pkg-descr Thu Oct 11 13:35:55 2012 (r305722)
+++ head/security/sudo/pkg-descr Thu Oct 11 13:36:47 2012 (r305723)
@@ -5,13 +5,4 @@ privileges to users and log root activit
give as few privileges as possible but still allow people to get their
work done.
-MAILING LISTS:
-
-Please send bugs, problems, comments, etc to sudo-bugs at courtesan.com
-There is a mailing list that receives announcements whenever a new
-version of sudo is released. You can subscribe to it by sending a
-message to "majordomo at courtesan.com" that includes the line
-"subscribe sudo-announce". There is also a list for people working
-on sudo. The command to add yourself is "subscribe sudo-workers".
-
WWW: http://www.courtesan.com/sudo/
More information about the svn-ports-all
mailing list