JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

intermediate, broken, does not even apply

Browse Source 
cvs and jupp in combination can produce weird results
jupp should be audited, or rewritten even
This commit is contained in:
tg
2003-03-22 16:14:09 +00:00
parent 45647567e6
commit a3d40b321c
1 changed files with 254 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

430
obsd.diff
View File

@@ -2,29 +2,25 @@
>> MirBSD is a modified version of OpenBSD (http://www.OpenBSD.org/)
Copyright (c) 1982-2003 by Thorsten "mirabile" Glaser <x86@ePost.de>
Copyright <20> 1968-2003 NOP by the authors of and contributors to AT&T
UNIX<EFBFBD>; the "C" Language, xBSD/Berkeley Unix; 386BSD, NetBSD 1.1,
OpenBSD and MirBSD. The licence conditions of specific files be-
fore patching also applies to the patched unless the file is re-
placed in its entirety.
Copyright <20> 1968-2003 The authors of And contributors to UNIX<EFBFBD>, the
"C" Language, BSD/Berkeley Unix; 386BSD, NetBSD 1.1 and OpenBSD.
I hereby permit everyone who obtained a copy of this work to distri-
bute, sell, give away, modify, sublicense, merge and use it, freely.
I retain the right to be known as an author of the work.
Anyone who obtained a copy of this work is hereby permitted to freely use,
distribute, modify, merge, sublicence, give away or sell it as long as the
authors are given due credit and the following notice is retained:
The work is provided "as is", with no explicit or implicit warranty.
Use at your own risk. Neither author nor any contributor may be held
liable for any damage, directly or indirectly, which originated thru
creation or modification of this work. Because computing devices are
error-prone, flawless behaviour cannot be expected.
This work is provided "as is", with no explicit or implicit warranty what-
soever. Use it only at your own risk. In no event may an author or contri-
butor be held liable for any damage, directly or indirectly, that origina-
ted through or is caused by creation or modification of this work.
This diff, ID $MirBSD: obsd.diff,v 1.30 2003/03/07 18:06:48 tg Exp $
This diff, ID $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $
(/usr/ports/mystuff/diff-metafiles to obsd.diff) is made
against CTM on Fri Mar 7 18:00:30 UTC 2003.
against CTM on Sat Mar 22 15:17:36 UTC 2003.
### GENERATOR: @(#)_MirBSD: regen-obsdp.sh,v 1.14 2003/03/01 22:12:48 tg Exp $
### CTM OpenBSD-cvs 3094
### GENERATOR: @(#)_MirBSD: regen-obsdp.sh,v 1.15 2003/03/09 21:54:38 tg Exp $
### CTM OpenBSD-cvs 3132
Index: src/bin/csh/csh.1
===================================================================
RCS file: /cvs/src/bin/csh/csh.1,v
@@ -116,17 +112,22 @@ RCS file: /cvs/src/bin/ksh/c_ulimit.c,v
retrieving revision 1.9
diff -u -r1.9 c_ulimit.c
--- src/bin/ksh/c_ulimit.c 9 Jun 2002 05:47:05 -0000 1.9
+++ src/bin/ksh/c_ulimit.c 4 Mar 2003 16:52:39 -0000
@@ -56,6 +56,9 @@
+++ src/bin/ksh/c_ulimit.c 22 Mar 2003 15:03:26 -0000
@@ -1,3 +1,4 @@
+/* $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $ */
/* $OpenBSD: c_ulimit.c,v 1.9 2002/06/09 05:47:27 todd Exp $ */
/*
@@ -55,6 +56,9 @@
/* Do not use options -H, -S or -a */
#ifdef RLIMIT_CPU
{ "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' },
#endif
+#endif
+#ifdef RLIMIT_TIME
+ { "humantime(seconds)", RLIMIT, RLIMIT_TIME, RLIMIT_TIME, 1, 'T' },
+#endif
#endif
#ifdef RLIMIT_FSIZE
{ "file(blocks)", RLIMIT, RLIMIT_FSIZE, RLIMIT_FSIZE, 512, 'f' },
#else /* RLIMIT_FSIZE */
Index: src/bin/ksh/history.c
===================================================================
RCS file: /cvs/src/bin/ksh/history.c,v
@@ -148,10 +149,15 @@ diff -u -r1.17 history.c
Index: src/bin/ksh/ksh.1tbl
===================================================================
RCS file: /cvs/src/bin/ksh/ksh.1tbl,v
retrieving revision 1.48
diff -u -r1.48 ksh.1tbl
--- src/bin/ksh/ksh.1tbl 18 Sep 2002 07:33:25 -0000 1.48
+++ src/bin/ksh/ksh.1tbl 4 Mar 2003 16:52:39 -0000
retrieving revision 1.50
diff -u -r1.50 ksh.1tbl
--- src/bin/ksh/ksh.1tbl 20 Mar 2003 07:30:15 -0000 1.50
+++ src/bin/ksh/ksh.1tbl 22 Mar 2003 15:03:21 -0000
@@ -1,3 +1,4 @@
+.\" $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $
.\" $OpenBSD: ksh.1tbl,v 1.50 2003/03/20 07:30:37 jmc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -4018,6 +4018,11 @@
.Ar n
.Tn CPU
@@ -3058,17 +3064,22 @@ RCS file: /cvs/src/lib/libc/sys/getrlimit.2,v
retrieving revision 1.11
diff -u -r1.11 getrlimit.2
--- src/lib/libc/sys/getrlimit.2 18 Oct 2000 05:11:47 -0000 1.11
+++ src/lib/libc/sys/getrlimit.2 4 Mar 2003 16:52:40 -0000
@@ -68,6 +68,9 @@
+++ src/lib/libc/sys/getrlimit.2 22 Mar 2003 15:11:09 -0000
@@ -1,3 +1,4 @@
+.\" $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $
.\" $OpenBSD: getrlimit.2,v 1.11 2000/10/18 05:12:09 aaron Exp $
.\" $NetBSD: getrlimit.2,v 1.8 1995/10/12 15:40:58 jtc Exp $
.\"
@@ -67,6 +68,9 @@
file that may be created.
.It Li RLIMIT_CPU
The maximum amount of cpu time (in seconds) to be used by
each process.
+each process.
+.It Li RLIMIT_TIME
+The maximum amount of human time (in seconds) to be used by
+each process.
each process.
.It Li RLIMIT_DATA
The maximum size (in bytes) of the data segment for a process;
this defines how far a program may extend its break with the
Index: src/lib/libpthread/uthread/uthread_mutex.c
===================================================================
RCS file: /cvs/src/lib/libpthread/uthread/uthread_mutex.c,v
@@ -3117,6 +3128,215 @@ diff -u -r1.36 passwd.c
(void)setrlimit(RLIMIT_FSIZE, &rlim);
(void)setrlimit(RLIMIT_STACK, &rlim);
(void)setrlimit(RLIMIT_DATA, &rlim);
Index: src/usr.bin/ssh/ssh/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- src/usr.bin/ssh/ssh/Makefile 20 Jun 2002 19:55:45 -0000 1.42
+++ src/usr.bin/ssh/ssh/Makefile 7 Mar 2003 18:07:05 -0000
@@ -23,7 +23,7 @@
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
LDADD+= -lkrb
DPADD+= ${LIBKRB}
Index: src/usr.bin/ssh/sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- src/usr.bin/ssh/sshd/Makefile 21 Feb 2003 09:03:47 -0000 1.52
+++ src/usr.bin/ssh/sshd/Makefile 7 Mar 2003 18:07:05 -0000
@@ -27,7 +27,7 @@
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
.if (${AFS:L} == "yes")
CFLAGS+= -DAFS
LDADD+= -lkafs
Index: src/usr.bin/telnet/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/telnet/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- src/usr.bin/telnet/Makefile 11 May 2002 00:19:58 -0000 1.17
+++ src/usr.bin/telnet/Makefile 22 Mar 2003 14:44:00 -0000
@@ -1,3 +1,4 @@
+# $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $
# $OpenBSD: Makefile,v 1.17 2002/05/11 00:20:20 espie Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
@@ -11,10 +12,6 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
# 4. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
@@ -52,7 +49,7 @@
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES}
.endif
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4
LDADD+= -lkrb -lcrypto -ldes
DPADD+= ${LIBDES} ${LIBKRB} ${LIBDES}
Index: src/usr.bin/xlint/lint1/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/xlint/lint1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/usr.bin/xlint/lint1/Makefile 11 Sep 2001 00:06:06 -0000 1.3
+++ src/usr.bin/xlint/lint1/Makefile 7 Mar 2003 18:07:05 -0000
@@ -8,7 +8,7 @@
LDADD+= -ll
DPADD+= ${LIBL}
YFLAGS= -d
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
LINTFLAGS=-aehpz
CLEANFILES+=y.tab.h cgram.c scan.c
Index: src/usr.sbin/amd/fsinfo/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/amd/fsinfo/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- src/usr.sbin/amd/fsinfo/Makefile 18 Oct 1995 08:46:59 -0000 1.1.1.1
+++ src/usr.sbin/amd/fsinfo/Makefile 7 Mar 2003 18:07:05 -0000
@@ -12,7 +12,7 @@
CLEANFILES= \
fsi_gram.c y.tab.c fsi_gram.h y.tab.h \
fsi_lex.c lex.yy.c y.output
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-I${.CURDIR}/../include
CFLAGS+=-I${.CURDIR}/../config
CFLAGS+=-DOS_HDR=\"os-${OS}.h\"
Index: src/usr.sbin/arp/arp.8
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.8,v
retrieving revision 1.12
diff -u -r1.12 arp.8
--- src/usr.sbin/arp/arp.8 13 Feb 2002 08:33:25 -0000 1.12
+++ src/usr.sbin/arp/arp.8 22 Mar 2003 14:42:00 -0000
@@ -1,3 +1,4 @@
+.\" $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $
.\" $OpenBSD: arp.8,v 1.12 2002/02/13 08:33:47 mpech Exp $
.\" $NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
.\"
@@ -12,10 +13,6 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
.\" 4. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
@@ -136,6 +133,7 @@
.Ed
.Pp
with argument meanings as given above.
+Lines beginning with '#' are considered comments and are ignored.
.El
.Sh EXAMPLES
To view the current
Index: src/usr.sbin/arp/arp.c
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.c,v
retrieving revision 1.26
diff -u -r1.26 arp.c
Binary files /tmp/cvst13485 and arp.c differ
Index: src/usr.sbin/ppp/ppp/alias_nbt.c
===================================================================
RCS file: /cvs/src/usr.sbin/ppp/ppp/alias_nbt.c,v
retrieving revision 1.8
diff -u -r1.8 alias_nbt.c
--- src/usr.sbin/ppp/ppp/alias_nbt.c 15 Jun 2002 08:01:37 -0000 1.8
+++ src/usr.sbin/ppp/ppp/alias_nbt.c 22 Mar 2003 14:37:07 -0000
@@ -1,3 +1,4 @@
+/* $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $ */
/*-
* Written by Atsushi Murai <amurai@spec.co.jp>
* Copyright (c) 1998, System Planning and Engineering Co.
@@ -111,7 +112,7 @@
case CFT_ERR:
printf("\nName in conflict error.\n");
default:
- printf("\n???=%0x\n", rcode );
+ printf("\n??? = %0x\n", rcode );
}
}
Index: src/usr.sbin/pppd/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- src/usr.sbin/pppd/Makefile 19 May 2002 20:47:30 -0000 1.15
+++ src/usr.sbin/pppd/Makefile 7 Mar 2003 18:07:06 -0000
@@ -15,6 +15,6 @@
LDADD= -lpcap -lutil
DPADD= ${LIBPCAP} ${LIBUTIL}
-CFLAGS+= -I. -I${PCAPDIR} -DHAVE_PATHS_H -DIPX_CHANGE -DPPP_FILTER -DUSE_CRYPT -DCHAPMS
+CFLAGS+= -I. -I${.CURDIR} -I${PCAPDIR} -DHAVE_PATHS_H -DIPX_CHANGE -DPPP_FILTER -DUSE_CRYPT -DCHAPMS
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.lockd/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/rpc.lockd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- src/usr.sbin/rpc.lockd/Makefile 19 Aug 1997 08:04:55 -0000 1.4
+++ src/usr.sbin/rpc.lockd/Makefile 7 Mar 2003 18:07:06 -0000
@@ -7,7 +7,7 @@
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-CFLAGS+= -I. -DSYSLOG
+CFLAGS+= -I. -I${.CURDIR} -DSYSLOG
CLEANFILES= nlm_prot_svc.c nlm_prot.h
Index: src/usr.sbin/user/user.c
===================================================================
RCS file: /cvs/src/usr.sbin/user/user.c,v
retrieving revision 1.40
diff -u -r1.40 user.c
--- src/usr.sbin/user/user.c 10 Dec 2002 20:49:06 -0000 1.40
+++ src/usr.sbin/user/user.c 22 Mar 2003 14:34:32 -0000
@@ -1,3 +1,4 @@
+/* $MirBSD: obsd.diff,v 1.31 2003/03/22 16:14:09 tg Exp $ */
/* $OpenBSD: user.c,v 1.40 2002/12/10 20:49:28 millert Exp $ */
/* $NetBSD: user.c,v 1.45 2001/08/17 08:29:00 joda Exp $ */
@@ -1129,8 +1130,8 @@
len + strlen(newlogin) >= sizeof(buf))) {
(void) close(ptmpfd);
pw_abort();
- errx(EXIT_FAILURE, "can't add `%s',
- line too long (%d bytes)", buf,
+ errx(EXIT_FAILURE, "can't add `%s', "
+ "line too long (%d bytes)", buf,
len + strlen(newlogin));
}
if (write(ptmpfd, buf, len) != len) {
Index: src/usr.bin/passwd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/passwd/Makefile,v
@@ -3603,38 +3823,6 @@ diff -u -r1.112 sshconnect2.c
ok = key_sign(private, &signature, &slen,
buffer_ptr(&b), buffer_len(&b));
key_free(private);
Index: src/usr.bin/ssh/ssh/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- src/usr.bin/ssh/ssh/Makefile 20 Jun 2002 19:55:45 -0000 1.42
+++ src/usr.bin/ssh/ssh/Makefile 4 Mar 2003 16:52:41 -0000
@@ -23,7 +23,7 @@
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
LDADD+= -lkrb
DPADD+= ${LIBKRB}
Index: src/usr.bin/ssh/sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- src/usr.bin/ssh/sshd/Makefile 21 Feb 2003 09:03:47 -0000 1.52
+++ src/usr.bin/ssh/sshd/Makefile 4 Mar 2003 16:52:41 -0000
@@ -27,7 +27,7 @@
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
.if (${AFS:L} == "yes")
CFLAGS+= -DAFS
LDADD+= -lkafs
Index: src/usr.bin/sudo/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/usr.bin/sudo/Makefile.bsd-wrapper,v
@@ -3651,53 +3839,6 @@ diff -u -r1.15 Makefile.bsd-wrapper
CONFIGURE_OPTS+=--with-kerb4
LDADD+= -lkrb -ldes -lkafs
DPADD+= ${LIBKRB} ${LIBDES} ${LIBKAFS}
Index: src/usr.bin/xlint/lint1/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/xlint/lint1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/usr.bin/xlint/lint1/Makefile 11 Sep 2001 00:06:06 -0000 1.3
+++ src/usr.bin/xlint/lint1/Makefile 4 Mar 2003 16:52:41 -0000
@@ -8,7 +8,7 @@
LDADD+= -ll
DPADD+= ${LIBL}
YFLAGS= -d
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
LINTFLAGS=-aehpz
CLEANFILES+=y.tab.h cgram.c scan.c
Index: src/usr.sbin/amd/fsinfo/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/amd/fsinfo/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- src/usr.sbin/amd/fsinfo/Makefile 18 Oct 1995 08:46:59 -0000 1.1.1.1
+++ src/usr.sbin/amd/fsinfo/Makefile 4 Mar 2003 16:52:41 -0000
@@ -12,7 +12,7 @@
CLEANFILES= \
fsi_gram.c y.tab.c fsi_gram.h y.tab.h \
fsi_lex.c lex.yy.c y.output
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
CFLAGS+=-I${.CURDIR}/../include
CFLAGS+=-I${.CURDIR}/../config
CFLAGS+=-DOS_HDR=\"os-${OS}.h\"
Index: src/usr.sbin/arp/arp.8
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.8,v
retrieving revision 1.12
diff -u -r1.12 arp.8
--- src/usr.sbin/arp/arp.8 13 Feb 2002 08:33:25 -0000 1.12
+++ src/usr.sbin/arp/arp.8 4 Mar 2003 16:52:41 -0000
@@ -136,6 +136,7 @@
.Ed
.Pp
with argument meanings as given above.
+Lines beginning with '#' are considered comments and are ignored.
.El
.Sh EXAMPLES
To view the current
Index: src/usr.sbin/arp/arp.c
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.c,v
@@ -3716,72 +3857,6 @@ diff -u -r1.25 arp.c
i = sscanf(line, "%49s %49s %49s %49s %49s", arg[0], arg[1], arg[2],
arg[3], arg[4]);
if (i < 2) {
Index: src/usr.sbin/ppp/ppp/alias_nbt.c
===================================================================
RCS file: /cvs/src/usr.sbin/ppp/ppp/alias_nbt.c,v
retrieving revision 1.8
diff -u -r1.8 alias_nbt.c
--- src/usr.sbin/ppp/ppp/alias_nbt.c 15 Jun 2002 08:01:37 -0000 1.8
+++ src/usr.sbin/ppp/ppp/alias_nbt.c 4 Mar 2003 16:52:41 -0000
@@ -111,7 +111,7 @@
case CFT_ERR:
printf("\nName in conflict error.\n");
default:
- printf("\n???=%0x\n", rcode );
+ printf("\n??? = %0x\n", rcode );
}
}
Index: src/usr.sbin/pppd/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- src/usr.sbin/pppd/Makefile 19 May 2002 20:47:30 -0000 1.15
+++ src/usr.sbin/pppd/Makefile 4 Mar 2003 16:52:41 -0000
@@ -15,6 +15,6 @@
LDADD= -lpcap -lutil
DPADD= ${LIBPCAP} ${LIBUTIL}
-CFLAGS+= -I. -I${PCAPDIR} -DHAVE_PATHS_H -DIPX_CHANGE -DPPP_FILTER -DUSE_CRYPT -DCHAPMS
+CFLAGS+= -I. -I${.CURDIR} -I${PCAPDIR} -DHAVE_PATHS_H -DIPX_CHANGE -DPPP_FILTER -DUSE_CRYPT -DCHAPMS
.include <bsd.prog.mk>
Index: src/usr.sbin/rpc.lockd/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/rpc.lockd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- src/usr.sbin/rpc.lockd/Makefile 19 Aug 1997 08:04:55 -0000 1.4
+++ src/usr.sbin/rpc.lockd/Makefile 4 Mar 2003 16:52:42 -0000
@@ -7,7 +7,7 @@
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
-CFLAGS+= -I. -DSYSLOG
+CFLAGS+= -I. -I${.CURDIR} -DSYSLOG
CLEANFILES= nlm_prot_svc.c nlm_prot.h
Index: src/usr.sbin/user/user.c
===================================================================
RCS file: /cvs/src/usr.sbin/user/user.c,v
retrieving revision 1.40
diff -u -r1.40 user.c
--- src/usr.sbin/user/user.c 10 Dec 2002 20:49:06 -0000 1.40
+++ src/usr.sbin/user/user.c 4 Mar 2003 16:52:42 -0000
@@ -1129,8 +1129,8 @@
len + strlen(newlogin) >= sizeof(buf))) {
(void) close(ptmpfd);
pw_abort();
- errx(EXIT_FAILURE, "can't add `%s',
- line too long (%d bytes)", buf,
+ errx(EXIT_FAILURE, "can't add `%s', "
+ "line too long (%d bytes)", buf,
len + strlen(newlogin));
}
if (write(ptmpfd, buf, len) != len) {
Index: ports/mystuff/diff-metafiles (meta file)
===================================================================
ports/mystuff/diff-metafiles .
@@ -3813,7 +3888,9 @@ src/gnu/usr.sbin/sendmail/sendmail/conf.c humantime
src/lib/libc/gen/login_cap.c humantime
src/lib/libc/sys/getrlimit.2 humantime
src/lib/libpthread/uthread/uthread_mutex.c uninitialized
src/lib/libtelnet/Makefile -krb
src/lib/libutil/passwd.c humantime
src/libexec/telnetd/Makefile -krb
src/sbin/isakmpd/util.c gcc botch
src/usr.bin/passwd/Makefile $.curdir, krb4
src/usr.bin/rdist/Makefile $.curdir
@@ -3826,6 +3903,7 @@ src/usr.bin/ssh/ssh/Makefile kerberos4
src/usr.bin/ssh/sshconnect2.c gobbles
src/usr.bin/ssh/sshd/Makefile kerberos4
src/usr.bin/sudo/Makefile.bsd-wrapper kerberos4
src/usr.bin/telnet/Makefile -krb
src/usr.bin/xlint/lint1/Makefile $.curdir
src/usr.sbin/amd/fsinfo/Makefile $.curdir
src/usr.sbin/arp/arp.8 arp stripcomments