d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Once upon a time we had both "crypto" and "krb5" distributions,

Browse Source 
and rebuilt some bits with crypto but without Kerberos support
(most notably SSH) during "make release", to put them into the
"crypto" distribution.

Now that we don't ship the separate "krb5" distribution anymore
(it's now part of the "crypto" distribuion), don't waste time
recompiling SSH bits without crypto and without Kerberos support
in an attempt to put them in the "base" distribution -- it just
doesn't work as SSH always uses crypto code.

We avoid this by not rebuilding KPROGS from kerberos5/Makefile in
release/Makefile and adding "libpam" to SPROGS in secure/Makefile
to ensure it's still rebuilt without crypto support for the "base"
distribution.  (Disabling crypto (NOCRYPT) also disables building
of Kerberos-related PAM modules, and it's OK to depend on this.)

This should be a no-op change saving some "make release" time.
This commit is contained in:
Ruslan Ermilov 2004-01-17 19:22:36 +00:00
parent 6b14fdfa52
commit 90165ba56f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=124638
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/Makefile
View File

@ -228,8 +228,7 @@ ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -
# Things that need to be compiled without crypto support in releases
.if !defined(FIXCRYPTO) && !make(release) && !make(rerelease)
FIXCRYPTO!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS; \
cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS
FIXCRYPTO!= cd ${.CURDIR}/../secure; ${MAKE} -V SPROGS
.endif
# Things which may get you into trouble if you change them

1
secure/Makefile
View File

@ -5,6 +5,7 @@ SUBDIR= lib libexec usr.bin usr.sbin
# These are programs which depend on crypto, but not Kerberos.
SPROGS= bin/ed usr.sbin/ppp usr.sbin/pppd usr.sbin/tcpdump/tcpdump \
lib/libfetch usr.bin/fetch usr.sbin/pkg_install \
lib/libpam \
lib/libtelnet libexec/telnetd usr.bin/telnet
.if !defined(NO_SENDMAIL)
SPROGS+=usr.sbin/sendmail