Mon Jul 20 17:29:08 2009 UTC ()
use the proper libcrypto


(christos)
diff -r1.4 -r1.5 src/lib/libpam/modules/pam_afslog/Makefile
diff -r1.8 -r1.9 src/lib/libpam/modules/pam_krb5/Makefile
diff -r1.8 -r1.9 src/lib/libpam/modules/pam_ksu/Makefile
diff -r1.8 -r1.9 src/lib/libpam/modules/pam_ssh/Makefile
cvs diff -r1.4 -r1.5 src/lib/libpam/modules/pam_afslog/Makefile (expand / switch to unified diff)

--- src/lib/libpam/modules/pam_afslog/Makefile 2008/10/27 07:57:41 1.4
+++ src/lib/libpam/modules/pam_afslog/Makefile 2009/07/20 17:29:08 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile,v 1.4 2008/10/27 07:57:41 mrg Exp $ 1# $NetBSD: Makefile,v 1.5 2009/07/20 17:29:08 christos Exp $
2 2
3LIB= pam_afslog 3LIB= pam_afslog
4SRCS= pam_afslog.c 4SRCS= pam_afslog.c
5MAN= pam_afslog.8 5MAN= pam_afslog.8
6 6
7LIBDPLIBS+= krb5 ${.CURDIR}/../../../libkrb5 \ 7LIBDPLIBS+= krb5 ${.CURDIR}/../../../libkrb5 \
8 kafs ${.CURDIR}/../../../libkafs \ 8 kafs ${.CURDIR}/../../../libkafs \
9 asn1 ${.CURDIR}/../../../libasn1 \ 9 asn1 ${.CURDIR}/../../../libasn1 \
10 roken ${.CURDIR}/../../../libroken \ 10 roken ${.CURDIR}/../../../libroken \
11 com_err ${.CURDIR}/../../../libcom_err \ 11 com_err ${.CURDIR}/../../../libcom_err \
12 crypt ${.CURDIR}/../../../libcrypt \ 12 crypt ${.CURDIR}/../../../libcrypt \
13 crypto ${.CURDIR}/../../../libcrypto 13 crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
14 14
15.include "${.CURDIR}/../mod.mk" 15.include "${.CURDIR}/../mod.mk"
cvs diff -r1.8 -r1.9 src/lib/libpam/modules/pam_krb5/Makefile (expand / switch to unified diff)

--- src/lib/libpam/modules/pam_krb5/Makefile 2008/10/27 07:57:41 1.8
+++ src/lib/libpam/modules/pam_krb5/Makefile 2009/07/20 17:29:08 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2008/10/27 07:57:41 mrg Exp $ 1# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
2# Copyright 2001 FreeBSD, Inc. 2# Copyright 2001 FreeBSD, Inc.
3# All rights reserved. 3# All rights reserved.
4# 4#
5# Redistribution and use in source and binary forms, with or without 5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions 6# modification, are permitted provided that the following conditions
7# are met: 7# are met:
8# 1. Redistributions of source code must retain the above copyright 8# 1. Redistributions of source code must retain the above copyright
9# notice, this list of conditions and the following disclaimer. 9# notice, this list of conditions and the following disclaimer.
10# 2. Redistributions in binary form must reproduce the above copyright 10# 2. Redistributions in binary form must reproduce the above copyright
11# notice, this list of conditions and the following disclaimer in the 11# notice, this list of conditions and the following disclaimer in the
12# documentation and/or other materials provided with the distribution. 12# documentation and/or other materials provided with the distribution.
13# 13#
14# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 14# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -24,16 +24,16 @@ @@ -24,16 +24,16 @@
24# SUCH DAMAGE. 24# SUCH DAMAGE.
25# 25#
26# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.13 2004/08/06 07:27:04 cperciva Exp $ 26# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.13 2004/08/06 07:27:04 cperciva Exp $
27 27
28LIB= pam_krb5 28LIB= pam_krb5
29SRCS= pam_krb5.c 29SRCS= pam_krb5.c
30MAN= pam_krb5.8 30MAN= pam_krb5.8
31 31
32LIBDPLIBS+= krb5 ${.CURDIR}/../../../libkrb5 \ 32LIBDPLIBS+= krb5 ${.CURDIR}/../../../libkrb5 \
33 asn1 ${.CURDIR}/../../../libasn1 \ 33 asn1 ${.CURDIR}/../../../libasn1 \
34 roken ${.CURDIR}/../../../libroken \ 34 roken ${.CURDIR}/../../../libroken \
35 com_err ${.CURDIR}/../../../libcom_err \ 35 com_err ${.CURDIR}/../../../libcom_err \
36 crypt ${.CURDIR}/../../../libcrypt \ 36 crypt ${.CURDIR}/../../../libcrypt \
37 crypto ${.CURDIR}/../../../libcrypto 37 crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
38 38
39.include "${.CURDIR}/../mod.mk" 39.include "${.CURDIR}/../mod.mk"
cvs diff -r1.8 -r1.9 src/lib/libpam/modules/pam_ksu/Makefile (expand / switch to unified diff)

--- src/lib/libpam/modules/pam_ksu/Makefile 2008/10/27 07:57:41 1.8
+++ src/lib/libpam/modules/pam_ksu/Makefile 2009/07/20 17:29:08 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2008/10/27 07:57:41 mrg Exp $ 1# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
2# Copyright 2002 FreeBSD, Inc. 2# Copyright 2002 FreeBSD, Inc.
3# All rights reserved. 3# All rights reserved.
4# 4#
5# Redistribution and use in source and binary forms, with or without 5# Redistribution and use in source and binary forms, with or without
6# modification, are permitted provided that the following conditions 6# modification, are permitted provided that the following conditions
7# are met: 7# are met:
8# 1. Redistributions of source code must retain the above copyright 8# 1. Redistributions of source code must retain the above copyright
9# notice, this list of conditions and the following disclaimer. 9# notice, this list of conditions and the following disclaimer.
10# 2. Redistributions in binary form must reproduce the above copyright 10# 2. Redistributions in binary form must reproduce the above copyright
11# notice, this list of conditions and the following disclaimer in the 11# notice, this list of conditions and the following disclaimer in the
12# documentation and/or other materials provided with the distribution. 12# documentation and/or other materials provided with the distribution.
13# 13#
14# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND 14# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -24,16 +24,16 @@ @@ -24,16 +24,16 @@
24# SUCH DAMAGE. 24# SUCH DAMAGE.
25# 25#
26# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $ 26# $FreeBSD: src/lib/libpam/modules/pam_ksu/Makefile,v 1.6 2004/08/06 07:27:04 cperciva Exp $
27 27
28LIB= pam_ksu 28LIB= pam_ksu
29SRCS= pam_ksu.c 29SRCS= pam_ksu.c
30MAN= pam_ksu.8 30MAN= pam_ksu.8
31 31
32LIBDPLIBS+= krb5 ${.CURDIR}/../../../libkrb5 \ 32LIBDPLIBS+= krb5 ${.CURDIR}/../../../libkrb5 \
33 asn1 ${.CURDIR}/../../../libasn1 \ 33 asn1 ${.CURDIR}/../../../libasn1 \
34 roken ${.CURDIR}/../../../libroken \ 34 roken ${.CURDIR}/../../../libroken \
35 com_err ${.CURDIR}/../../../libcom_err \ 35 com_err ${.CURDIR}/../../../libcom_err \
36 crypt ${.CURDIR}/../../../libcrypt \ 36 crypt ${.CURDIR}/../../../libcrypt \
37 crypto ${.CURDIR}/../../../libcrypto 37 crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
38 38
39.include "${.CURDIR}/../mod.mk" 39.include "${.CURDIR}/../mod.mk"
cvs diff -r1.8 -r1.9 src/lib/libpam/modules/pam_ssh/Makefile (expand / switch to unified diff)

--- src/lib/libpam/modules/pam_ssh/Makefile 2009/06/09 05:20:16 1.8
+++ src/lib/libpam/modules/pam_ssh/Makefile 2009/07/20 17:29:08 1.9
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.8 2009/06/09 05:20:16 mrg Exp $ 1# $NetBSD: Makefile,v 1.9 2009/07/20 17:29:08 christos Exp $
2# PAM module for SSH 2# PAM module for SSH
3# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $ 3# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
4 4
5NOLINT= # don't build a lint library 5NOLINT= # don't build a lint library
6NOPROFILE= # don't build a profile library 6NOPROFILE= # don't build a profile library
7NOPICINSTALL= # don't install _pic.a library 7NOPICINSTALL= # don't install _pic.a library
8 8
9.include <bsd.own.mk> 9.include <bsd.own.mk>
10 10
11SSHSRC= ${NETBSDSRCDIR}/crypto/dist/ssh 11SSHSRC= ${NETBSDSRCDIR}/crypto/dist/ssh
12 12
13LIB= pam_ssh 13LIB= pam_ssh
14MAN= pam_ssh.8 14MAN= pam_ssh.8
15SRCS= pam_ssh.c 15SRCS= pam_ssh.c
16 16
17CPPFLAGS+= -I${SSHSRC} 17CPPFLAGS+= -I${SSHSRC}
18 18
19LIBDPLIBS+= ssh ${.CURDIR}/../../../../crypto/external/bsd/openssh/lib \ 19LIBDPLIBS+= ssh ${NETBSDSRCDIR}/crypto/external/bsd/openssh/lib \
20 crypt ${.CURDIR}/../../../libcrypt \ 20 crypt ${.CURDIR}/../../../libcrypt \
21 crypto ${.CURDIR}/../../../libcrypto 21 crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
22 22
23.include "${.CURDIR}/../mod.mk" 23.include "${.CURDIR}/../mod.mk"