[src/trunk]: src Build & install pam_ssh.so.0 now that libssh is available fo...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e7fb5a934de0
branches:  trunk
changeset: 572451:e7fb5a934de0
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jan 03 06:15:42 2005 +0000

description:
Build & install pam_ssh.so.0 now that libssh is available for use.

diffstat:

 distrib/sets/lists/base/shl.mi      |   3 ++-
 distrib/sets/lists/man/mi           |   4 +++-
 lib/libpam/modules/Makefile         |   5 ++---
 lib/libpam/modules/pam_ssh/Makefile |  12 ++++++++----
 4 files changed, 15 insertions(+), 9 deletions(-)

diffs (88 lines):

diff -r b9677bc9fb03 -r e7fb5a934de0 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Mon Jan 03 06:15:02 2005 +0000
+++ b/distrib/sets/lists/base/shl.mi    Mon Jan 03 06:15:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.286 2005/01/03 06:00:13 lukem Exp $
+# $NetBSD: shl.mi,v 1.287 2005/01/03 06:15:42 lukem Exp $
 # Note: libtermcap and libtermlib are hardlinked and share the same version.
 ./lib/libc.so.12.125                           base-sys-shlib
 ./lib/libcrypt.so.0.1                          base-sys-shlib
@@ -97,4 +97,5 @@
 ./usr/lib/security/pam_rootok.so.0             base-sys-shlib
 ./usr/lib/security/pam_securetty.so.0          base-sys-shlib
 ./usr/lib/security/pam_self.so.0               base-sys-shlib
+./usr/lib/security/pam_ssh.so.0                        base-sys-shlib
 ./usr/lib/security/pam_unix.so.0               base-sys-shlib
diff -r b9677bc9fb03 -r e7fb5a934de0 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Mon Jan 03 06:15:02 2005 +0000
+++ b/distrib/sets/lists/man/mi Mon Jan 03 06:15:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.742 2005/01/02 17:55:48 thorpej Exp $
+# $NetBSD: mi,v 1.743 2005/01/03 06:15:42 lukem Exp $
 ./etc/mtree/set.man                            man-sys-root
 ./usr/share/info/am-utils.info                 man-amd-info            info
 ./usr/share/info/as.info                       man-computil-info       bfd,info
@@ -1952,6 +1952,7 @@
 ./usr/share/man/cat8/pam_rootok.0              man-sysutil-catman      .cat
 ./usr/share/man/cat8/pam_securetty.0           man-sysutil-catman      .cat
 ./usr/share/man/cat8/pam_self.0                        man-sysutil-catman      .cat
+./usr/share/man/cat8/pam_ssh.0                 man-sysutil-catman      .cat
 ./usr/share/man/cat8/pam_unix.0                        man-sysutil-catman      .cat
 ./usr/share/man/cat8/pc532/MAKEDEV.0           man-obsolete            obsolete
 ./usr/share/man/cat8/pc532/bim.0               man-sysutil-catman      .cat
@@ -4132,6 +4133,7 @@
 ./usr/share/man/man8/pam_rootok.8              man-sysutil-man         .man
 ./usr/share/man/man8/pam_securetty.8           man-sysutil-man         .man
 ./usr/share/man/man8/pam_self.8                        man-sysutil-man         .man
+./usr/share/man/man8/pam_ssh.8                 man-sysutil-man         .man
 ./usr/share/man/man8/pam_unix.8                        man-sysutil-man         .man
 ./usr/share/man/man8/pc532/MAKEDEV.8           man-obsolete            obsolete
 ./usr/share/man/man8/pc532/bim.8               man-sysutil-man         .man
diff -r b9677bc9fb03 -r e7fb5a934de0 lib/libpam/modules/Makefile
--- a/lib/libpam/modules/Makefile       Mon Jan 03 06:15:02 2005 +0000
+++ b/lib/libpam/modules/Makefile       Mon Jan 03 06:15:42 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/30 00:11:50 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/03 06:15:42 lukem Exp $
 # Copyright 1998 Juniper Networks, Inc.
 # All rights reserved.
 #
@@ -46,8 +46,7 @@
 .endif
 
 .if (${MKCRYPTO} != "no")
-#Not yet
-#SUBDIR+= pam_ssh
+SUBDIR+= pam_ssh
 .endif
 
 libinstall::           # disable install rule in <bsd.lib.mk>
diff -r b9677bc9fb03 -r e7fb5a934de0 lib/libpam/modules/pam_ssh/Makefile
--- a/lib/libpam/modules/pam_ssh/Makefile       Mon Jan 03 06:15:02 2005 +0000
+++ b/lib/libpam/modules/pam_ssh/Makefile       Mon Jan 03 06:15:42 2005 +0000
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2004/12/29 15:04:06 lukem Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/03 06:15:42 lukem Exp $
 # PAM module for SSH
 # $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
 
-.include <bsd.own.mk>  # XXX: fubars mod.mk's NOxxx
+NOLINT=                # don't build a lint library
+NOPROFILE=     # don't build a profile library
+NOPICINSTALL=  # don't install _pic.a library
+
+.include <bsd.own.mk>
 
 SSHSRC=        ${NETBSDSRCDIR}/crypto/dist/ssh
 
@@ -12,8 +16,8 @@
 
 CPPFLAGS+= -I${SSHSRC}
 
-# This does not work yet because we don't have libssh.
-LIBDPLIBS=     crypt   ${LIB_ROOT_DIR}/libcrypt \
+LIBDPLIBS=     ssh     ${LIB_ROOT_DIR}/libssh \
+               crypt   ${LIB_ROOT_DIR}/libcrypt \
                crypto  ${LIB_ROOT_DIR}/libcrypto
 
 .include "${.CURDIR}/../mod.mk"