Re: pkg/28743: make S/Key an option for security/sudo [patch supplied]

[Jukka Salmi <j+nbsd%2004.salmi.ch@localhost>]

j+nbsd%2004.salmi.ch@localhost --> pkgsrc-bugs (2004-12-22 00:03:00 +0000):
> >Number:         28743
> >Category:       pkg
> >Synopsis:       make S/Key an option for security/sudo
[...]
> >Fix:
>       I'll send the patch in a minute...

Here it is. Defaults remain the same as without this patch.

-- 
bashian roulette:
$ ((RANDOM%6)) || rm -rf ~

diff -ru security/sudo.orig/Makefile security/sudo/Makefile
--- security/sudo.orig/Makefile 2004-11-30 01:54:11.000000000 +0100
+++ security/sudo/Makefile      2004-12-22 00:49:06.000000000 +0100
@@ -28,9 +28,7 @@
 CONFIGURE_ARGS+=       --disable-root-mailer --disable-setreuid
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=       --with-skey
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       --without-skey
 .endif
 
diff -ru security/sudo.orig/options.mk security/sudo/options.mk
--- security/sudo.orig/options.mk       2004-11-26 19:43:03.000000000 +0100
+++ security/sudo/options.mk    2004-12-22 00:48:44.000000000 +0100
@@ -2,7 +2,10 @@
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sudo
-PKG_SUPPORTED_OPTIONS= kerberos ldap PAM
+PKG_SUPPORTED_OPTIONS= kerberos ldap PAM skey
+.if ${OPSYS} == "NetBSD"
+PKG_DEFAULT_OPTIONS+=  skey
+.endif
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mkerberos)
@@ -25,3 +28,7 @@
 DL_AUTO_VARS=          yes
 CONFIGURE_ARGS+=       --with-pam
 .endif
+
+.if !empty(PKG_OPTIONS:Mskey)
+CONFIGURE_ARGS+=       --with-skey
+.endif