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.)
This commit is contained in:
Ruslan Ermilov 2004-01-18 14:58:07 +00:00
parent 0541040c46
commit bb96dfc53a
5 changed files with 7 additions and 4 deletions

View File

@ -25,7 +25,3 @@
# $FreeBSD$
SHLIB_MAJOR= 2
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
.endif

View File

@ -41,6 +41,10 @@ OPENPAM= ${.CURDIR}/../../../contrib/openpam
LIB= pam
NOPROFILE= YES
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
DISTRIBUTION= crypto
.endif
SRCS= openpam_borrow_cred.c \
openpam_configure.c \
openpam_dispatch.c \

View File

@ -28,6 +28,7 @@ LIB= pam_krb5
SRCS= pam_krb5.c
MAN= pam_krb5.8
DISTRIBUTION= crypto
DPADD= ${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
${LIBCOM_ERR} ${LIBROKEN}
LDADD= -lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err -lroken

View File

@ -28,6 +28,7 @@ LIB= pam_ksu
SRCS= pam_ksu.c
MAN= pam_ksu.8
DISTRIBUTION= crypto
DPADD= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
${LIBCOM_ERR} ${LIBROKEN}
LDADD= -lkrb5 -lasn1 -lcrypto -lcrypt -lcom_err -lroken

View File

@ -10,6 +10,7 @@ SRCS= pam_ssh.c
WARNS?= 0
CFLAGS+= -I${SSHSRC}
DISTRIBUTION= crypto
DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
LDADD= -lssh -lcrypto -lcrypt