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

pre-build development

Browse Source 
do not use... cpp stuff is still untested (needs manual symlinking),
and userland as well
This commit is contained in:
tg 2003-02-23 22:04:06 +00:00
parent 2f45cd66e7
commit fa6b5092c3
1 changed files with 129 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
obsd.diff
View File

@ -21,9 +21,9 @@ by the creation or modification of this work. Since modern computing
devices are error-prone, flawless behaviour cannot be expected.
This diff, ID $MirBSD: obsd.diff,v 1.21 2003/02/23 17:59:42 tg Exp $
This diff, ID $MirBSD: obsd.diff,v 1.22 2003/02/23 22:04:06 tg Exp $
(/usr/ports/mystuff/diff-metafiles to obsd.diff) is made
against CTM on Sun Feb 23 17:35:50 UTC 2003.
against CTM on Sun Feb 23 22:02:05 UTC 2003.
### GENERATOR: @(#)_MirBSD: regen-obsdp.sh,v 1.11 2003/02/23 17:34:59 tg Exp $
### CTM OpenBSD-cvs 3060
@ -33,7 +33,7 @@ RCS file: /cvs/src/bin/csh/csh.1,v
retrieving revision 1.42
diff -u -r1.42 csh.1
--- src/bin/csh/csh.1 13 Nov 2001 13:59:53 -0000 1.42
+++ src/bin/csh/csh.1 11 Feb 2003 21:09:28 -0000
+++ src/bin/csh/csh.1 23 Feb 2003 18:22:07 -0000
@@ -1839,6 +1839,9 @@
.Ar cputime
(the maximum
@ -50,7 +50,7 @@ RCS file: /cvs/src/bin/csh/func.c,v
retrieving revision 1.15
diff -u -r1.15 func.c
--- src/bin/csh/func.c 9 Jun 2002 05:47:05 -0000 1.15
+++ src/bin/csh/func.c 11 Feb 2003 21:09:28 -0000
+++ src/bin/csh/func.c 23 Feb 2003 18:22:07 -0000
@@ -1156,6 +1156,7 @@
{ RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes" },
{ RLIMIT_NPROC, "maxproc", 1, "" },
@ -118,7 +118,7 @@ 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 11 Feb 2003 21:09:28 -0000
+++ src/bin/ksh/c_ulimit.c 23 Feb 2003 18:22:07 -0000
@@ -56,6 +56,9 @@
#ifdef RLIMIT_CPU
{ "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' },
@ -135,7 +135,7 @@ RCS file: /cvs/src/bin/ksh/history.c,v
retrieving revision 1.16
diff -u -r1.16 history.c
--- src/bin/ksh/history.c 27 Nov 2002 20:53:03 -0000 1.16
+++ src/bin/ksh/history.c 11 Feb 2003 21:09:28 -0000
+++ src/bin/ksh/history.c 23 Feb 2003 18:22:07 -0000
@@ -1017,8 +1017,8 @@
register int bytes;
{
@ -153,7 +153,7 @@ 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 11 Feb 2003 21:09:28 -0000
+++ src/bin/ksh/ksh.1tbl 23 Feb 2003 18:22:08 -0000
@@ -4018,6 +4018,11 @@
.Ar n
.Tn CPU
@ -172,7 +172,7 @@ RCS file: /cvs/src/distrib/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- src/distrib/Makefile 30 Jan 2003 21:58:56 -0000 1.22
+++ src/distrib/Makefile 23 Feb 2003 16:47:15 -0000
+++ src/distrib/Makefile 23 Feb 2003 18:22:08 -0000
@@ -1,23 +1,14 @@
# $OpenBSD: Makefile,v 1.22 2003/01/30 21:59:18 deraadt Exp $
@ -204,7 +204,7 @@ RCS file: /cvs/src/distrib/sets/lists/base/md.i386,v
retrieving revision 1.346
diff -u -r1.346 md.i386
--- src/distrib/sets/lists/base/md.i386 13 Feb 2003 21:35:03 -0000 1.346
+++ src/distrib/sets/lists/base/md.i386 23 Feb 2003 16:54:52 -0000
+++ src/distrib/sets/lists/base/md.i386 23 Feb 2003 18:22:08 -0000
@@ -33,9 +33,6 @@
./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/cpp0
./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include
@ -318,7 +318,7 @@ RCS file: /cvs/src/distrib/sets/lists/base/mi,v
retrieving revision 1.259
diff -u -r1.259 mi
--- src/distrib/sets/lists/base/mi 20 Feb 2003 08:23:05 -0000 1.259
+++ src/distrib/sets/lists/base/mi 23 Feb 2003 16:54:50 -0000
+++ src/distrib/sets/lists/base/mi 23 Feb 2003 21:59:23 -0000
@@ -45,7 +45,6 @@
./dev
./dev/MAKEDEV
@ -363,15 +363,7 @@ diff -u -r1.259 mi
./usr/bin/c2ph
./usr/bin/cal
./usr/bin/calendar
@@ -194,7 +192,6 @@
./usr/bin/comm
./usr/bin/compile_et
./usr/bin/compress
-./usr/bin/cpp
./usr/bin/crontab
./usr/bin/ctags
./usr/bin/cu
@@ -204,6 +201,7 @@
@@ -204,6 +202,7 @@
./usr/bin/dbmmanage
./usr/bin/dc
./usr/bin/deroff
@ -379,7 +371,7 @@ diff -u -r1.259 mi
./usr/bin/diff
./usr/bin/diff3
./usr/bin/dirname
@@ -254,6 +252,7 @@
@@ -254,6 +253,7 @@
./usr/bin/head
./usr/bin/help
./usr/bin/hexdump
@ -387,7 +379,7 @@ diff -u -r1.259 mi
./usr/bin/hoststat
./usr/bin/hpftodit
./usr/bin/htdigest
@@ -272,12 +271,8 @@
@@ -272,12 +272,8 @@
./usr/bin/ipcs
./usr/bin/join
./usr/bin/jot
@ -400,7 +392,7 @@ diff -u -r1.259 mi
./usr/bin/ktrace
./usr/bin/lam
./usr/bin/last
@@ -320,6 +315,7 @@
@@ -320,6 +316,7 @@
./usr/bin/msgs
./usr/bin/nawk
./usr/bin/nc
@ -408,7 +400,7 @@ diff -u -r1.259 mi
./usr/bin/neqn
./usr/bin/netstat
./usr/bin/newaliases
@@ -329,6 +325,7 @@
@@ -329,6 +326,7 @@
./usr/bin/nm
./usr/bin/nohup
./usr/bin/nroff
@ -416,7 +408,7 @@ diff -u -r1.259 mi
./usr/bin/od
./usr/bin/oldrdist
./usr/bin/olf2elf
@@ -338,10 +335,10 @@
@@ -338,7 +336,6 @@
./usr/bin/otp-sha1
./usr/bin/page
./usr/bin/pagesize
@ -424,10 +416,6 @@ diff -u -r1.259 mi
./usr/bin/passwd
./usr/bin/paste
./usr/bin/patch
+./usr/bin/pcpp
./usr/bin/perl
./usr/bin/perl5.8.0
./usr/bin/perlbug
@@ -417,7 +414,6 @@
./usr/bin/ssh-agent
./usr/bin/ssh-keygen
@ -1829,7 +1817,7 @@ RCS file: /cvs/src/distrib/sets/lists/comp/md.i386,v
retrieving revision 1.89
diff -u -r1.89 md.i386
--- src/distrib/sets/lists/comp/md.i386 13 Feb 2003 21:35:04 -0000 1.89
+++ src/distrib/sets/lists/comp/md.i386 23 Feb 2003 16:54:51 -0000
+++ src/distrib/sets/lists/comp/md.i386 23 Feb 2003 18:22:08 -0000
@@ -1,5 +1,9 @@
+./usr/bin/addr2line
+./usr/bin/gasp
@ -1931,7 +1919,7 @@ RCS file: /cvs/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.368
diff -u -r1.368 mi
--- src/distrib/sets/lists/comp/mi 20 Feb 2003 08:23:05 -0000 1.368
+++ src/distrib/sets/lists/comp/mi 23 Feb 2003 16:54:48 -0000
+++ src/distrib/sets/lists/comp/mi 23 Feb 2003 18:22:08 -0000
@@ -2,16 +2,11 @@
./usr/bin/ar
./usr/bin/as
@ -2277,7 +2265,7 @@ RCS file: /cvs/src/distrib/sets/lists/etc/mi,v
retrieving revision 1.70
diff -u -r1.70 mi
--- src/distrib/sets/lists/etc/mi 20 Feb 2003 08:23:06 -0000 1.70
+++ src/distrib/sets/lists/etc/mi 23 Feb 2003 16:54:42 -0000
+++ src/distrib/sets/lists/etc/mi 23 Feb 2003 18:22:08 -0000
@@ -1,10 +1,5 @@
./.cshrc
./.profile
@ -2382,7 +2370,7 @@ RCS file: /cvs/src/distrib/sets/lists/man/md.i386,v
retrieving revision 1.29
diff -u -r1.29 md.i386
--- src/distrib/sets/lists/man/md.i386 25 May 2000 21:56:28 -0000 1.29
+++ src/distrib/sets/lists/man/md.i386 23 Feb 2003 16:54:51 -0000
+++ src/distrib/sets/lists/man/md.i386 23 Feb 2003 18:22:08 -0000
@@ -1,5 +1,2 @@
-./usr/share/man/cat1/ld.so.0
./usr/share/man/cat1/ldd.0
@ -2395,7 +2383,7 @@ RCS file: /cvs/src/distrib/sets/lists/man/mi,v
retrieving revision 1.425
diff -u -r1.425 mi
--- src/distrib/sets/lists/man/mi 17 Feb 2003 01:10:33 -0000 1.425
+++ src/distrib/sets/lists/man/mi 23 Feb 2003 16:54:40 -0000
+++ src/distrib/sets/lists/man/mi 23 Feb 2003 18:22:08 -0000
@@ -40,6 +40,16 @@
./usr/share/info/amdref.info-1
./usr/share/info/amdref.info-2
@ -2768,7 +2756,7 @@ RCS file: /cvs/src/etc/inetd.conf,v
retrieving revision 1.50
diff -u -r1.50 inetd.conf
--- src/etc/inetd.conf 2 Aug 2002 23:27:11 -0000 1.50
+++ src/etc/inetd.conf 11 Feb 2003 21:09:29 -0000
+++ src/etc/inetd.conf 23 Feb 2003 18:22:08 -0000
@@ -22,6 +22,7 @@
#ntalk dgram udp wait root /usr/libexec/ntalkd ntalkd
#bootps dgram udp wait root /usr/sbin/bootpd bootpd
@ -2783,7 +2771,7 @@ RCS file: /cvs/src/etc/sysctl.conf,v
retrieving revision 1.28
diff -u -r1.28 sysctl.conf
--- src/etc/sysctl.conf 31 May 2002 19:35:06 -0000 1.28
+++ src/etc/sysctl.conf 11 Feb 2003 21:09:29 -0000
+++ src/etc/sysctl.conf 23 Feb 2003 18:22:08 -0000
@@ -11,12 +11,12 @@
#net.inet.esp.enable=0 # 0=Disable the ESP IPsec protocol
#net.inet.ah.enable=0 # 0=Disable the AH IPsec protocol
@ -2805,7 +2793,7 @@ RCS file: /cvs/src/gnu/usr.bin/binutils/binutils/bucomm.c,v
retrieving revision 1.5
diff -u -r1.5 bucomm.c
--- src/gnu/usr.bin/binutils/binutils/bucomm.c 13 May 2002 17:07:10 -0000 1.5
+++ src/gnu/usr.bin/binutils/binutils/bucomm.c 11 Feb 2003 21:09:29 -0000
+++ src/gnu/usr.bin/binutils/binutils/bucomm.c 23 Feb 2003 18:22:08 -0000
@@ -215,7 +215,7 @@
static char template[] = "stXXXXXX";
char *tmpname;
@ -2821,7 +2809,7 @@ RCS file: /cvs/src/gnu/usr.bin/perl/Configure,v
retrieving revision 1.11
diff -u -r1.11 Configure
--- src/gnu/usr.bin/perl/Configure 27 Oct 2002 22:24:54 -0000 1.11
+++ src/gnu/usr.bin/perl/Configure 11 Feb 2003 21:09:29 -0000
+++ src/gnu/usr.bin/perl/Configure 23 Feb 2003 18:22:08 -0000
@@ -747,7 +747,7 @@
dlsrc=''
ld=''
@ -2837,7 +2825,7 @@ RCS file: /cvs/src/gnu/usr.bin/perl/Makefile.bsd-wrapper,v
retrieving revision 1.51
diff -u -r1.51 Makefile.bsd-wrapper
--- src/gnu/usr.bin/perl/Makefile.bsd-wrapper 27 Oct 2002 22:24:54 -0000 1.51
+++ src/gnu/usr.bin/perl/Makefile.bsd-wrapper 15 Feb 2003 23:14:06 -0000
+++ src/gnu/usr.bin/perl/Makefile.bsd-wrapper 23 Feb 2003 21:35:05 -0000
@@ -6,9 +6,15 @@
# To build a threaded perl, uncomment this. Currently, there are bugs...
#THREADED=-Dusethreads
@ -2864,22 +2852,97 @@ diff -u -r1.51 Makefile.bsd-wrapper
.if defined (INSTALL_STRIP) && ${INSTALL_STRIP} == "-s"
INST_PROG='/usr/bin/install -cs'
@@ -498,7 +504,7 @@
@@ -494,44 +500,70 @@
beforedepend: config.sh config.h
perl.build: perl.lib
- cd ${.OBJDIR} && exec ${MAKE}
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec ${MAKE}
config.sh: ${.OBJDIR}/config.over
cd ${.OBJDIR} && PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
- exec /bin/sh Configure -Dopenbsd_distribution=defined ${THREADED} -dsE
+ USEDL=${USE_DL} exec /bin/sh Configure -Dopenbsd_distribution=defined ${THREADED} -dsE
+ USEDL=${USE_DL} \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh Configure -Dopenbsd_distribution=defined ${THREADED} -dsE
Policy.sh:
cd ${.OBJDIR} && exec /bin/sh Policy_sh.SH
- cd ${.OBJDIR} && exec /bin/sh Policy_sh.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh Policy_sh.SH
Makefile:
- cd ${.OBJDIR} && exec /bin/sh Makefile.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh Makefile.SH
cflags:
- cd ${.OBJDIR} && exec /bin/sh cflags.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh cflags.SH
config.h:
- cd ${.OBJDIR} && exec /bin/sh config_h.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh config_h.SH
makeaperl:
- cd ${.OBJDIR} && exec /bin/sh makeaperl.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh makeaperl.SH
makedepend:
- cd ${.OBJDIR} && exec /bin/sh makedepend.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh makedepend.SH
makedir:
- cd ${.OBJDIR} && exec /bin/sh makedir.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh makedir.SH
myconfig:
- cd ${.OBJDIR} && exec /bin/sh myconfig.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh myconfig.SH
writemain:
- cd ${.OBJDIR} && exec /bin/sh writemain.SH
+ cd ${.OBJDIR} && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh writemain.SH
x2p/Makefile:
- cd ${.OBJDIR}/x2p && exec /bin/sh Makefile.SH
+ cd ${.OBJDIR}/x2p && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh Makefile.SH
x2p/cflags:
- cd ${.OBJDIR}/x2p && exec /bin/sh cflags.SH
+ cd ${.OBJDIR}/x2p && \
+ CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+ exec /bin/sh cflags.SH
# Never try to regenerate perly.c or perly.h
perly.c perly.h: perly.y
Index: src/gnu/usr.sbin/sendmail/sendmail/conf.c
===================================================================
RCS file: /cvs/src/gnu/usr.sbin/sendmail/sendmail/conf.c,v
retrieving revision 1.17
diff -u -r1.17 conf.c
--- src/gnu/usr.sbin/sendmail/sendmail/conf.c 1 Jan 2003 19:59:00 -0000 1.17
+++ src/gnu/usr.sbin/sendmail/sendmail/conf.c 11 Feb 2003 21:09:30 -0000
+++ src/gnu/usr.sbin/sendmail/sendmail/conf.c 23 Feb 2003 18:22:09 -0000
@@ -3722,6 +3722,7 @@
lim.rlim_cur = lim.rlim_max = RLIM_INFINITY;
@ -2899,7 +2962,7 @@ RCS file: /cvs/src/lib/libc/gen/login_cap.c,v
retrieving revision 1.15
diff -u -r1.15 login_cap.c
--- src/lib/libc/gen/login_cap.c 15 Dec 2002 13:26:44 -0000 1.15
+++ src/lib/libc/gen/login_cap.c 11 Feb 2003 21:09:30 -0000
+++ src/lib/libc/gen/login_cap.c 23 Feb 2003 18:22:09 -0000
@@ -492,6 +492,7 @@
char * name;
} r_list[] = {
@ -2914,7 +2977,7 @@ 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 11 Feb 2003 21:09:30 -0000
+++ src/lib/libc/sys/getrlimit.2 23 Feb 2003 18:22:09 -0000
@@ -68,6 +68,9 @@
.It Li RLIMIT_CPU
The maximum amount of cpu time (in seconds) to be used by
@ -2931,7 +2994,7 @@ RCS file: /cvs/src/lib/libpthread/uthread/uthread_mutex.c,v
retrieving revision 1.17
diff -u -r1.17 uthread_mutex.c
--- src/lib/libpthread/uthread/uthread_mutex.c 31 Jan 2003 04:45:55 -0000 1.17
+++ src/lib/libpthread/uthread/uthread_mutex.c 23 Feb 2003 16:38:11 -0000
+++ src/lib/libpthread/uthread/uthread_mutex.c 23 Feb 2003 18:22:09 -0000
@@ -111,9 +111,9 @@
const pthread_mutexattr_t * mutex_attr)
{
@ -2964,7 +3027,7 @@ RCS file: /cvs/src/lib/libutil/passwd.c,v
retrieving revision 1.36
diff -u -r1.36 passwd.c
--- src/lib/libutil/passwd.c 31 Jul 2002 21:53:12 -0000 1.36
+++ src/lib/libutil/passwd.c 11 Feb 2003 21:09:30 -0000
+++ src/lib/libutil/passwd.c 23 Feb 2003 18:22:09 -0000
@@ -354,6 +354,7 @@
/* Unlimited resource limits. */
rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
@ -2979,7 +3042,7 @@ RCS file: /cvs/src/sbin/isakmpd/util.c,v
retrieving revision 1.29
diff -u -r1.29 util.c
--- src/sbin/isakmpd/util.c 9 Jan 2003 02:51:37 -0000 1.29
+++ src/sbin/isakmpd/util.c 11 Feb 2003 21:09:30 -0000
+++ src/sbin/isakmpd/util.c 23 Feb 2003 18:22:09 -0000
@@ -402,7 +402,8 @@
j += snprintf ((*address) + j, addrlen - j, "%02x%02x",
((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[2 * i],
@ -2996,7 +3059,7 @@ RCS file: /cvs/src/usr.bin/passwd/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- src/usr.bin/passwd/Makefile 8 May 2002 19:41:31 -0000 1.26
+++ src/usr.bin/passwd/Makefile 11 Feb 2003 21:09:33 -0000
+++ src/usr.bin/passwd/Makefile 23 Feb 2003 18:22:09 -0000
@@ -23,12 +23,16 @@
LDADD+= -lkrb5 -lasn1
.endif
@ -3023,7 +3086,7 @@ RCS file: /cvs/src/usr.bin/rdist/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- src/usr.bin/rdist/Makefile 9 May 2002 19:12:40 -0000 1.12
+++ src/usr.bin/rdist/Makefile 11 Feb 2003 21:09:33 -0000
+++ src/usr.bin/rdist/Makefile 23 Feb 2003 18:22:09 -0000
@@ -2,7 +2,7 @@
@ -3039,7 +3102,7 @@ RCS file: /cvs/src/usr.bin/rsh/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- src/usr.bin/rsh/Makefile 6 May 2002 22:23:31 -0000 1.6
+++ src/usr.bin/rsh/Makefile 11 Feb 2003 21:09:33 -0000
+++ src/usr.bin/rsh/Makefile 23 Feb 2003 18:22:09 -0000
@@ -7,7 +7,7 @@
.include <bsd.own.mk> # For KERBEROS
@ -3055,7 +3118,7 @@ RCS file: /cvs/src/usr.bin/skeyinit/skeyinit.c,v
retrieving revision 1.41
diff -u -r1.41 skeyinit.c
--- src/usr.bin/skeyinit/skeyinit.c 16 Nov 2002 23:05:14 -0000 1.41
+++ src/usr.bin/skeyinit/skeyinit.c 11 Feb 2003 21:09:33 -0000
+++ src/usr.bin/skeyinit/skeyinit.c 23 Feb 2003 18:22:09 -0000
@@ -181,13 +181,13 @@
case 1:
if (!defaultsetup) {
@ -3083,7 +3146,7 @@ RCS file: /cvs/src/usr.bin/ssh/lib/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- src/usr.bin/ssh/lib/Makefile 21 Feb 2003 09:03:47 -0000 1.39
+++ src/usr.bin/ssh/lib/Makefile 23 Feb 2003 16:42:53 -0000
+++ src/usr.bin/ssh/lib/Makefile 23 Feb 2003 18:22:09 -0000
@@ -24,7 +24,7 @@
CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
.endif # KERBEROS5
@ -3099,7 +3162,7 @@ RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.190
diff -u -r1.190 ssh.c
--- src/usr.bin/ssh/ssh.c 6 Feb 2003 09:27:07 -0000 1.190
+++ src/usr.bin/ssh/ssh.c 23 Feb 2003 16:42:49 -0000
+++ src/usr.bin/ssh/ssh.c 23 Feb 2003 18:22:09 -0000
@@ -138,6 +138,14 @@
/* # of replies received for global requests */
static int client_global_request_id = 0;
@ -3176,7 +3239,7 @@ RCS file: /cvs/src/usr.bin/ssh/ssh.h,v
retrieving revision 1.71
diff -u -r1.71 ssh.h
--- src/usr.bin/ssh/ssh.h 22 Jun 2002 02:00:07 -0000 1.71
+++ src/usr.bin/ssh/ssh.h 11 Feb 2003 21:09:34 -0000
+++ src/usr.bin/ssh/ssh.h 23 Feb 2003 18:22:09 -0000
@@ -95,4 +95,6 @@
/* Minimum modulus size (n) for RSA keys. */
#define SSH_RSA_MINIMUM_MODULUS_SIZE 768
@ -3190,7 +3253,7 @@ RCS file: /cvs/src/usr.bin/ssh/sshconnect2.c,v
retrieving revision 1.111
diff -u -r1.111 sshconnect2.c
--- src/usr.bin/ssh/sshconnect2.c 16 Feb 2003 17:09:35 -0000 1.111
+++ src/usr.bin/ssh/sshconnect2.c 23 Feb 2003 16:42:49 -0000
+++ src/usr.bin/ssh/sshconnect2.c 23 Feb 2003 18:22:09 -0000
@@ -47,10 +47,14 @@
#include "canohost.h"
#include "msg.h"
@ -3482,7 +3545,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.bin/ssh/ssh/Makefile 23 Feb 2003 18:22:09 -0000
@@ -23,7 +23,7 @@
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
@ -3498,7 +3561,7 @@ 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 23 Feb 2003 16:42:54 -0000
+++ src/usr.bin/ssh/sshd/Makefile 23 Feb 2003 18:22:09 -0000
@@ -27,7 +27,7 @@
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
@ -3514,7 +3577,7 @@ RCS file: /cvs/src/usr.bin/sudo/Makefile.bsd-wrapper,v
retrieving revision 1.15
diff -u -r1.15 Makefile.bsd-wrapper
--- src/usr.bin/sudo/Makefile.bsd-wrapper 26 Apr 2002 16:04:02 -0000 1.15
+++ src/usr.bin/sudo/Makefile.bsd-wrapper 11 Feb 2003 21:09:34 -0000
+++ src/usr.bin/sudo/Makefile.bsd-wrapper 23 Feb 2003 18:22:09 -0000
@@ -14,7 +14,7 @@
DPADD+= ${LIBSKEY}
.endif
@ -3530,7 +3593,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.bin/xlint/lint1/Makefile 23 Feb 2003 18:22:09 -0000
@@ -8,7 +8,7 @@
LDADD+= -ll
DPADD+= ${LIBL}
@ -3546,7 +3609,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/amd/fsinfo/Makefile 23 Feb 2003 18:22:09 -0000
@@ -12,7 +12,7 @@
CLEANFILES= \
fsi_gram.c y.tab.c fsi_gram.h y.tab.h \
@ -3562,7 +3625,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/arp/arp.8 23 Feb 2003 18:22:09 -0000
@@ -136,6 +136,7 @@
.Ed
.Pp
@ -3577,7 +3640,7 @@ RCS file: /cvs/src/usr.sbin/arp/arp.c,v
retrieving revision 1.25
diff -u -r1.25 arp.c
--- src/usr.sbin/arp/arp.c 3 Dec 2002 22:33:28 -0000 1.25
+++ src/usr.sbin/arp/arp.c 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/arp/arp.c 23 Feb 2003 18:22:09 -0000
@@ -198,7 +198,9 @@
args[3] = &arg[3][0];
args[4] = &arg[4][0];
@ -3595,7 +3658,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/ppp/ppp/alias_nbt.c 23 Feb 2003 18:22:09 -0000
@@ -111,7 +111,7 @@
case CFT_ERR:
printf("\nName in conflict error.\n");
@ -3611,7 +3674,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/pppd/Makefile 23 Feb 2003 18:22:09 -0000
@@ -15,6 +15,6 @@
LDADD= -lpcap -lutil
@ -3626,7 +3689,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/rpc.lockd/Makefile 23 Feb 2003 18:22:09 -0000
@@ -7,7 +7,7 @@
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
@ -3642,7 +3705,7 @@ 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 11 Feb 2003 21:09:34 -0000
+++ src/usr.sbin/user/user.c 23 Feb 2003 18:22:09 -0000
@@ -1129,8 +1129,8 @@
len + strlen(newlogin) >= sizeof(buf))) {
(void) close(ptmpfd);