From ad67ebdb8c2d49f5986dd2625f6d95c0ab99c75d Mon Sep 17 00:00:00 2001 From: dwhite Date: Tue, 24 Aug 1999 23:28:26 +0000 Subject: Fix patch so it applies without asking for a filename. --- release/picobsd/net/crunch1/passwd.diff | 50 +++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 21 deletions(-) (limited to 'release/picobsd/net/crunch1/passwd.diff') diff --git a/release/picobsd/net/crunch1/passwd.diff b/release/picobsd/net/crunch1/passwd.diff index 1684111..3f43505 100644 --- a/release/picobsd/net/crunch1/passwd.diff +++ b/release/picobsd/net/crunch1/passwd.diff @@ -1,40 +1,48 @@ +*** Makefile.orig Sat Aug 1 20:39:04 1998 +--- Makefile Sat Aug 1 20:40:38 1998 *************** -*** 2,20 **** - # $Id: Makefile,v 1.30.2.2 1999/07/29 16:37:09 sheldonh Exp $ +*** 2,24 **** + # $Id: passwd.diff,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ PROG= passwd -- SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \ -- yp_passwd.c ypxfr_misc.c ${GENSRCS} +! SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \ +! yp_passwd.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \ yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c - CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS + CFLAGS+=-Wall -- DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} -- LDADD= -lcrypt -lrpcsvc -lutil +! DPADD= ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} +! LDADD= -lcrypt -lrpcsvc -lutil .PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ -- ${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \ -- ${.CURDIR}/../../usr.sbin/rpc.yppasswdd +! ${.CURDIR}/../rlogin ${.CURDIR}/../../libexec/ypxfr \ +! ${.CURDIR}/../../usr.sbin/rpc.yppasswdd -- CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \ +! CFLAGS+= -DLOGIN_CAP -DCRYPT -DYP -I. -I${.CURDIR} \ -I${.CURDIR}/../../usr.sbin/vipw \ -I${.CURDIR}/../../usr.bin/chpass \ - -I${.CURDIR}/../../libexec/ypxfr \ ---- 2,19 ---- - # $Id: Makefile,v 1.30.2.2 1999/07/29 16:37:09 sheldonh Exp $ +- -I${.CURDIR}/../../libexec/ypxfr \ +- -I${.CURDIR}/../../usr.sbin/rpc.yppasswdd \ + -Dyp_error=warnx -DLOGGING + + CLEANFILES= ${GENSRCS} +--- 2,21 ---- + # $Id: passwd.diff,v 1.1.1.1 1998/08/27 17:38:43 abial Exp $ PROG= passwd -+ SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c -+ +! SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c +! GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c \ yppasswd_private.h yppasswd_private_clnt.c yppasswd_private_xdr.c - CFLAGS+=-Wall -DPASSWD_IGNORE_COMMENTS + CFLAGS+=-Wall -+ DPADD= ${LIBCRYPT} ${LIBUTIL} -+ LDADD= -lcrypt -lutil +! DPADD= ${LIBCRYPT} ${LIBUTIL} +! LDADD= -lcrypt -lutil .PATH: ${.CURDIR}/../../usr.bin/chpass ${.CURDIR}/../../usr.sbin/vipw \ -+ ${.CURDIR}/../rlogin +! ${.CURDIR}/../rlogin -+ CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \ +! CFLAGS+= -DLOGIN_CAP -DCRYPT -I. -I${.CURDIR} \ -I${.CURDIR}/../../usr.sbin/vipw \ -I${.CURDIR}/../../usr.bin/chpass \ - -I${.CURDIR}/../../libexec/ypxfr \ + -Dyp_error=warnx -DLOGGING + + CLEANFILES= ${GENSRCS} -- cgit v1.1