head	1.28;
access;
symbols
	RELENG_8_4:1.28.0.2
	RELENG_9_1_0_RELEASE:1.27.2.1.4.2
	RELENG_9_1:1.27.2.1.0.4
	RELENG_9_1_BP:1.27.2.1
	RELENG_8_3_0_RELEASE:1.25.10.2.6.1
	RELENG_8_3:1.25.10.2.0.6
	RELENG_8_3_BP:1.25.10.2
	RELENG_9_0_0_RELEASE:1.27.2.1.2.1
	RELENG_9_0:1.27.2.1.0.2
	RELENG_9_0_BP:1.27.2.1
	RELENG_9:1.27.0.2
	RELENG_9_BP:1.27
	RELENG_7_4_0_RELEASE:1.25.14.1
	RELENG_8_2_0_RELEASE:1.25.10.2.4.1
	RELENG_7_4:1.25.0.14
	RELENG_7_4_BP:1.25
	RELENG_8_2:1.25.10.2.0.4
	RELENG_8_2_BP:1.25.10.2
	RELENG_8_1_0_RELEASE:1.25.10.2.2.1
	RELENG_8_1:1.25.10.2.0.2
	RELENG_8_1_BP:1.25.10.2
	RELENG_7_3_0_RELEASE:1.25.12.1
	RELENG_7_3:1.25.0.12
	RELENG_7_3_BP:1.25
	RELENG_8_0_0_RELEASE:1.25.10.1.2.1
	RELENG_8_0:1.25.10.1.0.2
	RELENG_8_0_BP:1.25.10.1
	RELENG_8:1.25.0.10
	RELENG_8_BP:1.25
	RELENG_7_2_0_RELEASE:1.25.8.1
	RELENG_7_2:1.25.0.8
	RELENG_7_2_BP:1.25
	RELENG_7_1_0_RELEASE:1.25.6.1
	RELENG_6_4_0_RELEASE:1.20.2.2.6.1
	RELENG_7_1:1.25.0.6
	RELENG_7_1_BP:1.25
	RELENG_6_4:1.20.2.2.0.6
	RELENG_6_4_BP:1.20.2.2
	RELENG_7_0_0_RELEASE:1.25
	RELENG_6_3_0_RELEASE:1.20.2.2
	RELENG_7_0:1.25.0.4
	RELENG_7_0_BP:1.25
	RELENG_6_3:1.20.2.2.0.4
	RELENG_6_3_BP:1.20.2.2
	RELENG_7:1.25.0.2
	RELENG_7_BP:1.25
	RELENG_6_2_0_RELEASE:1.20.2.2
	RELENG_6_2:1.20.2.2.0.2
	RELENG_6_2_BP:1.20.2.2
	RELENG_5_5_0_RELEASE:1.18
	RELENG_5_5:1.18.0.8
	RELENG_5_5_BP:1.18
	RELENG_6_1_0_RELEASE:1.20
	RELENG_6_1:1.20.0.6
	RELENG_6_1_BP:1.20
	RELENG_6_0_0_RELEASE:1.20
	RELENG_6_0:1.20.0.4
	RELENG_6_0_BP:1.20
	RELENG_6:1.20.0.2
	RELENG_6_BP:1.20
	RELENG_5_4_0_RELEASE:1.18
	RELENG_5_4:1.18.0.6
	RELENG_5_4_BP:1.18
	RELENG_4_11_0_RELEASE:1.2.2.5
	RELENG_4_11:1.2.2.5.0.10
	RELENG_4_11_BP:1.2.2.5
	RELENG_5_3_0_RELEASE:1.18
	RELENG_5_3:1.18.0.4
	RELENG_5_3_BP:1.18
	RELENG_5:1.18.0.2
	RELENG_5_BP:1.18
	RELENG_4_10_0_RELEASE:1.2.2.5
	RELENG_4_10:1.2.2.5.0.8
	RELENG_4_10_BP:1.2.2.5
	RELENG_5_2_1_RELEASE:1.16
	RELENG_5_2_0_RELEASE:1.16
	RELENG_5_2:1.16.0.4
	RELENG_5_2_BP:1.16
	RELENG_4_9_0_RELEASE:1.2.2.5
	RELENG_4_9:1.2.2.5.0.6
	RELENG_4_9_BP:1.2.2.5
	RELENG_5_1_0_RELEASE:1.16
	RELENG_5_1:1.16.0.2
	RELENG_5_1_BP:1.16
	RELENG_4_8_0_RELEASE:1.2.2.5
	RELENG_4_8:1.2.2.5.0.4
	RELENG_4_8_BP:1.2.2.5
	RELENG_5_0_0_RELEASE:1.13
	RELENG_5_0:1.13.0.2
	RELENG_5_0_BP:1.13
	RELENG_4_7_0_RELEASE:1.2.2.5
	RELENG_4_7:1.2.2.5.0.2
	RELENG_4_7_BP:1.2.2.5
	RELENG_4_6_2_RELEASE:1.2.2.4.2.1
	RELENG_4_6_1_RELEASE:1.2.2.4.2.1
	RELENG_4_6_0_RELEASE:1.2.2.4
	RELENG_4_6:1.2.2.4.0.2
	RELENG_4_6_BP:1.2.2.4
	RELENG_4_5_0_RELEASE:1.2.2.3
	RELENG_4_5:1.2.2.3.0.4
	RELENG_4_5_BP:1.2.2.3
	RELENG_4_4_0_RELEASE:1.2.2.3
	RELENG_4_4:1.2.2.3.0.2
	RELENG_4_4_BP:1.2.2.3
	RELENG_4_3_0_RELEASE:1.2.2.1
	RELENG_4_3:1.2.2.1.0.2
	RELENG_4_3_BP:1.2.2.1
	RELENG_4_2_0_RELEASE:1.2
	RELENG_4_1_1_RELEASE:1.2
	PRE_SMPNG:1.2
	RELENG_4_1_0_RELEASE:1.2
	RELENG_4_0_0_RELEASE:1.2
	RELENG_4:1.2.0.2
	RELENG_4_BP:1.2;
locks; strict;
comment	@# @;


1.28
date	2012.11.17.01.49.58;	author svnexp;	state Exp;
branches
	1.28.2.1;
next	1.27;

1.27
date	2010.01.02.09.58.07;	author ed;	state Exp;
branches
	1.27.2.1;
next	1.26;

1.26
date	2009.10.05.18.56.18;	author des;	state Exp;
branches;
next	1.25;

1.25
date	2006.05.13.21.38.14;	author des;	state Exp;
branches
	1.25.2.1
	1.25.6.1
	1.25.8.1
	1.25.10.1
	1.25.12.1
	1.25.14.1;
next	1.24;

1.24
date	2006.05.13.13.47.45;	author des;	state Exp;
branches;
next	1.23;

1.23
date	2005.09.28.14.36.16;	author ru;	state Exp;
branches;
next	1.22;

1.22
date	2005.09.28.06.23.47;	author des;	state Exp;
branches;
next	1.21;

1.21
date	2005.09.26.20.34.09;	author des;	state Exp;
branches;
next	1.20;

1.20
date	2005.06.07.09.31.26;	author des;	state Exp;
branches
	1.20.2.1;
next	1.19;

1.19
date	2005.06.06.19.01.01;	author des;	state Exp;
branches;
next	1.18;

1.18
date	2004.08.06.07.27.04;	author cperciva;	state Exp;
branches;
next	1.17;

1.17
date	2004.01.18.14.58.07;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2003.03.10.09.19.08;	author des;	state Exp;
branches;
next	1.15;

1.15
date	2003.03.09.20.06.37;	author obrien;	state Exp;
branches;
next	1.14;

1.14
date	2003.02.09.21.20.44;	author des;	state Exp;
branches;
next	1.13;

1.13
date	2002.04.10.18.07.04;	author ru;	state Exp;
branches;
next	1.12;

1.12
date	2002.03.05.21.56.24;	author des;	state Exp;
branches;
next	1.11;

1.11
date	2002.02.08.13.42.56;	author ru;	state Exp;
branches;
next	1.10;

1.10
date	2002.02.06.18.46.48;	author markm;	state Exp;
branches;
next	1.9;

1.9
date	2002.02.04.16.09.25;	author markm;	state Exp;
branches;
next	1.8;

1.8
date	2002.01.23.15.54.08;	author ru;	state Exp;
branches;
next	1.7;

1.7
date	2001.12.05.16.02.50;	author des;	state Exp;
branches;
next	1.6;

1.6
date	2001.08.04.21.51.14;	author markm;	state Exp;
branches;
next	1.5;

1.5
date	2001.07.29.18.31.09;	author markm;	state Exp;
branches;
next	1.4;

1.4
date	2001.06.04.19.47.55;	author markm;	state Exp;
branches;
next	1.3;

1.3
date	2001.01.06.18.59.46;	author jhb;	state Exp;
branches;
next	1.2;

1.2
date	2000.03.06.15.28.30;	author peter;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2000.02.24.22.24.37;	author markm;	state Exp;
branches;
next	;

1.28.2.1
date	2012.11.17.01.49.58;	author svnexp;	state dead;
branches;
next	1.28.2.2;

1.28.2.2
date	2013.03.28.13.03.19;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.27.2.1.2.1
	1.27.2.1.4.1;
next	1.27.2.2;

1.27.2.2
date	2012.11.17.11.36.25;	author svnexp;	state Exp;
branches;
next	1.27.2.3;

1.27.2.3
date	2014.03.20.11.01.50;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.27.2.1.2.2;

1.27.2.1.2.2
date	2012.11.17.08.36.25;	author svnexp;	state Exp;
branches;
next	;

1.27.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.27.2.1.4.2;

1.27.2.1.4.2
date	2012.11.17.08.47.15;	author svnexp;	state Exp;
branches;
next	;

1.25.2.1
date	2012.11.17.08.02.57;	author svnexp;	state Exp;
branches;
next	;

1.25.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.25.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.25.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.25.10.1.2.1;
next	1.25.10.2;

1.25.10.2
date	2010.04.21.06.33.10;	author des;	state Exp;
branches
	1.25.10.2.2.1
	1.25.10.2.4.1
	1.25.10.2.6.1;
next	1.25.10.3;

1.25.10.3
date	2012.11.17.10.36.09;	author svnexp;	state Exp;
branches;
next	;

1.25.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.25.10.2.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.25.10.2.4.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.25.10.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.25.10.2.6.2;

1.25.10.2.6.2
date	2012.11.17.08.24.50;	author svnexp;	state Exp;
branches;
next	;

1.25.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.25.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.25.14.2;

1.25.14.2
date	2012.11.17.08.16.49;	author svnexp;	state Exp;
branches;
next	;

1.20.2.1
date	2006.07.14.06.36.13;	author des;	state Exp;
branches;
next	1.20.2.2;

1.20.2.2
date	2006.07.14.16.48.52;	author ru;	state Exp;
branches
	1.20.2.2.6.1;
next	1.20.2.3;

1.20.2.3
date	2012.11.17.07.40.30;	author svnexp;	state Exp;
branches;
next	;

1.20.2.2.6.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1
date	2001.01.06.23.16.57;	author obrien;	state Exp;
branches;
next	1.2.2.2;

1.2.2.2
date	2001.06.07.09.37.12;	author markm;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2001.06.11.15.28.49;	author markm;	state Exp;
branches;
next	1.2.2.4;

1.2.2.4
date	2002.04.04.12.29.36;	author des;	state Exp;
branches
	1.2.2.4.2.1;
next	1.2.2.5;

1.2.2.5
date	2002.07.03.21.41.30;	author des;	state Exp;
branches;
next	1.2.2.6;

1.2.2.6
date	2012.11.17.07.23.59;	author svnexp;	state Exp;
branches;
next	;

1.2.2.4.2.1
date	2002.07.16.12.33.25;	author des;	state Exp;
branches;
next	;


desc
@@


1.28
log
@Switching exporter and resync
@
text
@# PAM module for SSH
# $FreeBSD: head/lib/libpam/modules/pam_ssh/Makefile 201381 2010-01-02 09:58:07Z ed $

SSHDIR=	${.CURDIR}/../../../../crypto/openssh

LIB=	pam_ssh
MAN=	pam_ssh.8
SRCS=	pam_ssh.c

# required when linking with a dynamic libssh
SRCS+=	roaming_dummy.c

WARNS?=	3
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h

DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
LDADD=	-lssh -lcrypto -lcrypt

.include <bsd.lib.mk>

.PATH: ${SSHDIR}

${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
@


1.28.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:03:19 +0000
@
text
@d1 23
@


1.28.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 23
# PAM module for SSH
# $FreeBSD: releng/8.4/lib/libpam/modules/pam_ssh/Makefile 206984 2010-04-21 06:33:10Z des $

SSHDIR=	${.CURDIR}/../../../../crypto/openssh

LIB=	pam_ssh
MAN=	pam_ssh.8
SRCS=	pam_ssh.c

# required when linking with a dynamic libssh
SRCS+=	roaming_dummy.c

WARNS?=	0
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h

DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
LDADD=	-lssh -lcrypto -lcrypt

.include <bsd.lib.mk>

.PATH: ${SSHDIR}

${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
@


1.27
log
@SVN rev 201381 on 2010-01-02 09:58:07Z by ed

Build lib/ with WARNS=6 by default.

Similar to libexec/, do the same with lib/. Make WARNS=6 the norm and
lower it when needed.

I'm setting WARNS?=0 for secure/. It seems secure/ includes the
Makefile.inc provided by lib/. I'm not going to touch that directory.
Most of the code there is contributed anyway.
@
text
@d2 1
a2 1
# $FreeBSD$
@


1.27.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/lib/libpam/modules/pam_ssh/Makefile 201381 2010-01-02 09:58:07Z ed $
@


1.27.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263421
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d2 1
a2 1
# $FreeBSD: stable/9/lib/libpam/modules/pam_ssh/Makefile 263421 2014-03-20 10:56:05Z des $
a17 1
USEPRIVATELIB= ssh
@


1.27.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.4.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.1/lib/libpam/modules/pam_ssh/Makefile 201381 2010-01-02 09:58:07Z ed $
@


1.27.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.27.2.1.2.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/9.0/lib/libpam/modules/pam_ssh/Makefile 201381 2010-01-02 09:58:07Z ed $
@


1.26
log
@SVN rev 197786 on 2009-10-05 18:56:18Z by des

pam_ssh needs roaming_dummy to link correctly against libssh.
@
text
@d13 1
a13 1
WARNS?=	0
@


1.25
log
@Add a manual dependency on ssh_namespace.h.

Discussed with:	ru
@
text
@d10 3
@


1.25.2.1
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/7/lib/libpam/modules/pam_ssh/Makefile 158529 2006-05-13 21:38:16Z des $
@


1.25.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.25.14.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/7.4/lib/libpam/modules/pam_ssh/Makefile 158529 2006-05-13 21:38:16Z des $
@


1.25.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.25.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.25.10.2
log
@SVN rev 206984 on 2010-04-21 06:33:10Z by des

MFH OpenSSH 5.4p1
@
text
@a9 3
# required when linking with a dynamic libssh
SRCS+=	roaming_dummy.c

@


1.25.10.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d2 1
a2 1
# $FreeBSD: stable/8/lib/libpam/modules/pam_ssh/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.25.10.2.6.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.25.10.2.6.2
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: releng/8.3/lib/libpam/modules/pam_ssh/Makefile 206984 2010-04-21 06:33:10Z des $
@


1.25.10.2.4.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.25.10.2.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.25.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.25.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.25.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.24
log
@Introduce a namespace munging hack inspired by NetBSD to avoid polluting
the namespace of applications which inadvertantly link in libssh (usually
through pam_ssh)

Suggested by:	lukem@@netbsd.org
MFC after:	6 weeks
@
text
@d4 1
a4 1
SSHSRC=	${.CURDIR}/../../../../crypto/openssh
d11 1
a11 1
CFLAGS+= -I${SSHSRC} -include ssh_namespace.h
d17 4
@


1.23
log
@Commenting out WARNS actually brought it up to 4.
@
text
@d11 1
a11 1
CFLAGS+= -I${SSHSRC}
@


1.22
log
@Comment out WARNS, the OpenSSL headers don't compile cleanly on some platforms.
@
text
@d10 1
a10 1
#WARNS?=	3
@


1.21
log
@Increase WARNS.
@
text
@d10 1
a10 1
WARNS?=	3
@


1.20
log
@Revert the commits that made libssh an INTERNALLIB; they caused too much
trouble, especially on amd64.

Requested by:	ru
@
text
@d10 1
a10 1
WARNS?=	0
@


1.20.2.1
log
@MFC: include ssh_namespace.h
@
text
@d4 1
a4 1
SSHDIR=	${.CURDIR}/../../../../crypto/openssh
d11 1
a11 1
CFLAGS+= -I${SSHSRC} -include ssh_namespace.h
a15 2
.PATH:	${SSHDIR}

@


1.20.2.2
log
@Fix build by making this look like rev. 1.25.
@
text
@d11 1
a11 1
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
d16 2
a18 4

.PATH: ${SSHDIR}

${OBJS} ${POBJS} ${SOBJS}: ssh_namespace.h
@


1.20.2.3
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/6/lib/libpam/modules/pam_ssh/Makefile 160353 2006-07-14 16:48:52Z ru $
@


1.20.2.2.6.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.19
log
@Fix libssh dependency.
@
text
@a4 1
LIBSSH=	${.OBJDIR}/../../../../secure/lib/libssh/libssh.a
d14 1
a14 1
LDADD=	${LIBSSH} -lcrypto -lcrypt
@


1.18
log
@Join the 21st century: Cryptography is no longer an optional component
of releases.  The -DNOCRYPT build option still exists for anyone who
really wants to build non-cryptographic binaries, but the "crypto"
release distribution is now part of "base", and anyone installing from a
release will get cryptographic binaries.

Approved by:	re (scottl), markm
Discussed on:	freebsd-current, in late April 2004
@
text
@d5 1
d15 1
a15 1
LDADD=	-lssh -lcrypto -lcrypt
@


1.17
log
@Deal better with the crypto version of the PAM library that goes
on the release media -- only put what is different in the crypto
version compared to the base version.  This reduces PAM entries
in /usr/lib in the "crypto" distribution to:

	libpam.a
	libpam.so@@
	libpam.so.2
	pam_krb5.so@@
	pam_krb5.so.2
	pam_ksu.so@@
	pam_ksu.so.2
	pam_ssh.so@@
	pam_ssh.so.2

The libpam.so* is still redundant (it is identical to the "base"
version), but we can't set DISTRIBUTION differently for libpam.a
and libpam.so.

(The removal of libpam.so* from the crypto distribution could be
addressed by the release/scripts/crypto-make.sh script, but then
we'd also need to remove redundant PAM headers, and I'm not sure
this is worth a hassle.)
@
text
@a12 1
DISTRIBUTION= crypto
@


1.16
log
@This module is not WARNS-clean, due to brokenness in OpenSSL headers.
@
text
@d13 1
@


1.15
log
@style.Makefile(5) police
(I've tried to keep to the spirit of the original formatting)

Reviewed by:	des
@
text
@d10 1
@


1.14
log
@Complete rewrite of pam_ssh(8).  The previous version was becoming hard
to maintain, and had security issues which would have required a major
rewrite to address anyway.

This implementation currently starts a separate agent for each session
instead of connecting each new session to the agent started by the first
one.  While this would be a Good Thing (and the old pam_ssh(8) tried to
do it), it's hard to get right.  I'll revisit this issue when I've had a
chance to test some modifications to ssh-agent(1).
@
text
@d6 8
a13 6
LIB=		pam_ssh
SRCS=		pam_ssh.c
CFLAGS+=	-I${SSHSRC}
DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
LDADD=		-lssh -lcrypto -lcrypt
MAN=		pam_ssh.8
@


1.13
log
@Moved SHLIB_NAME definition into one place.

Approved by:	des
@
text
@d9 2
a10 2
DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL}
LDADD=		-lssh -lcrypto -lcrypt -lutil
@


1.12
log
@Switch to OpenPAM.  Bump library version.  Modules are now versioned, so
applications linked with Linux-PAM will still work.
Remove pam_get_pass(); OpenPAM has pam_get_authtok().
Remove pam_prompt(); OpenPAM has pam_{,v}{error,info,prompt}().
Remove pam_set_item(3) man page as OpenPAM has its own.

Sponsored by:	DARPA, NAI Labs
@
text
@a6 1
SHLIB_NAME=	${LIB}.so.${SHLIB_MAJOR}
@


1.11
log
@Now that cross-tools ld(1) has been fixed to look for dynamic
dependencies in the correct place, record the fact that -lssh
depends on -lcrypto and -lz.

Removed false dependencies on -lz (except ssh(1) and sshd(8)).
Removed false dependencies on -lcrypto and -lutil for scp(1).

Reviewed by:	markm
@
text
@d7 1
a7 1
SHLIB_NAME=	pam_ssh.so
@


1.10
log
@Remove NO_WERROR, now that WARNS=n is gone.
@
text
@d10 2
a11 2
DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
LDADD=		-lssh -lcrypto -lcrypt -lutil -lz
@


1.9
log
@Protect "make buildworld" against -Werror, as this module does not
build cleanly.
@
text
@a9 1
NO_WERROR=	yes
@


1.8
log
@Add pam_ssh support to the static PAM library, libpam.a:

- Spam /usr/lib some more by making libssh a standard library.
- Tweak ${LIBPAM} and ${MINUSLPAM}.
- Garbage collect unused libssh_pic.a.
- Add fake -lz dependency to secure/ makefiles needed for
  dynamic linkage with -lssh.

Reviewed by:	des, markm
Approved by:	markm
@
text
@d10 1
@


1.7
log
@Connect the man page to the build.

Sponsored by:	DARPA, NAI Labs
@
text
@d10 2
a11 3
DPADD=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
LDADD=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
		-lcrypt -lutil -lz
@


1.6
log
@Fix style/consistency in Makefile and repair static module building.

Submitted by:	bde(partially)
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.5 2001/07/29 18:31:09 markm Exp $
d13 1
@


1.5
log
@(Re)Add an SSH module for PAM, heavily based on Andrew Korty's module
from ports.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.4 2001/06/04 19:47:55 markm Exp $
d9 3
a11 3
CFLAGS=		-I${SSHSRC}
DPADD+=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
@


1.4
log
@Big module cleanup.

Move common stuff into Makefile.inc, and tidy up all the Makefiles
as a result.

Build new modules.

Put a commented-out dependancy on libpam for the (shared) modules.
I can't bring this in just yet, as the dependancy (modules->libpam)
is reversed for the static case (libpam->modules).
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.3 2001/01/06 18:59:46 jhb Exp $
d8 1
a8 1
SRCS=		log-client.c pam_ssh.c
a14 3

.PATH:		${SSHSRC}/pam_ssh
.PATH:		${SSHSRC}
@


1.3
log
@Use a unified libgcc rather than a seperate one for threaded and
non-threaded programs.  This provides threaded programs with the
needed exception frame symbols.

parts submitted by:	Max Khon <fjoe@@iclub.nsu.ru>
PR:	23252
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.2 2000/03/06 15:28:30 peter Exp $
d9 1
a9 1
CFLAGS+=	-Wall -I${SSHSRC}
d11 2
a12 3
LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
INTERNALLIB=	yes
INTERNALSTATICLIB=yes
@


1.2
log
@Make pam_ssh work.  It had an undefined symbol when it was dlopen()ed.
I'm not quite sure about this, I think it should be using -lssh_pic since
it's being linked into a .so, but nothing seems to complain ahd it does
work.  (well, it works for using the authorized_keys file, but I have not
figured out how to get it to start a ssh-agent and cache the key for me)

PR:		17191
Submitted by:	Adrian Pavlykevych <pam@@polynet.lviv.ua>
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.1 2000/02/24 22:24:37 markm Exp $
d10 2
a11 2
DPADD+=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ} ${LIBGCC_PIC}
LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto -lcrypt -lutil -lz -lgcc_pic
@


1.2.2.1
log
@MFC: use a unified libgcc and ensure strong references to pthread functions
     weakly referenced in libgcc.
@
text
@d2 1
a2 1
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.2 2000/03/06 15:28:30 peter Exp $
d10 2
a11 2
DPADD+=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
@


1.2.2.2
log
@MFC: FreeBSD PAM stuff and cleaned up modules build. New modules.
@
text
@d2 1
a2 1
# $FreeBSD$
d9 1
a9 1
CFLAGS=		-I${SSHSRC}
d11 3
a13 2
LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
		-lcrypt -lutil -lz
@


1.2.2.3
log
@Back out the extremely unwise PAM MFC that I did about 4 days ago.

My apologies to all. Please pass the pointy hat.
@
text
@d9 1
a9 1
CFLAGS+=	-Wall -I${SSHSRC}
d11 2
a12 3
LDADD+=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
INTERNALLIB=	yes
INTERNALSTATICLIB=yes
@


1.2.2.4
log
@MFC: pam_ssh(8).

Sponsored by:	DARPA, NAI Labs
@
text
@d8 6
a13 6
SRCS=		pam_ssh.c
CFLAGS+=	-I${SSHSRC}
DPADD=		${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
LDADD=		-L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
		-lcrypt -lutil -lz
MAN=		pam_ssh.8
d16 3
@


1.2.2.4.2.1
log
@Merge OpenSSH, OPIE, PAM and a number of dependencies from -STABLE.
@
text
@d7 1
d10 3
a12 2
DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL}
LDADD=		-lssh -lcrypto -lcrypt -lutil
@


1.2.2.5
log
@Bring -STABLE's libpam to a somewhat more functional state in preparation
for the OpenSSH upgrade:

 - update pam_opie(8) to not emit fake challenges when the no_fake_prompts
   option was specified, and add a man page.

 - add pam_opieaccess(8) and a man page.

 - synch pam_radius(8), pam_ssh(8) and pam_tacplus(8) with -CURRENT.

 - sync pam_unix(8) with its state in -CURRENT prior to the OpenPAM import.

 - bring in bits of OpenPAM and some of Mark's additions to Linux-PAM to
   support the updated modules.

Sponsored by:   DARPA, NAI Labs
@
text
@d7 1
d10 3
a12 2
DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL}
LDADD=		-lssh -lcrypto -lcrypt -lutil
@


1.2.2.6
log
@Switch importer
@
text
@d2 1
a2 1
# $FreeBSD: stable/4/lib/libpam/modules/pam_ssh/Makefile 99387 2002-07-03 21:41:31Z des $
@


1.1
log
@Use libcrypto instead of libdes.

Also - OpenSSH blesses us with a module for PAM.
@
text
@d2 1
a2 1
# $FreeBSD$
d11 1
a11 1
LDADD+=		-lcrypto -lcrypt -lutil -lz -lgcc_pic
@

