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

intermediate; should work tho

Browse Source 
sync ports
pull in new egcs-propolice 3.2.2-2 by etoh
www/lynx fallback to active ftp is pasv doesnt work & vice-versa
tinyirc update
stuff compiles with -Wall -Werror -pedantic
This commit is contained in:
tg 2003-03-07 18:06:48 +00:00
parent d1e251e085
commit 45647567e6
1 changed files with 80 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
obsd.diff
View File

@ -19,19 +19,19 @@ creation or modification of this work. Because computing devices are
error-prone, flawless behaviour cannot be expected.
This diff, ID $MirBSD: obsd.diff,v 1.29 2003/03/04 16:52:26 tg Exp $
This diff, ID $MirBSD: obsd.diff,v 1.30 2003/03/07 18:06:48 tg Exp $
(/usr/ports/mystuff/diff-metafiles to obsd.diff) is made
against CTM on Tue Mar 4 16:46:26 UTC 2003.
against CTM on Fri Mar 7 18:00:30 UTC 2003.
### GENERATOR: @(#)_MirBSD: regen-obsdp.sh,v 1.14 2003/03/01 22:12:48 tg Exp $
### CTM OpenBSD-cvs 3085
### CTM OpenBSD-cvs 3094
Index: src/bin/csh/csh.1
===================================================================
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 2 Mar 2003 01:08:44 -0000
+++ src/bin/csh/csh.1 4 Mar 2003 16:52:39 -0000
@@ -1839,6 +1839,9 @@
.Ar cputime
(the maximum
@ -48,7 +48,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 2 Mar 2003 01:08:44 -0000
+++ src/bin/csh/func.c 4 Mar 2003 16:52:39 -0000
@@ -1156,6 +1156,7 @@
{ RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes" },
{ RLIMIT_NPROC, "maxproc", 1, "" },
@ -116,7 +116,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 2 Mar 2003 01:08:44 -0000
+++ src/bin/ksh/c_ulimit.c 4 Mar 2003 16:52:39 -0000
@@ -56,6 +56,9 @@
#ifdef RLIMIT_CPU
{ "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' },
@ -133,7 +133,7 @@ RCS file: /cvs/src/bin/ksh/history.c,v
retrieving revision 1.17
diff -u -r1.17 history.c
--- src/bin/ksh/history.c 28 Feb 2003 09:44:47 -0000 1.17
+++ src/bin/ksh/history.c 2 Mar 2003 01:08:44 -0000
+++ src/bin/ksh/history.c 4 Mar 2003 16:52:39 -0000
@@ -1017,8 +1017,8 @@
register int bytes;
{
@ -151,7 +151,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 2 Mar 2003 01:08:44 -0000
+++ src/bin/ksh/ksh.1tbl 4 Mar 2003 16:52:39 -0000
@@ -4018,6 +4018,11 @@
.Ar n
.Tn CPU
@ -170,7 +170,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 2 Mar 2003 01:08:44 -0000
+++ src/distrib/Makefile 4 Mar 2003 16:52:39 -0000
@@ -1,23 +1,14 @@
# $OpenBSD: Makefile,v 1.22 2003/01/30 21:59:18 deraadt Exp $
@ -202,7 +202,7 @@ RCS file: /cvs/src/distrib/sets/lists/base/md.i386,v
retrieving revision 1.347
diff -u -r1.347 md.i386
--- src/distrib/sets/lists/base/md.i386 24 Feb 2003 01:17:16 -0000 1.347
+++ src/distrib/sets/lists/base/md.i386 2 Mar 2003 01:08:44 -0000
+++ src/distrib/sets/lists/base/md.i386 4 Mar 2003 16:52:39 -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
@ -314,7 +314,7 @@ RCS file: /cvs/src/distrib/sets/lists/base/mi,v
retrieving revision 1.263
diff -u -r1.263 mi
--- src/distrib/sets/lists/base/mi 2 Mar 2003 20:22:02 -0000 1.263
+++ src/distrib/sets/lists/base/mi 4 Mar 2003 16:09:39 -0000
+++ src/distrib/sets/lists/base/mi 4 Mar 2003 16:52:40 -0000
@@ -45,7 +45,6 @@
./dev
./dev/MAKEDEV
@ -1805,7 +1805,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 2 Mar 2003 01:08:44 -0000
+++ src/distrib/sets/lists/comp/md.i386 4 Mar 2003 16:52:40 -0000
@@ -1,5 +1,9 @@
+./usr/bin/addr2line
+./usr/bin/gasp
@ -1915,7 +1915,7 @@ RCS file: /cvs/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.370
diff -u -r1.370 mi
--- src/distrib/sets/lists/comp/mi 27 Feb 2003 17:29:58 -0000 1.370
+++ src/distrib/sets/lists/comp/mi 2 Mar 2003 01:08:44 -0000
+++ src/distrib/sets/lists/comp/mi 4 Mar 2003 16:52:40 -0000
@@ -2,16 +2,11 @@
./usr/bin/ar
./usr/bin/as
@ -2269,7 +2269,7 @@ RCS file: /cvs/src/distrib/sets/lists/etc/mi,v
retrieving revision 1.71
diff -u -r1.71 mi
--- src/distrib/sets/lists/etc/mi 28 Feb 2003 21:27:56 -0000 1.71
+++ src/distrib/sets/lists/etc/mi 2 Mar 2003 01:08:44 -0000
+++ src/distrib/sets/lists/etc/mi 4 Mar 2003 16:52:40 -0000
@@ -1,10 +1,5 @@
./.cshrc
./.profile
@ -2366,7 +2366,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 2 Mar 2003 01:08:44 -0000
+++ src/distrib/sets/lists/man/md.i386 4 Mar 2003 16:52:40 -0000
@@ -1,5 +1,2 @@
-./usr/share/man/cat1/ld.so.0
./usr/share/man/cat1/ldd.0
@ -2376,10 +2376,10 @@ diff -u -r1.29 md.i386
Index: src/distrib/sets/lists/man/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/man/mi,v
retrieving revision 1.430
diff -u -r1.430 mi
--- src/distrib/sets/lists/man/mi 2 Mar 2003 20:22:02 -0000 1.430
+++ src/distrib/sets/lists/man/mi 4 Mar 2003 16:09:42 -0000
retrieving revision 1.432
diff -u -r1.432 mi
--- src/distrib/sets/lists/man/mi 7 Mar 2003 01:18:24 -0000 1.432
+++ src/distrib/sets/lists/man/mi 7 Mar 2003 16:30:27 -0000
@@ -5,6 +5,16 @@
./usr/share/info/amdref.info-1
./usr/share/info/amdref.info-2
@ -2558,7 +2558,14 @@ diff -u -r1.430 mi
./usr/share/man/cat1/ksh.0
./usr/share/man/cat1/ktrace.0
./usr/share/man/cat1/lam.0
@@ -371,7 +329,6 @@
@@ -365,13 +323,13 @@
./usr/share/man/cat1/oldrdist.0
./usr/share/man/cat1/olf2elf.0
./usr/share/man/cat1/openssl.0
+./usr/share/man/cat1/openssltool.0
./usr/share/man/cat1/otp-md4.0
./usr/share/man/cat1/otp-md5.0
./usr/share/man/cat1/otp-rmd160.0
./usr/share/man/cat1/otp-sha1.0
./usr/share/man/cat1/page.0
./usr/share/man/cat1/pagesize.0
@ -2566,7 +2573,7 @@ diff -u -r1.430 mi
./usr/share/man/cat1/passwd.0
./usr/share/man/cat1/paste.0
./usr/share/man/cat1/patch.0
@@ -487,7 +444,6 @@
@@ -487,7 +445,6 @@
./usr/share/man/cat1/psbb.0
./usr/share/man/cat1/psed.0
./usr/share/man/cat1/pstruct.0
@ -2574,7 +2581,7 @@ diff -u -r1.430 mi
./usr/share/man/cat1/purgestat.0
./usr/share/man/cat1/pushd.0
./usr/share/man/cat1/pwd.0
@@ -622,13 +578,11 @@
@@ -622,13 +579,11 @@
./usr/share/man/cat1/whois.0
./usr/share/man/cat1/window.0
./usr/share/man/cat1/write.0
@ -2589,7 +2596,7 @@ diff -u -r1.430 mi
./usr/share/man/cat1/yyfix.0
./usr/share/man/cat1/zcat.0
./usr/share/man/cat1/zcmp.0
@@ -1457,13 +1411,8 @@
@@ -1478,13 +1433,8 @@
./usr/share/man/cat4/zero.0
./usr/share/man/cat5
./usr/share/man/cat5/.rhosts.0
@ -2603,7 +2610,7 @@ diff -u -r1.430 mi
./usr/share/man/cat5/aliases.0
./usr/share/man/cat5/alpha
./usr/share/man/cat5/bootparams.0
@@ -1518,7 +1467,6 @@
@@ -1539,7 +1489,6 @@
./usr/share/man/cat5/krb.equiv.0
./usr/share/man/cat5/krb.extra.0
./usr/share/man/cat5/krb.realms.0
@ -2611,7 +2618,7 @@ diff -u -r1.430 mi
./usr/share/man/cat5/lastlog.0
./usr/share/man/cat5/link.0
./usr/share/man/cat5/login.conf.0
@@ -1536,7 +1484,6 @@
@@ -1557,7 +1506,6 @@
./usr/share/man/cat5/mvme88k
./usr/share/man/cat5/mvmeppc
./usr/share/man/cat5/netgroup.0
@ -2619,7 +2626,7 @@ diff -u -r1.430 mi
./usr/share/man/cat5/networks.0
./usr/share/man/cat5/newsyslog.conf.0
./usr/share/man/cat5/passwd.0
@@ -1550,10 +1497,8 @@
@@ -1571,10 +1519,8 @@
./usr/share/man/cat5/remote.0
./usr/share/man/cat5/resolv.conf.0
./usr/share/man/cat5/resolver.0
@ -2630,7 +2637,7 @@ diff -u -r1.430 mi
./usr/share/man/cat5/services.0
./usr/share/man/cat5/shells.0
./usr/share/man/cat5/skey.0
@@ -1578,7 +1523,6 @@
@@ -1599,7 +1545,6 @@
./usr/share/man/cat5/vgrindefs.0
./usr/share/man/cat5/wsconsctl.conf.0
./usr/share/man/cat5/wtmp.0
@ -2638,7 +2645,7 @@ diff -u -r1.430 mi
./usr/share/man/cat6
./usr/share/man/cat6/bs.0
./usr/share/man/cat6/cfscores.0
@@ -1624,7 +1568,6 @@
@@ -1645,7 +1590,6 @@
./usr/share/man/cat8/accton.0
./usr/share/man/cat8/activadm.0
./usr/share/man/cat8/activinit.0
@ -2646,7 +2653,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/alpha
./usr/share/man/cat8/alpha/MAKEDEV.0
./usr/share/man/cat8/alpha/boot_alpha.0
@@ -1651,7 +1594,6 @@
@@ -1672,7 +1616,6 @@
./usr/share/man/cat8/bootpef.0
./usr/share/man/cat8/bootpgw.0
./usr/share/man/cat8/bootptest.0
@ -2654,7 +2661,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/brconfig.0
./usr/share/man/cat8/ccdconfig.0
./usr/share/man/cat8/certpatch.0
@@ -1688,7 +1630,6 @@
@@ -1709,7 +1652,6 @@
./usr/share/man/cat8/dumpfs.0
./usr/share/man/cat8/editmap.0
./usr/share/man/cat8/edquota.0
@ -2662,7 +2669,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/extattrctl.0
./usr/share/man/cat8/faithd.0
./usr/share/man/cat8/faq.0
@@ -1726,8 +1667,6 @@
@@ -1747,8 +1689,6 @@
./usr/share/man/cat8/hppa/wsconscfg.0
./usr/share/man/cat8/hppa/wsconsctl.0
./usr/share/man/cat8/hppa/wsfontload.0
@ -2671,7 +2678,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/httpd.0
./usr/share/man/cat8/i386
./usr/share/man/cat8/i386/MAKEDEV.0
@@ -1756,32 +1695,13 @@
@@ -1777,32 +1717,13 @@
./usr/share/man/cat8/iostat.0
./usr/share/man/cat8/ipsecadm.0
./usr/share/man/cat8/isakmpd.0
@ -2704,7 +2711,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/login_lchpass.0
./usr/share/man/cat8/login_passwd.0
./usr/share/man/cat8/login_radius.0
@@ -1811,15 +1731,12 @@
@@ -1832,15 +1753,12 @@
./usr/share/man/cat8/mailq.0
./usr/share/man/cat8/mailstats.0
./usr/share/man/cat8/mailwrapper.0
@ -2720,7 +2727,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/mknod.0
./usr/share/man/cat8/modload.0
./usr/share/man/cat8/modstat.0
@@ -1851,9 +1768,6 @@
@@ -1872,9 +1790,6 @@
./usr/share/man/cat8/mvme68k/installboot.0
./usr/share/man/cat8/mvme88k
./usr/share/man/cat8/mvmeppc
@ -2730,7 +2737,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/ncheck.0
./usr/share/man/cat8/ncheck_ffs.0
./usr/share/man/cat8/ndp.0
@@ -1866,7 +1780,6 @@
@@ -1887,7 +1802,6 @@
./usr/share/man/cat8/nfsd.0
./usr/share/man/cat8/nologin.0
./usr/share/man/cat8/nslookup.0
@ -2738,7 +2745,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/ntalkd.0
./usr/share/man/cat8/pac.0
./usr/share/man/cat8/pcnfsd.0
@@ -1904,14 +1817,11 @@
@@ -1925,14 +1839,11 @@
./usr/share/man/cat8/renice.0
./usr/share/man/cat8/repquota.0
./usr/share/man/cat8/restore.0
@ -2753,7 +2760,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/rotatelogs.0
./usr/share/man/cat8/route.0
./usr/share/man/cat8/route6d.0
@@ -1924,7 +1834,6 @@
@@ -1945,7 +1856,6 @@
./usr/share/man/cat8/rpc.rusersd.0
./usr/share/man/cat8/rpc.rwalld.0
./usr/share/man/cat8/rpc.sprayd.0
@ -2761,7 +2768,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/rpcinfo.0
./usr/share/man/cat8/rquotad.0
./usr/share/man/cat8/rrestore.0
@@ -1981,10 +1890,7 @@
@@ -2002,10 +1912,7 @@
./usr/share/man/cat8/sshd.0
./usr/share/man/cat8/ssl.0
./usr/share/man/cat8/starttls.0
@ -2772,7 +2779,7 @@ diff -u -r1.430 mi
./usr/share/man/cat8/sudo.0
./usr/share/man/cat8/suexec.0
./usr/share/man/cat8/supfilesrv.0
@@ -2021,27 +1927,13 @@
@@ -2042,27 +1949,13 @@
./usr/share/man/cat8/vax/boot_vax.0
./usr/share/man/cat8/vax/format.0
./usr/share/man/cat8/vax/kbd.0
@ -2806,7 +2813,7 @@ RCS file: /cvs/src/distrib/sets/lists/misc/mi,v
retrieving revision 1.9
diff -u -r1.9 mi
--- src/distrib/sets/lists/misc/mi 28 Feb 2003 21:27:56 -0000 1.9
+++ src/distrib/sets/lists/misc/mi 2 Mar 2003 01:08:44 -0000
+++ src/distrib/sets/lists/misc/mi 4 Mar 2003 16:52:40 -0000
@@ -4,16 +4,6 @@
./usr/share/dict/web2
./usr/share/dict/web2a
@ -2830,7 +2837,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 2 Mar 2003 01:08:44 -0000
+++ src/etc/inetd.conf 4 Mar 2003 16:52:40 -0000
@@ -22,6 +22,7 @@
#ntalk dgram udp wait root /usr/libexec/ntalkd ntalkd
#bootps dgram udp wait root /usr/sbin/bootpd bootpd
@ -2845,7 +2852,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 2 Mar 2003 01:08:44 -0000
+++ src/etc/sysctl.conf 4 Mar 2003 16:52:40 -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
@ -2867,7 +2874,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 2 Mar 2003 01:08:44 -0000
+++ src/gnu/usr.bin/binutils/binutils/bucomm.c 4 Mar 2003 16:52:40 -0000
@@ -215,7 +215,7 @@
static char template[] = "stXXXXXX";
char *tmpname;
@ -2883,7 +2890,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 2 Mar 2003 01:08:45 -0000
+++ src/gnu/usr.bin/perl/Configure 4 Mar 2003 16:52:40 -0000
@@ -747,7 +747,7 @@
dlsrc=''
ld=''
@ -2899,7 +2906,7 @@ RCS file: /cvs/src/gnu/usr.bin/perl/Makefile.bsd-wrapper,v
retrieving revision 1.52
diff -u -r1.52 Makefile.bsd-wrapper
--- src/gnu/usr.bin/perl/Makefile.bsd-wrapper 2 Mar 2003 19:17:31 -0000 1.52
+++ src/gnu/usr.bin/perl/Makefile.bsd-wrapper 4 Mar 2003 16:11:47 -0000
+++ src/gnu/usr.bin/perl/Makefile.bsd-wrapper 4 Mar 2003 16:52:40 -0000
@@ -6,9 +6,15 @@
# To build a threaded perl, uncomment this. Currently, there are bugs...
#THREADED=-Dusethreads
@ -3016,7 +3023,7 @@ RCS file: /cvs/src/gnu/usr.sbin/sendmail/sendmail/conf.c,v
retrieving revision 1.18
diff -u -r1.18 conf.c
--- src/gnu/usr.sbin/sendmail/sendmail/conf.c 3 Mar 2003 17:30:59 -0000 1.18
+++ src/gnu/usr.sbin/sendmail/sendmail/conf.c 4 Mar 2003 16:12:52 -0000
+++ src/gnu/usr.sbin/sendmail/sendmail/conf.c 4 Mar 2003 16:52:40 -0000
@@ -3722,6 +3722,7 @@
lim.rlim_cur = lim.rlim_max = RLIM_INFINITY;
@ -3036,7 +3043,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 2 Mar 2003 01:08:45 -0000
+++ src/lib/libc/gen/login_cap.c 4 Mar 2003 16:52:40 -0000
@@ -492,6 +492,7 @@
char * name;
} r_list[] = {
@ -3051,7 +3058,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 2 Mar 2003 01:08:45 -0000
+++ src/lib/libc/sys/getrlimit.2 4 Mar 2003 16:52:40 -0000
@@ -68,6 +68,9 @@
.It Li RLIMIT_CPU
The maximum amount of cpu time (in seconds) to be used by
@ -3068,7 +3075,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 2 Mar 2003 01:08:45 -0000
+++ src/lib/libpthread/uthread/uthread_mutex.c 4 Mar 2003 16:52:41 -0000
@@ -111,9 +111,9 @@
const pthread_mutexattr_t * mutex_attr)
{
@ -3101,7 +3108,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 2 Mar 2003 01:08:45 -0000
+++ src/lib/libutil/passwd.c 4 Mar 2003 16:52:41 -0000
@@ -354,6 +354,7 @@
/* Unlimited resource limits. */
rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
@ -3110,30 +3117,13 @@ diff -u -r1.36 passwd.c
(void)setrlimit(RLIMIT_FSIZE, &rlim);
(void)setrlimit(RLIMIT_STACK, &rlim);
(void)setrlimit(RLIMIT_DATA, &rlim);
Index: src/sbin/isakmpd/util.c
===================================================================
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 2 Mar 2003 01:08:45 -0000
@@ -402,7 +402,8 @@
j += snprintf ((*address) + j, addrlen - j, "%02x%02x",
((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[2 * i],
((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr[2 * i + 1]);
- (*address)[j] = (++j < addrlen) ? ':' : '\0';
+ ++j;
+ (*address)[j] = (j < addrlen) ? ':' : '\0';
}
break;
Index: src/usr.bin/passwd/Makefile
===================================================================
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 2 Mar 2003 01:08:45 -0000
+++ src/usr.bin/passwd/Makefile 4 Mar 2003 16:52:41 -0000
@@ -23,12 +23,16 @@
LDADD+= -lkrb5 -lasn1
.endif
@ -3160,7 +3150,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 2 Mar 2003 01:08:45 -0000
+++ src/usr.bin/rdist/Makefile 4 Mar 2003 16:52:41 -0000
@@ -2,7 +2,7 @@
@ -3176,7 +3166,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 2 Mar 2003 01:08:45 -0000
+++ src/usr.bin/rsh/Makefile 4 Mar 2003 16:52:41 -0000
@@ -7,7 +7,7 @@
.include <bsd.own.mk> # For KERBEROS
@ -3192,7 +3182,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 2 Mar 2003 01:08:45 -0000
+++ src/usr.bin/skeyinit/skeyinit.c 4 Mar 2003 16:52:41 -0000
@@ -181,13 +181,13 @@
case 1:
if (!defaultsetup) {
@ -3220,7 +3210,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.bin/ssh/lib/Makefile 4 Mar 2003 16:52:41 -0000
@@ -24,7 +24,7 @@
CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
.endif # KERBEROS5
@ -3236,7 +3226,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.bin/ssh/ssh.c 4 Mar 2003 16:52:41 -0000
@@ -138,6 +138,14 @@
/* # of replies received for global requests */
static int client_global_request_id = 0;
@ -3313,7 +3303,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.bin/ssh/ssh.h 4 Mar 2003 16:52:41 -0000
@@ -95,4 +95,6 @@
/* Minimum modulus size (n) for RSA keys. */
#define SSH_RSA_MINIMUM_MODULUS_SIZE 768
@ -3324,10 +3314,10 @@ diff -u -r1.71 ssh.h
Index: src/usr.bin/ssh/sshconnect2.c
===================================================================
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 2 Mar 2003 01:08:46 -0000
retrieving revision 1.112
diff -u -r1.112 sshconnect2.c
--- src/usr.bin/ssh/sshconnect2.c 5 Mar 2003 22:33:21 -0000 1.112
+++ src/usr.bin/ssh/sshconnect2.c 7 Mar 2003 16:38:12 -0000
@@ -47,10 +47,14 @@
#include "canohost.h"
#include "msg.h"
@ -3604,7 +3594,7 @@ diff -u -r1.111 sshconnect2.c
}
static int
@@ -1035,7 +1194,7 @@
@@ -1036,7 +1195,7 @@
if (sensitive->external_keysign)
ok = ssh_keysign(private, &signature, &slen,
buffer_ptr(&b), buffer_len(&b));
@ -3619,7 +3609,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.bin/ssh/ssh/Makefile 4 Mar 2003 16:52:41 -0000
@@ -23,7 +23,7 @@
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
.endif # KERBEROS5
@ -3635,7 +3625,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 2 Mar 2003 01:08:46 -0000
+++ 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
@ -3651,7 +3641,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.bin/sudo/Makefile.bsd-wrapper 4 Mar 2003 16:52:41 -0000
@@ -14,7 +14,7 @@
DPADD+= ${LIBSKEY}
.endif
@ -3667,7 +3657,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.bin/xlint/lint1/Makefile 4 Mar 2003 16:52:41 -0000
@@ -8,7 +8,7 @@
LDADD+= -ll
DPADD+= ${LIBL}
@ -3683,7 +3673,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 2 Mar 2003 01:08:46 -0000
+++ 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 \
@ -3699,7 +3689,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.sbin/arp/arp.8 4 Mar 2003 16:52:41 -0000
@@ -136,6 +136,7 @@
.Ed
.Pp
@ -3714,7 +3704,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.sbin/arp/arp.c 4 Mar 2003 16:52:41 -0000
@@ -198,7 +198,9 @@
args[3] = &arg[3][0];
args[4] = &arg[4][0];
@ -3732,7 +3722,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 2 Mar 2003 01:08:46 -0000
+++ 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");
@ -3748,7 +3738,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.sbin/pppd/Makefile 4 Mar 2003 16:52:41 -0000
@@ -15,6 +15,6 @@
LDADD= -lpcap -lutil
@ -3763,7 +3753,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 2 Mar 2003 01:08:46 -0000
+++ src/usr.sbin/rpc.lockd/Makefile 4 Mar 2003 16:52:42 -0000
@@ -7,7 +7,7 @@
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
@ -3779,7 +3769,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 2 Mar 2003 01:08:46 -0000
+++ 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);