Date: Wed, 30 Apr 2003 11:34:06 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30105 for review Message-ID: <200304301834.h3UIY6cw037121@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30105 Change 30105 by peter@peter_daintree on 2003/04/30 11:33:40 IFC @30104 (pass 1) Affected files ... .. //depot/projects/hammer/bin/cat/cat.c#3 integrate .. //depot/projects/hammer/release/Makefile#15 integrate .. //depot/projects/hammer/release/picobsd/tinyware/passwd/Makefile#2 integrate .. //depot/projects/hammer/release/scripts/crypto-install.sh#2 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#4 integrate Differences ... ==== //depot/projects/hammer/bin/cat/cat.c#3 (text+ko) ==== @@ -34,11 +34,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#endif #ifndef lint #if 0 @@ -46,7 +48,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/hammer/release/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.771 2003/04/25 06:08:11 kuriyama Exp $ +# $FreeBSD: src/release/Makefile,v 1.772 2003/04/30 17:54:18 markm Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -143,7 +143,7 @@ COMPAT_DISTS?= compat4x .endif OTHER_DISTS?= catpages manpages games proflibs dict info doc -CRYPTO_DISTS?= crypto krb5 +CRYPTO_DISTS?= crypto BASE_DISTS?= base DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} @@ -513,7 +513,7 @@ cd ${.CURDIR}/.. && ${CROSSMAKE} distributeworld DISTDIR=${RD}/trees touch release.2 -# Build and install crypto and krb5 distributions. +# Build and install crypto distributions. release.3: # Handle some grief caused by the munition braindeadness. cd ${.CURDIR}/..; \ @@ -605,13 +605,6 @@ echo "$${i} distribution is finished."; \ fi ; \ done - # More munition braindeadness. - ( cd ${RD}/dists && \ - if [ -f krb5/krb5.aa ] ; then \ - mv krb5/krb5.* crypto && \ - cat krb5/CHECKSUM.MD5 >> crypto/CHECKSUM.MD5 && \ - rm -r krb5; \ - fi ) touch release.7 ==== //depot/projects/hammer/release/picobsd/tinyware/passwd/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 4/2/94 -# $FreeBSD: src/release/picobsd/tinyware/passwd/Makefile,v 1.2 2002/06/20 21:17:33 luigi Exp $ +# $FreeBSD: src/release/picobsd/tinyware/passwd/Makefile,v 1.3 2003/04/30 17:50:08 markm Exp $ # Only NOPAM is used by PicoBSD and supported here @@ -57,19 +57,6 @@ LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd MLINKS=passwd.1 yppasswd.1 -.if exists(${DESTDIR}${LIBDIR}/libkrb.a) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS4) -SRCS+= kpasswd_standalone.c -.PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ - ${.CURDIR}/../../usr.bin/rlogin ${.CURDIR}/../../usr.bin/passwd \ - ${.CURDIR}/../../crypto/kerberosIV/kadmin - -CFLAGS+= -DKERBEROS -# XXX not defined: ${LIBKADM}, ${LIBCOM_ERR} -DPADD= ${LIBKADM} ${LIBKRB} ${LIBCRYPTO} ${LIBCRYPT} ${LIBRPCSVC} ${LIBCOM_ERR} ${LIBUTIL} -LDADD= -lkadm -lkrb -lcrypto -lcrypt -lrpcsvc -lcom_err -lutil -DISTRIBUTION= krb4 -.endif - beforeinstall: .for i in passwd yppasswd [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ ==== //depot/projects/hammer/release/scripts/crypto-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/crypto-install.sh,v 1.2 2001/04/08 23:09:21 obrien Exp $ +# $FreeBSD: src/release/scripts/crypto-install.sh,v 1.3 2003/04/30 17:54:19 markm Exp $ # if [ "`id -u`" != "0" ]; then @@ -13,14 +13,11 @@ echo -n "otherwise hit return to continue. " read junk cat crypto.?? | tar --unlink -xpzf - -C ${_DEST} -cat krb4.?? | tar --unlink -xpzf - -C ${_DEST} -cat krb5.?? | tar --unlink -xpzf - -C ${_DEST} echo -n "Do you want to install the CRYPTO sources (y/n)? " read ans if [ "$ans" = "y" ]; then cat scrypto.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src cat ssecure.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src - cat skrb4.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src cat skrb5.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src fi exit 0 ==== //depot/projects/hammer/secure/usr.bin/ssh/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.21 2003/04/23 17:25:47 des Exp $ +# $FreeBSD: src/secure/usr.bin/ssh/Makefile,v 1.22 2003/04/30 17:46:24 markm Exp $ # PROG= ssh @@ -11,7 +11,6 @@ sshconnect.c sshconnect1.c sshconnect2.c .if defined(MAKE_KERBEROS5) -DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -DHEIMDAL LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} ==== //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.30 2003/04/23 17:25:47 des Exp $ +# $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.31 2003/04/30 17:46:24 markm Exp $ # PROG= sshd @@ -17,7 +17,6 @@ CFLAGS+=-I${SSHDIR} .if defined(MAKE_KERBEROS5) -DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -DHEIMDAL SRCS+= auth-krb5.c LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304301834.h3UIY6cw037121>