./PaxHeaders.33808/2.500407550001756001161000000000035101675613070011257xustar0029 atime=1783552627.81868753 2.5004075500017560011610000000000001016756130700102545ustar00ssyncsync2.5/PaxHeaders.33808/alpha00407550001756001161000000000035101675603360012210xustar0029 atime=1783552627.81868753 2.5/alpha004075500017560011610000000000001016756033600113425ustar00ssyncsync2.5/PaxHeaders.33808/amiga00407550001756001161000000000035101675603360012201xustar0029 atime=1783552627.81868753 2.5/amiga004075500017560011610000000000001016756033600113335ustar00ssyncsync2.5/PaxHeaders.33808/arc00407550001756001161000000000036101675603360011671xustar0030 atime=1783552627.828696846 2.5/arc004075500017560011610000000000001016756033600110225ustar00ssyncsync2.5/PaxHeaders.33808/common00407550001756001161000000000036101675613150012412xustar0030 atime=1783552627.828696846 2.5/common004075500017560011610000000000001016756131500115435ustar00ssyncsync2.5/common/PaxHeaders.33808/001_pfkey.patch01004440001756001161000000000036067671113400015176xustar0030 atime=1783552627.828696846 2.5/common/001_pfkey.patch010044400017560011610000000023770676711134000143450ustar00ssyncsyncApply by doing: cd /usr patch -p0 < 001_pfkey.patch And then rebuild your kernel. Index: src/sys/net/pfkey.c diff -u src/sys/net/pfkey.c:1.4 src/sys/net/pfkey.c:1.5 --- src/sys/net/pfkey.c:1.4 Sun Apr 11 13:41:35 1999 +++ src/sys/net/pfkey.c Mon May 3 16:30:27 1999 @@ -117,22 +117,36 @@ pfkey_output(struct mbuf *mbuf, struct socket *socket) { void *message; + int error = 0; #if DIAGNOSTIC - if (!mbuf || !(mbuf->m_flags & M_PKTHDR)) - return EINVAL; + if (!mbuf || !(mbuf->m_flags & M_PKTHDR)) { + error = EINVAL; + goto ret; + } #endif /* DIAGNOSTIC */ - if (mbuf->m_pkthdr.len > PFKEY_MSG_MAXSZ) - return EMSGSIZE; + if (mbuf->m_pkthdr.len > PFKEY_MSG_MAXSZ) { + error = EMSGSIZE; + goto ret; + } if (!(message = malloc((unsigned long) mbuf->m_pkthdr.len, M_TEMP, - M_DONTWAIT))) - return ENOMEM; + M_DONTWAIT))) { + error = ENOMEM; + goto ret; + } m_copydata(mbuf, 0, mbuf->m_pkthdr.len, message); - return pfkey_versions[socket->so_proto->pr_protocol]->send(socket, message, mbuf->m_pkthdr.len); + error = + pfkey_versions[socket->so_proto->pr_protocol]->send(socket, message, + mbuf->m_pkthdr.len); + + ret: + if (mbuf) + m_freem (mbuf); + return error; } static int 2.5/common/PaxHeaders.33808/002_bmap.patch01004440001756001161000000000036067671113400015000xustar0030 atime=1783552627.828696846 2.5/common/002_bmap.patch010044400017560011610000000021550676711134000141410ustar00ssyncsyncApply by doing: cd /usr/src/sys patch -p0 < 002_bmap.patch And then rebuild your kernel. Index: ufs/ext2fs/ext2fs_bmap.c =================================================================== RCS file: /cvs/src/sys/ufs/ext2fs/ext2fs_bmap.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ufs/ext2fs/ext2fs_bmap.c 1997/06/12 21:09:31 1.3 +++ ufs/ext2fs/ext2fs_bmap.c 1999/04/25 00:36:46 1.4 @@ -120,7 +120,7 @@ struct ufsmount *ump; struct mount *mp; struct vnode *devvp; - struct indir a[NIADDR], *xap; + struct indir a[NIADDR+1], *xap; daddr_t daddr; long metalbn; int error, maxrun = 0, num; Index: ufs/ufs/ufs_bmap.c =================================================================== RCS file: /cvs/src/sys/ufs/ufs/ufs_bmap.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ufs/ufs/ufs_bmap.c 1997/05/30 08:35:02 1.4 +++ ufs/ufs/ufs_bmap.c 1999/04/25 00:36:47 1.5 @@ -114,7 +114,7 @@ struct ufsmount *ump; struct mount *mp; struct vnode *devvp; - struct indir a[NIADDR], *xap; + struct indir a[NIADDR+1], *xap; daddr_t daddr; long metalbn; #ifdef TRACE 2.5/common/PaxHeaders.33808/003_espdata.patch01004440001756001161000000000036067671113400015503xustar0030 atime=1783552627.828696846 2.5/common/003_espdata.patch010044400017560011610000000052020676711134000146400ustar00ssyncsyncApply by doing: cd /usr/src/sys patch -p0 < 003_espdata.patch And then rebuild your kernel. --- netinet/ip_esp_new.c:1.40 Sun May 9 18:06:31 1999 +++ netinet/ip_esp_new.c Wed May 12 23:11:42 1999 @@ -781,7 +781,7 @@ struct ip *ip, ipo; int i, ilen, ohlen, nh, rlen, plen, padding, rest; struct esp_new espo; - struct mbuf *mi, *mo; + struct mbuf *mi, *mo = (struct mbuf *) NULL; u_char *pad, *idat, *odat, *ivp; u_char iv[ESP_MAX_IVS], blk[ESP_MAX_BLKS], auth[AH_ALEN_MAX], opts[40]; union { @@ -799,6 +799,39 @@ alen = 0; espstat.esps_output++; + + /* + * Loop through mbuf chain; if we find an M_EXT mbuf with + * more than one reference, replace the rest of the chain. + */ + mi = m; + while (mi != NULL && + (!(mi->m_flags & M_EXT) || + mclrefcnt[mtocl(mi->m_ext.ext_buf)] <= 1)) + { + mo = mi; + mi = mi->m_next; + } + + if (mi != NULL) + { + /* Replace the rest of the mbuf chain. */ + struct mbuf *n = m_copym2(mi, 0, M_COPYALL, M_DONTWAIT); + + if (n == NULL) + { + espstat.esps_hdrops++; + m_freem(m); + return ENOBUFS; + } + + if (mo != NULL) + mo->m_next = n; + else + m = n; + + m_freem(mi); + } m = m_pullup(m, sizeof (struct ip)); /* Get IP header in one mbuf */ if (m == NULL) --- netinet/ip_esp_old.c:1.31 Sun May 9 20:14:50 1999 +++ netinet/ip_esp_old.c Wed May 12 23:11:42 1999 @@ -505,7 +505,7 @@ struct ip *ip, ipo; int i, ilen, ohlen, nh, rlen, plen, padding, rest; u_int32_t spi; - struct mbuf *mi, *mo; + struct mbuf *mi, *mo = (struct mbuf *) NULL; u_char *pad, *idat, *odat, *ivp; u_char iv[ESP_3DES_IVS], blk[ESP_3DES_IVS], opts[40]; int iphlen, blks; @@ -513,6 +513,39 @@ blks = espx->blocksize; espstat.esps_output++; + + /* + * Loop through mbuf chain; if we find an M_EXT mbuf with + * more than one reference, replace the rest of the chain. + */ + mi = m; + while (mi != NULL && + (!(mi->m_flags & M_EXT) || + mclrefcnt[mtocl(mi->m_ext.ext_buf)] <= 1)) + { + mo = mi; + mi = mi->m_next; + } + + if (mi != NULL) + { + /* Replace the rest of the mbuf chain. */ + struct mbuf *n = m_copym2(mi, 0, M_COPYALL, M_DONTWAIT); + + if (n == NULL) + { + espstat.esps_hdrops++; + m_freem(m); + return ENOBUFS; + } + + if (mo != NULL) + mo->m_next = n; + else + m = n; + + m_freem(mi); + } m = m_pullup(m, sizeof(struct ip)); if (m == NULL) 2.5/common/PaxHeaders.33808/004_tcpsack.patch01004440001756001161000000000036067671113400015513xustar0030 atime=1783552627.828696846 2.5/common/004_tcpsack.patch010044400017560011610000000040060676711134000146510ustar00ssyncsyncApply by doing: cd /usr/src/sys patch -p0 < 004_tcpsack.patch And then rebuild your kernel. Index: netinet/tcp_input.c =================================================================== RCS file: /cvs/src/sys/netinet/tcp_input.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- src/sys/netinet/tcp_input.c 1999/03/27 21:04:20 1.33 +++ src/sys/netinet/tcp_input.c 1999/04/21 21:38:58 1.34 @@ -875,6 +875,14 @@ tcpstat.tcps_rcvackbyte += acked; sbdrop(&so->so_snd, acked); tp->snd_una = th->th_ack; +#if defined(TCP_SACK) || defined(TCP_NEWRENO) + /* + * We want snd_last to track snd_una so + * as to avoid sequence wraparound problems + * for very large transfers. + */ + tp->snd_last = tp->snd_una; +#endif /* TCP_SACK or TCP_NEWRENO */ #if defined(TCP_SACK) && defined(TCP_FACK) tp->snd_fack = tp->snd_una; tp->retran_data = 0; @@ -2978,7 +2986,11 @@ tp->t_timer[TCPT_REXMT] = 0; tp->t_rtt = 0; tp->snd_nxt = th->th_ack; - tp->snd_cwnd = tp->t_maxseg; + /* + * Set snd_cwnd to one segment beyond acknowledged offset + * (tp->snd_una not yet updated when this function is called) + */ + tp->snd_cwnd = tp->t_maxseg + (th->th_ack - tp->snd_una); (void) tcp_output(tp); tp->snd_cwnd = ocwnd; if (SEQ_GT(onxt, tp->snd_nxt)) Index: netinet/tcp_timer.c =================================================================== RCS file: /cvs/src/sys/netinet/tcp_timer.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- src/sys/netinet/tcp_timer.c 1999/01/27 16:47:29 1.11 +++ src/sys/netinet/tcp_timer.c 1999/04/21 21:38:58 1.12 @@ -247,6 +247,13 @@ tp->t_srtt = 0; } tp->snd_nxt = tp->snd_una; +#if defined(TCP_SACK) || defined(TCP_NEWRENO) + /* + * Note: We overload snd_last to function also as the + * snd_last variable described in RFC 2582 + */ + tp->snd_last = tp->snd_max; +#endif /* TCP_SACK or TCP_NEWRENO */ /* * If timing a segment in this window, stop the timer. */ 2.5/common/PaxHeaders.33808/005_fts.patch01004440001756001161000000000036067671113400014660xustar0030 atime=1783552627.828696846 2.5/common/005_fts.patch010044400017560011610000000101350676711134000140160ustar00ssyncsyncApply by doing: cd /usr/src patch -p0 < 005_fts.patch And then rebuild and install libc. However, this will not affect statically linked binaries that use fts(3) such as chmod, cp, ls, pax, rm, and dump. Index: lib/libc/gen/fts.c =================================================================== RCS file: /cvs/src/lib/libc/gen/fts.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- lib/libc/gen/fts.c 1998/08/15 08:10:15 1.18 +++ lib/libc/gen/fts.c 1999/05/17 02:32:31 1.19 @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.c,v 1.18 1998/08/15 08:10:15 deraadt Exp $ */ +/* $OpenBSD: fts.c,v 1.19 1999/05/17 02:32:31 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #else -static char rcsid[] = "$OpenBSD: fts.c,v 1.18 1998/08/15 08:10:15 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: fts.c,v 1.19 1999/05/17 02:32:31 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -57,7 +57,7 @@ static void fts_lfree __P((FTSENT *)); static void fts_load __P((FTS *, FTSENT *)); static size_t fts_maxarglen __P((char * const *)); -static void fts_padjust __P((FTS *, void *)); +static void fts_padjust __P((FTS *, FTSENT *)); static int fts_palloc __P((FTS *, size_t)); static FTSENT *fts_sort __P((FTS *, FTSENT *, int)); static u_short fts_stat __P((FTS *, FTSENT *, int)); @@ -428,7 +428,7 @@ return (sp->fts_cur = NULL); } - /* Nul terminate the pathname. */ + /* NUL terminate the pathname. */ sp->fts_path[p->fts_pathlen] = '\0'; /* @@ -581,9 +581,9 @@ register int nitems; FTSENT *cur, *tail; DIR *dirp; - void *adjaddr; + void *oldaddr; int cderrno, descend, len, level, maxlen, nlinks, oflag, saved_errno, - nostat; + nostat, doadjust; char *cp; /* Set current node pointer. */ @@ -679,7 +679,7 @@ level = cur->fts_level + 1; /* Read the directory, attaching each entry to the `link' pointer. */ - adjaddr = NULL; + doadjust = 0; for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) { if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) continue; @@ -687,6 +687,7 @@ if ((p = fts_alloc(sp, dp->d_name, (int)dp->d_namlen)) == NULL) goto mem1; if (dp->d_namlen > maxlen) { + oldaddr = sp->fts_path; if (fts_palloc(sp, (size_t)dp->d_namlen)) { /* * No more memory for path or structures. Save @@ -703,7 +704,9 @@ SET(FTS_STOP); return (NULL); } - adjaddr = sp->fts_path; + /* Did realloc() change the pointer? */ + if (oldaddr != sp->fts_path) + doadjust = 1; maxlen = sp->fts_pathlen - sp->fts_cur->fts_pathlen - 1; } @@ -762,11 +765,11 @@ (void)closedir(dirp); /* - * If had to realloc the path, adjust the addresses for the rest - * of the tree. + * If realloc() changed the address of the path, adjust the + * addresses for the rest of the tree and the dir list. */ - if (adjaddr) - fts_padjust(sp, adjaddr); + if (doadjust) + fts_padjust(sp, head); /* * If not changing directories, reset the path back to original @@ -950,7 +953,7 @@ if ((p = malloc(len)) == NULL) return (NULL); - /* Copy the name and guarantee NULL termination. */ + /* Copy the name and guarantee NUL termination. */ memmove(p->fts_name, name, namelen); p->fts_name[namelen] = '\0'; @@ -1009,15 +1012,18 @@ * already returned. */ static void -fts_padjust(sp, addr) +fts_padjust(sp, head) FTS *sp; - void *addr; + FTSENT *head; { FTSENT *p; + void *addr = sp->fts_path; #define ADJUST(p) { \ - (p)->fts_accpath = \ - (char *)addr + ((p)->fts_accpath - (p)->fts_path); \ + if ((p)->fts_accpath != (p)->fts_name) { \ + (p)->fts_accpath = \ + (char *)addr + ((p)->fts_accpath - (p)->fts_path); \ + } \ (p)->fts_path = addr; \ } /* Adjust the current set of children. */ @@ -1028,6 +1034,12 @@ for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) { ADJUST(p); p = p->fts_link ? p->fts_link : p->fts_parent; + } + + /* Adjust entries in the dir list as needed */ + for (p = head; p; p = p->fts_link) { + if (p->fts_path != addr) + ADJUST(p); } } 2.5/common/PaxHeaders.33808/006_nroff.patch01004440001756001161000000000036067671113400015177xustar0030 atime=1783552627.828696846 2.5/common/006_nroff.patch010044400017560011610000000014450676711134000143410ustar00ssyncsyncApply by doing: cd /usr/src/gnu/usr.bin/groff/nroff patch -p0 < 006_nroff.patch And then reinstall nroff. Index: nroff.sh =================================================================== RCS file: /cvs/src/gnu/usr.bin/groff/nroff/nroff.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- nroff.sh 1996/09/14 19:01:54 1.1.1.1 +++ nroff.sh 1999/07/26 22:04:13 1.2 @@ -24,7 +24,7 @@ echo "$prog: option $1 requires an argument" >&2 exit 1 ;; - -i|-[mrno]*) + -i|-S|-[mrno]*) opts="$opts $1"; ;; @@ -58,4 +58,4 @@ # This shell script is intended for use with man, so warnings are # probably not wanted. Also load nroff-style character definitions. -exec groff -Wall -mtty-char $T $opts ${1+"$@"} +exec groff -S -Wall -mtty-char $T $opts ${1+"$@"} 2.5/common/PaxHeaders.33808/007_chflags.patch01004440001756001161000000000036067671113400015475xustar0030 atime=1783552627.828696846 2.5/common/007_chflags.patch010044400017560011610000000024740676711134000146420ustar00ssyncsyncApply by doing: cd /usr/src/sys/kern patch -p0 < 007_chflags.patch And then rebuild your kernel. Index: vfs_syscalls.c =================================================================== RCS file: /cvs/src/sys/kern/vfs_syscalls.c,v retrieving revision 1.56 diff -u -r1.56 vfs_syscalls.c --- vfs_syscalls.c 1999/02/26 04:51:17 1.56 +++ vfs_syscalls.c 1999/07/30 21:21:44 @@ -1530,10 +1530,19 @@ else if (SCARG(uap, flags) == VNOVAL) error = EINVAL; else { + if (suser(p->p_ucred, &p->p_acflag)) { + if ((error = VOP_GETATTR(vp, &vattr, p->p_ucred, p)) != 0) + goto out; + if (vattr.va_type == VCHR || vattr.va_type == VBLK) { + error = EINVAL; + goto out; + } + } VATTR_NULL(&vattr); vattr.va_flags = SCARG(uap, flags); error = VOP_SETATTR(vp, &vattr, p->p_ucred, p); } +out: vput(vp); return (error); } @@ -1567,10 +1576,20 @@ else if (SCARG(uap, flags) == VNOVAL) error = EINVAL; else { + if (suser(p->p_ucred, &p->p_acflag)) { + if ((error = VOP_GETATTR(vp, &vattr, p->p_ucred, p)) + != 0) + goto out; + if (vattr.va_type == VCHR || vattr.va_type == VBLK) { + error = EINVAL; + goto out; + } + } VATTR_NULL(&vattr); vattr.va_flags = SCARG(uap, flags); error = VOP_SETATTR(vp, &vattr, p->p_ucred, p); } +out: VOP_UNLOCK(vp, 0, p); return (error); } 2.5/common/PaxHeaders.33808/008_rc.patch01004440001756001161000000000036067671113400014473xustar0030 atime=1783552627.828696846 2.5/common/008_rc.patch010044400017560011610000000022500676711134000136300ustar00ssyncsyncApply by doing: cd /etc patch -p0 < 008_rc.patch And things should be much happier on the next reboot. Index: rc =================================================================== RCS file: /cvs/src/etc/rc,v retrieving revision 1.95 diff -u -r1.95 rc --- rc 1998/12/28 06:58:30 1.95 +++ rc 1999/08/05 08:12:29 @@ -263,7 +263,7 @@ # (not needed with mfs /tmp, but doesn't hurt there...) (cd /tmp && rm -rf [a-km-pr-zA-Z]* && find . ! -name . ! -name lost+found ! -name quota.user \ - ! -name quota.group -exec rm -rf -- {} \; -type d -prune) + ! -name quota.group -execdir rm -rf -- {} \; -type d -prune) if [ -f /etc/sysctl.conf ]; then ( @@ -286,13 +286,14 @@ if [ ! -f /etc/motd ]; then install -c -o root -g wheel -m 664 /dev/null /etc/motd fi -T=/tmp/_motd -rm -f $T -sysctl -n kern.version | sed 1q > $T -echo "" >> $T -sed '1,/^$/d' < /etc/motd >> $T -cmp -s $T /etc/motd || cp $T /etc/motd -rm -f $T +T=`mktemp /tmp/_motd.XXXXXXXXXX` +if [ $? -eq 0 ]; then + sysctl -n kern.version | sed 1q > $T + echo "" >> $T + sed '1,/^$/d' < /etc/motd >> $T + cmp -s $T /etc/motd || cp $T /etc/motd + rm -f $T +fi # nvi file recovery if [ ! -d /var/tmp/vi.recover ]; then 2.5/common/PaxHeaders.33808/009_ipsec_in_use.patch01004440001756001161000000000036067671113400016535xustar0030 atime=1783552627.828696846 2.5/common/009_ipsec_in_use.patch010044400017560011610000000053320676711134000156760ustar00ssyncsyncApply by doing: cd /usr/src patch -p0 < 009_ipsec_in_use.patch And then rebuild your kernel. --- sys/net/pfkeyv2.c:1.14 1999/07/06 20:17:52 +++ sys/net/pfkeyv2.c 1999/07/06 20:54:03 @@ -559,8 +559,10 @@ } ret: - bzero(buffer, j + sizeof(struct sadb_msg)); - free(buffer, M_TEMP); + if (buffer != NULL) { + bzero(buffer, j + sizeof(struct sadb_msg)); + free(buffer, M_TEMP); + } return rval; } @@ -1276,7 +1278,6 @@ 0, (struct rtentry **) 0); delete_flow(flow, flow->flow_sa); - ipsec_in_use--; } else if (!replace) { @@ -1294,7 +1295,6 @@ goto ret; } - ipsec_in_use++; sa2->tdb_cur_allocations++; } else @@ -1316,7 +1316,6 @@ delete_flow(flow2, sa2); goto ret; } - ipsec_in_use++; } else if (rt_setgate(rt, rt_key(rt), (struct sockaddr *) &encapgw)) { @@ -1344,7 +1343,6 @@ (struct rtentry **) 0); delete_flow(flow2, flow2->flow_sa); - ipsec_in_use--; } else if (!replace) { @@ -1367,11 +1365,9 @@ delete_flow(flow, sa2); delete_flow(flow2, sa2); - ipsec_in_use--; goto ret; } - ipsec_in_use++; sa2->tdb_cur_allocations++; } else @@ -1400,7 +1396,6 @@ delete_flow(flow2, sa2); goto ret; } - ipsec_in_use++; } else if (rt_setgate(rt, rt_key(rt), (struct sockaddr *) &encapgw)) @@ -1621,7 +1616,7 @@ #if 0 int rval = 0; int i, j; - void *p, *headers[SADB_EXT_MAX+1], *buffer; + void *p, *headers[SADB_EXT_MAX+1], *buffer = NULL; if (!nregistered) { rval = ESRCH; @@ -1727,6 +1722,10 @@ rval = 0; ret: + if (buffer != NULL) { + bzero(buffer, i); + free(buffer, M_TEMP); + } return rval; #endif return 0; @@ -1738,7 +1737,7 @@ int rval = 0; int i; u_int8_t satype; - void *p, *headers[SADB_EXT_MAX+1], *buffer; + void *p, *headers[SADB_EXT_MAX+1], *buffer = NULL; switch (sa->tdb_sproto) { case IPPROTO_AH: @@ -1800,6 +1799,10 @@ rval = 0; ret: + if (buffer != NULL) { + bzero(buffer, i); + free(buffer, M_TEMP); + } return rval; } --- sys/netinet/ip_ipsp.c:1.40 1999/07/06 20:17:52 +++ sys/netinet/ip_ipsp.c 1999/07/06 20:54:03 @@ -417,6 +417,7 @@ MALLOC(flow, struct flow *, sizeof(struct flow), M_TDB, M_WAITOK); bzero(flow, sizeof(struct flow)); + ipsec_in_use++; return flow; } @@ -671,6 +672,7 @@ } } + ipsec_in_use--; FREE(flow, M_TDB); } @@ -722,10 +724,7 @@ (*(tdbp->tdb_xform->xf_zeroize))(tdbp); while (tdbp->tdb_flow) - { delete_flow(tdbp->tdb_flow, tdbp); - ipsec_in_use--; - } /* Cleanup SA-Bindings */ for (tdbpp = TAILQ_FIRST(&tdbp->tdb_bind_in); tdbpp; 2.5/common/PaxHeaders.33808/010_profil.patch01004440001756001161000000000036067671113400015353xustar0030 atime=1783552627.828696846 2.5/common/010_profil.patch010044400017560011610000000006360676711134000145160ustar00ssyncsyncApply by doing: cd /usr/src/sys/kern patch -p0 < 010_profil.patch And then rebuild your kernel. --- kern_exec.c.orig Mon Aug 9 11:50:57 1999 +++ kern_exec.c Mon Aug 9 11:51:11 1999 @@ -434,6 +434,7 @@ ((char *)PS_STRINGS) - szsigcode, szsigcode)) goto exec_abort; + stopprofclock(p); /* stop profiling */ fdcloseexec(p); /* handle close on exec */ execsigs(p); /* reset catched signals */ 2.5/common/PaxHeaders.33808/011_miscfs.patch01004440001756001161000000000036067671113400015345xustar0030 atime=1783552627.828696846 2.5/common/011_miscfs.patch010044400017560011610000000023300676711134000145010ustar00ssyncsyncApply by doing: cd /usr/src/sys/miscfs patch -p0 < 011_miscfs.patch And then rebuild your kernel. Index: fdesc/fdesc_vnops.c =================================================================== RCS file: /cvs/src/sys/miscfs/fdesc/fdesc_vnops.c,v retrieving revision 1.13 retrieving revision 1.15 diff -u -r1.13 -r1.15 --- fdesc/fdesc_vnops.c 1999/04/28 09:28:15 1.13 +++ fdesc/fdesc_vnops.c 1999/08/13 07:05:46 1.15 @@ -718,11 +718,11 @@ if (uio->uio_resid < UIO_MX) return (EINVAL); - if (uio->uio_offset < 0) - return (EINVAL); error = 0; i = uio->uio_offset; + if (i < 0) + return (EINVAL); bzero((caddr_t)&d, UIO_MX); d.d_reclen = UIO_MX; Index: procfs/procfs_vnops.c =================================================================== RCS file: /cvs/src/sys/miscfs/procfs/procfs_vnops.c,v retrieving revision 1.12 retrieving revision 1.14 diff -u -r1.12 -r1.14 --- procfs/procfs_vnops.c 1998/08/06 19:34:46 1.12 +++ procfs/procfs_vnops.c 1999/08/13 07:05:46 1.14 @@ -825,11 +825,11 @@ if (uio->uio_resid < UIO_MX) return (EINVAL); - if (uio->uio_offset < 0) - return (EINVAL); error = 0; i = uio->uio_offset; + if (i < 0) + return (EINVAL); bzero((caddr_t)&d, UIO_MX); d.d_reclen = UIO_MX; 2.5/common/PaxHeaders.33808/012_cron.patch01004440001756001161000000000036067671113400015023xustar0030 atime=1783552627.828696846 2.5/common/012_cron.patch010044400017560011610000000060500676711134000141620ustar00ssyncsyncApply by doing: cd /usr/src/usr.sbin/cron patch -p0 < 012_cron.patch And then reinstall cron. Index: config.h =================================================================== RCS file: /cvs/src/usr.sbin/cron/config.h,v retrieving revision 1.2 retrieving revision 1.4 diff -u -r1.2 -r1.4 --- config.h 1998/03/30 06:59:41 1.2 +++ config.h 1999/08/29 08:51:55 1.4 @@ -42,12 +42,14 @@ */ #define MAILCMD _PATH_SENDMAIL /*-*/ -#define MAILARGS "%s -FCronDaemon -odi -oem -oi -or0s -t" /*-*/ +#define MAILARGS "%s -FCronDaemon -odi -oem -oi -t" /*-*/ /* -Fx = set full-name of sender * -odi = Option Deliverymode Interactive * -oem = Option Errors Mailedtosender - * -or0s = Option Readtimeout -- don't time out * -t = read recipient from header of message + * NOTE: since this runs as the user, not root you must + * not specify any args that will cause sendmail + * to drop its suidness (see op.me for a list). */ /* #define MAILCMD "/bin/mail" -*/ Index: cron.h =================================================================== RCS file: /cvs/src/usr.sbin/cron/cron.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cron.h 1997/12/22 08:10:41 1.2 +++ cron.h 1999/08/28 20:13:13 1.3 @@ -231,7 +231,7 @@ entry *load_entry __P((FILE *, void (*)(), struct passwd *, char **)); -FILE *cron_popen __P((char *, char *)); +FILE *cron_popen __P((char *, char *, entry *)); /* in the C tradition, we only create Index: do_command.c =================================================================== RCS file: /cvs/src/usr.sbin/cron/do_command.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- do_command.c 1998/05/08 20:17:18 1.5 +++ do_command.c 1999/08/28 20:13:13 1.6 @@ -387,7 +387,7 @@ (void) gethostname(hostname, MAXHOSTNAMELEN); (void) snprintf(mailcmd, sizeof(mailcmd), MAILARGS, MAILCMD); - if (!(mail = cron_popen(mailcmd, "w"))) { + if (!(mail = cron_popen(mailcmd, "w", e))) { perror(MAILCMD); (void) _exit(ERROR_EXIT); } Index: popen.c =================================================================== RCS file: /cvs/src/usr.sbin/cron/popen.c,v retrieving revision 1.2 retrieving revision 1.5 diff -u -r1.2 -r1.5 --- popen.c 1998/03/30 06:59:47 1.2 +++ popen.c 1999/08/30 10:45:37 1.5 @@ -44,8 +44,9 @@ static int fds; FILE * -cron_popen(program, type) +cron_popen(program, type, e) char *program, *type; + entry *e; { register char *cp; FILE *iop; @@ -80,6 +81,7 @@ for (argc = 0, cp = program; argc < MAX_ARGS; cp = NULL) if (!(argv[argc++] = strtok(cp, " \t\n"))) break; + argv[MAX_ARGS] = NULL; #if WANT_GLOBBING /* glob each piece */ @@ -118,6 +120,15 @@ (void)close(pdes[0]); } (void)close(pdes[1]); + } + if (e) { + setgid(e->gid); +#if defined(BSD) + initgroups(env_get("LOGNAME", e->envp), e->gid); +#endif + setlogin(env_get("LOGNAME", e->envp)); + setuid(e->uid); + chdir(env_get("HOME", e->envp)); } #if WANT_GLOBBING execvp(gargv[0], gargv); 2.5/PaxHeaders.33808/hp30000407550001756001161000000000036101675603360011756xustar0030 atime=1783552627.828696846 2.5/hp300004075500017560011610000000000001016756033600111075ustar00ssyncsync2.5/PaxHeaders.33808/i38600407550001756001161000000000036101675613100011606xustar0030 atime=1783552627.828696846 2.5/i386004075500017560011610000000000001016756131000107375ustar00ssyncsync2.5/i386/PaxHeaders.33808/013_brooktree.patch01004440001756001161000000000036070132061600015246xustar0030 atime=1783552627.828696846 2.5/i386/013_brooktree.patch010044400017560011610000000024250701320616000144070ustar00ssyncsyncApply by doing: cd /usr/src patch -p0 < 013_brooktree.patch And then rebuild your kernel. Index: sys/dev/pci/brooktree848.c =================================================================== RCS file: /cvs/src/sys/dev/pci/brooktree848.c,v retrieving revision 1.7 diff -u -r1.7 brooktree848.c --- sys/dev/pci/brooktree848.c 1999/02/19 02:54:38 1.7 +++ sys/dev/pci/brooktree848.c 1999/11/14 01:59:56 @@ -1,4 +1,4 @@ -/* $OpenBSD: brooktree848.c,v 1.7 1999/02/19 02:54:38 deraadt Exp $ */ +/* $OpenBSD: brooktree848.c,v 1.12 1999/10/31 20:50:04 deraadt Exp $ */ /* $FreeBSD: brooktree848.c,v 1.64 1999/01/28 17:47:47 roger Exp $ */ /* BT848 Driver for Brooktree's Bt848, Bt849, Bt878 and Bt 879 based cards. The Brooktree BT848 Driver driver is based upon Mark Tinguely and @@ -1939,14 +1939,15 @@ int unit; unit = UNIT( minor(dev) ); - if (unit >= NBKTR) /* unit out of range */ + if (unit >= NBKTR || unit > bktr_cd.cd_ndevs) /* unit out of range */ return( ENXIO ); -#if defined(__NetBSD__) || defined(__OpenBSD__) + if (bktr_cd.cd_devs == NULL) + return( ENXIO ); + bktr = bktr_cd.cd_devs[unit]; -#else - bktr = &(brooktree[ unit ]); -#endif + if (bktr == NULL) + return ( ENXIO ); if (!(bktr->flags & METEOR_INITALIZED)) /* device not found */ return( ENXIO ); 2.5/i386/PaxHeaders.33808/014_y2k.patch01004440001756001161000000000036070326013600013762xustar0030 atime=1783552627.828696846 2.5/i386/014_y2k.patch010044400017560011610000000025140703260136000131220ustar00ssyncsyncApply by doing: cd /usr/src/sys patch -p0 < 014_y2k.patch --- arch/i386/isa/clock.c.orig Thu Mar 25 00:03:36 1999 +++ arch/i386/isa/clock.c Thu Dec 23 11:07:46 1999 @@ -449,7 +449,7 @@ { mc_todregs rtclk; time_t n; - int sec, min, hr, dom, mon, yr; + int sec, min, hr, dom, mon, yr, cent; int i, days = 0; int s; @@ -481,7 +481,18 @@ dom = hexdectodec(rtclk[MC_DOM]); mon = hexdectodec(rtclk[MC_MONTH]); yr = hexdectodec(rtclk[MC_YEAR]); - yr = (yr < 70) ? yr+100 : yr; + switch ( cent = hexdectodec(mc146818_read(NULL, NVRAM_CENTURY)) ) { + case 19: + /* FALLTHROUGH */ + case 20: + yr += cent * 100; + break; + + default: + (void)printf("WARNING: Your NVRAM doesn't seem to hold " + "century\n"); + yr += ((yr < 70) ? 2000 : 1900); + } n = sec + 60 * min + 3600 * hr; n += (dom - 1) * 3600 * 24; @@ -491,7 +502,7 @@ for (i = mon - 2; i >= 0; i--) days += month[i]; month[1] = 28; - for (i = 70; i < yr; i++) + for (i = 1970; i < yr; i++) days += yeartoday(i); n += days * 3600 * 24; @@ -557,7 +568,10 @@ for (j = 1970, i = yeartoday(j); n >= i; j++, i = yeartoday(j)) n -= i; - rtclk[MC_YEAR] = dectohexdec(j - 1900); + rtclk[MC_YEAR] = dectohexdec((j - 1900) % 100); + + /* update century byte */ + mc146818_write(NULL, NVRAM_CENTURY, dectohexdec(j / 100)); if (i == 366) month[1] = 29; 2.5/PaxHeaders.33808/mac68k00407550001756001161000000000036101675603360012215xustar0030 atime=1783552627.828696846 2.5/mac68k004075500017560011610000000000001016756033600113465ustar00ssyncsync2.5/PaxHeaders.33808/mvme68k00407550001756001161000000000036101675603360012421xustar0030 atime=1783552627.828696846 2.5/mvme68k004075500017560011610000000000001016756033600115525ustar00ssyncsync2.5/PaxHeaders.33808/mvme88k00407550001756001161000000000036101675603360012423xustar0030 atime=1783552627.828696846 2.5/mvme88k004075500017560011610000000000001016756033600115545ustar00ssyncsync2.5/PaxHeaders.33808/pmax00407550001756001161000000000036101675603360012071xustar0030 atime=1783552627.828696846 2.5/pmax004075500017560011610000000000001016756033600112225ustar00ssyncsync2.5/PaxHeaders.33808/powerpc00407550001756001161000000000036101675613100012574xustar0030 atime=1783552627.828696846 2.5/powerpc004075500017560011610000000000001016756131000117255ustar00ssyncsync2.5/powerpc/PaxHeaders.33808/001_trap.patch01004440001756001161000000000036067671113400015215xustar0030 atime=1783552627.828696846 2.5/powerpc/001_trap.patch010044400017560011610000000025330676711134000143560ustar00ssyncsyncApply by doing: cd /usr/src/sys/arch/powerpc/powerpc patch < 001_trap.patch build a new kernel, ie. cd /usr/src/sys/arch/powerpc/conf config GENERIC cd ../compile/GENERIC make mv /bsd /bsd.1 cp bsd /bsd reboot Index: trap.c =================================================================== RCS file: /cvs/src/sys/arch/powerpc/powerpc/trap.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- trap.c 1999/03/13 01:49:07 1.13 +++ trap.c 1999/04/22 06:08:06 1.14 @@ -133,7 +133,7 @@ ftype = VM_PROT_READ; if (vm_fault(map, trunc_page(va), ftype, FALSE) == KERN_SUCCESS) - break; + return; if (fb = p->p_addr->u_pcb.pcb_onfault) { p->p_addr->u_pcb.pcb_onfault = 0; frame->srr0 = fb->pc; /* PC */ @@ -465,8 +465,10 @@ faultbuf env; u_int32_t v; - if (setfault(env)) + if (setfault(env)) { + curpcb->pcb_onfault = 0; return EACCES; + } switch(len) { case 4: v = *((volatile u_int32_t *)addr); @@ -492,8 +494,10 @@ size_t l; faultbuf env; - if (setfault(env)) + if (setfault(env)) { + curpcb->pcb_onfault = 0; return EACCES; + } while (len > 0) { p = USER_ADDR + ((u_int)udaddr & ~SEGMENT_MASK); l = (USER_ADDR + SEGMENT_LENGTH) - p; @@ -520,6 +524,7 @@ faultbuf env; if (setfault(env)) { + curpcb->pcb_onfault = 0; return EACCES; } while (len > 0) { 2.5/PaxHeaders.33808/sparc00407550001756001161000000000036101675603360012234xustar0030 atime=1783552627.828696846 2.5/sparc004075500017560011610000000000001016756033600113655ustar00ssyncsync2.5/PaxHeaders.33808/README01004440001756001161000000000035067072645400012053xustar0029 atime=1783552627.81868753 2.5/README010044400017560011610000000001260670726454000112110ustar00ssyncsyncFor more information on these patches, please see http://www.openbsd.org/errata.html