From owner-svn-src-user@FreeBSD.ORG Sun Dec 13 02:00:41 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CB62106566C; Sun, 13 Dec 2009 02:00:41 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6ABE78FC0C; Sun, 13 Dec 2009 02:00:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBD20fDE070259; Sun, 13 Dec 2009 02:00:41 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBD20f2u070256; Sun, 13 Dec 2009 02:00:41 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200912130200.nBD20f2u070256@svn.freebsd.org> From: Kip Macy Date: Sun, 13 Dec 2009 02:00:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200461 - user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2009 02:00:41 -0000 Author: kmacy Date: Sun Dec 13 02:00:41 2009 New Revision: 200461 URL: http://svn.freebsd.org/changeset/base/200461 Log: simplify initial version and reduce ARC churn by assuming that the block address is never available at getblk time Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Dec 13 01:20:32 2009 (r200460) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Dec 13 02:00:41 2009 (r200461) @@ -258,7 +258,6 @@ static arc_state_t ARC_mfu_ghost; static arc_state_t ARC_l2c_only; typedef struct arc_stats { - kstat_named_t arcstat_page_cache_hits; kstat_named_t arcstat_hits; kstat_named_t arcstat_misses; kstat_named_t arcstat_demand_data_hits; @@ -309,7 +308,6 @@ typedef struct arc_stats { static arc_stats_t arc_stats = { { "hits", KSTAT_DATA_UINT64 }, - { "page_cache_hits", KSTAT_DATA_UINT64 }, { "misses", KSTAT_DATA_UINT64 }, { "demand_data_hits", KSTAT_DATA_UINT64 }, { "demand_data_misses", KSTAT_DATA_UINT64 }, @@ -451,7 +449,6 @@ struct arc_write_callback { /* * Keep initial ordering in-sync with zbio_buf_hdr */ - struct arc_buf_hdr { /* protected by hash lock */ dva_t b_dva; @@ -646,6 +643,8 @@ typedef struct l2arc_data_free { list_node_t l2df_list_node; } l2arc_data_free_t; +extern int zfs_page_cache_disable; + static kmutex_t l2arc_feed_thr_lock; static kcondvar_t l2arc_feed_thr_cv; static uint8_t l2arc_thread_exit; @@ -1198,9 +1197,8 @@ arc_data_buf_free(void *buf, uint64_t si atomic_add_64(&arc_size, -size); } -static arc_buf_t * -_arc_buf_alloc(spa_t *spa, int size, void *tag, arc_buf_contents_t type, - blkptr_t *bp) +arc_buf_t * +arc_buf_alloc(spa_t *spa, int size, void *tag, arc_buf_contents_t type) { arc_buf_hdr_t *hdr; arc_buf_t *buf; @@ -1210,14 +1208,6 @@ _arc_buf_alloc(spa_t *spa, int size, voi ASSERT(BUF_EMPTY(hdr)); hdr->b_size = size; hdr->b_type = type; - if (bp != NULL) { - hdr->b_dva = *BP_IDENTITY(bp); - hdr->b_birth = bp->blk_birth; - } else { - hdr->b_dva.dva_word[0] = 0; - hdr->b_dva.dva_word[1] = 0; - hdr->b_birth = 0; - } hdr->b_spa = spa; hdr->b_state = arc_anon; hdr->b_arc_access = 0; @@ -1237,13 +1227,6 @@ _arc_buf_alloc(spa_t *spa, int size, voi return (buf); } -arc_buf_t * -arc_buf_alloc(spa_t *spa, int size, void *tag, arc_buf_contents_t type) -{ - - return (_arc_buf_alloc(spa, size, tag, type, NULL)); -} - static arc_buf_t * arc_buf_clone(arc_buf_t *from) { @@ -1564,7 +1547,7 @@ arc_evict(arc_state_t *state, spa_t *spa * don't recycle page cache bufs * */ - if (recycle && (bytes >= PAGE_SIZE)) + if (recycle && ((bytes & PAGE_MASK) != 0) && !zfs_page_cache_disable) recycle = FALSE; #endif if (type == ARC_BUFC_METADATA) { @@ -2339,7 +2322,7 @@ arc_get_data_buf(arc_buf_t *buf) zbio_data_getblk(buf); atomic_add_64(&arc_size, size); } - if (size < PAGE_SIZE) + if (size & PAGE_MASK) ARCSTAT_BUMP(arcstat_recycle_miss); } ASSERT(buf->b_data != NULL); @@ -2768,8 +2751,10 @@ top: /* this block is not in the cache */ arc_buf_hdr_t *exists; arc_buf_contents_t type = BP_GET_BUFC_TYPE(bp); - buf = _arc_buf_alloc(spa, size, private, type, bp); + buf = arc_buf_alloc(spa, size, private, type); hdr = buf->b_hdr; + hdr->b_dva = *BP_IDENTITY(bp); + hdr->b_birth = bp->blk_birth; hdr->b_cksum0 = bp->blk_cksum.zc_word[0]; exists = buf_hash_insert(hdr, &hash_lock); if (exists) { @@ -4021,6 +4006,7 @@ l2arc_do_free_on_write() for (df = list_tail(buflist); df; df = df_prev) { df_prev = list_prev(buflist, df); + ASSERT(df->l2df_buf != NULL); ASSERT(df->l2df_func != NULL); df->l2df_func(df->l2df_buf, df->l2df_size); list_remove(buflist, df); Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c Sun Dec 13 01:20:32 2009 (r200460) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c Sun Dec 13 02:00:41 2009 (r200461) @@ -105,7 +105,7 @@ __FBSDID("$FreeBSD$"); (buf)->b_birth == 0) SYSCTL_DECL(_vfs_zfs); -static int zfs_page_cache_disable = 1; +int zfs_page_cache_disable = 1; TUNABLE_INT("vfs.zfs.page_cache_disable", &zfs_page_cache_disable); SYSCTL_INT(_vfs_zfs, OID_AUTO, page_cache_disable, CTLFLAG_RDTUN, &zfs_page_cache_disable, 0, "Disable backing ARC with page cache "); @@ -759,16 +759,6 @@ _zbio_getblk_malloc(zbio_buf_hdr_t *hdr, newbp->b_data = data; newbp->b_flags = (B_MALLOC|B_INVAL); newbp->b_bcount = size; - if (!BUF_EMPTY(hdr) && !(hdr->b_flags & ZBIO_BUF_CLONING)) { - blkno = hdr->b_dva.dva_word[1] & ~(1ULL<<63); - zbio_buf_evict_overlap(blkno, size, state, txg, ZB_EVICT_BUFFERED); - newbp->b_blkno = blkno; - /* - * Copy in from the page cache if found & valid - * and mark B_CACHE - */ - zbio_buf_vm_object_copyin(newbp); - } if (hdr->b_flags & ZBIO_BUF_CLONING) { newbp->b_flags |= B_CLONED; @@ -781,31 +771,13 @@ static buf_t * _zbio_getblk_vmio(zbio_buf_hdr_t *hdr, int flags) { buf_t *newbp; - daddr_t blkno; uint64_t size = hdr->b_size; spa_t *spa = hdr->b_spa; zbio_state_t *state = spa_get_bio_state(spa); - struct vnode *vp = spa_get_vnode(spa); - struct bufobj *bo = &vp->v_bufobj; - if (BUF_EMPTY(hdr)) { - newbp = geteblk(size, flags); - zbio_buf_va_insert(newbp, state); - } else { - blkno = hdr->b_dva.dva_word[1] & ~(1ULL<<63); - zbio_buf_evict_overlap(blkno, size, state, NO_TXG, ZB_EVICT_BUFFERED); - - while (newbp == NULL) - newbp = getblk(vp, blkno, size, 0, 0, flags | GB_LOCK_NOWAIT); - brelvp(newbp); - newbp->b_flags |= B_ASSIGNED; - zbio_buf_blkno_insert(newbp, state); - } - newbp->b_bufobj = bo; + newbp = geteblk(size, flags); + zbio_buf_va_insert(newbp, state); BUF_KERNPROC(newbp); - CTR4(KTR_SPARE2, "arc_getblk() bp=%p flags %X " - "blkno %ld npages %d", - newbp, newbp->b_flags, blkno, newbp->b_npages); return (newbp); } @@ -876,7 +848,8 @@ zbio_relse(arc_buf_t *buf, size_t size) } int -zbio_sync_cache(spa_t *spa, blkptr_t *blkp, uint64_t txg, void *data, uint64_t size, int bio_op) +zbio_sync_cache(spa_t *spa, blkptr_t *blkp, uint64_t txg, void *data, + uint64_t size, int bio_op) { buf_t *bp; zbio_state_t *state = spa_get_bio_state(spa); @@ -917,11 +890,13 @@ zbio_sync_cache(spa_t *spa, blkptr_t *bl zbio_buf_vm_object_copyout(bp); } } else { + zbio_buf_va_remove(bp); VM_OBJECT_LOCK(object); zbio_buf_evict_overlap_locked(blkno, size, state, NO_TXG, ZB_EVICT_ALL, object); bp->b_blkno = bp->b_lblkno = blkno; bp->b_flags |= (B_VMIO|B_ASSIGNED); + zbio_buf_blkno_insert(bp, state); zbio_buf_vm_object_insert_locked(bp, vp, object, bio_op == BIO_WRITE); VM_OBJECT_UNLOCK(object); } From owner-svn-src-user@FreeBSD.ORG Sun Dec 13 13:40:41 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7258D1065670; Sun, 13 Dec 2009 13:40:41 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 60E518FC14; Sun, 13 Dec 2009 13:40:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBDDefiN087713; Sun, 13 Dec 2009 13:40:41 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBDDefNt087709; Sun, 13 Dec 2009 13:40:41 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200912131340.nBDDefNt087709@svn.freebsd.org> From: Takahashi Yoshihiro Date: Sun, 13 Dec 2009 13:40:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200472 - user/nyan/pc98/sys/boot/pc98/boot2 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2009 13:40:41 -0000 Author: nyan Date: Sun Dec 13 13:40:41 2009 New Revision: 200472 URL: http://svn.freebsd.org/changeset/base/200472 Log: - Implement the read function into boot1 which called both boot1 and boot2. - Cleanup to reduce code size. - Find the slice number from slice table. Modified: user/nyan/pc98/sys/boot/pc98/boot2/Makefile user/nyan/pc98/sys/boot/pc98/boot2/boot1.S user/nyan/pc98/sys/boot/pc98/boot2/boot2.c Modified: user/nyan/pc98/sys/boot/pc98/boot2/Makefile ============================================================================== --- user/nyan/pc98/sys/boot/pc98/boot2/Makefile Sun Dec 13 11:06:39 2009 (r200471) +++ user/nyan/pc98/sys/boot/pc98/boot2/Makefile Sun Dec 13 13:40:41 2009 (r200472) @@ -95,9 +95,9 @@ boot2.s: boot2.c boot2.h ${.CURDIR}/../. rm -f boot2.s.tmp boot2.h: boot1.out - ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T putc/ \ + ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T (read|putc)/ \ { x = $$1 - ORG1; \ - printf("#define PUTCORG %#x\n", REL1 + x) }' \ + printf("#define %sORG %#x\n", toupper($$3), REL1 + x) }' \ ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} Modified: user/nyan/pc98/sys/boot/pc98/boot2/boot1.S ============================================================================== --- user/nyan/pc98/sys/boot/pc98/boot2/boot1.S Sun Dec 13 11:06:39 2009 (r200471) +++ user/nyan/pc98/sys/boot/pc98/boot2/boot1.S Sun Dec 13 13:40:41 2009 (r200472) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 TAKAHASHI Yoshihiro + * Copyright (c) 2008-2009 TAKAHASHI Yoshihiro * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -60,6 +60,7 @@ .set NSECT,0x10 .globl start + .globl read .globl putc .code16 @@ -134,9 +135,9 @@ main: cld pop %cx /* bootstrap passes */ - xor %ax,%ax - mov %ax,%ds - mov %ax,%es + xor %edi,%edi + mov %di,%ds + mov %di,%es mov %cs,%bx cmp $0x1fe0,%bx jz boot_fd @@ -149,20 +150,18 @@ main: cld jz boot_fd cmp $0x90,%al jnz boot_hd -boot_fd: mov $0xd6,%ah /* read data */ - mov $0x0200,%cx - mov $0x0001,%dx +boot_fd: xor %cx,%cx jmp boot_load boot_hd: test %cx,%cx - jnz boot_hd.1 + jnz boot_load mov %cs:(boot_cyl),%cx -boot_hd.1: mov $0x06,%ah /* read data */ - xor %dx,%dx boot_load: mov %cx,MEM_ARG /* Save cylinder number */ - mov (DAUA),%al + mov %cx,%di + xor %dx,%dx mov $LOAD_SIZE,%bx mov $MEM_BUF,%bp - int $0x1b + push %cs + callw read jc error /* Transfer boot2.bin */ @@ -185,6 +184,48 @@ boot_load: mov %cx,MEM_ARG /* Save cyli ljmp $0x0000,$MEM_JMP /* + * Reads sectors from the disk. + * Call with: + * + * %bx - bytes to read + * %cx - cylinder + * %dh - head + * %dl - sector + * %edi - lba + * %es:(%bp) - buffer to read data into + * %ds - segment to access BIOS area (= 0x0000) + */ +read: mov $0x06,%ah + mov (DAUA),%al + mov %ax,%si + and $0xf0,%al + cmp $0x30,%al /* 1.44MB FDD */ + jz read_fd + cmp $0x90,%al /* 1MB FDD */ + jz read_fd + cmp $0xa0,%al /* Is SCSI device? */ + jnz read_load + push %cx + mov %si,%cx + and $0x0f,%cl + inc %cl + mov (0x482),%ah + shr %cl,%ah /* Is SCSI HDD? */ + pop %cx + jc read_load + and $0xff7f,%si /* SCSI MO */ + mov %di,%cx + shr $16,%di + mov %di,%dx + jmp read_load +read_fd: or $0xd000,%si + or $0x0200,%cx + inc %dx +read_load: mov %si,%ax + int $0x1b + lret + +/* * Print out the error message, wait for a keypress, and then reboot * the machine. */ Modified: user/nyan/pc98/sys/boot/pc98/boot2/boot2.c ============================================================================== --- user/nyan/pc98/sys/boot/pc98/boot2/boot2.c Sun Dec 13 11:06:39 2009 (r200471) +++ user/nyan/pc98/sys/boot/pc98/boot2/boot2.c Sun Dec 13 13:40:41 2009 (r200472) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 TAKAHASHI Yoshihiro + * Copyright (c) 2008-2009 TAKAHASHI Yoshihiro * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -28,8 +28,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include @@ -149,7 +147,7 @@ static int dskread(void *, unsigned, uns static void printf(const char *,...); static void putchar(int); static uint32_t memsize(void); -static int drvread(void *, unsigned, unsigned); +static int drvread(void *, unsigned); static int keyhit(unsigned); static int xputc(int); static int xgetc(int); @@ -235,7 +233,7 @@ putc(int c) v86.ctl = V86_FLAGS; } -static int +static inline int is_scsi_hd(void) { @@ -248,7 +246,9 @@ is_scsi_hd(void) static inline void fix_sector_size(void) { - u_char *p = (u_char *)PTOV(0x460 + dsk.unit * 4); + u_char *p; + + p = (u_char *)PTOV(0x460 + dsk.unit * 4); /* SCSI equipment parameter */ if ((p[0] & 0x1f) == 7) { /* SCSI MO */ if (!(p[3] & 0x30)) { /* 256B / sector */ @@ -258,7 +258,7 @@ fix_sector_size(void) } } -static uint32_t +static inline uint32_t get_diskinfo(void) { @@ -275,10 +275,25 @@ get_diskinfo(void) return (v86.ecx << 16) | v86.edx; } + /* SCSI MO or CD */ + fix_sector_size(); /* SCSI MO */ + /* other SCSI devices */ return (65535 << 16) | (8 << 8) | 32; } +static void +set_dsk(void) +{ + uint32_t di; + + di = get_diskinfo(); + + dsk.head = (di >> 8) & 0xff; + dsk.sec = di & 0xff; + dsk.start = 0; +} + #ifdef GET_BIOSGEOM static uint32_t bd_getbigeom(int bunit) @@ -314,6 +329,32 @@ bd_getbigeom(int bunit) } #endif +static int +check_slice(void) +{ + struct pc98_partition *dp; + char *sec; + unsigned i, cyl; + + sec = dmadat->secbuf; + cyl = *(uint16_t *)PTOV(ARGS); + set_dsk(); + + if (dsk.type == TYPE_FD) + return (WHOLE_DISK_SLICE); + if (drvread(sec, DOSBBSECTOR + 1)) + return (WHOLE_DISK_SLICE); /* Read error */ + dp = (void *)(sec + DOSPARTOFF); + for (i = 0; i < NDOSPART; i++) { + if (dp[i].dp_mid == DOSMID_386BSD) { + if (dp[i].dp_scyl <= cyl && cyl <= dp[i].dp_ecyl) + return (BASE_SLICE + i); + } + } + + return (WHOLE_DISK_SLICE); +} + int main(void) { @@ -335,7 +376,7 @@ main(void) dsk.type = TYPE_DA; else /* if (dsk.disk == 0x30 || dsk.disk == 0x90) */ dsk.type = TYPE_FD; - dsk.slice = WHOLE_DISK_SLICE; /* XXX */ + dsk.slice = check_slice(); #ifdef GET_BIOSGEOM for (i = 0; i < N_BIOS_GEOM; i++) bootinfo.bi_bios_geom[i] = bd_getbigeom(i); @@ -605,18 +646,14 @@ dskread(void *buf, unsigned lba, unsigne struct disklabel *d; char *sec; unsigned sl, i; - uint32_t di; u_char *p; if (!dsk_meta) { sec = dmadat->secbuf; - di = get_diskinfo(); - dsk.head = (di >> 8) & 0xff; - dsk.sec = di & 0xff; - dsk.start = 0; + set_dsk(); if (dsk.type == TYPE_FD) goto unsliced; - if (drvread(sec, DOSBBSECTOR + 1, 1)) + if (drvread(sec, DOSBBSECTOR + 1)) return -1; dp = (void *)(sec + DOSPARTOFF); sl = dsk.slice; @@ -637,7 +674,7 @@ dskread(void *buf, unsigned lba, unsigne dsk.start = dp->dp_scyl * dsk.head * dsk.sec + dp->dp_shd * dsk.sec + dp->dp_ssect; } - if (drvread(sec, dsk.start + LABELSECTOR, 1)) + if (drvread(sec, dsk.start + LABELSECTOR)) return -1; d = (void *)(sec + LABELOFFSET); if (d->d_magic != DISKMAGIC || d->d_magic2 != DISKMAGIC) { @@ -657,7 +694,7 @@ dskread(void *buf, unsigned lba, unsigne unsliced: ; } for (p = buf; nblk; p += 512, lba++, nblk--) { - if ((i = drvread(p, dsk.start + lba, 1))) + if ((i = drvread(p, dsk.start + lba))) return i; } return 0; @@ -710,7 +747,7 @@ putchar(int c) } static int -drvread(void *buf, unsigned lba, unsigned nblk) +drvread(void *buf, unsigned lba) { static unsigned c = 0x2d5c7c2f; unsigned bpc, x, cyl, head, sec; @@ -723,28 +760,19 @@ drvread(void *buf, unsigned lba, unsigne if (!OPT_CHECK(RBX_QUIET)) printf("%c\b", c = c << 8 | c >> 24); - v86.addr = 0x1b; - v86.eax = 0x0600 | dsk.daua; + v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; + v86.addr = READORG; /* call to read in boot1 */ v86.ecx = cyl; v86.edx = (head << 8) | sec; - if (dsk.type == TYPE_FD) { - v86.eax |= 0xd000; - v86.ecx |= 0x0200; - v86.edx += 1; - } else if (dsk.type == TYPE_DA && !is_scsi_hd()) { - /* SCSI MO */ - fix_sector_size(); - v86.eax &= 0xff7f; - v86.ecx = lba & 0xffff; - v86.edx = (lba >> 16) & 0xffff; - } - v86.ebx = nblk * 512; + v86.edi = lba; + v86.ebx = 512; v86.es = VTOPSEG(buf); v86.ebp = VTOPOFF(buf); v86int(); + v86.ctl = V86_FLAGS; if (V86_CY(v86.efl)) { - printf("error %x c/h/s %u/%u/%u lba %u nblk %u\n", v86.eax >> 8 & 0xff, - cyl, head, sec, lba, nblk); + printf("error %u c/h/s %u/%u/%u lba %u\n", v86.eax >> 8 & 0xff, + cyl, head, sec, lba); return -1; } return 0; From owner-svn-src-user@FreeBSD.ORG Mon Dec 14 03:52:22 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 003ED106566B; Mon, 14 Dec 2009 03:52:21 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E163A8FC16; Mon, 14 Dec 2009 03:52:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBE3qLYq007024; Mon, 14 Dec 2009 03:52:21 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBE3qLw1007017; Mon, 14 Dec 2009 03:52:21 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200912140352.nBE3qLw1007017@svn.freebsd.org> From: Kip Macy Date: Mon, 14 Dec 2009 03:52:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200501 - in user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs: . sys X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 03:52:22 -0000 Author: kmacy Date: Mon Dec 14 03:52:21 2009 New Revision: 200501 URL: http://svn.freebsd.org/changeset/base/200501 Log: - reduce changes to arc.c to including zfs_bio.h and not recycling buffers whose pages are cacheable - streamline zfs_bio.c interfaces so that it can be a drop in backend for zio buf allocation - prefix original zio_buf functions with '_' so that all callers to the zio_buf function are now routed through the page cache logic if page caching is not disabled - change zbio_ functions to zio_ except where a naming conflict could occur in which case they're renamed to zfs_bio - add zio_cache_validate to zio_done to mark pages as valid on read completion - move conditional logic for call to zio_cache_sync and zio_cache_validate in to inline function to minimize churn in core ZFS code Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_bio.h user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Dec 14 02:50:04 2009 (r200500) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Dec 14 03:52:21 2009 (r200501) @@ -122,7 +122,6 @@ #include #include #include -#include #include #include #ifdef _KERNEL @@ -446,32 +445,28 @@ struct arc_write_callback { arc_buf_t *awcb_buf; }; -/* - * Keep initial ordering in-sync with zbio_buf_hdr - */ struct arc_buf_hdr { /* protected by hash lock */ dva_t b_dva; uint64_t b_birth; - uint32_t b_flags; - uint32_t b_datacnt; - - /* immutable */ - arc_buf_contents_t b_type; - uint64_t b_size; - spa_t *b_spa; + uint64_t b_cksum0; - /* protected by hash lock */ kmutex_t b_freeze_lock; zio_cksum_t *b_freeze_cksum; arc_buf_hdr_t *b_hash_next; arc_buf_t *b_buf; - uint64_t b_cksum0; + uint32_t b_flags; + uint32_t b_datacnt; arc_callback_t *b_acb; kcondvar_t b_cv; + /* immutable */ + arc_buf_contents_t b_type; + uint64_t b_size; + spa_t *b_spa; + /* protected by arc state mutex */ arc_state_t *b_state; list_node_t b_arc_node; @@ -637,14 +632,12 @@ struct l2arc_buf_hdr { typedef struct l2arc_data_free { /* protected by l2arc_free_on_write_mtx */ - arc_buf_t *l2df_buf; + void *l2df_data; size_t l2df_size; - void (*l2df_func)(arc_buf_t *, size_t); + void (*l2df_func)(void *, size_t); list_node_t l2df_list_node; } l2arc_data_free_t; -extern int zfs_page_cache_disable; - static kmutex_t l2arc_feed_thr_lock; static kcondvar_t l2arc_feed_thr_cv; static uint8_t l2arc_thread_exit; @@ -1241,7 +1234,6 @@ arc_buf_clone(arc_buf_t *from) buf->b_private = NULL; buf->b_next = hdr->b_buf; hdr->b_buf = buf; - hdr->b_flags |= ZBIO_BUF_CLONING; arc_get_data_buf(buf); bcopy(from->b_data, buf->b_data, size); hdr->b_datacnt += 1; @@ -1285,13 +1277,13 @@ arc_buf_add_ref(arc_buf_t *buf, void* ta * the buffer is placed on l2arc_free_on_write to be freed later. */ static void -arc_buf_data_free(arc_buf_hdr_t *hdr, void (*free_func)(arc_buf_t *, size_t), - arc_buf_t *buf, size_t size) +arc_buf_data_free(arc_buf_hdr_t *hdr, void (*free_func)(void *, size_t), + void *data, size_t size) { if (HDR_L2_WRITING(hdr)) { l2arc_data_free_t *df; df = kmem_alloc(sizeof (l2arc_data_free_t), KM_SLEEP); - df->l2df_buf = buf; + df->l2df_data = data; df->l2df_size = size; df->l2df_func = free_func; mutex_enter(&l2arc_free_on_write_mtx); @@ -1299,7 +1291,7 @@ arc_buf_data_free(arc_buf_hdr_t *hdr, vo mutex_exit(&l2arc_free_on_write_mtx); ARCSTAT_BUMP(arcstat_l2_free_on_write); } else { - free_func(buf, size); + free_func(data, size); } } @@ -1317,13 +1309,13 @@ arc_buf_destroy(arc_buf_t *buf, boolean_ arc_cksum_verify(buf); if (!recycle) { if (type == ARC_BUFC_METADATA) { - arc_buf_data_free(buf->b_hdr, zbio_relse, - buf, size); + arc_buf_data_free(buf->b_hdr, zio_buf_free, + buf->b_data, size); arc_space_return(size); } else { ASSERT(type == ARC_BUFC_DATA); arc_buf_data_free(buf->b_hdr, - zbio_relse, buf, size); + zio_data_buf_free, buf->b_data, size); atomic_add_64(&arc_size, -size); } } @@ -1541,15 +1533,8 @@ arc_evict(arc_state_t *state, spa_t *spa ASSERT(state == arc_mru || state == arc_mfu); evicted_state = (state == arc_mru) ? arc_mru_ghost : arc_mfu_ghost; + recycle = (bytes & PAGE_MASK) ? recycle : FALSE; -#ifdef _KERNEL - /* - * don't recycle page cache bufs - * - */ - if (recycle && ((bytes & PAGE_MASK) != 0) && !zfs_page_cache_disable) - recycle = FALSE; -#endif if (type == ARC_BUFC_METADATA) { offset = 0; list_count = ARC_BUFC_NUMMETADATALISTS; @@ -1973,6 +1958,7 @@ arc_reclaim_needed(void) if (arc_size <= arc_c_min) return (0); +#if 0 /* * If pages are needed or we're within 2048 pages * of needing to page need to reclaim @@ -1980,7 +1966,7 @@ arc_reclaim_needed(void) if (vm_pages_needed || (vm_paging_target() > -2048)) return (1); -#if 0 + /* * take 'desfree' extra pages, so we reclaim sooner, rather than later */ @@ -2284,11 +2270,11 @@ arc_get_data_buf(arc_buf_t *buf) */ if (!arc_evict_needed(type)) { if (type == ARC_BUFC_METADATA) { - zbio_getblk(buf); + buf->b_data = zio_buf_alloc(size); arc_space_consume(size); } else { ASSERT(type == ARC_BUFC_DATA); - zbio_data_getblk(buf); + buf->b_data = zio_data_buf_alloc(size); atomic_add_64(&arc_size, size); } goto out; @@ -2315,11 +2301,11 @@ arc_get_data_buf(arc_buf_t *buf) } if ((buf->b_data = arc_evict(state, NULL, size, TRUE, type)) == NULL) { if (type == ARC_BUFC_METADATA) { - zbio_getblk(buf); + buf->b_data = zio_buf_alloc(size); arc_space_consume(size); } else { ASSERT(type == ARC_BUFC_DATA); - zbio_data_getblk(buf); + buf->b_data = zio_data_buf_alloc(size); atomic_add_64(&arc_size, size); } if (size & PAGE_MASK) @@ -4006,9 +3992,9 @@ l2arc_do_free_on_write() for (df = list_tail(buflist); df; df = df_prev) { df_prev = list_prev(buflist, df); - ASSERT(df->l2df_buf != NULL); + ASSERT(df->l2df_data != NULL); ASSERT(df->l2df_func != NULL); - df->l2df_func(df->l2df_buf, df->l2df_size); + df->l2df_func(df->l2df_data, df->l2df_size); list_remove(buflist, df); kmem_free(df, sizeof (l2arc_data_free_t)); } Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Mon Dec 14 02:50:04 2009 (r200500) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h Mon Dec 14 03:52:21 2009 (r200501) @@ -52,9 +52,6 @@ struct arc_buf { void *b_data; arc_evict_func_t *b_efunc; void *b_private; -#ifdef _KERNEL - struct buf *b_bp; -#endif }; typedef enum arc_buf_contents { Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_bio.h ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_bio.h Mon Dec 14 02:50:04 2009 (r200500) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_bio.h Mon Dec 14 03:52:21 2009 (r200501) @@ -31,30 +31,43 @@ $FreeBSD$ #ifndef _SYS_ZFS_BIO_H #define _SYS_ZFS_BIO_H +#include /* vd->vdev_vnode */ +#include -#define ZBIO_BUF_CLONING (1 << 30) /* is being cloned */ +extern int zfs_page_cache_disable; -int zbio_sync_cache(spa_t *spa, blkptr_t *bp, uint64_t txg, void *data, uint64_t size, int bio_op); -void zbio_getblk(arc_buf_t *buf); -void zbio_data_getblk(arc_buf_t *buf); -void zbio_relse(arc_buf_t *buf, size_t size); - -typedef struct zbio_buf_hdr zbio_buf_hdr_t; -struct zbio_buf_hdr { - /* protected by hash lock */ - dva_t b_dva; - uint64_t b_birth; - uint32_t b_flags; - uint32_t b_datacnt; - - /* immutable */ - arc_buf_contents_t b_type; - uint64_t b_size; - spa_t *b_spa; -}; +void _zio_cache_valid(void *data, uint64_t size); +int _zio_sync_cache(spa_t *spa, blkptr_t *bp, uint64_t txg, void *data, + uint64_t size, zio_type_t type); + +static __inline int +zio_sync_cache(spa_t *spa, blkptr_t *bp, uint64_t txg, void *data, + uint64_t size, zio_type_t type, vdev_t *vd) +{ + int io_bypass = 0; + + if (!zfs_page_cache_disable && + ((vd != NULL) && (vd->vdev_vnode != NULL)) && + ((type == ZIO_TYPE_WRITE) || (type == ZIO_TYPE_READ))) + io_bypass = _zio_sync_cache(spa, bp, txg, data, size, type); + + return (io_bypass); +} + +static __inline void +zio_cache_valid(void *data, uint64_t size, zio_type_t type, vdev_t *vd) +{ + + if ((vd != NULL) && (type == ZIO_TYPE_READ) && + (vd->vdev_vnode != NULL) && (size & PAGE_MASK) == 0) + _zio_cache_valid(data, size); +} + +void *zio_getblk(uint64_t size, int flags); +void zio_relse(void *data, size_t size); #ifdef _KERNEL -void zbio_init(void); -void zbio_fini(void); +void zfs_bio_init(void); +void zfs_bio_fini(void); #endif #endif Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Mon Dec 14 02:50:04 2009 (r200500) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Mon Dec 14 03:52:21 2009 (r200501) @@ -371,6 +371,11 @@ extern void zio_buf_free(void *buf, size extern void *zio_data_buf_alloc(size_t size); extern void zio_data_buf_free(void *buf, size_t size); +extern void *_zio_buf_alloc(size_t size); +extern void _zio_buf_free(void *buf, size_t size); +extern void *_zio_data_buf_alloc(size_t size); +extern void _zio_data_buf_free(void *buf, size_t size); + extern void zio_resubmit_stage_async(void *); extern zio_t *zio_vdev_child_io(zio_t *zio, blkptr_t *bp, vdev_t *vd, Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c Mon Dec 14 02:50:04 2009 (r200500) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_bio.c Mon Dec 14 03:52:21 2009 (r200501) @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. /************************************************************************** This module integrates the caching af pages associated with ARC buffers in a -per-SPA vm object. Each SPA also has an associated "zbio_state_t" which +per-SPA vm object. Each SPA also has an associated "zio_state_t" which tracks bufs allocated for the SPA in two splay trees. The first splay tree tracks bufs by the data pointer's virtual address. @@ -86,16 +86,14 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include #include #include - #include -#include +#include #ifdef _KERNEL @@ -110,16 +108,15 @@ TUNABLE_INT("vfs.zfs.page_cache_disable" SYSCTL_INT(_vfs_zfs, OID_AUTO, page_cache_disable, CTLFLAG_RDTUN, &zfs_page_cache_disable, 0, "Disable backing ARC with page cache "); -static eventhandler_tag zbio_event_shutdown = NULL; -struct zbio_state; -typedef struct zbio_state zbio_state_t; +static eventhandler_tag zfs_bio_event_shutdown = NULL; +struct zio_state; +typedef struct zio_state zio_state_t; typedef struct buf buf_t; -typedef uint64_t zbio_pindex_t; MALLOC_DEFINE(M_ZFS_BIO, "zfs_bio", "zfs buffer cache / vm"); #define B_EVICTED B_00000800 -#define B_CLONED B_00001000 +#define B_DATA B_00001000 #define B_ASSIGNED B_00004000 #define ZB_EVICT_ALL 0x1 @@ -133,10 +130,9 @@ MALLOC_DEFINE(M_ZFS_BIO, "zfs_bio", "zfs #define btos(nbytes) ((nbytes)>>DEV_BSHIFT) #define stob(nsectors) ((nsectors)<mtx) -#define ZBIO_STATE_UNLOCK(zs) mtx_unlock(&(zs)->mtx) +static zio_state_t global_state; -#define spa_get_bio_state(spa) ((zbio_state_t *)spa_get_vnode((spa))->v_data) +#define ZIO_STATE_LOCK(zs) mtx_lock(&(zs)->mtx) +#define ZIO_STATE_UNLOCK(zs) mtx_unlock(&(zs)->mtx) + +#define spa_get_zio_state(spa) ((zio_state_t *)spa_get_vnode((spa))->v_data) #define spa_get_vm_object(spa) spa_get_vnode((spa))->v_object -#define zbio_buf_get_spa(bp) (((zbio_buf_hdr_t *)((arc_buf_t *)(bp->b_arc_buf))->b_hdr)->b_spa) -#define zbio_buf_get_vm_object(bp) spa_get_vm_object(zbio_buf_get_spa((bp))) +#define zio_buf_get_spa(bp) (((zio_state_t *)bp->b_state)->spa) +#define zio_buf_get_vm_object(bp) spa_get_vm_object(zio_buf_get_spa((bp))) -static void zbio_buf_blkno_remove(buf_t *bp); -static void zbio_buf_va_insert(buf_t *bp, zbio_state_t *object); +static void zio_buf_blkno_remove(buf_t *bp); +static void zio_buf_va_insert(buf_t *bp); /* - * zbio_buf_blkno_splay: [ internal use only ] + * zio_buf_blkno_splay: [ internal use only ] * * Implements Sleator and Tarjan's top-down splay algorithm. Returns * the buf containing the given lblkno. If, however, that @@ -167,7 +165,7 @@ static void zbio_buf_va_insert(buf_t *bp * adjacent to the pindex, coming before or after it. */ static buf_t * -zbio_buf_blkno_splay(daddr_t blkno, buf_t *root) +zio_buf_blkno_splay(daddr_t blkno, buf_t *root) { buf_t dummy; buf_t *lefttreemax, *righttreemin, *y; @@ -216,7 +214,7 @@ zbio_buf_blkno_splay(daddr_t blkno, buf_ } static buf_t * -zbio_buf_va_splay(caddr_t va, buf_t *root) +zio_buf_va_splay(caddr_t va, buf_t *root) { buf_t dummy; buf_t *lefttreemax, *righttreemin, *y; @@ -265,7 +263,7 @@ zbio_buf_va_splay(caddr_t va, buf_t *roo } /* - * zbio_buf_blkno_insert: [ internal use only ] + * zio_buf_blkno_insert: [ internal use only ] * * Inserts the given buf into the state splay tree and state list. * @@ -273,7 +271,7 @@ zbio_buf_va_splay(caddr_t va, buf_t *roo * This routine may not block. */ static void -zbio_buf_blkno_insert(buf_t *bp, zbio_state_t *object) +zio_buf_blkno_insert(buf_t *bp, zio_state_t *object) { buf_t *root; daddr_t root_blkno_end, blkno, blkno_end; @@ -287,7 +285,7 @@ zbio_buf_blkno_insert(buf_t *bp, zbio_st bp->b_right = NULL; TAILQ_INSERT_TAIL(&object->blkno_memq, bp, b_bobufs); } else { - root = zbio_buf_blkno_splay(bp->b_blkno, root); + root = zio_buf_blkno_splay(bp->b_blkno, root); root_blkno_end = root->b_blkno + btos(root->b_bcount); if (blkno < root->b_blkno) { @@ -297,7 +295,7 @@ zbio_buf_blkno_insert(buf_t *bp, zbio_st root->b_left = NULL; TAILQ_INSERT_BEFORE(root, bp, b_bobufs); } else if (blkno == root->b_blkno) { - panic("zbio_buf_blkno_insert: blkno already allocated"); + panic("zio_buf_blkno_insert: blkno already allocated"); } else { KASSERT(root_blkno_end <= blkno, ("buffer overlap!")); @@ -317,7 +315,7 @@ zbio_buf_blkno_insert(buf_t *bp, zbio_st } /* - * zbio_buf_insert: [ internal use only ] + * zio_buf_insert: [ internal use only ] * * Inserts the given buf into the state splay tree and state list. * @@ -325,26 +323,26 @@ zbio_buf_blkno_insert(buf_t *bp, zbio_st * This routine may not block. */ static void -zbio_buf_va_insert(buf_t *bp, zbio_state_t *object) +zio_buf_va_insert(buf_t *bp) { buf_t *root; caddr_t va = bp->b_data; + zio_state_t *object = &global_state; - bp->b_state = object; root = object->va_root; if (root == NULL) { bp->b_left = NULL; bp->b_right = NULL; TAILQ_INSERT_TAIL(&object->va_memq, bp, b_bobufs); } else { - root = zbio_buf_va_splay(bp->b_data, root); + root = zio_buf_va_splay(bp->b_data, root); if (va < root->b_data) { bp->b_left = root->b_left; bp->b_right = root; root->b_left = NULL; TAILQ_INSERT_BEFORE(root, bp, b_bobufs); } else if (va == root->b_data) { - panic("zbio_buf_va_insert: address already allocated"); + panic("zio_buf_va_insert: address already allocated"); } else { bp->b_right = root->b_right; bp->b_left = root; @@ -362,7 +360,7 @@ zbio_buf_va_insert(buf_t *bp, zbio_state } /* - * zbio_buf_remove: + * zio_buf_remove: * * Removes the given buf from the spa's state tree * buf list @@ -371,9 +369,9 @@ zbio_buf_va_insert(buf_t *bp, zbio_state * This routine may not block. */ static void -zbio_buf_blkno_remove(buf_t *bp) +zio_buf_blkno_remove(buf_t *bp) { - zbio_state_t *state; + zio_state_t *state; buf_t *root; daddr_t blkno, blkno_end; @@ -384,11 +382,11 @@ zbio_buf_blkno_remove(buf_t *bp) * Now remove from the object's list of backed pages. */ if (bp != state->blkno_root) - zbio_buf_blkno_splay(bp->b_blkno, state->blkno_root); + zio_buf_blkno_splay(bp->b_blkno, state->blkno_root); if (bp->b_left == NULL) root = bp->b_right; else { - root = zbio_buf_blkno_splay(bp->b_blkno, bp->b_left); + root = zio_buf_blkno_splay(bp->b_blkno, bp->b_left); root->b_right = bp->b_right; } state->blkno_root = root; @@ -402,7 +400,7 @@ zbio_buf_blkno_remove(buf_t *bp) } /* - * zbio_buf_va_remove: + * zio_buf_va_remove: * * Removes the given buf from the spa's state tree * buf list @@ -411,9 +409,9 @@ zbio_buf_blkno_remove(buf_t *bp) * This routine may not block. */ static void -zbio_buf_va_remove(buf_t *bp) +zio_buf_va_remove(buf_t *bp) { - zbio_state_t *state; + zio_state_t *state; buf_t *root; vm_offset_t va; @@ -424,11 +422,11 @@ zbio_buf_va_remove(buf_t *bp) * Now remove from the object's list of backed pages. */ if (bp != state->va_root) - zbio_buf_va_splay(bp->b_data, state->va_root); + zio_buf_va_splay(bp->b_data, state->va_root); if (bp->b_left == NULL) root = bp->b_right; else { - root = zbio_buf_va_splay(bp->b_data, bp->b_left); + root = zio_buf_va_splay(bp->b_data, bp->b_left); root->b_right = bp->b_right; } state->va_root = root; @@ -442,7 +440,7 @@ zbio_buf_va_remove(buf_t *bp) } /* - * zbio_buf_va_lookup: + * zio_buf_va_lookup: * * Returns the range associated with the object/offset * pair specified; if none is found, NULL is returned. @@ -452,13 +450,13 @@ zbio_buf_va_remove(buf_t *bp) * This is a critical path routine */ static buf_t * -zbio_buf_va_lookup(zbio_state_t *state, caddr_t va) +zio_buf_va_lookup(caddr_t va) { buf_t *bp; - if ((bp = state->va_root) != NULL && bp->b_data != va) { - bp = zbio_buf_va_splay(va, bp); - if ((state->va_root = bp)->b_data != va) + if ((bp = global_state.va_root) != NULL && bp->b_data != va) { + bp = zio_buf_va_splay(va, bp); + if ((global_state.va_root = bp)->b_data != va) bp = NULL; } return (bp); @@ -466,7 +464,7 @@ zbio_buf_va_lookup(zbio_state_t *state, /* - * zbio_buf_blkno_lookup: + * zio_buf_blkno_lookup: * * Returns the range associated with the object/offset * pair specified; if none is found, NULL is returned. @@ -476,12 +474,12 @@ zbio_buf_va_lookup(zbio_state_t *state, * This is a critical path routine */ static buf_t * -zbio_buf_blkno_lookup(zbio_state_t *state, daddr_t blkno) +zio_buf_blkno_lookup(zio_state_t *state, daddr_t blkno) { buf_t *bp; if ((bp = state->blkno_root) != NULL && bp->b_blkno != blkno) { - bp = zbio_buf_blkno_splay(blkno, bp); + bp = zio_buf_blkno_splay(blkno, bp); if ((state->blkno_root = bp)->b_blkno != blkno) bp = NULL; } @@ -489,7 +487,7 @@ zbio_buf_blkno_lookup(zbio_state_t *stat } static void -zbio_buf_vm_object_copy(buf_t *bp, int direction) +zio_buf_vm_object_copy(buf_t *bp, int direction) { vm_object_t object; vm_pindex_t start, end; @@ -501,7 +499,7 @@ zbio_buf_vm_object_copy(buf_t *bp, int d vm_page_t m; struct sf_buf *sf; - object = zbio_buf_get_vm_object(bp); + object = zio_buf_get_vm_object(bp); byte_offset = stob(bp->b_blkno); page_offset = byte_offset & PAGE_MASK; start = OFF_TO_IDX(byte_offset); @@ -542,26 +540,26 @@ done: } static void -zbio_buf_vm_object_copyout(buf_t *bp) +zio_buf_vm_object_copyout(buf_t *bp) { - zbio_buf_vm_object_copy(bp, ZB_COPYOUT); + zio_buf_vm_object_copy(bp, ZB_COPYOUT); } static void -zbio_buf_vm_object_copyin(buf_t *bp) +zio_buf_vm_object_copyin(buf_t *bp) { - zbio_buf_vm_object_copy(bp, ZB_COPYIN); + zio_buf_vm_object_copy(bp, ZB_COPYIN); } static void -zbio_buf_vm_object_evict(buf_t *bp) +zio_buf_vm_object_evict(buf_t *bp) { int i; vm_page_t m; - VM_OBJECT_LOCK_ASSERT(zbio_buf_get_vm_object(bp), MA_OWNED); + VM_OBJECT_LOCK_ASSERT(zio_buf_get_vm_object(bp), MA_OWNED); vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { m = bp->b_pages[i]; @@ -580,7 +578,7 @@ zbio_buf_vm_object_evict(buf_t *bp) } static void -zbio_buf_vm_object_insert_locked(buf_t *bp, struct vnode *vp, +zio_buf_vm_object_insert_locked(buf_t *bp, struct vnode *vp, vm_object_t object, int valid) { vm_page_t m; @@ -606,19 +604,19 @@ zbio_buf_vm_object_insert_locked(buf_t * } static void -zbio_buf_vm_object_insert(buf_t *bp, int valid) +zio_buf_vm_object_insert(buf_t *bp, int valid) { - spa_t *spa = zbio_buf_get_spa(bp); + spa_t *spa = zio_buf_get_spa(bp); struct vnode *vp = spa_get_vnode(spa); vm_object_t object = vp->v_object; VM_OBJECT_LOCK(object); - zbio_buf_vm_object_insert_locked(bp, vp, object, valid); + zio_buf_vm_object_insert_locked(bp, vp, object, valid); VM_OBJECT_UNLOCK(object); } /* - * zbio_buf_evict_overlap: [ internal use only ] + * zio_buf_evict_overlap: [ internal use only ] * * Evict the pages of any buffers overlapping with this range * @@ -629,7 +627,7 @@ zbio_buf_vm_object_insert(buf_t *bp, int * This routine may not block. */ static void -zbio_buf_evict_overlap_locked(daddr_t blkno, int size, zbio_state_t *state, +zio_buf_evict_overlap_locked(daddr_t blkno, int size, zio_state_t *state, uint64_t txg, int evict_op, vm_object_t object) { buf_t *root, *tmpbp; @@ -643,7 +641,7 @@ zbio_buf_evict_overlap_locked(daddr_t bl goto done; collisions = 0; - root = zbio_buf_blkno_splay(blkno, root); + root = zio_buf_blkno_splay(blkno, root); TAILQ_INIT(&clh); if (blkno < root->b_blkno) tmpbp = TAILQ_PREV(root, cluster_list_head, b_bobufs); @@ -655,8 +653,8 @@ zbio_buf_evict_overlap_locked(daddr_t bl while (tmpbp != NULL && tmpbp->b_blkno < blkno_end) { tmpblkno = tmpbp->b_blkno; tmpblkno_end = tmpblkno + btos(tmpbp->b_bcount); - tmptxg = ((zbio_buf_hdr_t *)((arc_buf_t *)tmpbp->b_arc_buf)->b_hdr)->b_birth; - + tmptxg = tmpbp->b_birth; + if (((tmpblkno >= blkno) && (tmpblkno < blkno_end)) || (tmpblkno_end > blkno) && (tmpblkno_end <= blkno_end) && ((txg == NO_TXG) || (tmptxg < txg))) { @@ -668,7 +666,7 @@ zbio_buf_evict_overlap_locked(daddr_t bl while (!TAILQ_EMPTY(&clh)) { tmpbp = TAILQ_FIRST(&clh); TAILQ_REMOVE(&clh, tmpbp, b_freelist); - zbio_buf_vm_object_evict(tmpbp); + zio_buf_vm_object_evict(tmpbp); KASSERT(tmpbp->b_flags & B_EVICTED == 0, ("buffer has already been evicted")); @@ -677,8 +675,8 @@ zbio_buf_evict_overlap_locked(daddr_t bl /* * move buffer to the unmanaged tree */ - zbio_buf_blkno_remove(tmpbp); - zbio_buf_va_insert(tmpbp, state); + zio_buf_blkno_remove(tmpbp); + zio_buf_va_insert(tmpbp); } done: if (!(collisions == 1 && tmpbp->b_blkno == blkno && tmpbp->b_bcount == size) @@ -697,13 +695,13 @@ done: } static void -zbio_buf_evict_overlap(daddr_t blkno, int size, zbio_state_t *state, +zio_buf_evict_overlap(daddr_t blkno, int size, zio_state_t *state, uint64_t txg, int evict_op) { vm_object_t object = spa_get_vm_object(state->spa); VM_OBJECT_LOCK(object); - zbio_buf_evict_overlap_locked(blkno, size, state, txg, evict_op, object); + zio_buf_evict_overlap_locked(blkno, size, state, txg, evict_op, object); VM_OBJECT_UNLOCK(object); } @@ -742,100 +740,62 @@ D) !B_MALLOC / address is known */ static buf_t * -_zbio_getblk_malloc(zbio_buf_hdr_t *hdr, int flags) +_zio_getblk_malloc(uint64_t size, int flags) { - buf_t *newbp, *tmpbp; + buf_t *newbp; void *data; - daddr_t blkno; - uint64_t size = hdr->b_size; - uint64_t txg = hdr->b_birth; - zbio_state_t *state = spa_get_bio_state(hdr->b_spa); if (flags & GB_NODUMP) - data = zio_data_buf_alloc(size); + data = _zio_data_buf_alloc(size); else - data = zio_buf_alloc(size); + data = _zio_buf_alloc(size); newbp = malloc(sizeof(struct buf), M_ZFS_BIO, M_WAITOK|M_ZERO); newbp->b_data = data; newbp->b_flags = (B_MALLOC|B_INVAL); newbp->b_bcount = size; - - if (hdr->b_flags & ZBIO_BUF_CLONING) { - newbp->b_flags |= B_CLONED; - hdr->b_flags &= ~ZBIO_BUF_CLONING; - } - zbio_buf_va_insert(newbp, state); } static buf_t * -_zbio_getblk_vmio(zbio_buf_hdr_t *hdr, int flags) +_zio_getblk_vmio(uint64_t size, int flags) { buf_t *newbp; - uint64_t size = hdr->b_size; - spa_t *spa = hdr->b_spa; - zbio_state_t *state = spa_get_bio_state(spa); newbp = geteblk(size, flags); - zbio_buf_va_insert(newbp, state); BUF_KERNPROC(newbp); return (newbp); } -static void -_zbio_getblk(arc_buf_t *buf, int flags) +void * +zio_getblk(uint64_t size, int flags) { - zbio_buf_hdr_t *hdr = (zbio_buf_hdr_t *)buf->b_hdr; - uint64_t size = hdr->b_size; - buf_t *newbp; - - if (zfs_page_cache_disable) { - buf->b_data = zio_buf_alloc(size); - hdr->b_flags &= ~ZBIO_BUF_CLONING; - return; - } + buf_t *newbp; - if ((size & PAGE_MASK) || (hdr->b_flags & ZBIO_BUF_CLONING)) - newbp = _zbio_getblk_malloc(hdr, flags); + if (size & PAGE_MASK) + newbp = _zio_getblk_malloc(size, flags); else - newbp = _zbio_getblk_vmio(hdr, flags); - - buf->b_bp = newbp; - buf->b_data = newbp->b_data; - newbp->b_arc_buf = buf; -} - -void -zbio_getblk(arc_buf_t *buf) -{ - - _zbio_getblk(buf, 0); -} + newbp = _zio_getblk_vmio(size, flags); -void -zbio_data_getblk(arc_buf_t *buf) -{ - - _zbio_getblk(buf, GB_NODUMP); + zio_buf_va_insert(newbp); + return (newbp->b_data); } void -zbio_relse(arc_buf_t *buf, size_t size) +zio_relse(void *data, size_t size) { - struct buf *bp = buf->b_bp; + buf_t *bp; - if (zfs_page_cache_disable) { - zio_buf_free(buf->b_data, size); - return; - } + bp = zio_buf_va_lookup(data); + zio_buf_va_remove(bp); if (bp->b_flags & B_ASSIGNED) - zbio_buf_blkno_remove(bp); - else - zbio_buf_va_remove(bp); + zio_buf_blkno_remove(bp); if (bp->b_flags & B_MALLOC) { - zio_buf_free(bp->b_data, size); + if (bp->b_flags & B_DATA) + _zio_data_buf_free(bp->b_data, size); + else + _zio_buf_free(bp->b_data, size); free(bp, M_ZFS_BIO); } else { CTR4(KTR_SPARE2, "arc_brelse() bp=%p flags %X" @@ -848,11 +808,11 @@ zbio_relse(arc_buf_t *buf, size_t size) } int -zbio_sync_cache(spa_t *spa, blkptr_t *blkp, uint64_t txg, void *data, - uint64_t size, int bio_op) +_zio_sync_cache(spa_t *spa, blkptr_t *blkp, uint64_t txg, void *data, + uint64_t size, zio_type_t bio_op) { buf_t *bp; - zbio_state_t *state = spa_get_bio_state(spa); + zio_state_t *state = spa_get_zio_state(spa); dva_t dva = *BP_IDENTITY(blkp); daddr_t blkno = dva.dva_word[1] & ~(1ULL<<63); struct vnode *vp = spa_get_vnode(spa); @@ -861,47 +821,44 @@ zbio_sync_cache(spa_t *spa, blkptr_t *bl vm_page_t m; int i, io_bypass = FALSE; - if (zfs_page_cache_disable) - return (FALSE); - /* * XXX incomplete */ - if ((bp = zbio_buf_va_lookup(state, data)) != NULL) { - KASSERT(bp->b_flags & (B_CLONED|B_EVICTED) == 0, + if ((bp = zio_buf_va_lookup(data)) != NULL) { + KASSERT(bp->b_flags & B_EVICTED == 0, ("doing I/O with cloned or evicted buffer 0x%x", bp->b_flags)); if (bp->b_flags & B_MALLOC) { - zbio_buf_evict_overlap(blkno, size, state, txg, ZB_EVICT_BUFFERED); + zio_buf_evict_overlap(blkno, size, state, txg, ZB_EVICT_BUFFERED); if (bio_op == BIO_READ) { /* * if page resident - copy in * update zio pipeline */ - zbio_buf_vm_object_copyin(bp); + zio_buf_vm_object_copyin(bp); if (bp->b_flags & B_CACHE) { /* update zio pipeline */ io_bypass = TRUE; } } else { - zbio_buf_vm_object_copyout(bp); + zio_buf_vm_object_copyout(bp); } } else { - zbio_buf_va_remove(bp); + zio_buf_va_remove(bp); VM_OBJECT_LOCK(object); - zbio_buf_evict_overlap_locked(blkno, size, state, NO_TXG, + zio_buf_evict_overlap_locked(blkno, size, state, NO_TXG, ZB_EVICT_ALL, object); bp->b_blkno = bp->b_lblkno = blkno; bp->b_flags |= (B_VMIO|B_ASSIGNED); - zbio_buf_blkno_insert(bp, state); - zbio_buf_vm_object_insert_locked(bp, vp, object, bio_op == BIO_WRITE); + zio_buf_blkno_insert(bp, state); + zio_buf_vm_object_insert_locked(bp, vp, object, bio_op == BIO_WRITE); VM_OBJECT_UNLOCK(object); } } else { - bp = zbio_buf_blkno_lookup(state, blkno); + bp = zio_buf_blkno_lookup(state, blkno); if (bio_op == BIO_READ && (bp->b_flags & (B_CACHE|B_INVAL)) == B_CACHE) io_bypass = TRUE; KASSERT(bp != NULL, ("blkno=%ld data=%p unmanaged", blkno, bp->b_data)); @@ -910,8 +867,15 @@ zbio_sync_cache(spa_t *spa, blkptr_t *bl return (io_bypass); } +void +_zio_cache_valid(void *data, uint64_t size) +{ + + +} + static void -zbio_shutdown(void *arg __unused, int howto __unused) +zfs_bio_shutdown(void *arg __unused, int howto __unused) { struct mount *mp, *tmpmp; int error; @@ -949,55 +913,48 @@ zbio_shutdown(void *arg __unused, int ho } void -zbio_init(void) +zfs_bio_init(void) { if (zfs_page_cache_disable) return; - zbio_event_shutdown = EVENTHANDLER_REGISTER(shutdown_pre_sync, - zbio_shutdown, NULL, EVENTHANDLER_PRI_FIRST); + zfs_bio_event_shutdown = EVENTHANDLER_REGISTER(shutdown_pre_sync, + zfs_bio_shutdown, NULL, EVENTHANDLER_PRI_FIRST); } void -zbio_fini(void) +zfs_bio_fini(void) { - if (zbio_event_shutdown != NULL) - EVENTHANDLER_DEREGISTER(shutdown_pre_sync, zbio_event_shutdown); + if (zfs_bio_event_shutdown != NULL) + EVENTHANDLER_DEREGISTER(shutdown_pre_sync, zfs_bio_event_shutdown); } #else /* !_KERNEL */ -void -zbio_getblk(arc_buf_t *buf) +void * +zio_getblk(uint64_t size) { - zbio_buf_hdr_t *hdr = (zbio_buf_hdr_t *)buf->b_hdr; - uint64_t size = hdr->b_size; - - buf->b_data = zio_buf_alloc(size); - hdr->b_flags &= ~ZBIO_BUF_CLONING; + return (zio_buf_alloc(size)); } void -zbio_data_getblk(arc_buf_t *buf) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Mon Dec 14 03:54:47 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C7DDE1065695; Mon, 14 Dec 2009 03:54:47 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B6A7F8FC13; Mon, 14 Dec 2009 03:54:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBE3slnw007116; Mon, 14 Dec 2009 03:54:47 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBE3slQI007114; Mon, 14 Dec 2009 03:54:47 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200912140354.nBE3slQI007114@svn.freebsd.org> From: Kip Macy Date: Mon, 14 Dec 2009 03:54:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200502 - user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 03:54:47 -0000 Author: kmacy Date: Mon Dec 14 03:54:47 2009 New Revision: 200502 URL: http://svn.freebsd.org/changeset/base/200502 Log: eliminate explicit backpressure from VM in arc.c Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Dec 14 03:52:21 2009 (r200501) +++ user/kmacy/releng_8_fcs_buf_xen/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Dec 14 03:54:47 2009 (r200502) @@ -131,8 +131,6 @@ #include #include -#include - static kmutex_t arc_reclaim_thr_lock; static kcondvar_t arc_reclaim_thr_cv; /* used to signal reclaim thr */ static uint8_t arc_thread_exit; @@ -1960,14 +1958,6 @@ arc_reclaim_needed(void) #if 0 /* - * If pages are needed or we're within 2048 pages - * of needing to page need to reclaim - */ - if (vm_pages_needed || (vm_paging_target() > -2048)) - return (1); - - - /* * take 'desfree' extra pages, so we reclaim sooner, rather than later */ extra = desfree; From owner-svn-src-user@FreeBSD.ORG Mon Dec 14 11:08:22 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20CDB10656B8; Mon, 14 Dec 2009 11:08:22 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1067C8FC26; Mon, 14 Dec 2009 11:08:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBEB8LXq024481; Mon, 14 Dec 2009 11:08:21 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBEB8L75024479; Mon, 14 Dec 2009 11:08:21 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200912141108.nBEB8L75024479@svn.freebsd.org> From: Takahashi Yoshihiro Date: Mon, 14 Dec 2009 11:08:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200505 - user/nyan/pc98/sys/boot/pc98/boot2 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 11:08:22 -0000 Author: nyan Date: Mon Dec 14 11:08:21 2009 New Revision: 200505 URL: http://svn.freebsd.org/changeset/base/200505 Log: Initialize machine type by dummy parameter if SET_MACHINE_TYPE is not set. Modified: user/nyan/pc98/sys/boot/pc98/boot2/boot1.S Modified: user/nyan/pc98/sys/boot/pc98/boot2/boot1.S ============================================================================== --- user/nyan/pc98/sys/boot/pc98/boot2/boot1.S Mon Dec 14 10:48:19 2009 (r200504) +++ user/nyan/pc98/sys/boot/pc98/boot2/boot1.S Mon Dec 14 11:08:21 2009 (r200505) @@ -105,9 +105,12 @@ main: cld and $0x00ffffff,%eax mov %eax,%es:(EPSON_ID) -#ifdef SET_MACHINE_TYPE /* Set machine type to PC98_SYSTEM_PARAMETER */ +#ifdef SET_MACHINE_TYPE call set_machine_type +#else + mov $M_NEC_PC98+M_NOT_H98,%eax + mov %eax,%es:(PC98_MACHINE_TYPE) #endif /* Setup graphic screen */ @@ -319,6 +322,7 @@ set_machine_type: mov %dx,%ds // mov $MEM_SYS,%ax // mov %ax,%es + /* Wait V-SYNC */ vsync.1: inb $0x60,%al test $0x20,%al From owner-svn-src-user@FreeBSD.ORG Mon Dec 14 23:49:07 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50D7A1065679; Mon, 14 Dec 2009 23:49:07 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CE268FC16; Mon, 14 Dec 2009 23:49:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBENn73l042621; Mon, 14 Dec 2009 23:49:07 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBENn6ch042590; Mon, 14 Dec 2009 23:49:06 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200912142349.nBENn6ch042590@svn.freebsd.org> From: Luigi Rizzo Date: Mon, 14 Dec 2009 23:49:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200559 - in user/luigi/ipfw3-head: . cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/top etc etc/mtree etc/rc.d gnu/lib/libgcc lib lib/libexpat lib/... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Dec 2009 23:49:07 -0000 Author: luigi Date: Mon Dec 14 23:49:06 2009 New Revision: 200559 URL: http://svn.freebsd.org/changeset/base/200559 Log: sync with head r200555 Added: user/luigi/ipfw3-head/sys/boot/common/md.c - copied unchanged from r200555, head/sys/boot/common/md.c user/luigi/ipfw3-head/tools/regression/kqueue/ - copied from r200555, head/tools/regression/kqueue/ user/luigi/ipfw3-head/tools/regression/usr.bin/comm/ - copied from r200555, head/tools/regression/usr.bin/comm/ Deleted: user/luigi/ipfw3-head/usr.sbin/ndp/gnuc.h Modified: user/luigi/ipfw3-head/Makefile.inc1 user/luigi/ipfw3-head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist user/luigi/ipfw3-head/etc/rc.d/named user/luigi/ipfw3-head/etc/termcap.small user/luigi/ipfw3-head/gnu/lib/libgcc/Makefile user/luigi/ipfw3-head/lib/Makefile user/luigi/ipfw3-head/lib/libexpat/libbsdxml.3 user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/Makefile user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/pam_lastlog.c user/luigi/ipfw3-head/lib/libtacplus/libtacplus.3 user/luigi/ipfw3-head/lib/libthr/thread/thr_umtx.c user/luigi/ipfw3-head/lib/libulog/ulog_login.c user/luigi/ipfw3-head/lib/libusb/libusb10.c user/luigi/ipfw3-head/lib/libutil/gr_util.c user/luigi/ipfw3-head/share/examples/Makefile user/luigi/ipfw3-head/share/man/man4/iwnfw.4 user/luigi/ipfw3-head/share/man/man9/sleep.9 user/luigi/ipfw3-head/share/man/man9/sleepqueue.9 user/luigi/ipfw3-head/share/termcap/termcap.5 user/luigi/ipfw3-head/share/termcap/termcap.src user/luigi/ipfw3-head/sys/amd64/amd64/vm_machdep.c user/luigi/ipfw3-head/sys/amd64/ia32/ia32_syscall.c user/luigi/ipfw3-head/sys/boot/common/Makefile.inc user/luigi/ipfw3-head/sys/boot/pc98/boot2/Makefile user/luigi/ipfw3-head/sys/boot/pc98/boot2/bios.S user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot.c user/luigi/ipfw3-head/sys/boot/pc98/boot2/boot.h user/luigi/ipfw3-head/sys/boot/pc98/boot2/disk.c user/luigi/ipfw3-head/sys/boot/pc98/boot2/io.c user/luigi/ipfw3-head/sys/boot/pc98/boot2/serial_16550.S user/luigi/ipfw3-head/sys/boot/pc98/boot2/sys.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/changes.txt user/luigi/ipfw3-head/sys/contrib/dev/acpica/compiler/aslcompile.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/debugger/dbutils.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/disassembler/dmwalk.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dsmethod.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/dispatcher/dswload.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evregion.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evrgnini.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evxface.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evxfevnt.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/events/evxfregn.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/executer/exmutex.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acnamesp.h user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acobject.h user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acoutput.h user/luigi/ipfw3-head/sys/contrib/dev/acpica/include/acpixf.h user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsaccess.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsdump.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nseval.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsnames.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nspredef.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsrepair.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsrepair2.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsutils.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsxfeval.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsxfname.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/namespace/nsxfobj.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/parser/psxface.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/resources/rsxface.c user/luigi/ipfw3-head/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h user/luigi/ipfw3-head/sys/contrib/dev/acpica/utilities/utcopy.c user/luigi/ipfw3-head/sys/dev/ata/ata-all.c user/luigi/ipfw3-head/sys/dev/ata/ata-all.h user/luigi/ipfw3-head/sys/dev/ata/ata-disk.c user/luigi/ipfw3-head/sys/dev/ata/atapi-cd.c user/luigi/ipfw3-head/sys/dev/ata/atapi-cd.h user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-acerlabs.c user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-amd.c user/luigi/ipfw3-head/sys/dev/ata/chipsets/ata-ite.c user/luigi/ipfw3-head/sys/dev/e1000/e1000_82543.c user/luigi/ipfw3-head/sys/dev/e1000/e1000_osdep.h user/luigi/ipfw3-head/sys/dev/fdc/fdc_acpi.c user/luigi/ipfw3-head/sys/dev/if_ndis/if_ndis.c user/luigi/ipfw3-head/sys/dev/vge/if_vge.c user/luigi/ipfw3-head/sys/dev/vge/if_vgereg.h user/luigi/ipfw3-head/sys/dev/vge/if_vgevar.h user/luigi/ipfw3-head/sys/dev/wpi/if_wpi.c user/luigi/ipfw3-head/sys/geom/part/g_part.c user/luigi/ipfw3-head/sys/geom/part/g_part.h user/luigi/ipfw3-head/sys/geom/part/g_part_gpt.c user/luigi/ipfw3-head/sys/i386/conf/NOTES user/luigi/ipfw3-head/sys/kern/kern_jail.c user/luigi/ipfw3-head/sys/kern/kern_lock.c user/luigi/ipfw3-head/sys/kern/kern_sx.c user/luigi/ipfw3-head/sys/kern/kern_timeout.c user/luigi/ipfw3-head/sys/kern/subr_sleepqueue.c user/luigi/ipfw3-head/sys/mips/adm5120/if_admsw.c user/luigi/ipfw3-head/sys/net/radix.c user/luigi/ipfw3-head/sys/net/radix.h user/luigi/ipfw3-head/sys/net/route.c user/luigi/ipfw3-head/sys/net/rtsock.c user/luigi/ipfw3-head/sys/netinet/raw_ip.c user/luigi/ipfw3-head/sys/netinet6/raw_ip6.c user/luigi/ipfw3-head/sys/nfsclient/bootp_subr.c user/luigi/ipfw3-head/sys/nfsclient/krpc_subr.c user/luigi/ipfw3-head/sys/nfsclient/nfs_vfsops.c user/luigi/ipfw3-head/sys/nfsclient/nfs_vnops.c user/luigi/ipfw3-head/sys/sys/_lockmgr.h user/luigi/ipfw3-head/sys/sys/bio.h user/luigi/ipfw3-head/sys/sys/gpt.h user/luigi/ipfw3-head/sys/sys/jail.h user/luigi/ipfw3-head/sys/sys/param.h user/luigi/ipfw3-head/sys/sys/sleepqueue.h user/luigi/ipfw3-head/tools/regression/usr.bin/Makefile user/luigi/ipfw3-head/usr.bin/calendar/calendar.c user/luigi/ipfw3-head/usr.bin/calendar/day.c user/luigi/ipfw3-head/usr.bin/calendar/ostern.c user/luigi/ipfw3-head/usr.bin/calendar/paskha.c user/luigi/ipfw3-head/usr.bin/comm/comm.1 user/luigi/ipfw3-head/usr.bin/comm/comm.c user/luigi/ipfw3-head/usr.bin/lastcomm/pathnames.h user/luigi/ipfw3-head/usr.bin/make/arch.c user/luigi/ipfw3-head/usr.bin/make/dir.c user/luigi/ipfw3-head/usr.bin/make/for.c user/luigi/ipfw3-head/usr.bin/make/globals.h user/luigi/ipfw3-head/usr.bin/make/lst.c user/luigi/ipfw3-head/usr.bin/make/lst.h user/luigi/ipfw3-head/usr.bin/make/make.c user/luigi/ipfw3-head/usr.bin/make/str.c user/luigi/ipfw3-head/usr.bin/make/targ.c user/luigi/ipfw3-head/usr.bin/make/var.c user/luigi/ipfw3-head/usr.bin/mktemp/mktemp.c user/luigi/ipfw3-head/usr.bin/pr/egetopt.c user/luigi/ipfw3-head/usr.bin/talk/ctl_transact.c user/luigi/ipfw3-head/usr.bin/talk/display.c user/luigi/ipfw3-head/usr.bin/talk/get_addrs.c user/luigi/ipfw3-head/usr.bin/talk/get_iface.c user/luigi/ipfw3-head/usr.bin/talk/get_names.c user/luigi/ipfw3-head/usr.bin/talk/invite.c user/luigi/ipfw3-head/usr.bin/talk/look_up.c user/luigi/ipfw3-head/usr.bin/talk/talk.c user/luigi/ipfw3-head/usr.bin/talk/talk.h user/luigi/ipfw3-head/usr.bin/tset/extern.h user/luigi/ipfw3-head/usr.bin/tset/map.c user/luigi/ipfw3-head/usr.bin/tset/misc.c user/luigi/ipfw3-head/usr.bin/tset/set.c user/luigi/ipfw3-head/usr.bin/tset/term.c user/luigi/ipfw3-head/usr.bin/tset/tset.c user/luigi/ipfw3-head/usr.bin/tset/wrterm.c user/luigi/ipfw3-head/usr.bin/vis/foldit.c user/luigi/ipfw3-head/usr.bin/xinstall/xinstall.c user/luigi/ipfw3-head/usr.sbin/jls/jls.c user/luigi/ipfw3-head/usr.sbin/mergemaster/mergemaster.sh user/luigi/ipfw3-head/usr.sbin/ypserv/yp_main.c user/luigi/ipfw3-head/usr.sbin/ypserv/ypserv.8 Directory Properties: user/luigi/ipfw3-head/ (props changed) user/luigi/ipfw3-head/cddl/contrib/opensolaris/ (props changed) user/luigi/ipfw3-head/contrib/bind9/ (props changed) user/luigi/ipfw3-head/contrib/cpio/ (props changed) user/luigi/ipfw3-head/contrib/csup/ (props changed) user/luigi/ipfw3-head/contrib/ee/ (props changed) user/luigi/ipfw3-head/contrib/expat/ (props changed) user/luigi/ipfw3-head/contrib/file/ (props changed) user/luigi/ipfw3-head/contrib/gdb/ (props changed) user/luigi/ipfw3-head/contrib/gdtoa/ (props changed) user/luigi/ipfw3-head/contrib/less/ (props changed) user/luigi/ipfw3-head/contrib/libpcap/ (props changed) user/luigi/ipfw3-head/contrib/ncurses/ (props changed) user/luigi/ipfw3-head/contrib/netcat/ (props changed) user/luigi/ipfw3-head/contrib/ntp/ (props changed) user/luigi/ipfw3-head/contrib/openbsm/ (props changed) user/luigi/ipfw3-head/contrib/openpam/ (props changed) user/luigi/ipfw3-head/contrib/pf/ (props changed) user/luigi/ipfw3-head/contrib/sendmail/ (props changed) user/luigi/ipfw3-head/contrib/tcpdump/ (props changed) user/luigi/ipfw3-head/contrib/tcsh/ (props changed) user/luigi/ipfw3-head/contrib/top/ (props changed) user/luigi/ipfw3-head/contrib/top/install-sh (props changed) user/luigi/ipfw3-head/contrib/wpa/ (props changed) user/luigi/ipfw3-head/crypto/openssh/ (props changed) user/luigi/ipfw3-head/crypto/openssl/ (props changed) user/luigi/ipfw3-head/lib/libc/ (props changed) user/luigi/ipfw3-head/lib/libc/stdtime/ (props changed) user/luigi/ipfw3-head/lib/libutil/ (props changed) user/luigi/ipfw3-head/sbin/ (props changed) user/luigi/ipfw3-head/sbin/ipfw/ (props changed) user/luigi/ipfw3-head/share/zoneinfo/ (props changed) user/luigi/ipfw3-head/sys/ (props changed) user/luigi/ipfw3-head/sys/amd64/include/xen/ (props changed) user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/ (props changed) user/luigi/ipfw3-head/sys/contrib/dev/acpica/ (props changed) user/luigi/ipfw3-head/sys/contrib/pf/ (props changed) user/luigi/ipfw3-head/sys/dev/xen/xenpci/ (props changed) user/luigi/ipfw3-head/usr.bin/csup/ (props changed) user/luigi/ipfw3-head/usr.bin/procstat/ (props changed) user/luigi/ipfw3-head/usr.sbin/zic/ (props changed) Modified: user/luigi/ipfw3-head/Makefile.inc1 ============================================================================== --- user/luigi/ipfw3-head/Makefile.inc1 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/Makefile.inc1 Mon Dec 14 23:49:06 2009 (r200559) @@ -1103,8 +1103,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ - ${_lib_libypclnt} lib/libz lib/msun \ + lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} lib/libdwarf lib/libproc Modified: user/luigi/ipfw3-head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- user/luigi/ipfw3-head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Mon Dec 14 23:49:06 2009 (r200559) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2457,7 +2457,7 @@ zfs_do_receive(int argc, char **argv) bzero(&flags, sizeof (recvflags_t)); /* check options */ - while ((c = getopt(argc, argv, ":dnvF")) != -1) { + while ((c = getopt(argc, argv, ":dnuvF")) != -1) { switch (c) { case 'd': flags.isprefix = B_TRUE; @@ -2465,6 +2465,9 @@ zfs_do_receive(int argc, char **argv) case 'n': flags.dryrun = B_TRUE; break; + case 'u': + flags.nomount = B_TRUE; + break; case 'v': flags.verbose = B_TRUE; break; Modified: user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Mon Dec 14 23:49:06 2009 (r200559) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -457,6 +457,9 @@ typedef struct recvflags { /* byteswap flag is used internally; callers need not specify */ int byteswap : 1; + + /* do not mount file systems as they are extracted (private) */ + int nomount : 1; } recvflags_t; extern int zfs_receive(libzfs_handle_t *, const char *, recvflags_t, Modified: user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Mon Dec 14 23:49:06 2009 (r200559) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2080,7 +2080,7 @@ zfs_receive(libzfs_handle_t *hdl, const err = zfs_receive_impl(hdl, tosnap, flags, infd, stream_avl, &top_zfs); - if (err == 0 && top_zfs) { + if (err == 0 && !flags.nomount && top_zfs) { zfs_handle_t *zhp; prop_changelist_t *clp; Modified: user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist ============================================================================== --- user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/etc/mtree/BSD.usr.dist Mon Dec 14 23:49:06 2009 (r200559) @@ -230,6 +230,12 @@ .. dyn_sysctl .. + firmware + fwconsumer + .. + fwimage + .. + .. syscall module .. Modified: user/luigi/ipfw3-head/etc/rc.d/named ============================================================================== --- user/luigi/ipfw3-head/etc/rc.d/named Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/etc/rc.d/named Mon Dec 14 23:49:06 2009 (r200559) @@ -12,10 +12,9 @@ name="named" rcvar=named_enable -command="/usr/sbin/named" extra_commands="reload" -start_precmd="named_precmd" +start_precmd="named_prestart" start_postcmd="named_poststart" reload_cmd="named_reload" stop_cmd="named_stop" @@ -155,8 +154,17 @@ create_file () { chmod 644 $1 } -named_precmd() +named_prestart() { + command_args="-u ${named_uid:=root}" + + if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then + case "$named_flags" in + -c*|*' -c'*) ;; # No need to add it + *) command_args="-c $named_conf $command_args" ;; + esac + fi + local line nsip firstns # Is the user using a sandbox? @@ -170,11 +178,11 @@ named_precmd() # Create an rndc.key file for the user if none exists # - if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then - return 0 - fi confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \ -c ${named_chrootdir}/etc/namedb/rndc.key" + if [ -s "${named_chrootdir}/etc/namedb/rndc.conf" ]; then + unset confgen_command + fi if [ -s "${named_chrootdir}/etc/namedb/rndc.key" ]; then case `stat -f%Su ${named_chrootdir}/etc/namedb/rndc.key` in root|$named_uid) ;; @@ -260,10 +268,11 @@ named_precmd() } load_rc_config $name + # Updating the following variables requires that rc.conf be loaded first # required_dirs="$named_chrootdir" # if it is set, it must exist +required_files="${named_conf:=/etc/namedb/named.conf}" pidfile="${named_pidfile:-/var/run/named/pid}" -command_args="-u ${named_uid:=root}" run_rc_command "$1" Modified: user/luigi/ipfw3-head/etc/termcap.small ============================================================================== --- user/luigi/ipfw3-head/etc/termcap.small Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/etc/termcap.small Mon Dec 14 23:49:06 2009 (r200559) @@ -312,7 +312,7 @@ xterm-basic|modern xterm common:\ :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\ :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\ :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\ - :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\ + :so=\E[7m:sr=\EM:st=\EH:\ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h: # # This is the only entry which you should have to customize, since "xterm" @@ -320,3 +320,8 @@ xterm-basic|modern xterm common:\ # color_xterm and rxvt. xterm|X11 terminal emulator:\ :tc=xterm-new: +# +# Add the capability to "clear the screen" after exiting vi, more/less, etc. +xterm-clear:\ + :te=\E[?1049l:ti=\E[?1049h:\ + :tc=xterm-new: Modified: user/luigi/ipfw3-head/gnu/lib/libgcc/Makefile ============================================================================== --- user/luigi/ipfw3-head/gnu/lib/libgcc/Makefile Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/gnu/lib/libgcc/Makefile Mon Dec 14 23:49:06 2009 (r200559) @@ -297,7 +297,7 @@ CLEANFILES += cs-*.h option* #----------------------------------------------------------------------- # -# Build additional static libgcc_eh[_p].a librarries. +# Build symbol version map # SHLIB_MKMAP = ${GCCDIR}/mkmap-symver.awk SHLIB_MKMAP_OPTS = @@ -316,7 +316,7 @@ CLEANFILES += libgcc.map #----------------------------------------------------------------------- # -# Build additional static libgcc_eh[_p].a librarries. +# Build additional static libgcc_eh[_p].a libraries. # lib${LIB}_eh.a: ${EH_OBJS_T} @${ECHO} building static ${LIB}_eh library Modified: user/luigi/ipfw3-head/lib/Makefile ============================================================================== --- user/luigi/ipfw3-head/lib/Makefile Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/Makefile Mon Dec 14 23:49:06 2009 (r200559) @@ -21,6 +21,7 @@ # librpcsvc must be built before libpam. # libsbuf must be built before libcam. # libtacplus must be built before libpam. +# libulog must be built before libpam. # libutil must be built before libpam. # libypclnt must be built before libpam. # libgssapi must be built before librpcsec_gss @@ -30,8 +31,8 @@ SUBDIR= ${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm msun \ libmd \ ncurses ${_libnetgraph} libradius librpcsvc libsbuf \ - libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \ - libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ + libtacplus libulog libutil ${_libypclnt} libalias libarchive \ + ${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} ${_librpcsec_gss} libipsec \ @@ -40,8 +41,8 @@ SUBDIR= ${_csu} libc libbsm libauditd li ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ - libugidfw libulog ${_libusbhid} ${_libusb} ${_libvgl} libwrap \ - liby libz ${_bind} + libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \ + ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf Modified: user/luigi/ipfw3-head/lib/libexpat/libbsdxml.3 ============================================================================== --- user/luigi/ipfw3-head/lib/libexpat/libbsdxml.3 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libexpat/libbsdxml.3 Mon Dec 14 23:49:06 2009 (r200559) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd May 5, 2008 +.Dd December 12, 2009 .Dt LIBBSDXML 3 .Os .Sh NAME @@ -38,6 +38,15 @@ The .Nm library is a verbatim copy of the eXpat XML library version 2.0.1. .Pp +The +.Nm +library is intended to use within the +.Fx +base system only. +Use of the +.Nm +library for other purposes is not supported and discouraged. +.Pp To avoid version and autoconfiguration issues, the library has been renamed to .Nm Modified: user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/Makefile ============================================================================== --- user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/Makefile Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/Makefile Mon Dec 14 23:49:06 2009 (r200559) @@ -28,7 +28,7 @@ LIB= pam_lastlog SRCS= pam_lastlog.c MAN= pam_lastlog.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBULOG} +LDADD= -lulog .include Modified: user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/pam_lastlog.c ============================================================================== --- user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/pam_lastlog.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libpam/modules/pam_lastlog/pam_lastlog.c Mon Dec 14 23:49:06 2009 (r200559) @@ -46,19 +46,9 @@ __FBSDID("$FreeBSD$"); #define _BSD_SOURCE -#include - -#include -#include -#include #include -#include -#include -#include -#include #include -#include -#include +#include #define PAM_SM_SESSION @@ -71,13 +61,11 @@ pam_sm_open_session(pam_handle_t *pamh, int argc __unused, const char *argv[] __unused) { struct passwd *pwd; - struct utmp utmp; - struct lastlog ll; + struct ulog_utmpx *utx; time_t t; const char *user; const void *rhost, *tty; - off_t llpos; - int fd, pam_err; + int pam_err; pam_err = pam_get_user(pamh, &user, NULL); if (pam_err != PAM_SUCCESS) @@ -101,72 +89,29 @@ pam_sm_open_session(pam_handle_t *pamh, pam_err = PAM_SERVICE_ERR; goto err; } - if (strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)) == 0) - tty = (const char *)tty + strlen(_PATH_DEV); - if (*(const char *)tty == '\0') - return (PAM_SERVICE_ERR); - fd = open(_PATH_LASTLOG, O_RDWR|O_CREAT, 0644); - if (fd == -1) { - PAM_LOG("Failed to open %s", _PATH_LASTLOG); - goto file_err; - } - - /* - * Record session in lastlog(5). - */ - llpos = (off_t)(pwd->pw_uid * sizeof(ll)); - if (lseek(fd, llpos, L_SET) != llpos) - goto file_err; if ((flags & PAM_SILENT) == 0) { - if (read(fd, &ll, sizeof ll) == sizeof ll && ll.ll_time != 0) { - t = ll.ll_time; - if (*ll.ll_host != '\0') - pam_info(pamh, "Last login: %.*s from %.*s", - 24 - 5, ctime(&t), - (int)sizeof(ll.ll_host), ll.ll_host); - else - pam_info(pamh, "Last login: %.*s on %.*s", - 24 - 5, ctime(&t), - (int)sizeof(ll.ll_line), ll.ll_line); + if (ulog_setutxfile(UTXF_LASTLOG, NULL) != 0) { + PAM_LOG("Failed to open lastlog database"); + } else { + utx = ulog_getutxuser(user); + if (utx != NULL && utx->ut_type == USER_PROCESS) { + t = utx->ut_tv.tv_sec; + if (*utx->ut_host != '\0') + pam_info(pamh, "Last login: %.*s from %s", + 24 - 5, ctime(&t), utx->ut_host); + else + pam_info(pamh, "Last login: %.*s on %s", + 24 - 5, ctime(&t), utx->ut_line); + } + ulog_endutxent(); } - if (lseek(fd, llpos, L_SET) != llpos) - goto file_err; } - bzero(&ll, sizeof(ll)); - ll.ll_time = time(NULL); - - /* note: does not need to be NUL-terminated */ - strncpy(ll.ll_line, tty, sizeof(ll.ll_line)); - if (rhost != NULL && *(const char *)rhost != '\0') - /* note: does not need to be NUL-terminated */ - strncpy(ll.ll_host, rhost, sizeof(ll.ll_host)); - - if (write(fd, (char *)&ll, sizeof(ll)) != sizeof(ll) || close(fd) != 0) - goto file_err; - - PAM_LOG("Login recorded in %s", _PATH_LASTLOG); - - /* - * Record session in utmp(5) and wtmp(5). - */ - bzero(&utmp, sizeof(utmp)); - utmp.ut_time = time(NULL); - /* note: does not need to be NUL-terminated */ - strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); - if (rhost != NULL && *(const char *)rhost != '\0') - strncpy(utmp.ut_host, rhost, sizeof(utmp.ut_host)); - (void)strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line)); - login(&utmp); + ulog_login(tty, user, rhost); return (PAM_SUCCESS); -file_err: - syslog(LOG_ERR, "%s: %m", _PATH_LASTLOG); - if (fd != -1) - close(fd); - pam_err = PAM_SYSTEM_ERR; err: if (openpam_get_option(pamh, "no_fail")) return (PAM_SUCCESS); @@ -174,7 +119,7 @@ err: } PAM_EXTERN int -pam_sm_close_session(pam_handle_t *pamh __unused, int flags __unused, +pam_sm_close_session(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) { const void *tty; @@ -188,14 +133,7 @@ pam_sm_close_session(pam_handle_t *pamh pam_err = PAM_SERVICE_ERR; goto err; } - if (strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)) == 0) - tty = (const char *)tty + strlen(_PATH_DEV); - if (*(const char *)tty == '\0') - return (PAM_SERVICE_ERR); - if (logout(tty) != 1) - syslog(LOG_ERR, "%s(): no utmp record for %s", - __func__, (const char *)tty); - logwtmp(tty, "", ""); + ulog_logout(tty); return (PAM_SUCCESS); err: Modified: user/luigi/ipfw3-head/lib/libtacplus/libtacplus.3 ============================================================================== --- user/luigi/ipfw3-head/lib/libtacplus/libtacplus.3 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libtacplus/libtacplus.3 Mon Dec 14 23:49:06 2009 (r200559) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 1998 +.Dd December 11, 2009 .Dt LIBTACPLUS 3 .Os .Sh NAME Modified: user/luigi/ipfw3-head/lib/libthr/thread/thr_umtx.c ============================================================================== --- user/luigi/ipfw3-head/lib/libthr/thread/thr_umtx.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libthr/thread/thr_umtx.c Mon Dec 14 23:49:06 2009 (r200559) @@ -112,10 +112,13 @@ __thr_umutex_timedlock(struct umutex *mt int __thr_umutex_unlock(struct umutex *mtx, uint32_t id) { +#ifndef __ia64__ + /* XXX this logic has a race-condition on ia64. */ if ((mtx->m_flags & (UMUTEX_PRIO_PROTECT | UMUTEX_PRIO_INHERIT)) == 0) { atomic_cmpset_rel_32(&mtx->m_owner, id | UMUTEX_CONTESTED, UMUTEX_CONTESTED); return _umtx_op_err(mtx, UMTX_OP_MUTEX_WAKE, 0, 0, 0); } +#endif /* __ia64__ */ return _umtx_op_err(mtx, UMTX_OP_MUTEX_UNLOCK, 0, 0, 0); } Modified: user/luigi/ipfw3-head/lib/libulog/ulog_login.c ============================================================================== --- user/luigi/ipfw3-head/lib/libulog/ulog_login.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libulog/ulog_login.c Mon Dec 14 23:49:06 2009 (r200559) @@ -48,7 +48,8 @@ ulog_login(const char *line, const char utx.ut_type = USER_PROCESS; strncpy(utx.ut_line, line, sizeof utx.ut_line); strncpy(utx.ut_user, user, sizeof utx.ut_user); - strncpy(utx.ut_host, host, sizeof utx.ut_host); + if (host != NULL) + strncpy(utx.ut_host, host, sizeof utx.ut_host); gettimeofday(&utx.ut_tv, NULL); ulog_pututxline(&utx); Modified: user/luigi/ipfw3-head/lib/libusb/libusb10.c ============================================================================== --- user/luigi/ipfw3-head/lib/libusb/libusb10.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libusb/libusb10.c Mon Dec 14 23:49:06 2009 (r200559) @@ -379,8 +379,6 @@ libusb_open_device_with_vid_pid(libusb_c if ((i = libusb_get_device_list(ctx, &devs)) < 0) return (NULL); - pdev = NULL; - for (j = 0; j < i; j++) { pdev = devs[j]->os_priv; pdesc = libusb20_dev_get_device_desc(pdev); @@ -396,6 +394,8 @@ libusb_open_device_with_vid_pid(libusb_c break; } } + if (j == i) + pdev = NULL; libusb_free_device_list(devs, 1); DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave"); Modified: user/luigi/ipfw3-head/lib/libutil/gr_util.c ============================================================================== --- user/luigi/ipfw3-head/lib/libutil/gr_util.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/lib/libutil/gr_util.c Mon Dec 14 23:49:06 2009 (r200559) @@ -117,8 +117,8 @@ gr_make(const struct group *gr) /* Create the group line and fill it. */ if ((line = malloc(line_size)) == NULL) return (NULL); - line_size = snprintf(line, line_size, group_line_format, gr->gr_name, - gr->gr_passwd, (uintmax_t)gr->gr_gid); + snprintf(line, line_size, group_line_format, gr->gr_name, gr->gr_passwd, + (uintmax_t)gr->gr_gid); if (gr->gr_mem != NULL) for (ndx = 0; gr->gr_mem[ndx] != NULL; ndx++) { strcat(line, gr->gr_mem[ndx]); Modified: user/luigi/ipfw3-head/share/examples/Makefile ============================================================================== --- user/luigi/ipfw3-head/share/examples/Makefile Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/share/examples/Makefile Mon Dec 14 23:49:06 2009 (r200559) @@ -88,6 +88,12 @@ XFILES= BSD_daemon/FreeBSD.pfa \ kld/dyn_sysctl/Makefile \ kld/dyn_sysctl/README \ kld/dyn_sysctl/dyn_sysctl.c \ + kld/firmware/Makefile \ + kld/firmware/README \ + kld/firmware/fwconsumer/Makefile \ + kld/firmware/fwconsumer/fw_consumer.c \ + kld/firmware/fwimage/Makefile \ + kld/firmware/fwimage/firmware.img \ kld/syscall/Makefile \ kld/syscall/module/Makefile \ kld/syscall/module/syscall.c \ Modified: user/luigi/ipfw3-head/share/man/man4/iwnfw.4 ============================================================================== --- user/luigi/ipfw3-head/share/man/man4/iwnfw.4 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/share/man/man4/iwnfw.4 Mon Dec 14 23:49:06 2009 (r200559) @@ -60,4 +60,4 @@ It may be statically linked into the kernel, or loaded as a module. .Sh SEE ALSO .Xr iwn 4 , -.Xr firmware 8 +.Xr firmware 9 Modified: user/luigi/ipfw3-head/share/man/man9/sleep.9 ============================================================================== --- user/luigi/ipfw3-head/share/man/man9/sleep.9 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/share/man/man9/sleep.9 Mon Dec 14 23:49:06 2009 (r200559) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 4, 2008 +.Dd December 12, 2009 .Os .Dt SLEEP 9 .Sh NAME @@ -97,6 +97,7 @@ when it resumes. should never be used, as it is for compatibility only. A new priority of 0 means to use the thread's current priority when it is made runnable again. +.Pp If .Fa priority includes the @@ -113,6 +114,17 @@ possible, and is returned if the system call should be interrupted by the signal (return .Er EINTR ) . +If +.Dv PBDRY +flag is specified in addition to +.Dv PCATCH , +then the sleeping thread is not stopped while sleeping upon delivery of +.Dv SIGSTOP +or other stop action. +Instead, it is waken up, assuming that stop occurs on reaching a stop +point when returning to usermode. +The flag should be used when sleeping thread owns resources, for instance +vnode locks, that should be freed timely. .Pp The parameter .Fa wmesg Modified: user/luigi/ipfw3-head/share/man/man9/sleepqueue.9 ============================================================================== --- user/luigi/ipfw3-head/share/man/man9/sleepqueue.9 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/share/man/man9/sleepqueue.9 Mon Dec 14 23:49:06 2009 (r200559) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 2007 +.Dd December 12, 2009 .Dt SLEEPQUEUE 9 .Os .Sh NAME @@ -41,6 +41,7 @@ .Nm sleepq_remove , .Nm sleepq_signal , .Nm sleepq_set_timeout , +.Nm sleepq_sleepcnt , .Nm sleepq_timedwait , .Nm sleepq_timedwait_sig , .Nm sleepq_wait , @@ -77,6 +78,8 @@ .Fn sleepq_signal "void *wchan" "int flags" "int pri" "int queue" .Ft void .Fn sleepq_set_timeout "void *wchan" "int timo" +.Ft u_int +.Fn sleepq_sleepcnt "void *wchan" "int queue" .Ft int .Fn sleepq_timedwait "void *wchan" .Ft int @@ -195,12 +198,19 @@ A sleep queue used to implement .Xr pause 9 . .El .Pp -There is currently only one optional flag: +There are currently two optional flag: .Pp .Bl -tag -width ".Dv SLEEPQ_INTERRUPTIBLE" -compact .It Dv SLEEPQ_INTERRUPTIBLE The current thread is entering an interruptible sleep. .El +.Bl -tag -width ".Dv SLEEPQ_STOP_ON_BDRY" -compact +.It Dv SLEEPQ_STOP_ON_BDRY +When thread is entering an interruptible sleep, do not stop it upon +arrival of stop action, like +.Dv SIGSTOP . +Wake it up instead. +.El .Pp A timeout on the sleep may be specified by calling .Fn sleepq_set_timeout @@ -348,6 +358,14 @@ One possible use is waking up a specific channel. .Pp The +.Fn sleepq_sleepcnt +function offer a simple way to retrieve the number of threads sleeping for +the specified +.Fa queue , +given a +.Fa wchan . +.Pp +The .Fn sleepq_abort , .Fn sleepq_broadcast , and Modified: user/luigi/ipfw3-head/share/termcap/termcap.5 ============================================================================== --- user/luigi/ipfw3-head/share/termcap/termcap.5 Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/share/termcap/termcap.5 Mon Dec 14 23:49:06 2009 (r200559) @@ -53,7 +53,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 16, 1994 +.Dd December 13, 2009 .Dt TERMCAP 5 .Os .Sh NAME @@ -1999,6 +1999,25 @@ Unfortunately, due to lack of a definiti only .Xr terminfo 5 supports these capabilities. +.Pp +For the +.Xr xterm 1 +terminal emulator the traditional behavior in +.Fx +when exiting a pager such as +.Xr less 1 +or +.Xr more 1 , +or an editor such as +.Xr vi 1 +is +.Em NOT +to clear the screen after the program exits. +If you prefer to clear the screen there are a number of +.Dq xterm-clear +entries that add this capability in the +.Nm +file that you can use directly, or as examples. .Ss Glitches and Braindamage Hazeltine terminals, which do not allow `~' characters to be displayed, should indicate @@ -2105,6 +2124,7 @@ Hash database file containing terminal d .Xr tset 1 , .Xr ul 1 , .Xr vi 1 , +.Xr xterm 1 , .Xr ncurses 3 , .Xr printf 3 , .Xr termcap 3 , Modified: user/luigi/ipfw3-head/share/termcap/termcap.src ============================================================================== --- user/luigi/ipfw3-head/share/termcap/termcap.src Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/share/termcap/termcap.src Mon Dec 14 23:49:06 2009 (r200559) @@ -2800,7 +2800,12 @@ SW|screen-w|VT 100/ANSI X3.64 virtual te # # I checked the limits using ncurses "captoinfo -CrTUvx", which prints # the resolved length of each entry in a comment at the end - T.Dickey + +# Add the capability to "clear the screen" after exiting vi, more/less, etc. # +xterm-clear:\ + :te=\E[?1049l:ti=\E[?1049h:\ + :tc=xterm-new: xterm-new|modern xterm:\ :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\ @@ -2820,7 +2825,7 @@ xterm-basic|modern xterm common:\ :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\ :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\ :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\ - :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\ + :so=\E[7m:sr=\EM:st=\EH:\ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h: # The xterm-new description has all of the features, but is not completely @@ -2886,6 +2891,12 @@ xterm-xmc|xterm alias 6:\ # # An 8-bit description is doable with termcap, but there are probably no # termcap (or BSD curses) applications that are able to use it. +# +# Add the capability to "clear the screen" after exiting vi, more/less, etc. +# +xterm-8bit-clear:\ + :te=\233?1049l:ti=\233?1049h:ue=\23324m:\ + :tc=xterm-8bit: xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\ :am:km:mi:ms:xn:\ :co#80:it#8:li#24:\ @@ -2902,7 +2913,7 @@ xterm-8bit|xterm terminal emulator 8-bit :ke=\233?1l\E>:kh=\2331~:kl=\217D:kr=\217C:ks=\233?1h\E=:\ :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m:mr=\2337m:\ :nd=\233C:rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\ - :st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:\ + :st=\210:ta=^I:ue=\23324m:\ :up=\233A:us=\2334m:vb=\233?5h\233?5l:ve=\233?25l\233?25h:\ :vs=\233?12;25h:vi=\233?25l: # @@ -2941,6 +2952,12 @@ xterm-ic|xterm-vi|xterm with insert char :IC=\E[%d@:ei@:ic=\E[@:im@:tc=xterm: # # Compatible with the X11R6.3 xterm +# +# Add the capability to "clear the screen" after exiting vi, more/less, etc. +# +xterm-r6-clear:\ + :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:\ + :tc=xterm-r6: xterm-r6|xterm-old|X11R6 xterm:\ :am:bs:km:mi:ms:pt:xn:\ :co#80:kn#20:li#24:\ @@ -2958,10 +2975,16 @@ xterm-r6|xterm-old|X11R6 xterm:\ :ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\ :ku=\EOA:md=\E[1m:me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:\ :rc=\E8:rs=\E[m\E[?7h\E[4l\E>\E7\E[r\E[?1;3;4;6l\E8:\ - :sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:te=\E[2J\E[?47l\E8:\ - :ti=\E7\E[?47h:ue=\E[m:up=\E[A:us=\E[4m: + :sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\ + :ue=\E[m:up=\E[A:us=\E[4m: # # Compatible with the R5 xterm +# +# Add the capability to "clear the screen" after exiting vi, more/less, etc. +# +xterm-r5-clear:\ + :te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:ue=\E[m:\ + :tc=xterm-r5: xterm-r5|X11R5 xterm X11R5:\ :am:bs:km:mi:ms:pt:xn:\ :co#80:kn#4:li#24:\ @@ -2974,8 +2997,8 @@ xterm-r5|X11R5 xterm X11R5:\ :ke=\E[?1l\E>:kh=\E[1~:kl=\EOD:kr=\EOC:ks=\E[?1h\E=:\ :ku=\EOA:md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:rc=\E8:\ :rs=\E>\E[?1;3;4;5;6l\E[4l\E[?7h\E[m\E[r\E[2J\E[H:\ - :sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:te=\E[2J\E[?47l\E8:\ - :ti=\E7\E[?47h:ue=\E[m:up=\E[A:us=\E[4m: + :sc=\E7:se=\E[m:sf=^J:so=\E[7m:sr=\EM:\ + :up=\E[A:us=\E[4m: # # Customization begins here. xterm-xfree86|xterm terminal emulator (XFree86):\ Modified: user/luigi/ipfw3-head/sys/amd64/amd64/vm_machdep.c ============================================================================== --- user/luigi/ipfw3-head/sys/amd64/amd64/vm_machdep.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/sys/amd64/amd64/vm_machdep.c Mon Dec 14 23:49:06 2009 (r200559) @@ -330,10 +330,14 @@ cpu_set_syscall_retval(struct thread *td case ERESTART: /* - * Reconstruct pc, we know that 'syscall' is 2 bytes. + * Reconstruct pc, we know that 'syscall' is 2 bytes, + * lcall $X,y is 7 bytes, int 0x80 is 2 bytes. + * We saved this in tf_err. * We have to do a full context restore so that %r10 * (which was holding the value of %rcx) is restored * for the next iteration. + * r10 restore is only required for freebsd/amd64 processes, + * but shall be innocent for any ia32 ABI. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; Modified: user/luigi/ipfw3-head/sys/amd64/ia32/ia32_syscall.c ============================================================================== --- user/luigi/ipfw3-head/sys/amd64/ia32/ia32_syscall.c Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/sys/amd64/ia32/ia32_syscall.c Mon Dec 14 23:49:06 2009 (r200559) @@ -183,35 +183,7 @@ ia32_syscall(struct trapframe *frame) AUDIT_SYSCALL_EXIT(error, td); } - switch (error) { - case 0: - frame->tf_rax = td->td_retval[0]; - frame->tf_rdx = td->td_retval[1]; - frame->tf_rflags &= ~PSL_C; - break; - - case ERESTART: - /* - * Reconstruct pc, assuming lcall $X,y is 7 bytes, - * int 0x80 is 2 bytes. We saved this in tf_err. - */ - frame->tf_rip -= frame->tf_err; - break; - - case EJUSTRETURN: - break; - - default: - if (p->p_sysent->sv_errsize) { - if (error >= p->p_sysent->sv_errsize) - error = -1; /* XXX */ - else - error = p->p_sysent->sv_errtbl[error]; - } - frame->tf_rax = error; - frame->tf_rflags |= PSL_C; - break; - } + cpu_set_syscall_retval(td, error); /* * Traced syscall. Modified: user/luigi/ipfw3-head/sys/boot/common/Makefile.inc ============================================================================== --- user/luigi/ipfw3-head/sys/boot/common/Makefile.inc Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/sys/boot/common/Makefile.inc Mon Dec 14 23:49:06 2009 (r200559) @@ -23,6 +23,11 @@ SRCS+= dev_net.c SRCS+= bcache.c .endif +.if defined(MD_IMAGE_SIZE) +CFLAGS+= -DMD_IMAGE_SIZE=${MD_IMAGE_SIZE} +SRCS+= md.c +.endif + # Machine-independant ISA PnP .if defined(HAVE_ISABUS) SRCS+= isapnp.c Copied: user/luigi/ipfw3-head/sys/boot/common/md.c (from r200555, head/sys/boot/common/md.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/luigi/ipfw3-head/sys/boot/common/md.c Mon Dec 14 23:49:06 2009 (r200559, copy of r200555, head/sys/boot/common/md.c) @@ -0,0 +1,151 @@ +/*- + * Copyright (c) 2009 Marcel Moolenaar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include +#include + +#include "bootstrap.h" + +#define MD_BLOCK_SIZE 512 + +#ifndef MD_IMAGE_SIZE +#error Must be compiled with MD_IMAGE_SIZE defined +#endif +#if (MD_IMAGE_SIZE == 0 || MD_IMAGE_SIZE % MD_BLOCK_SIZE) +#error Image size must be a multiple of 512. +#endif + +/* + * Preloaded image gets put here. + * Applications that patch the object with the image can determine + * the size looking at the start and end markers (strings), + * so we want them contiguous. + */ +static struct { + u_char start[MD_IMAGE_SIZE]; + u_char end[128]; +} md_image = { + .start = "MFS Filesystem goes here", + .end = "MFS Filesystem had better STOP here", +}; + +/* devsw I/F */ +static int md_init(void); +static int md_strategy(void *, int, daddr_t, size_t, char *, size_t *); +static int md_open(struct open_file *, ...); +static int md_close(struct open_file *); +static void md_print(int); + +struct devsw md_dev = { + "md", + DEVT_DISK, + md_init, + md_strategy, + md_open, + md_close, + noioctl, + md_print +}; + +static int +md_init(void) +{ + + return (0); +} + +static int +md_strategy(void *devdata, int rw, daddr_t blk, size_t size, char *buf, + size_t *rsize) +{ + struct devdesc *dev = (struct devdesc *)devdata; + size_t ofs; + + if (dev->d_unit != 0) + return (ENXIO); + + if (blk < 0 || blk >= (MD_IMAGE_SIZE / MD_BLOCK_SIZE)) + return (EIO); + + if (size % MD_BLOCK_SIZE) + return (EIO); + + ofs = blk * MD_BLOCK_SIZE; + if ((ofs + size) > MD_IMAGE_SIZE) + size = MD_IMAGE_SIZE - ofs; + + if (rsize != 0) + *rsize = size; + + switch (rw) { + case F_READ: + bcopy(md_image.start + ofs, buf, size); + return (0); + case F_WRITE: + bcopy(buf, md_image.start + ofs, size); + return (0); + } + + return (ENODEV); +} + +static int +md_open(struct open_file *f, ...) +{ + va_list ap; + struct devdesc *dev; + + va_start(ap, f); + dev = va_arg(ap, struct devdesc *); + va_end(ap); + + if (dev->d_unit != 0) + return (ENXIO); + + return (0); +} + +static int +md_close(struct open_file *f) +{ + struct devdesc *dev; + + dev = (struct devdesc *)(f->f_devdata); + return ((dev->d_unit != 0) ? ENXIO : 0); +} + +static void +md_print(int verbose) +{ + + printf("MD (%u bytes)\n", MD_IMAGE_SIZE); +} Modified: user/luigi/ipfw3-head/sys/boot/pc98/boot2/Makefile ============================================================================== --- user/luigi/ipfw3-head/sys/boot/pc98/boot2/Makefile Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/sys/boot/pc98/boot2/Makefile Mon Dec 14 23:49:06 2009 (r200559) @@ -28,6 +28,12 @@ CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_ BOOT_COMCONSOLE_SPEED?=9600 CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} +# Set machine type to PC98_SYSTEM_PARAMETER +CFLAGS+= -DSET_MACHINE_TYPE + +# Initialize the bi_bios_geom using the BIOS geometry +CFLAGS+= -DGET_BIOSGEOM + # Enable code to take the default boot string from a fixed location on the # disk. See nextboot(8) and README.386BSD for more info. #CFLAGS+= -DNAMEBLOCK Modified: user/luigi/ipfw3-head/sys/boot/pc98/boot2/bios.S ============================================================================== --- user/luigi/ipfw3-head/sys/boot/pc98/boot2/bios.S Mon Dec 14 22:55:20 2009 (r200558) +++ user/luigi/ipfw3-head/sys/boot/pc98/boot2/bios.S Mon Dec 14 23:49:06 2009 (r200559) @@ -91,8 +91,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT #include "asm.h" .text -#ifndef CDBOOT *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Wed Dec 16 19:27:55 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86841106566C; Wed, 16 Dec 2009 19:27:55 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 720C88FC1A; Wed, 16 Dec 2009 19:27:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBGJRtrh008427; Wed, 16 Dec 2009 19:27:55 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBGJRtVr008421; Wed, 16 Dec 2009 19:27:55 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200912161927.nBGJRtVr008421@svn.freebsd.org> From: Luigi Rizzo Date: Wed, 16 Dec 2009 19:27:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200612 - in user/luigi/ipfw3-head: . contrib/ntp contrib/ntp/adjtimed contrib/ntp/arlib contrib/ntp/clockstuff contrib/ntp/html contrib/ntp/html/build/hints contrib/ntp/html/drivers co... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2009 19:27:55 -0000 Author: luigi Date: Wed Dec 16 19:27:54 2009 New Revision: 200612 URL: http://svn.freebsd.org/changeset/base/200612 Log: merge to around 200600 Added: user/luigi/ipfw3-head/contrib/ntp/html/build/hints/solaris.xtra.4095849 - copied unchanged from r200604, head/contrib/ntp/html/build/hints/solaris.xtra.4095849 user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_dynamic.c - copied unchanged from r200604, head/sys/netinet/ipfw/ip_fw_dynamic.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_log.c - copied unchanged from r200604, head/sys/netinet/ipfw/ip_fw_log.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_private.h - copied unchanged from r200604, head/sys/netinet/ipfw/ip_fw_private.h user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_sockopt.c - copied unchanged from r200604, head/sys/netinet/ipfw/ip_fw_sockopt.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_table.c - copied unchanged from r200604, head/sys/netinet/ipfw/ip_fw_table.c Deleted: user/luigi/ipfw3-head/usr.sbin/ntp/ntptrace/Makefile Modified: user/luigi/ipfw3-head/Makefile.inc1 user/luigi/ipfw3-head/contrib/ntp/COPYRIGHT user/luigi/ipfw3-head/contrib/ntp/ChangeLog user/luigi/ipfw3-head/contrib/ntp/CommitLog user/luigi/ipfw3-head/contrib/ntp/Makefile.in user/luigi/ipfw3-head/contrib/ntp/NEWS user/luigi/ipfw3-head/contrib/ntp/README user/luigi/ipfw3-head/contrib/ntp/README.bk user/luigi/ipfw3-head/contrib/ntp/README.patches user/luigi/ipfw3-head/contrib/ntp/WHERE-TO-START user/luigi/ipfw3-head/contrib/ntp/aclocal.m4 user/luigi/ipfw3-head/contrib/ntp/adjtimed/Makefile.in user/luigi/ipfw3-head/contrib/ntp/arlib/Makefile.in user/luigi/ipfw3-head/contrib/ntp/arlib/aclocal.m4 user/luigi/ipfw3-head/contrib/ntp/arlib/configure user/luigi/ipfw3-head/contrib/ntp/build user/luigi/ipfw3-head/contrib/ntp/clockstuff/Makefile.in user/luigi/ipfw3-head/contrib/ntp/config.h.in user/luigi/ipfw3-head/contrib/ntp/configure user/luigi/ipfw3-head/contrib/ntp/configure.ac user/luigi/ipfw3-head/contrib/ntp/flock-build user/luigi/ipfw3-head/contrib/ntp/html/copyright.html user/luigi/ipfw3-head/contrib/ntp/html/drivers/driver40.html user/luigi/ipfw3-head/contrib/ntp/include/Makefile.in user/luigi/ipfw3-head/contrib/ntp/include/copyright.def user/luigi/ipfw3-head/contrib/ntp/include/isc/Makefile.in user/luigi/ipfw3-head/contrib/ntp/include/ntp_debug.h user/luigi/ipfw3-head/contrib/ntp/include/version.def user/luigi/ipfw3-head/contrib/ntp/kernel/Makefile.in user/luigi/ipfw3-head/contrib/ntp/kernel/sys/Makefile.in user/luigi/ipfw3-head/contrib/ntp/libntp/Makefile.in user/luigi/ipfw3-head/contrib/ntp/libopts/Makefile.in user/luigi/ipfw3-head/contrib/ntp/libparse/Makefile.am user/luigi/ipfw3-head/contrib/ntp/libparse/Makefile.in user/luigi/ipfw3-head/contrib/ntp/libparse/clk_rawdcf.c user/luigi/ipfw3-head/contrib/ntp/ntpd/Makefile.in user/luigi/ipfw3-head/contrib/ntp/ntpd/cmd_args.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntp_crypto.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntp_intres.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntp_io.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntp_request.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntp_timer.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpd-opts.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpd-opts.h user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpd-opts.texi user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpd.1 user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpd.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpdsim-opts.c user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpdsim-opts.h user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpdsim-opts.texi user/luigi/ipfw3-head/contrib/ntp/ntpd/ntpdsim.1 user/luigi/ipfw3-head/contrib/ntp/ntpd/refclock_dumbclock.c user/luigi/ipfw3-head/contrib/ntp/ntpd/refclock_hopfser.c user/luigi/ipfw3-head/contrib/ntp/ntpd/refclock_jjy.c user/luigi/ipfw3-head/contrib/ntp/ntpd/refclock_nmea.c user/luigi/ipfw3-head/contrib/ntp/ntpd/refclock_palisade.c user/luigi/ipfw3-head/contrib/ntp/ntpdate/Makefile.in user/luigi/ipfw3-head/contrib/ntp/ntpdc/Makefile.in user/luigi/ipfw3-head/contrib/ntp/ntpdc/ntpdc-opts.c user/luigi/ipfw3-head/contrib/ntp/ntpdc/ntpdc-opts.h user/luigi/ipfw3-head/contrib/ntp/ntpdc/ntpdc-opts.texi user/luigi/ipfw3-head/contrib/ntp/ntpdc/ntpdc.1 user/luigi/ipfw3-head/contrib/ntp/ntpq/Makefile.in user/luigi/ipfw3-head/contrib/ntp/ntpq/ntpq-opts.c user/luigi/ipfw3-head/contrib/ntp/ntpq/ntpq-opts.h user/luigi/ipfw3-head/contrib/ntp/ntpq/ntpq-opts.texi user/luigi/ipfw3-head/contrib/ntp/ntpq/ntpq.1 user/luigi/ipfw3-head/contrib/ntp/ntpq/ntpq.c user/luigi/ipfw3-head/contrib/ntp/packageinfo.sh user/luigi/ipfw3-head/contrib/ntp/parseutil/Makefile.in user/luigi/ipfw3-head/contrib/ntp/scripts/Makefile.in user/luigi/ipfw3-head/contrib/ntp/sntp/Makefile.in user/luigi/ipfw3-head/contrib/ntp/sntp/aclocal.m4 user/luigi/ipfw3-head/contrib/ntp/sntp/config.h.in user/luigi/ipfw3-head/contrib/ntp/sntp/configure user/luigi/ipfw3-head/contrib/ntp/sntp/configure.ac user/luigi/ipfw3-head/contrib/ntp/sntp/libopts/Makefile.in user/luigi/ipfw3-head/contrib/ntp/sntp/sntp-opts.c user/luigi/ipfw3-head/contrib/ntp/sntp/sntp-opts.def user/luigi/ipfw3-head/contrib/ntp/sntp/sntp-opts.h user/luigi/ipfw3-head/contrib/ntp/sntp/sntp-opts.texi user/luigi/ipfw3-head/contrib/ntp/sntp/sntp.1 user/luigi/ipfw3-head/contrib/ntp/sntp/version.def user/luigi/ipfw3-head/contrib/ntp/util/Makefile.in user/luigi/ipfw3-head/contrib/ntp/util/ntp-keygen-opts.c user/luigi/ipfw3-head/contrib/ntp/util/ntp-keygen-opts.h user/luigi/ipfw3-head/contrib/ntp/util/ntp-keygen-opts.texi user/luigi/ipfw3-head/contrib/ntp/util/ntp-keygen.1 user/luigi/ipfw3-head/contrib/ntp/version user/luigi/ipfw3-head/contrib/ntp/version.m4 user/luigi/ipfw3-head/etc/mtree/BIND.chroot.dist user/luigi/ipfw3-head/etc/namedb/named.conf user/luigi/ipfw3-head/lib/libc/stdio/getline.3 user/luigi/ipfw3-head/lib/libc/sys/cpuset.2 user/luigi/ipfw3-head/sbin/ifconfig/regdomain.c user/luigi/ipfw3-head/sbin/ipfw/ipfw.8 user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c user/luigi/ipfw3-head/sbin/ipfw/ipfw2.h user/luigi/ipfw3-head/share/man/man5/make.conf.5 user/luigi/ipfw3-head/share/man/man7/build.7 user/luigi/ipfw3-head/sys/amd64/conf/DEFAULTS user/luigi/ipfw3-head/sys/arm/conf/DEFAULTS user/luigi/ipfw3-head/sys/compat/x86bios/x86bios.c user/luigi/ipfw3-head/sys/conf/files user/luigi/ipfw3-head/sys/dev/dpms/dpms.c user/luigi/ipfw3-head/sys/dev/ichsmb/ichsmb_pci.c user/luigi/ipfw3-head/sys/i386/conf/DEFAULTS user/luigi/ipfw3-head/sys/ia64/conf/DEFAULTS user/luigi/ipfw3-head/sys/isa/vga_isa.c user/luigi/ipfw3-head/sys/mips/conf/DEFAULTS user/luigi/ipfw3-head/sys/net/if_bridge.c user/luigi/ipfw3-head/sys/net/if_ethersubr.c user/luigi/ipfw3-head/sys/netgraph/ng_bridge.c user/luigi/ipfw3-head/sys/netgraph/ng_ipfw.c user/luigi/ipfw3-head/sys/netinet/ip_divert.c user/luigi/ipfw3-head/sys/netinet/ip_fw.h user/luigi/ipfw3-head/sys/netinet/ipfw/ip_dummynet.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_nat.c user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw_pfil.c user/luigi/ipfw3-head/sys/netinet6/mld6.c user/luigi/ipfw3-head/sys/pc98/conf/DEFAULTS user/luigi/ipfw3-head/sys/powerpc/conf/DEFAULTS user/luigi/ipfw3-head/sys/sparc64/conf/DEFAULTS user/luigi/ipfw3-head/sys/sun4v/conf/DEFAULTS user/luigi/ipfw3-head/tools/regression/kqueue/config.h user/luigi/ipfw3-head/tools/regression/kqueue/main.c user/luigi/ipfw3-head/tools/regression/kqueue/user.c user/luigi/ipfw3-head/usr.bin/comm/comm.c user/luigi/ipfw3-head/usr.sbin/ntp/Makefile Directory Properties: user/luigi/ipfw3-head/ (props changed) user/luigi/ipfw3-head/cddl/contrib/opensolaris/ (props changed) user/luigi/ipfw3-head/contrib/bind9/ (props changed) user/luigi/ipfw3-head/contrib/cpio/ (props changed) user/luigi/ipfw3-head/contrib/csup/ (props changed) user/luigi/ipfw3-head/contrib/ee/ (props changed) user/luigi/ipfw3-head/contrib/expat/ (props changed) user/luigi/ipfw3-head/contrib/file/ (props changed) user/luigi/ipfw3-head/contrib/gdb/ (props changed) user/luigi/ipfw3-head/contrib/gdtoa/ (props changed) user/luigi/ipfw3-head/contrib/less/ (props changed) user/luigi/ipfw3-head/contrib/libpcap/ (props changed) user/luigi/ipfw3-head/contrib/ncurses/ (props changed) user/luigi/ipfw3-head/contrib/netcat/ (props changed) user/luigi/ipfw3-head/contrib/ntp/ (props changed) user/luigi/ipfw3-head/contrib/openbsm/ (props changed) user/luigi/ipfw3-head/contrib/openpam/ (props changed) user/luigi/ipfw3-head/contrib/pf/ (props changed) user/luigi/ipfw3-head/contrib/sendmail/ (props changed) user/luigi/ipfw3-head/contrib/tcpdump/ (props changed) user/luigi/ipfw3-head/contrib/tcsh/ (props changed) user/luigi/ipfw3-head/contrib/top/ (props changed) user/luigi/ipfw3-head/contrib/top/install-sh (props changed) user/luigi/ipfw3-head/contrib/wpa/ (props changed) user/luigi/ipfw3-head/crypto/openssh/ (props changed) user/luigi/ipfw3-head/crypto/openssl/ (props changed) user/luigi/ipfw3-head/lib/libc/ (props changed) user/luigi/ipfw3-head/lib/libc/stdtime/ (props changed) user/luigi/ipfw3-head/lib/libutil/ (props changed) user/luigi/ipfw3-head/sbin/ (props changed) user/luigi/ipfw3-head/sbin/ipfw/ (props changed) user/luigi/ipfw3-head/share/zoneinfo/ (props changed) user/luigi/ipfw3-head/sys/ (props changed) user/luigi/ipfw3-head/sys/amd64/include/xen/ (props changed) user/luigi/ipfw3-head/sys/cddl/contrib/opensolaris/ (props changed) user/luigi/ipfw3-head/sys/contrib/dev/acpica/ (props changed) user/luigi/ipfw3-head/sys/contrib/pf/ (props changed) user/luigi/ipfw3-head/sys/dev/xen/xenpci/ (props changed) user/luigi/ipfw3-head/usr.bin/csup/ (props changed) user/luigi/ipfw3-head/usr.bin/procstat/ (props changed) user/luigi/ipfw3-head/usr.sbin/zic/ (props changed) Modified: user/luigi/ipfw3-head/Makefile.inc1 ============================================================================== --- user/luigi/ipfw3-head/Makefile.inc1 Wed Dec 16 18:39:32 2009 (r200611) +++ user/luigi/ipfw3-head/Makefile.inc1 Wed Dec 16 19:27:54 2009 (r200612) @@ -5,10 +5,11 @@ # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel +# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects @@ -694,6 +695,7 @@ distrib-dirs distribution: NO_KERNELCLEAN= t NO_KERNELCONFIG= t NO_KERNELDEPEND= t +NO_KERNELOBJ= t # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah .if !defined(KERNCONF) && ${KERNFAST} != "1" KERNCONF=${KERNFAST} @@ -763,11 +765,13 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif +.if !defined(NO_KERNELOBJ) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" Modified: user/luigi/ipfw3-head/contrib/ntp/COPYRIGHT ============================================================================== --- user/luigi/ipfw3-head/contrib/ntp/COPYRIGHT Wed Dec 16 18:39:32 2009 (r200611) +++ user/luigi/ipfw3-head/contrib/ntp/COPYRIGHT Wed Dec 16 19:27:54 2009 (r200612) @@ -13,7 +13,7 @@ This file is automatically generated fro applies as if the text was explicitly included in the file. *********************************************************************** * * -* Copyright (c) David L. Mills 1992-2008 * +* Copyright (c) David L. Mills 1992-2009 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose with or without fee is hereby * Modified: user/luigi/ipfw3-head/contrib/ntp/ChangeLog ============================================================================== --- user/luigi/ipfw3-head/contrib/ntp/ChangeLog Wed Dec 16 18:39:32 2009 (r200611) +++ user/luigi/ipfw3-head/contrib/ntp/ChangeLog Wed Dec 16 19:27:54 2009 (r200612) @@ -1,6 +1,85 @@ -(4.2.4p5) 2008/08/17 Released by Harlan Stenn --- -(4.2.4p5) 2008/08/17 Released by Harlan Stenn +(4.2.4p8) 2009/12/08 Released by Harlan Stenn + +* [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. + +--- +(4.2.4p7) 2009/05/18 Released by Harlan Stenn + +* [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252. +* [Bug 1187] Update the copyright date. +* [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. + +--- +(4.2.4p7-RC7) 2009/05/12 Released by Harlan Stenn + +* ntp.isc.org -> ntp.org cleanup. +* [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime, + add configure --enable-ignore-dns-errors to be even more stubborn + +--- +(4.2.4p7-RC6) 2009/05/08 Released by Harlan Stenn + +* [Bug 784] Make --enable-linuxcaps the default when available +* [Bug 1179] error messages for -u/--user and -i lacking droproot +* Updated JJY reference clock driver from Takao Abe +* [Bug 1071] Log a message and exit before trying to use FD_SET with a + descriptor larger than FD_SETSIZE, which will corrupt memory +* On corruption of the iface list head in add_interface, log and exit + +--- +(4.2.4p7-RC5) 2009/05/02 Released by Harlan Stenn + +* [Bug 1172] 4.2.4p7-RC{3,4} fail to build on linux. +* flock-build script unportable 'set -m' use removed + +--- +(4.2.4p7-RC4) 2009/04/29 Released by Harlan Stenn + +* [Bug 1167] use gcc -Winit-self only if it is understood + +--- +(4.2.4p7-RC3) 2009/04/22 Released by Harlan Stenn + +* [Bug 787] Bug fixes for 64-bit time_t on Windows +* [Bug 813] Conditional naming of Event +* [Bug 1147] System errors should be logged to msyslog() +* [Bug 1155] Fix compile problem on Windows with VS2005 +* [Bug 1156] lock_thread_to_processor() should be declared in header +* [Bug 1157] quiet OpenSSL warnings, clean up configure.ac +* [Bug 1158] support for aix6.1 +* [Bug 1160] MacOS X is like BSD regarding F_SETOWN + +--- +(4.2.4p7-RC2) 2009/04/09 Released by Harlan Stenn + +* [Sec 1144] limited buffer overflow in ntpq. CVE-2009-0159 +* [Sec 1149] use SO_EXCLUSIVEADDRUSE on Windows + +--- +(4.2.4p7-RC1) 2009/03/30 Released by Harlan Stenn + +* [Bug 1131] UDP sockets should not use SIGPOLL on Solaris. +* build system email address cleanup +* [Bug 774] parsesolaris.c does not compile under the new Solaris +* [Bug 873] Windows serial refclock proper TTY line discipline emulation +* [Bug 1014] Enable building with VC9 (in Visual Studio 2008, + Visual C++ 2008, or SDK) +* [Bug 1117] Deferred interface binding under Windows works only correctly + if FORCE_DNSRETRY is defined +* [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU +* DPRINTF macro made safer, always evaluates to a statement and will not + misassociate an else which follows the macro. + +--- +(4.2.4p6) 2009/01/08 Released by Harlan Stenn + +* [Bug 1113] Fixed build errors with recent versions of openSSL. +* [Sec 1111] Fix incorrect check of EVP_VerifyFinal()'s return value. +* Update the copyright year. + +--- (4.2.4p5) 2008/08/17 Released by Harlan Stenn * [BUG 1051] Month off by one in leap second message written to clockstats Modified: user/luigi/ipfw3-head/contrib/ntp/CommitLog ============================================================================== --- user/luigi/ipfw3-head/contrib/ntp/CommitLog Wed Dec 16 18:39:32 2009 (r200611) +++ user/luigi/ipfw3-head/contrib/ntp/CommitLog Wed Dec 16 19:27:54 2009 (r200612) @@ -1,1772 +1,3496 @@ -ChangeSet@1.1541, 2008-08-17 05:30:47-04:00, stenn@whimsy.udel.edu +26 -0 - NTP_4_2_4P5 - TAG: NTP_4_2_4P5 +ChangeSet@1.1612, 2009-12-08 08:30:54-05:00, stenn@whimsy.udel.edu +1 -0 + ChangeLog: + typo - ChangeLog@1.44, 2008-08-17 05:30:27-04:00, stenn@whimsy.udel.edu +3 -0 - NTP_4_2_4P5 + ChangeLog@1.95, 2009-12-08 08:30:44-05:00, stenn@whimsy.udel.edu +0 -1 + typo - ntpd/ntpd-opts.c@1.74, 2008-08-17 05:30:28-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 +ChangeSet@1.1611, 2009-12-08 08:23:12-05:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P8 + TAG: NTP_4_2_4P8 - ntpd/ntpd-opts.h@1.74, 2008-08-17 05:30:28-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ChangeLog@1.94, 2009-12-08 08:23:01-05:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P8 - ntpd/ntpd-opts.texi@1.73, 2008-08-17 05:30:29-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpd/ntpd-opts.c@1.86, 2009-12-08 08:23:02-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpd/ntpd.1@1.72, 2008-08-17 05:30:30-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpd-opts.h@1.86, 2009-12-08 08:23:02-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - ntpd/ntpdsim-opts.c@1.74, 2008-08-17 05:30:30-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpd-opts.texi@1.85, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - ntpd/ntpdsim-opts.h@1.74, 2008-08-17 05:30:31-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ntpd/ntpd.1@1.84, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpd/ntpdsim-opts.texi@1.72, 2008-08-17 05:30:32-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpd/ntpdsim-opts.c@1.86, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpd/ntpdsim.1@1.72, 2008-08-17 05:30:33-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpdsim-opts.h@1.86, 2009-12-08 08:23:04-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - ntpdc/ntpdc-opts.c@1.74, 2008-08-17 05:30:33-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpd/ntpdsim-opts.texi@1.84, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - ntpdc/ntpdc-opts.h@1.74, 2008-08-17 05:30:34-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ntpd/ntpdsim.1@1.84, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpdc/ntpdc-opts.texi@1.72, 2008-08-17 05:30:34-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpdc/ntpdc-opts.c@1.86, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpdc/ntpdc.1@1.72, 2008-08-17 05:30:35-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpdc/ntpdc-opts.h@1.86, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - ntpq/ntpq-opts.c@1.76, 2008-08-17 05:30:35-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpdc/ntpdc-opts.texi@1.84, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - ntpq/ntpq-opts.h@1.76, 2008-08-17 05:30:36-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + ntpdc/ntpdc.1@1.84, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpq/ntpq-opts.texi@1.73, 2008-08-17 05:30:36-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + ntpq/ntpq-opts.c@1.88, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - ntpq/ntpq.1@1.72, 2008-08-17 05:30:37-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpq/ntpq-opts.h@1.88, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - packageinfo.sh@1.101, 2008-08-17 05:30:37-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpq/ntpq-opts.texi@1.85, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - sntp/sntp-opts.c@1.72, 2008-08-17 05:30:38-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + ntpq/ntpq.1@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - sntp/sntp-opts.h@1.72, 2008-08-17 05:30:39-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + packageinfo.sh@1.118, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P8 - sntp/sntp-opts.texi@1.69, 2008-08-17 05:30:39-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + sntp/sntp-opts.c@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - sntp/sntp.1@1.72, 2008-08-17 05:30:40-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + sntp/sntp-opts.h@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 - util/ntp-keygen-opts.c@1.73, 2008-08-17 05:30:40-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + sntp/sntp-opts.texi@1.81, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - util/ntp-keygen-opts.h@1.73, 2008-08-17 05:30:41-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5 + sntp/sntp.1@1.84, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - util/ntp-keygen-opts.texi@1.71, 2008-08-17 05:30:42-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5 + util/ntp-keygen-opts.c@1.85, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 - util/ntp-keygen.1@1.71, 2008-08-17 05:30:42-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5 + util/ntp-keygen-opts.h@1.85, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 -ChangeSet@1.1540, 2008-08-17 05:29:47-04:00, stenn@whimsy.udel.edu +1 -0 - typo + util/ntp-keygen-opts.texi@1.83, 2009-12-08 08:23:09-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 - scripts/addChangeLogTag@1.2, 2008-08-17 05:29:37-04:00, stenn@whimsy.udel.edu +1 -1 - typo + util/ntp-keygen.1@1.83, 2009-12-08 08:23:09-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 -ChangeSet@1.1539, 2008-08-17 03:28:53-04:00, stenn@whimsy.udel.edu +5 -0 - 4.2.4p5 prep +ChangeSet@1.1610, 2009-12-08 07:45:28-05:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P9_RC1 + TAG: NTP_4_2_4P9_RC1 - .point-changed-filelist@1.2, 2008-08-17 03:27:42-04:00, stenn@whimsy.udel.edu +1 -0 - 4.2.4p5 prep + ChangeLog@1.93, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P9_RC1 - NEWS@1.99, 2008-08-17 03:27:42-04:00, stenn@whimsy.udel.edu +17 -0 - 4.2.4p5 prep + ntpd/ntpd-opts.c@1.85, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - packageinfo.sh@1.100, 2008-08-17 03:27:43-04:00, stenn@whimsy.udel.edu +1 -1 - 4.2.4p5 prep + ntpd/ntpd-opts.h@1.85, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - scripts/addChangeLogTag@1.1, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +27 -0 - BitKeeper file /deacon/backroom/ntp-stable/scripts/addChangeLogTag + ntpd/ntpd-opts.texi@1.84, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +13 -6 + NTP_4_2_4P9_RC1 - scripts/addChangeLogTag@1.0, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +0 -0 + ntpd/ntpd.1@1.83, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - scripts/genChangeLogTag@1.1, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +6 -0 - BitKeeper file /deacon/backroom/ntp-stable/scripts/genChangeLogTag + ntpd/ntpdsim-opts.c@1.85, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - scripts/genChangeLogTag@1.0, 2008-08-17 03:27:55-04:00, stenn@whimsy.udel.edu +0 -0 + ntpd/ntpdsim-opts.h@1.85, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 -ChangeSet@1.1538, 2008-08-16 22:42:08-04:00, stenn@whimsy.udel.edu +2 -0 - [BUG 1051] Month off by one in leap second message written to clockstats + ntpd/ntpdsim-opts.texi@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +61 -2 + NTP_4_2_4P9_RC1 - ChangeLog@1.43, 2008-08-16 22:41:50-04:00, stenn@whimsy.udel.edu +2 -0 - [BUG 1051] Month off by one in leap second message written to clockstats + ntpd/ntpdsim.1@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpd/refclock_oncore.c@1.63, 2008-08-16 22:41:50-04:00, stenn@whimsy.udel.edu +1 -1 - [BUG 1051] Month off by one in leap second message written to clockstats + ntpdc/ntpdc-opts.c@1.85, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 -ChangeSet@1.1537, 2008-08-10 07:44:31-04:00, stenn@whimsy.udel.edu +25 -0 - NTP_4_2_4P5_RC2 - TAG: NTP_4_2_4P5_RC2 + ntpdc/ntpdc-opts.h@1.85, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpd-opts.c@1.73, 2008-08-10 07:44:09-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpdc/ntpdc-opts.texi@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +7 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpd-opts.h@1.73, 2008-08-10 07:44:09-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ntpdc/ntpdc.1@1.83, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpd/ntpd-opts.texi@1.72, 2008-08-10 07:44:10-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + ntpq/ntpq-opts.c@1.87, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - ntpd/ntpd.1@1.71, 2008-08-10 07:44:10-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpq/ntpq-opts.h@1.87, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim-opts.c@1.73, 2008-08-10 07:44:11-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpq/ntpq-opts.texi@1.84, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +8 -4 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim-opts.h@1.73, 2008-08-10 07:44:12-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ntpq/ntpq.1@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim-opts.texi@1.71, 2008-08-10 07:44:12-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + packageinfo.sh@1.117, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P9_RC1 - ntpd/ntpdsim.1@1.71, 2008-08-10 07:44:13-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + sntp/sntp-opts.c@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc-opts.c@1.73, 2008-08-10 07:44:14-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + sntp/sntp-opts.h@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc-opts.h@1.73, 2008-08-10 07:44:15-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + sntp/sntp-opts.texi@1.80, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +54 -2 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc-opts.texi@1.71, 2008-08-10 07:44:16-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + sntp/sntp.1@1.83, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpdc/ntpdc.1@1.71, 2008-08-10 07:44:17-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + util/ntp-keygen-opts.c@1.84, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 - ntpq/ntpq-opts.c@1.75, 2008-08-10 07:44:17-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + util/ntp-keygen-opts.h@1.84, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpq/ntpq-opts.h@1.75, 2008-08-10 07:44:18-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + util/ntp-keygen-opts.texi@1.82, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 - ntpq/ntpq-opts.texi@1.72, 2008-08-10 07:44:19-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + util/ntp-keygen.1@1.82, 2009-12-08 07:45:25-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 - ntpq/ntpq.1@1.71, 2008-08-10 07:44:20-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 +ChangeSet@1.1609, 2009-12-08 05:36:47-05:00, stenn@whimsy.udel.edu +2 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 - packageinfo.sh@1.99, 2008-08-10 07:44:20-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + NEWS@1.102, 2009-12-08 05:36:36-05:00, stenn@whimsy.udel.edu +34 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 - sntp/sntp-opts.c@1.71, 2008-08-10 07:44:22-04:00, stenn@whimsy.udel.edu +4 -5 - NTP_4_2_4P5_RC2 + packageinfo.sh@1.116, 2009-12-08 05:36:36-05:00, stenn@whimsy.udel.edu +2 -2 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 - sntp/sntp-opts.h@1.71, 2008-08-10 07:44:23-04:00, stenn@whimsy.udel.edu +5 -6 - NTP_4_2_4P5_RC2 +ChangeSet@1.1608, 2009-10-07 01:33:22+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. - sntp/sntp-opts.texi@1.68, 2008-08-10 07:44:23-04:00, stenn@whimsy.udel.edu +2 -3 - NTP_4_2_4P5_RC2 + ChangeLog@1.92, 2009-10-07 01:33:21+00:00, davehart@shiny.ad.hartbrothers.com +4 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. - sntp/sntp.1@1.71, 2008-08-10 07:44:24-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ntpd/ntp_request.c@1.68, 2009-10-07 01:33:21+00:00, davehart@shiny.ad.hartbrothers.com +9 -2 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. - util/ntp-keygen-opts.c@1.72, 2008-08-10 07:44:25-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 +ChangeSet@1.1607, 2009-05-18 05:04:41-04:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P7 + TAG: NTP_4_2_4P7 - util/ntp-keygen-opts.h@1.72, 2008-08-10 07:44:25-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC2 + ChangeLog@1.91, 2009-05-18 05:04:18-04:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P7 - util/ntp-keygen-opts.texi@1.70, 2008-08-10 07:44:27-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC2 + ntpd/ntpd-opts.c@1.84, 2009-05-18 05:04:19-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - util/ntp-keygen.1@1.70, 2008-08-10 07:44:27-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC2 + ntpd/ntpd-opts.h@1.84, 2009-05-18 05:04:20-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 -ChangeSet@1.1531.3.1, 2008-08-10 02:22:22-04:00, stenn@whimsy.udel.edu +1 -0 - triggert needs to handle rooted RESYNC paths now + ntpd/ntpd-opts.texi@1.83, 2009-05-18 05:04:21-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 - BitKeeper/triggers/triggert@1.5, 2008-08-10 02:22:11-04:00, stenn@whimsy.udel.edu +3 -2 - triggert needs to handle rooted RESYNC paths now + ntpd/ntpd.1@1.82, 2009-05-18 05:04:22-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 -ChangeSet@1.1534, 2008-08-09 20:05:06-04:00, stenn@whimsy.udel.edu +2 -0 - AutoGen'd files must be writable + ntpd/ntpdsim-opts.c@1.84, 2009-05-18 05:04:22-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - sntp/Makefile.am@1.23, 2008-08-09 20:04:56-04:00, stenn@whimsy.udel.edu +2 -2 - AutoGen'd files must be writable + ntpd/ntpdsim-opts.h@1.84, 2009-05-18 05:04:23-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - sntp/sntp-opts.menu@1.3, 2008-08-09 20:04:10-04:00, stenn@whimsy.udel.edu +0 -0 - Change mode to -rw-rw-r-- + ntpd/ntpdsim-opts.texi@1.82, 2009-05-18 05:04:24-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 -ChangeSet@1.1531.2.1, 2008-08-07 20:44:31+02:00, burnicki@pogo.udel.edu +3 -0 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpd/ntpdsim.1@1.82, 2009-05-18 05:04:25-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ChangeLog@1.39.2.1, 2008-08-07 20:44:30+02:00, burnicki@pogo.udel.edu +2 -0 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpdc/ntpdc-opts.c@1.84, 2009-05-18 05:04:26-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ntpd/ntp_peer.c@1.99.1.1, 2008-08-07 20:44:30+02:00, burnicki@pogo.udel.edu +10 -2 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpdc/ntpdc-opts.h@1.84, 2009-05-18 05:04:26-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ports/winnt/ntpd/ntservice.c@1.11, 2008-08-07 20:44:30+02:00, burnicki@pogo.udel.edu +8 -1 - [Bug 450] Windows only: Under original Windows NT we must not discard the - wildcard socket to workaround a bug in NT's getsockname(). + ntpdc/ntpdc-opts.texi@1.82, 2009-05-18 05:04:27-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 -ChangeSet@1.1531.1.2, 2008-08-05 09:56:08+02:00, burnicki@pogo.udel.edu +1 -0 - Removed Windows-specific debug code which has been added in ntp-dev and fails to compile in ntp-stable. + ntpdc/ntpdc.1@1.82, 2009-05-18 05:04:28-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ports/winnt/ntpd/ntp_iocompletionport.c@1.26, 2008-08-05 09:56:08+02:00, burnicki@pogo.udel.edu +0 -8 - Removed Windows-specific debug code which has been added in ntp-dev and fails to compile in ntp-stable. + ntpq/ntpq-opts.c@1.86, 2009-05-18 05:04:29-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 -ChangeSet@1.1531.1.1, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +10 -0 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. - Emit a warning if that keyword is used for configuration. + ntpq/ntpq-opts.h@1.86, 2009-05-18 05:04:29-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ChangeLog@1.39.1.1, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +3 -0 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. - Emit a warning if that keyword is used for configuration. + ntpq/ntpq-opts.texi@1.83, 2009-05-18 05:04:30-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 - html/confopt.html@1.36, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +0 -2 - Bug 841: Obsolete the "dynamic" keyword. + ntpq/ntpq.1@1.82, 2009-05-18 05:04:31-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - html/ntpdc.html@1.27, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +2 -3 - Bug 841: Obsolete the "dynamic" keyword. + packageinfo.sh@1.115, 2009-05-18 05:04:32-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - include/ntp.h@1.129, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +0 -1 - Bug 841: Obsolete the "dynamic" keyword. + sntp/sntp-opts.c@1.82, 2009-05-18 05:04:32-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - include/ntp_request.h@1.31, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +0 -1 - Bug 841: Obsolete the "dynamic" keyword. + sntp/sntp-opts.h@1.82, 2009-05-18 05:04:33-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7 - ntpd/ntp_config.c@1.144, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +4 -2 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. - Emit a warning if that keyword is used for configuration. + sntp/sntp-opts.texi@1.79, 2009-05-18 05:04:34-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 - ntpd/ntp_intres.c@1.52, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +1 -3 - Bug 841: Obsolete the "dynamic" keyword. + sntp/sntp.1@1.82, 2009-05-18 05:04:34-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ntpd/ntp_peer.c@1.100, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +5 -25 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. + util/ntp-keygen-opts.c@1.83, 2009-05-18 05:04:35-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ntpd/ntp_request.c@1.66, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +1 -3 - Bug 841: Obsolete the "dynamic" keyword. + util/ntp-keygen-opts.h@1.83, 2009-05-18 05:04:36-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 - ntpdc/ntpdc_ops.c@1.50, 2008-08-05 09:50:23+02:00, burnicki@pogo.udel.edu +3 -3 - [Bug 841] Obsolete the "dynamic" keyword and make deferred binding - to local interfaces the default. + util/ntp-keygen-opts.texi@1.81, 2009-05-18 05:04:37-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 -ChangeSet@1.1532, 2008-07-22 11:41:26+02:00, burnicki@pogo.udel.edu +2 -0 - [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG. + util/ntp-keygen.1@1.81, 2009-05-18 05:04:37-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7 - ChangeLog@1.40, 2008-07-22 11:41:25+02:00, burnicki@pogo.udel.edu +1 -0 - [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG. +ChangeSet@1.1606, 2009-05-18 03:14:59-04:00, stenn@whimsy.udel.edu +2 -0 + 4.2.4p7 - libntp/machines.c@1.19, 2008-07-22 11:41:25+02:00, burnicki@pogo.udel.edu +2 -2 - [Bug 1038] Built-in getpass() function also prompts for password if not built with DEBUG. + NEWS@1.101, 2009-05-18 03:14:49-04:00, stenn@whimsy.udel.edu +38 -0 + 4.2.4p7 -ChangeSet@1.1531, 2008-05-20 03:51:01-04:00, stenn@whimsy.udel.edu +25 -0 - NTP_4_2_4P5_RC1 - TAG: NTP_4_2_4P5_RC1 + packageinfo.sh@1.114, 2009-05-18 03:14:50-04:00, stenn@whimsy.udel.edu +1 -1 + 4.2.4p7 - ntpd/ntpd-opts.c@1.72, 2008-05-20 03:50:37-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 +ChangeSet@1.1605, 2009-05-18 02:56:36-04:00, stenn@whimsy.udel.edu +2 -0 + [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252 - ntpd/ntpd-opts.h@1.72, 2008-05-20 03:50:37-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ChangeLog@1.90, 2009-05-18 02:56:22-04:00, stenn@whimsy.udel.edu +1 -0 + [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252 - ntpd/ntpd-opts.texi@1.71, 2008-05-20 03:50:38-04:00, stenn@whimsy.udel.edu +8 -11 - NTP_4_2_4P5_RC1 + ntpd/ntp_crypto.c@1.110, 2009-05-18 02:56:22-04:00, stenn@whimsy.udel.edu +22 -17 + [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252 - ntpd/ntpd.1@1.70, 2008-05-20 03:50:39-04:00, stenn@whimsy.udel.edu +4 -4 - NTP_4_2_4P5_RC1 +ChangeSet@1.1604, 2009-05-18 02:24:31-04:00, stenn@whimsy.udel.edu +2 -0 + [Bug 1187] Update the copyright date. - ntpd/ntpdsim-opts.c@1.72, 2008-05-20 03:50:40-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ChangeLog@1.89, 2009-05-18 02:24:21-04:00, stenn@whimsy.udel.edu +1 -0 + [Bug 1187] Update the copyright date. - ntpd/ntpdsim-opts.h@1.72, 2008-05-20 03:50:41-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + include/copyright.def@1.8, 2009-05-18 02:24:22-04:00, stenn@whimsy.udel.edu +1 -1 + [Bug 1187] Update the copyright date. - ntpd/ntpdsim-opts.texi@1.70, 2008-05-20 03:50:42-04:00, stenn@whimsy.udel.edu +3 -4 - NTP_4_2_4P5_RC1 +ChangeSet@1.1603, 2009-05-17 08:59:06+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. - ntpd/ntpdsim.1@1.70, 2008-05-20 03:50:43-04:00, stenn@whimsy.udel.edu +4 -4 - NTP_4_2_4P5_RC1 + ChangeLog@1.88, 2009-05-17 08:59:05+00:00, davehart@shiny.ad.hartbrothers.com +5 -0 + [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. - ntpdc/ntpdc-opts.c@1.72, 2008-05-20 03:50:44-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpd/ntp_io.c@1.261, 2009-05-17 08:59:05+00:00, davehart@shiny.ad.hartbrothers.com +45 -34 + [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. - ntpdc/ntpdc-opts.h@1.72, 2008-05-20 03:50:44-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 +ChangeSet@1.1602, 2009-05-14 04:42:10+00:00, davehart@shiny.ad.hartbrothers.com +1 -0 + fix error from BitKeeper/triggers/pre-resolve.licfix triggered (ahem) + by recent BitKeeper/etc/config delta updating repologs email address - ntpdc/ntpdc-opts.texi@1.70, 2008-05-20 03:50:45-04:00, stenn@whimsy.udel.edu +5 -6 - NTP_4_2_4P5_RC1 + BitKeeper/triggers/pre-resolve.licfix@1.5, 2009-05-14 04:42:09+00:00, davehart@shiny.ad.hartbrothers.com +4 -1 + bk sccscat has been removed, replaced by bk annotate -R + -q grep -> grep -q (untested until recent BitKeeper/etc/config commit + changing repologs@ntp.isc.org to repologs@ntp.org - ntpdc/ntpdc.1@1.70, 2008-05-20 03:50:46-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 +ChangeSet@1.1601, 2009-05-12 02:41:56-04:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P7_RC7 + TAG: NTP_4_2_4P7_RC7 - ntpq/ntpq-opts.c@1.74, 2008-05-20 03:50:47-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ChangeLog@1.87, 2009-05-12 02:41:33-04:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P7_RC7 - ntpq/ntpq-opts.h@1.74, 2008-05-20 03:50:47-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpd/ntpd-opts.c@1.83, 2009-05-12 02:41:33-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpq/ntpq-opts.texi@1.71, 2008-05-20 03:50:48-04:00, stenn@whimsy.udel.edu +5 -6 - NTP_4_2_4P5_RC1 + ntpd/ntpd-opts.h@1.83, 2009-05-12 02:41:33-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpq/ntpq.1@1.70, 2008-05-20 03:50:49-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 + ntpd/ntpd-opts.texi@1.82, 2009-05-12 02:41:35-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - packageinfo.sh@1.98, 2008-05-20 03:50:50-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC1 + ntpd/ntpd.1@1.81, 2009-05-12 02:41:35-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - sntp/sntp-opts.c@1.70, 2008-05-20 03:50:51-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim-opts.c@1.83, 2009-05-12 02:41:36-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - sntp/sntp-opts.h@1.70, 2008-05-20 03:50:52-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim-opts.h@1.83, 2009-05-12 02:41:37-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - sntp/sntp-opts.texi@1.67, 2008-05-20 03:50:52-04:00, stenn@whimsy.udel.edu +1 -1 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim-opts.texi@1.81, 2009-05-12 02:41:37-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - sntp/sntp.1@1.70, 2008-05-20 03:50:53-04:00, stenn@whimsy.udel.edu +2 -2 - NTP_4_2_4P5_RC1 + ntpd/ntpdsim.1@1.81, 2009-05-12 02:41:38-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - util/ntp-keygen-opts.c@1.71, 2008-05-20 03:50:54-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc-opts.c@1.83, 2009-05-12 02:41:39-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - util/ntp-keygen-opts.h@1.71, 2008-05-20 03:50:54-04:00, stenn@whimsy.udel.edu +6 -7 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc-opts.h@1.83, 2009-05-12 02:41:40-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - util/ntp-keygen-opts.texi@1.69, 2008-05-20 03:50:55-04:00, stenn@whimsy.udel.edu +7 -9 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc-opts.texi@1.81, 2009-05-12 02:41:41-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - util/ntp-keygen.1@1.69, 2008-05-20 03:50:56-04:00, stenn@whimsy.udel.edu +3 -3 - NTP_4_2_4P5_RC1 + ntpdc/ntpdc.1@1.81, 2009-05-12 02:41:42-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1530, 2008-05-18 05:14:37-04:00, stenn@whimsy.udel.edu +1 -0 - Start the 4.2.4p5 release candidate cycle + ntpq/ntpq-opts.c@1.85, 2009-05-12 02:41:43-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - packageinfo.sh@1.97, 2008-05-18 05:14:27-04:00, stenn@whimsy.udel.edu +1 -1 - Start the 4.2.4p5 release candidate cycle + ntpq/ntpq-opts.h@1.85, 2009-05-12 02:41:44-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1529, 2008-04-11 18:41:57-04:00, stenn@whimsy.udel.edu +1 -0 - Solaris _XOPEN_SOURCE updates + ntpq/ntpq-opts.texi@1.82, 2009-05-12 02:41:45-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - configure.ac@1.401, 2008-04-11 18:41:47-04:00, stenn@whimsy.udel.edu +5 -1 - Solaris _XOPEN_SOURCE updates + ntpq/ntpq.1@1.81, 2009-05-12 02:41:46-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1524.1.3, 2008-04-10 02:09:52-04:00, stenn@pogo.udel.edu +1 -0 - Changelog cleanup + packageinfo.sh@1.113, 2009-05-12 02:41:47-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - ChangeLog@1.37.1.2, 2008-04-10 02:08:57-04:00, stenn@pogo.udel.edu +2 -1 + sntp/sntp-opts.c@1.81, 2009-05-12 02:41:47-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 -ChangeSet@1.1524.1.2, 2008-04-08 12:20:22+02:00, burnicki@pogo.udel.edu +1 -0 - Always sleep a little before calling doconfigure() to make sure the network is completely up. + sntp/sntp-opts.h@1.81, 2009-05-12 02:41:48-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpd/ntp_intres.c@1.51, 2008-04-08 12:20:21+02:00, burnicki@pogo.udel.edu +5 -6 - Always sleep a little before calling doconfigure() to make sure the network is completely up. + sntp/sntp-opts.texi@1.78, 2009-05-12 02:41:49-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 -ChangeSet@1.1524.1.1, 2008-04-03 10:19:03-04:00, burnicki@pogo.udel.edu +5 -0 - [Bug 987] Wake up the resolver thread/process when a new interface has become available. + sntp/sntp.1@1.81, 2009-05-12 02:41:50-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ChangeLog@1.37.1.1, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +1 -0 - [Bug 987] Wake up the resolver thread/process when a new interface has become available. + util/ntp-keygen-opts.c@1.82, 2009-05-12 02:41:51-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - include/ntpd.h@1.98, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +5 -0 - Added vars used to wake up the resolver process/thread. + util/ntp-keygen-opts.h@1.82, 2009-05-12 02:41:51-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpd/ntp_config.c@1.143, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +34 -1 - Initialize synchronization variables when the resolver process/thread is started. + util/ntp-keygen-opts.texi@1.80, 2009-05-12 02:41:52-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7_RC7 - ntpd/ntp_intres.c@1.50, 2008-04-03 10:18:59-04:00, burnicki@pogo.udel.edu +64 -65 - Enable the resolver to be woken up when a new interface has become available. + util/ntp-keygen.1@1.80, 2009-05-12 02:41:53-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC7 - ntpd/ntp_io.c@1.256, 2008-04-03 10:19:00-04:00, burnicki@pogo.udel.edu +25 -5 - Wake up the resolver thread/process when a new interface has become available. +ChangeSet@1.1600, 2009-05-12 01:07:37-04:00, stenn@whimsy.udel.edu +9 -0 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1527, 2008-03-24 22:12:42-04:00, mayer@pogo.udel.edu +1 -0 - bugs 993 a d 959 + BitKeeper/etc/config@1.10, 2009-05-12 01:06:49-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ChangeLog@1.38, 2008-03-24 22:12:26-04:00, mayer@pogo.udel.edu +2 -0 - bugs 993 a d 959 + ChangeLog@1.86, 2009-05-12 01:06:01-04:00, stenn@whimsy.udel.edu +1 -0 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1526, 2008-03-24 21:41:55-04:00, mayer@pogo.udel.edu +1 -0 - [Bug 959] Refclock on Windows not properly releasing recvbuffs + README@1.23, 2009-05-12 01:06:02-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ports/winnt/ntpd/ntp_iocompletionport.c@1.25, 2008-03-24 21:41:37-04:00, mayer@pogo.udel.edu +25 -13 - [Bug 959] Refclock on Windows not properly releasing recvbuffs + README.bk@1.19, 2009-05-12 01:06:03-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1525, 2008-03-24 21:40:32-04:00, mayer@pogo.udel.edu +1 -0 - [Bug 993] Windows: Fix memory leak when fetching system messages + README.patches@1.4, 2009-05-12 01:06:03-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ports/winnt/libisc/isc_strerror.c@1.5, 2008-03-24 21:40:07-04:00, mayer@pogo.udel.edu +78 -18 - [Bug 993] Windows: Fix memory leak when fetching system messages + WHERE-TO-START@1.7, 2009-05-12 01:06:03-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1520.3.5, 2008-03-22 02:12:10-05:00, stenn@whimsy.udel.edu +2 -0 - [Bug 977] Fix mismatching #ifdefs for builds without IPv6 + configure.ac@1.418, 2009-05-12 01:06:04-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - ChangeLog@1.35.3.4, 2008-03-22 02:11:57-05:00, stenn@whimsy.udel.edu +1 -0 - [Bug 977] Fix mismatching #ifdefs for builds without IPv6 + include/copyright.def@1.7, 2009-05-12 01:06:49-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup - libisc/net.c@1.9, 2008-03-22 02:11:58-05:00, stenn@whimsy.udel.edu +1 -1 - [Bug 977] Fix mismatching #ifdefs for builds without IPv6 + sntp/sntp-opts.def@1.11, 2009-05-12 01:06:49-04:00, stenn@whimsy.udel.edu +1 -1 + ntp.isc.org -> ntp.org cleanup -ChangeSet@1.1520.3.4, 2008-03-22 02:02:36-05:00, stenn@whimsy.udel.edu +3 -0 - Update the copyright year +ChangeSet@1.1597.1.1, 2009-05-08 18:11:36+00:00, davehart@shiny.ad.hartbrothers.com +1 -0 + configure.ac: + correct help text - ChangeLog@1.35.3.3, 2008-03-22 02:02:24-05:00, stenn@whimsy.udel.edu +8 -6 - Update the copyright year + configure.ac@1.415.1.1, 2009-05-08 18:11:24+00:00, davehart@shiny.ad.hartbrothers.com +11 -5 + correct help text - html/copyright.html@1.37, 2008-03-22 02:02:25-05:00, stenn@whimsy.udel.edu +1 -1 - Update the copyright year +ChangeSet@1.1598, 2009-05-08 17:50:37+00:00, davehart@shiny.ad.hartbrothers.com +3 -0 + add configure --enable-ignore-dns-errors to retry on any failure - include/copyright.def@1.6, 2008-03-22 02:02:25-05:00, stenn@whimsy.udel.edu +1 -1 - Update the copyright year + ChangeLog@1.85, 2009-05-08 17:50:35+00:00, davehart@shiny.ad.hartbrothers.com +2 -1 + add configure --enable-ignore-dns-errors to retry on any failure -ChangeSet@1.1520.3.3, 2008-03-22 01:58:52-05:00, stenn@whimsy.udel.edu +5 -0 - Make autogen-generated files writable + configure.ac@1.416, 2009-05-08 17:50:35+00:00, davehart@shiny.ad.hartbrothers.com +26 -4 + add configure --enable-ignore-dns-errors to retry on any failure - ntpd/Makefile.am@1.54, 2008-03-22 01:57:08-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable + ntpd/ntp_intres.c@1.55, 2009-05-08 17:50:35+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + add configure --enable-ignore-dns-errors to retry on any failure - ntpdc/Makefile.am@1.35, 2008-03-22 01:57:09-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable +ChangeSet@1.1597, 2009-05-08 15:34:46+00:00, davehart@shiny.ad.hartbrothers.com +4 -0 + Do not exceed FD_SETSIZE in ntp_intres.c + --- + ntp_intres.c: + typo + --- + ntp_intres.c: + missing comma typo + --- + ntp_intres.c: + typo - ntpq/Makefile.am@1.27, 2008-03-22 01:57:10-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable + ntpd/ntp_intres.c@1.54, 2009-05-08 15:34:45+00:00, davehart@shiny.ad.hartbrothers.com +64 -33 + fix typos, refine "host name not found" log message, stay under FD_SETSIZE - sntp/Makefile.am@1.22, 2008-03-22 01:57:11-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable + ntpd/ntp_request.c@1.67, 2009-05-08 15:34:45+00:00, davehart@shiny.ad.hartbrothers.com +21 -3 + after ntp_intres adds a server entry, rescan interfaces, to notice the + return of connectivity sooner. - util/Makefile.am@1.36, 2008-03-22 01:57:11-05:00, stenn@whimsy.udel.edu +1 -1 - Make autogen-generated files writable + ntpd/ntp_timer.c@1.34, 2009-05-08 15:34:45+00:00, davehart@shiny.ad.hartbrothers.com +3 -5 + indent cleanup -ChangeSet@1.1520.4.1, 2008-03-16 09:15:13-04:00, burnicki@pogo.udel.edu +2 -0 - [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI override the standard parameters from the ImagePath registry key. + ports/winnt/include/config.h@1.52, 2009-05-08 15:34:45+00:00, davehart@shiny.ad.hartbrothers.com +4 -10 + remove FORCE_DNSRETRY, no longer used + indent cleanup - ChangeLog@1.35.4.1, 2008-03-16 09:15:10-04:00, burnicki@pogo.udel.edu +3 -0 - [Bug 957] Let command line parameters from the Windows SCM GUI override the standard parameters from the ImagePath registry key. +ChangeSet@1.1587.1.1, 2009-05-08 11:24:43+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime - ports/winnt/ntpd/ntservice.c@1.10, 2008-03-16 09:15:11-04:00, burnicki@pogo.udel.edu +11 -2 - [Bug 957] Let command line parameters from the Windows SCM GUI override the standard parameters from the ImagePath registry key. + ChangeLog@1.76.1.1, 2009-05-08 11:24:42+00:00, davehart@shiny.ad.hartbrothers.com +4 -0 + [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime -ChangeSet@1.1520.3.1, 2008-03-03 11:50:50+01:00, martin@pc-martin.py.meinberg.de +2 -0 - [Bug 532] nptdate timeout is too long if several servers are supplied - [Bug 698] timeBeginPeriod is called without timeEndPeriod in some NTP tools - [Bug 857] ntpdate debug mode adjusts system clock when it shouldn't - [Bug 908] ntpdate crashes sometimes - [Bug 982] ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set (dup of 908) - [Bug 997] ntpdate buffer too small and unsafe - Under Windows check whether NTP port in use under same conditions as under other OSs. - Fixed some typos and indents (tabs/spaces). + ntpd/ntp_intres.c@1.53, 2009-05-08 11:24:42+00:00, davehart@shiny.ad.hartbrothers.com +53 -55 + [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime - ChangeLog@1.35.3.1, 2008-03-03 11:50:49+01:00, martin@pc-martin.py.meinberg.de +10 -0 - [Bug 532] nptdate timeout is too long if several servers are supplied - [Bug 698] timeBeginPeriod is called without timeEndPeriod in some NTP tools - [Bug 857] ntpdate debug mode adjusts system clock when it shouldn't - [Bug 908] ntpdate crashes sometimes - [Bug 982] ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set (dup of 908) - [Bug 997] ntpdate buffer too small and unsafe - Under Windows check whether NTP port in use under same conditions as under other OSs. - Fixed some typos and indents (tabs/spaces). +ChangeSet@1.1595, 2009-05-08 04:42:52-04:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P7_RC6 + TAG: NTP_4_2_4P7_RC6 - ntpdate/ntpdate.c@1.62, 2008-03-03 11:50:49+01:00, martin@pc-martin.py.meinberg.de +101 -82 - [Bug 532] nptdate timeout is too long if several servers are supplied - [Bug 698] timeBeginPeriod is called without timeEndPeriod in some NTP tools - [Bug 857] ntpdate debug mode adjusts system clock when it shouldn't - [Bug 908] ntpdate crashes sometimes - [Bug 982] ntpdate(and ntptimeset) buffer overrun if HAVE_POLL_H isn't set (dup of 908) - [Bug 997] ntpdate buffer too small and unsafe - Under Windows check whether NTP port in use under same conditions as under other OSs. - Fixed some typos and indents (tabs/spaces). + ChangeLog@1.83, 2009-05-08 04:42:28-04:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P7_RC6 -ChangeSet@1.1520.2.7, 2008-02-20 12:13:24+01:00, martin@pc-martin4. +2 -0 - [Bug 909] Define int32_t for Windows (backport from ntp-dev) + ntpd/ntpd-opts.c@1.82, 2009-05-08 04:42:28-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7_RC6 - ChangeLog@1.35.2.3, 2008-02-20 12:13:24+01:00, martin@pc-martin4. +1 -0 - [Bug 909] Define int32_t for Windows (backport from ntp-dev) + ntpd/ntpd-opts.h@1.82, 2009-05-08 04:42:29-04:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P7_RC6 - ports/winnt/include/config.h@1.47, 2008-02-20 12:13:24+01:00, martin@pc-martin4. +2 -0 - [Bug 909] Define int32_t for Windows (backport from ntp-dev) + ntpd/ntpd-opts.texi@1.81, 2009-05-08 04:42:30-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7_RC6 -ChangeSet@1.1520.2.6, 2008-02-19 11:08:55-05:00, burnicki@pogo.udel.edu +1 -0 - Fixed indentation. + ntpd/ntpd.1@1.80, 2009-05-08 04:42:30-04:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P7_RC6 - ntpd/ntp_io.c@1.255, 2008-02-19 11:08:52-05:00, burnicki@pogo.udel.edu +1 -1 - Fixed indentation. *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 00:54:16 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EF2E106566B; Fri, 18 Dec 2009 00:54:15 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F2C088FC08; Fri, 18 Dec 2009 00:54:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBI0sEUK066395; Fri, 18 Dec 2009 00:54:14 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI0sEn7066393; Fri, 18 Dec 2009 00:54:14 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180054.nBI0sEn7066393@svn.freebsd.org> From: Doug Barton Date: Fri, 18 Dec 2009 00:54:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200659 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 00:54:16 -0000 Author: dougb Date: Fri Dec 18 00:54:14 2009 New Revision: 200659 URL: http://svn.freebsd.org/changeset/base/200659 Log: Further update the --packages-build and --delete-build-only options to work with -a: 1. Create a new function clean_build_only_list() from code that was already in dependency_check() and use it both there and at the end of the config mode in -a. 2. Properly initialize the variables related to these two features in the same spot as all the other global vars are initialized rather than doing it in different locations. There were reasons to do it differently early on, but those reasons are long gone. 3. Move the cleanup for run_dl_g to after the "Starting ..." message in one-port-on-the-command-line section to be consistent with how it's done in multiport(), and now how it's done in -a. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 00:36:30 2009 (r200658) +++ user/dougb/portmaster/portmaster Fri Dec 18 00:54:14 2009 (r200659) @@ -1674,6 +1674,19 @@ update_port () { return 0 } +clean_build_only_list () { + local dep temp_bodlg + + for dep in $build_only_dl_g; do + case "$run_dl_g" in + *" ${dep} "*) ;; + *) temp_bodlg="$temp_bodlg $dep" ;; + esac + done + + build_only_dl_g=" $temp_bodlg " +} + dependency_check () { # Global: doing_dep_check # Global: run_dl_g build_only_dl_g @@ -1700,7 +1713,7 @@ dependency_check () { fi if [ "$PM_BUILD_ONLY_LIST" = pmp_doing_build_deps ]; then - local rundeps dep run_dl build_only_dl temp_bodlg + local rundeps dep run_dl build_only_dl if [ -z "$RECURSE_THOROUGH" ]; then rundeps=`pm_make run-depends-list | sort -u` @@ -1729,14 +1742,7 @@ dependency_check () { esac done - for dep in $build_only_dl_g; do - case "$run_dl_g" in - *" ${dep} "*) ;; - *) temp_bodlg="$temp_bodlg $dep" ;; - esac - done - - build_only_dl_g=" $temp_bodlg " + clean_build_only_list fi local d_port origin iport conflicts glob confl_p udf @@ -1919,12 +1925,6 @@ multiport () { run_dl_g="$run_dl_g ${pd}/`origin_from_pdb $port` " ;; esac done - build_only_dl_g='' - export run_dl_g build_only_dl_g - fi - if [ -n "$PM_DEL_BUILD_ONLY" ]; then - build_deps_il='' - export build_deps_il fi for port in $worklist; do @@ -2016,6 +2016,14 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S CONFIG_SEEN_LIST=':' ; CONFIG_ONLY=config_only NO_DEP_UPDATES=no_dep_updates export CONFIG_SEEN_LIST CONFIG_ONLY NO_DEP_UPDATES + + if [ -n "$PM_BUILD_ONLY_LIST" ]; then + run_dl_g='' ; build_only_dl_g='' + export run_dl_g build_only_dl_g + fi + if [ -n "$PM_DEL_BUILD_ONLY" ]; then + build_deps_il='' ; export build_deps_il + fi fi [ -n "$NO_BACKUP" -a -z "$MAKE_PACKAGE" ] || init_packages @@ -2052,6 +2060,9 @@ all_config () { origin=`origin_from_pdb $iport` case "$CONFIG_SEEN_LIST" in *:${origin}:*) continue ;; esac + [ -n "$PM_BUILD_ONLY_LIST" ] && + run_dl_g="$run_dl_g ${pd}/${origin} " + check_exclude $iport || continue PM_DEPTH= @@ -2065,6 +2076,9 @@ all_config () { ports_by_category echo "===>>> Starting check of installed ports for available updates" + [ -n "$PM_BUILD_ONLY_LIST" ] && + PM_BUILD_ONLY_LIST=pmp_doing_build_deps + if [ -n "$CONFIG_ONLY" ]; then [ -n "$FETCH_ONLY" ] && export ALL_FETCH=all_fetch @@ -2093,6 +2107,12 @@ all_config () { echo '' echo "===>>> Starting `pca` for ports that need updating <<<===" echo '' + + if [ -n "$PM_BUILD_ONLY_LIST" ]; then + clean_build_only_list + unset run_dl_g + PM_BUILD_ONLY_LIST=pm_bol + fi fi export PM_BUILDING=pmbuildingall @@ -2336,18 +2356,8 @@ dofetch () { fi if [ -n "$CONFIG_ONLY" ]; then - if [ "$$" -eq "$PM_PARENT_PID" ]; then - # Keep in sync in multiport() - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - PM_BUILD_ONLY_LIST=pmp_doing_build_deps - run_dl_g='' ; build_only_dl_g='' - export run_dl_g build_only_dl_g - fi - if [ -n "$PM_DEL_BUILD_ONLY" ]; then - build_deps_il='' - export build_deps_il - fi - fi + [ "$$" -eq "$PM_PARENT_PID" -a -n "$PM_BUILD_ONLY_LIST" ] && + PM_BUILD_ONLY_LIST=pmp_doing_build_deps [ -z "$PM_PACKAGES" ] && make_config @@ -2400,15 +2410,15 @@ if [ -n "$CONFIG_ONLY" ]; then unset URB_YES MASTER_RB_LIST ; URB_DONE_LIST=':' fi - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi - check_fetch_only unset CONFIG_SEEN_LIST CONFIG_ONLY echo "===>>> Starting `pca` for $portdir <<<===" echo '' + + if [ -n "$PM_BUILD_ONLY_LIST" ]; then + unset run_dl_g + PM_BUILD_ONLY_LIST=pm_bol + fi fi [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 01:05:42 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5125C106566C; Fri, 18 Dec 2009 01:05:42 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 278108FC19; Fri, 18 Dec 2009 01:05:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBI15geC066817; Fri, 18 Dec 2009 01:05:42 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI15gRE066814; Fri, 18 Dec 2009 01:05:42 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180105.nBI15gRE066814@svn.freebsd.org> From: Doug Barton Date: Fri, 18 Dec 2009 01:05:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200660 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 01:05:42 -0000 Author: dougb Date: Fri Dec 18 01:05:41 2009 New Revision: 200660 URL: http://svn.freebsd.org/changeset/base/200660 Log: Make it easier to include the --packages-build and/or --delete-build-only options in a portmaster rc file by setting the PM_BUILD_ONLY_LIST variable (which is used by both options) in the script if either of the two options is detected. Update the example rc file in the man page accordingly. Modified: user/dougb/portmaster/portmaster user/dougb/portmaster/portmaster.8 Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 00:54:14 2009 (r200659) +++ user/dougb/portmaster/portmaster Fri Dec 18 01:05:41 2009 (r200660) @@ -423,8 +423,7 @@ for var in "$@" ; do --packages-build) packages_init build unset PM_PACKAGES PM_PACKAGES_BUILD=pmp_build - PM_BUILD_ONLY_LIST=pm_bol - export PM_PACKAGES_BUILD PM_BUILD_ONLY_LIST ;; + export PM_PACKAGES_BUILD ;; --packages-if-newer) packages_init newer PM_PACKAGES_NEWER=pmp_newer export PM_PACKAGES_NEWER ;; @@ -434,8 +433,7 @@ for var in "$@" ; do export LOCAL_PACKAGEDIR ;; -[A-Za-z0-9]*) newopts="$newopts $var" ;; --delete-build-only) PM_DEL_BUILD_ONLY=pm_dbo - PM_BUILD_ONLY_LIST=pm_bol - export PM_DEL_BUILD_ONLY PM_BUILD_ONLY_LIST ;; + export PM_DEL_BUILD_ONLY ;; --help) usage 0 ;; --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; @@ -451,6 +449,11 @@ for var in "$@" ; do esac done +if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then + PM_BUILD_ONLY_LIST=pm_bol + export PM_BUILD_ONLY_LIST +fi + set -- $newopts unset var newopts Modified: user/dougb/portmaster/portmaster.8 ============================================================================== --- user/dougb/portmaster/portmaster.8 Fri Dec 18 00:54:14 2009 (r200659) +++ user/dougb/portmaster/portmaster.8 Fri Dec 18 01:05:41 2009 (r200660) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 2, 2009 +.Dd December 3, 2009 .Dt PORTMASTER 8 .Os .Sh NAME @@ -582,11 +582,9 @@ along with their related options. # # Install packages for build-only dependencies (--packages-build) # PM_PACKAGES_BUILD=pmp_build -# PM_BUILD_ONLY_LIST=pm_bol # # Delete build-only dependencies when finished (--delete-build-only) # PM_DEL_BUILD_ONLY=pm_dbo -# PM_BUILD_ONLY_LIST=pm_bol # # Use packages if they are newer than installed (--packages-newer) # PM_PACKAGES=newer From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 01:30:11 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 931DA10656A5; Fri, 18 Dec 2009 01:30:11 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 82A248FC1D; Fri, 18 Dec 2009 01:30:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBI1UB5Y067524; Fri, 18 Dec 2009 01:30:11 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI1UBo1067522; Fri, 18 Dec 2009 01:30:11 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180130.nBI1UBo1067522@svn.freebsd.org> From: Doug Barton Date: Fri, 18 Dec 2009 01:30:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200661 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 01:30:11 -0000 Author: dougb Date: Fri Dec 18 01:30:11 2009 New Revision: 200661 URL: http://svn.freebsd.org/changeset/base/200661 Log: More robust error-handling for package directory creation in pm_pkg_create(). Chase the location on the ftp site for packages likely to work with 9-current Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 01:05:41 2009 (r200660) +++ user/dougb/portmaster/portmaster Fri Dec 18 01:30:11 2009 (r200661) @@ -1126,7 +1126,10 @@ pm_pkg_create () { local pkgdir if [ "$1" = "${packages}" ]; then - pm_mkdir_s ${1}/All ${1}/Latest ${1}/${portdir%/*} + for pkgdir in All Latest ${portdir%/*}; do + pm_mkdir_s ${packages}/${pkgdir} || + fail "Cannot mkdir -p $pkgdir" + done pkgdir=${packages}/All echo "===>>> Creating a package for new version $2" else @@ -2518,7 +2521,7 @@ fetch_package () { release=packages-${release%%\.*}-stable ;; [678]\.[0-9]-RELEASE*) release=packages-${release%-RELEASE*}-release ;; - 9\.0-CURRENT) release=packages-8-current ;; # XXX + 9\.0-CURRENT) release=packages-8-stable ;; # XXX *RC[0-9]*) release=${release%-RC[0-9]} release=packages-${release}-release ;; *BETA[0-9]*) release=${release%-BETA[0-9]} From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 08:03:31 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E11C106566C; Fri, 18 Dec 2009 08:03:31 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E1158FC0A; Fri, 18 Dec 2009 08:03:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBI83VDw079920; Fri, 18 Dec 2009 08:03:31 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI83VaK079918; Fri, 18 Dec 2009 08:03:31 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180803.nBI83VaK079918@svn.freebsd.org> From: Doug Barton Date: Fri, 18 Dec 2009 08:03:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200663 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 08:03:31 -0000 Author: dougb Date: Fri Dec 18 08:03:31 2009 New Revision: 200663 URL: http://svn.freebsd.org/changeset/base/200663 Log: 1. Instead of having a pca() to describe the post-config action collect the stuff that always runs after config is done into a function, and use the pca() logic to determine what to print. This also restores the whitespace to consistency between the modes (one port, multiport, -a). 2. 9-CURRENT has its own package repo now, hurray! 3. Instead of fetching the directory listing for each port category (devel, ports-mgmt, etc.) every time we need to check a port, fetch it once and save it to a temporary file. This lets us do several cool things: a. Save a lot of time not having to re-fetch each iteration b. Run the sed code to fix %2c -> , up front c. Add a sed pattern to fix %2b -> + d. Run a variety of different patterns to try and find the latest_pv 4. Not finding a package (or even a package repo) should only fail() if we are using -PP, not if we're just using -P. 5. Move the error message for "no package in -PP mode" to a variable for both reuse and code readability. 6. We only want to run the logic tree on whether $latest_pv is up to date or not if that variable has a value, so add appropriate tests. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 06:09:43 2009 (r200662) +++ user/dougb/portmaster/portmaster Fri Dec 18 08:03:31 2009 (r200663) @@ -1865,14 +1865,21 @@ create_master_rb_list () { [ -n "$MASTER_RB_LIST" ] && export MASTER_RB_LIST=" $MASTER_RB_LIST" } -pca () { +post_config () { + local action + + unset CONFIG_SEEN_LIST CONFIG_ONLY + + action=build if [ "$PM_PACKAGES" = only ]; then - echo install + action=install elif [ -n "$PM_PACKAGES" ]; then - echo 'build and/or install' - else - echo build + action='build and/or install' fi + + echo '' + echo "===>>> Starting $action for $* <<<===" + echo '' } multiport () { @@ -1937,11 +1944,9 @@ multiport () { ($0 $ARGS $port) || fail "Update for $port failed" . $IPC_SAVE done + check_fetch_only - unset CONFIG_SEEN_LIST CONFIG_ONLY - echo '' - echo "===>>> Starting `pca` for multiple ports <<<===" - echo '' + post_config multiple ports if [ -n "$PM_BUILD_ONLY_LIST" ]; then unset run_dl_g @@ -2109,10 +2114,7 @@ all_config () { safe_exit fi - unset CONFIG_SEEN_LIST CONFIG_ONLY - echo '' - echo "===>>> Starting `pca` for ports that need updating <<<===" - echo '' + post_config for ports that need updating if [ -n "$PM_BUILD_ONLY_LIST" ]; then clean_build_only_list @@ -2417,9 +2419,7 @@ if [ -n "$CONFIG_ONLY" ]; then fi check_fetch_only - unset CONFIG_SEEN_LIST CONFIG_ONLY - echo "===>>> Starting `pca` for $portdir <<<===" - echo '' + post_config $portdir if [ -n "$PM_BUILD_ONLY_LIST" ]; then unset run_dl_g @@ -2521,7 +2521,7 @@ fetch_package () { release=packages-${release%%\.*}-stable ;; [678]\.[0-9]-RELEASE*) release=packages-${release%-RELEASE*}-release ;; - 9\.0-CURRENT) release=packages-8-stable ;; # XXX + 9\.0-CURRENT) release=packages-9-current ;; *RC[0-9]*) release=${release%-RC[0-9]} release=packages-${release}-release ;; *BETA[0-9]*) release=${release%-BETA[0-9]} @@ -2553,13 +2553,21 @@ fetch_package () { fi if [ -z "$latest_pv" ]; then - case "$new_port" in - *\.*) s=${new_port%%\.*} ;; - *) s=`pm_make -V LATEST_LINK` ;; - esac - latest_pv=`fetch -q -o - ${sitepath} 2>/dev/null | grep "href=\"${s}"` + dirlist=`echo ${TMPDIR}/f-${PM_PARENT_PID}-dl-${portdir%/*}*` + if [ ! -r "$dirlist" ]; then + pm_unlink $dirlist # JIC + dirlist=`pm_mktemp dl-${portdir%/*}` + fetch -q -o - ${sitepath} 2>/dev/null | + sed -e "s#%2[cC]#,#g" -e "s#%2[bB]#+#g" > \ + $dirlist + fi + + for s in ${new_port%\.*} ${new_port%%\.*} ${new_port%-*}; do + latest_pv=`grep "href=\"${s}" $dirlist` + [ -n "$latest_pv" ] && break + done fi - unset s + unset dirlist s if [ -z "$latest_pv" ]; then fetch_package $new_port try @@ -2568,19 +2576,18 @@ fetch_package () { fi fi + ponly_err="Try --packages-if-newer, or do not use -PP/--packages-only" + if [ -z "$latest_pv" ]; then echo "===>>> Package and/or archive not found at:" echo "${sitepath}" echo '' echo " Check the pkg_add(1) man page for information" echo " on setting the PACKAGESITE environment variable" - fail 'No package archive found' + [ "$PM_PACKAGES" = only ] && fail $ponly_err else latest_pv=${latest_pv#*href=\"} latest_pv=${latest_pv%%\.tbz*} - case "$latest_pv" in - *%2[cC]*) latest_pv=`echo $latest_pv | sed s#%2[cC]#,#` ;; - esac fi notnewer () { @@ -2595,7 +2602,7 @@ notnewer () { use_package=up_equal [ -n "$PM_VERBOSE" ] && echo "===>>> Available package ($latest_pv) matches the ports tree" - elif [ -n "$PM_PACKAGES_NEWER" ]; then + elif [ -n "$latest_pv" -a -n "$PM_PACKAGES_NEWER" ]; then if [ -n "$upg_port" ]; then case `pkg_version -t $upg_port $latest_pv` in \<) use_package=up_newer @@ -2614,7 +2621,7 @@ notnewer () { [ -n "$PM_VERBOSE" ] && echo "===>>> There is a package available ($latest_pv)" fi - else + elif [ -n "$latest_pv" ]; then case `pkg_version -t $new_port $latest_pv` in \<) # Could happen if ports tree is out of date use_package=up_old_tree @@ -2636,7 +2643,7 @@ notnewer () { use_package=up_force2 echo "===>>> Installing anyway due to -f" else - fail "Try --packages-if-newer, or do not use -PP/--packages-only" + fail $ponly_err fi fi fi ;; From owner-svn-src-user@FreeBSD.ORG Fri Dec 18 08:35:35 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96EDB106566C; Fri, 18 Dec 2009 08:35:35 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1D22D8FC18; Fri, 18 Dec 2009 08:35:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBI8ZZgd080903; Fri, 18 Dec 2009 08:35:35 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBI8ZYHR080901; Fri, 18 Dec 2009 08:35:34 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912180835.nBI8ZYHR080901@svn.freebsd.org> From: Doug Barton Date: Fri, 18 Dec 2009 08:35:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200664 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2009 08:35:35 -0000 Author: dougb Date: Fri Dec 18 08:35:34 2009 New Revision: 200664 URL: http://svn.freebsd.org/changeset/base/200664 Log: Collect common post-config code related to build-only options into post_config() Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Dec 18 08:03:31 2009 (r200663) +++ user/dougb/portmaster/portmaster Fri Dec 18 08:35:34 2009 (r200664) @@ -1868,8 +1868,6 @@ create_master_rb_list () { post_config () { local action - unset CONFIG_SEEN_LIST CONFIG_ONLY - action=build if [ "$PM_PACKAGES" = only ]; then action=install @@ -1880,6 +1878,13 @@ post_config () { echo '' echo "===>>> Starting $action for $* <<<===" echo '' + + unset CONFIG_SEEN_LIST CONFIG_ONLY + + if [ -n "$PM_BUILD_ONLY_LIST" ]; then + unset run_dl_g + PM_BUILD_ONLY_LIST=pm_bol + fi } multiport () { @@ -1947,11 +1952,6 @@ multiport () { check_fetch_only post_config multiple ports - - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi fi export PM_BUILDING=pmbuildingmultiport @@ -2116,11 +2116,7 @@ all_config () { post_config for ports that need updating - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - clean_build_only_list - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi + [ -n "$PM_BUILD_ONLY_LIST" ] && clean_build_only_list fi export PM_BUILDING=pmbuildingall @@ -2420,11 +2416,6 @@ if [ -n "$CONFIG_ONLY" ]; then check_fetch_only post_config $portdir - - if [ -n "$PM_BUILD_ONLY_LIST" ]; then - unset run_dl_g - PM_BUILD_ONLY_LIST=pm_bol - fi fi [ -z "$PM_BUILDING" ] && export PM_BUILDING=pmbuildingmain From owner-svn-src-user@FreeBSD.ORG Sat Dec 19 06:36:35 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 042401065679; Sat, 19 Dec 2009 06:36:35 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E86B28FC12; Sat, 19 Dec 2009 06:36:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJ6aYHh022347; Sat, 19 Dec 2009 06:36:34 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJ6aYV7022345; Sat, 19 Dec 2009 06:36:34 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912190636.nBJ6aYV7022345@svn.freebsd.org> From: Doug Barton Date: Sat, 19 Dec 2009 06:36:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200709 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2009 06:36:35 -0000 Author: dougb Date: Sat Dec 19 06:36:34 2009 New Revision: 200709 URL: http://svn.freebsd.org/changeset/base/200709 Log: in pm_pkg_create() include a little more detail about what directory creation failed in an error message Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Dec 19 05:20:26 2009 (r200708) +++ user/dougb/portmaster/portmaster Sat Dec 19 06:36:34 2009 (r200709) @@ -1128,7 +1128,7 @@ pm_pkg_create () { if [ "$1" = "${packages}" ]; then for pkgdir in All Latest ${portdir%/*}; do pm_mkdir_s ${packages}/${pkgdir} || - fail "Cannot mkdir -p $pkgdir" + fail "Cannot mkdir -p ${packages}/${pkgdir}" done pkgdir=${packages}/All echo "===>>> Creating a package for new version $2" From owner-svn-src-user@FreeBSD.ORG Sat Dec 19 13:39:08 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 644611065672; Sat, 19 Dec 2009 13:39:08 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 39B238FC1A; Sat, 19 Dec 2009 13:39:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJDd8E9034706; Sat, 19 Dec 2009 13:39:08 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJDd8qe034705; Sat, 19 Dec 2009 13:39:08 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200912191339.nBJDd8qe034705@svn.freebsd.org> From: Takahashi Yoshihiro Date: Sat, 19 Dec 2009 13:39:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200730 - in user/nyan/pc98/sys/boot: common pc98 X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2009 13:39:08 -0000 Author: nyan Date: Sat Dec 19 13:39:07 2009 New Revision: 200730 URL: http://svn.freebsd.org/changeset/base/200730 Log: Don't use 15M-16M area on pc98. It's reserved for some devices. Modified: user/nyan/pc98/sys/boot/common/module.c user/nyan/pc98/sys/boot/pc98/Makefile.inc Modified: user/nyan/pc98/sys/boot/common/module.c ============================================================================== --- user/nyan/pc98/sys/boot/common/module.c Sat Dec 19 12:06:12 2009 (r200729) +++ user/nyan/pc98/sys/boot/common/module.c Sat Dec 19 13:39:07 2009 (r200730) @@ -313,6 +313,9 @@ file_loadraw(char *type, char *name) char *cp; int fd, got; vm_offset_t laddr; +#ifdef PC98 + struct stat st; +#endif /* We can't load first */ if ((file_findfile(NULL, NULL)) == NULL) { @@ -334,6 +337,14 @@ file_loadraw(char *type, char *name) return(CMD_ERROR); } +#ifdef PC98 + /* We cannot use 15M-16M area on pc98. */ + if (loadaddr < 0x1000000 && + fstat(fd, &st) == 0 && + (st.st_size == -1 || loadaddr + st.st_size > 0xf00000)) + loadaddr = 0x1000000; +#endif + laddr = loadaddr; for (;;) { /* read in 4k chunks; size is not really important */ @@ -439,6 +450,14 @@ mod_loadkld(const char *kldname, int arg ; do { +#ifdef PC98 + /* We cannot use 15M-16M area on pc98. */ + struct stat st; + if (loadaddr < 0x1000000 && + stat(filename, &st) == 0 && + (st.st_size == -1 || loadaddr + st.st_size > 0xf00000)) + loadaddr = 0x1000000; +#endif err = file_load(filename, loadaddr, &fp); if (err) break; Modified: user/nyan/pc98/sys/boot/pc98/Makefile.inc ============================================================================== --- user/nyan/pc98/sys/boot/pc98/Makefile.inc Sat Dec 19 12:06:12 2009 (r200729) +++ user/nyan/pc98/sys/boot/pc98/Makefile.inc Sat Dec 19 13:39:07 2009 (r200730) @@ -7,7 +7,7 @@ BINDIR?= /boot LOADER_ADDRESS?=0x100000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ - -Os + -Os -DPC98 LDFLAGS+= -nostdlib # BTX components From owner-svn-src-user@FreeBSD.ORG Sat Dec 19 19:01:36 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C36910656A9; Sat, 19 Dec 2009 19:01:36 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 006B78FC1E; Sat, 19 Dec 2009 19:01:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBJJ1Oek040988; Sat, 19 Dec 2009 19:01:24 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJJ1OV0040986; Sat, 19 Dec 2009 19:01:24 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200912191901.nBJJ1OV0040986@svn.freebsd.org> From: Doug Barton Date: Sat, 19 Dec 2009 19:01:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200733 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2009 19:01:36 -0000 Author: dougb Date: Sat Dec 19 19:01:24 2009 New Revision: 200733 URL: http://svn.freebsd.org/changeset/base/200733 Log: pkg_add on FreeBSD 6.3 does not have long options,[1] so use the short ones instead and add a comment about what they do. Submitted by: Miroslav Lachman <000.fbsd@quip.cz>[1] Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sat Dec 19 18:42:12 2009 (r200732) +++ user/dougb/portmaster/portmaster Sat Dec 19 19:01:24 2009 (r200733) @@ -2781,7 +2781,8 @@ else [ -n "$local_package" ] && ppd=${local_package%/Latest*}/All echo "===>>> Installing package" - pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz || + # -i == --no-deps, -f == --force + pkg_add -i -f ${ppd}/${latest_pv}.tbz || install_failed ${latest_pv}.tbz fi echo ''