CVS commit: pkgsrc/security/openssh

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Apr 11 05:29:57 UTC 2024

Modified Files:
        pkgsrc/security/openssh: Makefile options.mk

Log Message:
openssh: default-on pam for macOS, create pid dir.


To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 pkgsrc/security/openssh/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/security/openssh/options.mk

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

Modified files:

Index: pkgsrc/security/openssh/Makefile
diff -u pkgsrc/security/openssh/Makefile:1.280 pkgsrc/security/openssh/Makefile:1.281
--- pkgsrc/security/openssh/Makefile:1.280      Mon Dec 18 15:38:34 2023
+++ pkgsrc/security/openssh/Makefile    Thu Apr 11 05:29:57 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.280 2023/12/18 15:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.281 2024/04/11 05:29:57 schmonz Exp $
 
 DISTNAME=              openssh-9.6p1
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 
@@ -130,6 +131,7 @@ PLIST.darwin=               yes
 CONF_FILES+=           ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 OWN_DIRS=              ${OPENSSH_CHROOT}
+MAKE_DIRS=             ${SSH_PID_DIR}
 RCD_SCRIPTS=           sshd
 RCD_SCRIPT_SRC.sshd=   ${WRKDIR}/sshd.sh
 SMF_METHODS=           sshd

Index: pkgsrc/security/openssh/options.mk
diff -u pkgsrc/security/openssh/options.mk:1.48 pkgsrc/security/openssh/options.mk:1.49
--- pkgsrc/security/openssh/options.mk:1.48     Fri Dec  1 11:01:05 2023
+++ pkgsrc/security/openssh/options.mk  Thu Apr 11 05:29:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.48 2023/12/01 11:01:05 nia Exp $
+# $NetBSD: options.mk,v 1.49 2024/04/11 05:29:57 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openssh
 PKG_SUPPORTED_OPTIONS= editline fido kerberos openssl pam legacymodsz
@@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS=        editline openssl
 PKG_SUGGESTED_OPTIONS+=        fido
 .endif
 
-.if ${OPSYS} == "NetBSD"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
 PKG_SUGGESTED_OPTIONS+=        pam
 .endif