Date: Fri, 9 May 2003 15:46:28 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30888 for review Message-ID: <200305092246.h49MkSbD097695@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=30888 Change 30888 by peter@peter_hammer on 2003/05/09 15:45:40 exclude pam_ssh from the static libpam.a builds because it is such a bad citizen. it exports unprotected global variables like "int debug" which will conflict with an application. Affected files ... .. //depot/projects/hammer/lib/libpam/modules/modules.inc#5 edit .. //depot/projects/hammer/share/mk/bsd.libnames.mk#7 edit Differences ... ==== //depot/projects/hammer/lib/libpam/modules/modules.inc#5 (text+ko) ==== @@ -24,8 +24,10 @@ MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self +(!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) + !defined(NOSECURE) && !defined(NOPIC) && \ + (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) MODULES += pam_ssh .endif MODULES += pam_tacplus ==== //depot/projects/hammer/share/mk/bsd.libnames.mk#7 (text+ko) ==== @@ -81,7 +81,9 @@ ${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBYPCLNT} MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lcrypt \ -lutil -lopie -lmd -lypclnt -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ + !defined(NOPIC) && \ + (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) LIBPAM+= ${LIBSSH} ${LIBCRYPTO} MINUSLPAM+= -lssh -lcrypto .endifhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305092246.h49MkSbD097695>