Skip to content

Commit

Permalink
KerberosIV de-orbit burn continues. Disconnect from "make release".
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Murray authored and Mark Murray committed Mar 8, 2003
1 parent 38b1858 commit 0b5a594
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 22 deletions.
21 changes: 2 additions & 19 deletions release/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x
COMPAT_DISTS?= compat4x
.endif
OTHER_DISTS?= catpages manpages games proflibs dict info doc
CRYPTO_DISTS?= crypto krb4 krb5
CRYPTO_DISTS?= crypto krb5
BASE_DISTS?= base
DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS}

Expand Down Expand Up @@ -220,9 +220,6 @@ MFSSIZE= 8192
ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -

# Things that need to be recompiled with Kerberos support.
.if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
K4PROGS!= cd ${.CURDIR}/../kerberosIV; ${MAKE} -V KPROGS
.endif
.if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
K5PROGS!= cd ${.CURDIR}/../kerberos5; ${MAKE} -V KPROGS
.endif
Expand Down Expand Up @@ -512,19 +509,13 @@ release.2:
cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees
touch release.2

# Build and install crypto, krb4 and krb5 distributions.
# Build and install crypto and krb5 distributions.
release.3:
# Handle some grief caused by the munition braindeadness.
cd ${.CURDIR}/..; \
${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DNOCRYPT \
SUBDIR_OVERRIDE="${FIXCRYPTO}" \
buildworld distributeworld DISTDIR=${RD}/trees
.if exists(${.CURDIR}/../kerberosIV) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
cd ${.CURDIR}/..; \
${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS4 \
SUBDIR_OVERRIDE="kerberosIV ${K4PROGS}" \
buildworld distributeworld DISTDIR=${RD}/trees
.endif
.if exists(${.CURDIR}/../kerberos5) && exists(${.CURDIR}/../crypto) && !defined(NOKERBEROS)
cd ${.CURDIR}/..; \
${CROSSMAKE} ${WORLD_FLAGS} -DNO_MAKEDB_RUN -DMAKE_KERBEROS5 \
Expand Down Expand Up @@ -610,12 +601,6 @@ release.7:
fi ; \
done
# More munition braindeadness.
( cd ${RD}/dists && \
if [ -f krb4/krb4.aa ] ; then \
mv krb4/krb4.* crypto && \
cat krb4/CHECKSUM.MD5 >> crypto/CHECKSUM.MD5 && \
rm -r krb4; \
fi )
( cd ${RD}/dists && \
if [ -f krb5/krb5.aa ] ; then \
mv krb5/krb5.* crypto && \
Expand All @@ -637,7 +622,6 @@ release.8:
cd ${.CURDIR} && $(MAKE) doTARBALL \
TN=`echo s$$i | tr -d '.' | \
sed -e 's/usr/u/' \
-e 's/kerberosIV/krb4/' \
-e 's/kerberos5/krb5/'` \
SD=/usr/src TD=src ARG="$$i" ; \
fi ; \
Expand All @@ -654,7 +638,6 @@ release.8:
if [ -d ${RD}/dists/crypto ] ; then ( cd ${RD}/dists/src && \
if [ -f ssecure.aa ] ; then mv ssecure.* ../crypto ; fi && \
if [ -f scrypto.aa ] ; then mv scrypto.* ../crypto ; fi && \
if [ -f skrb4.aa ] ; then mv skrb4.* ../crypto ; fi && \
if [ -f skrb5.aa ] ; then mv skrb5.* ../crypto ; fi ; \
cd ${RD}/dists/crypto; rm -f CHECKSUM.MD5; \
md5 * > CHECKSUM.MD5 ) ; fi
Expand Down
1 change: 0 additions & 1 deletion release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@
<filename>hosts.equiv</filename>,
<filename>hosts.lpd</filename>,
<filename>inetd.conf</filename>,
<filename>kerberosIV</filename>,
<filename>localtime</filename>,
<filename>login.access</filename>,
<filename>login.conf</filename>,
Expand Down
1 change: 0 additions & 1 deletion release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@
<filename>hosts.equiv</filename>,
<filename>hosts.lpd</filename>,
<filename>inetd.conf</filename>,
<filename>kerberosIV</filename>,
<filename>localtime</filename>,
<filename>login.access</filename>,
<filename>login.conf</filename>,
Expand Down
1 change: 0 additions & 1 deletion release/doc/fr_FR.ISO8859-1/installation/common/upgrade.sgml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
<filename>hosts.equiv</filename>,
<filename>hosts.lpd</filename>,
<filename>inetd.conf</filename>,
<filename>kerberosIV</filename>,
<filename>localtime</filename>,
<filename>login.access</filename>,
<filename>login.conf</filename>,
Expand Down

0 comments on commit 0b5a594

Please sign in to comment.