Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11]) by www.NetBSD.org (Postfix) with ESMTP id 0CDBC63B8C3 for ; Mon, 9 Jan 2012 05:25:31 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B712A14A585; Mon, 9 Jan 2012 05:25:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7AEF414A584 for ; Mon, 9 Jan 2012 05:25:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id T-BOzBBLnTiX for ; Mon, 9 Jan 2012 05:25:35 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 0173714A582 for ; Mon, 9 Jan 2012 05:25:34 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id A1E43175DD; Mon, 9 Jan 2012 05:25:36 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Mon, 9 Jan 2012 05:25:36 +0000 From: "Emmanuel Dreyfus" Subject: CVS commit: pkgsrc/security/openssh To: pkgsrc-changes@NetBSD.org Reply-To: manu@netbsd.org X-Mailer: log_accum Message-Id: <20120109052536.A1E43175DD@cvs.netbsd.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk Module Name: pkgsrc Committed By: manu Date: Mon Jan 9 05:25:36 UTC 2012 Modified Files: pkgsrc/security/openssh: Makefile PLIST.pam options.mk Log Message: Re-enable PAM support, as it works fine provided one does not mix multiple versions of libcrypto in sshd. This can happen if OpenSSH is linked with pkgsrc's OpenSSL and if using nss_ldap, which pulls base-system OpenSSL through kerberos libraries. One needs to disable the krb5 of nss_ldap in order to fix that. To generate a diff of this commit: cvs rdiff -u -r1.204 -r1.205 pkgsrc/security/openssh/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/openssh/PLIST.pam cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/openssh/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.