svn commit: r218839 - head/usr.sbin/sysinstall
Author: brucec Date: Sat Feb 19 09:08:13 2011 New Revision: 218839 URL: http://svn.freebsd.org/changeset/base/218839 Log: In the distribution list, 'A' is listed as the key to press to select both 'All' and 'Minimal'. Update the keys for Minimal and Custom to avoid the conflict. PR: bin/153809 Submitted by: Janne Snabb MFC after:3 days Modified: head/usr.sbin/sysinstall/menus.c Modified: head/usr.sbin/sysinstall/menus.c == --- head/usr.sbin/sysinstall/menus.cSat Feb 19 07:47:25 2011 (r218838) +++ head/usr.sbin/sysinstall/menus.cSat Feb 19 09:08:13 2011 (r218839) @@ -961,9 +961,9 @@ DMenu MenuDistributions = { checkDistKernDeveloper, distSetKernDeveloper }, { "6 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "A Minimal", "The smallest configuration possible", + { "7 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, - { "B Custom","Specify your own distribution set", + { "8 Custom","Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, { NULL } }, }; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218840 - head/usr.sbin/sysinstall
Author: brucec Date: Sat Feb 19 09:24:24 2011 New Revision: 218840 URL: http://svn.freebsd.org/changeset/base/218840 Log: Remove the quotas option from the Startup Services menu. GENERIC has no support for quotas so this option has no effect. PR: bin/123237 Submitted by: Lawrence Mayer MFC after:3 days Modified: head/usr.sbin/sysinstall/menus.c Modified: head/usr.sbin/sysinstall/menus.c == --- head/usr.sbin/sysinstall/menus.cSat Feb 19 09:08:13 2011 (r218839) +++ head/usr.sbin/sysinstall/menus.cSat Feb 19 09:24:24 2011 (r218840) @@ -1283,8 +1283,6 @@ DMenu MenuStartup = { { " SVR4", "This host wants to be able to run SVR4 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "svr4_enable=YES" }, #endif - { " quotas", "This host wishes to check quotas on startup.", - dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { NULL } }, }; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218841 - head/usr.sbin/sysinstall
Author: brucec Date: Sat Feb 19 09:33:53 2011 New Revision: 218841 URL: http://svn.freebsd.org/changeset/base/218841 Log: Allow users to create ufs1 filesystems via the noninteractive install.cfg system. PR: bin/113979 MFC after:3 days Modified: head/usr.sbin/sysinstall/label.c Modified: head/usr.sbin/sysinstall/label.c == --- head/usr.sbin/sysinstall/label.cSat Feb 19 09:24:24 2011 (r218840) +++ head/usr.sbin/sysinstall/label.cSat Feb 19 09:33:53 2011 (r218841) @@ -1653,6 +1653,8 @@ diskLabelNonInteractive(Device *dev) pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE); tmp->private_free = safe_free; pi->newfs_data.newfs_ufs.softupdates = soft; + if (!strcmp(typ, "ufs1")) + pi->newfs_data.newfs_ufs.ufs1 = TRUE; } } } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218842 - head/sys/boot/pc98/boot2
Author: nyan Date: Sat Feb 19 10:32:12 2011 New Revision: 218842 URL: http://svn.freebsd.org/changeset/base/218842 Log: MFi386: revision 218745 Remove reading of symbols from a.out loaded files. Modified: head/sys/boot/pc98/boot2/boot2.c Modified: head/sys/boot/pc98/boot2/boot2.c == --- head/sys/boot/pc98/boot2/boot2.cSat Feb 19 09:33:53 2011 (r218841) +++ head/sys/boot/pc98/boot2/boot2.cSat Feb 19 10:32:12 2011 (r218842) @@ -484,23 +484,6 @@ load(void) p += roundup2(hdr.ex.a_text, PAGE_SIZE); if (xfsread(ino, p, hdr.ex.a_data)) return; - p += hdr.ex.a_data + roundup2(hdr.ex.a_bss, PAGE_SIZE); - bootinfo.bi_symtab = VTOP(p); - *(uint32_t*)p = hdr.ex.a_syms; - p += sizeof(hdr.ex.a_syms); - if (hdr.ex.a_syms) { - if (xfsread(ino, p, hdr.ex.a_syms)) - return; - p += hdr.ex.a_syms; - if (xfsread(ino, p, sizeof(int))) - return; - x = *(uint32_t *)p; - p += sizeof(int); - x -= sizeof(int); - if (xfsread(ino, p, x)) - return; - p += x; - } } else { fs_off = hdr.eh.e_phoff; for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) { @@ -532,8 +515,8 @@ load(void) } } addr = hdr.eh.e_entry & 0xff; + bootinfo.bi_esymtab = VTOP(p); } -bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_kernelname = VTOP(kname); bootinfo.bi_bios_dev = dsk.daua; __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218843 - head/sys/pc98/pc98
Author: nyan Date: Sat Feb 19 10:36:05 2011 New Revision: 218843 URL: http://svn.freebsd.org/changeset/base/218843 Log: MFi386: revision 218744 To avoid excessive code duplication create wrapper for fill regs from stack frame. Modified: head/sys/pc98/pc98/machdep.c Modified: head/sys/pc98/pc98/machdep.c == --- head/sys/pc98/pc98/machdep.cSat Feb 19 10:32:12 2011 (r218842) +++ head/sys/pc98/pc98/machdep.cSat Feb 19 10:36:05 2011 (r218843) @@ -2458,6 +2458,13 @@ fill_regs(struct thread *td, struct reg tp = td->td_frame; pcb = td->td_pcb; + regs->r_gs = pcb->pcb_gs; + return (fill_frame_regs(tp, regs)); +} + +int +fill_frame_regs(struct trapframe *tp, struct reg *regs) +{ regs->r_fs = tp->tf_fs; regs->r_es = tp->tf_es; regs->r_ds = tp->tf_ds; @@ -2473,7 +2480,6 @@ fill_regs(struct thread *td, struct reg regs->r_eflags = tp->tf_eflags; regs->r_esp = tp->tf_esp; regs->r_ss = tp->tf_ss; - regs->r_gs = pcb->pcb_gs; return (0); } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218844 - head/share/termcap
Author: ed Date: Sat Feb 19 11:06:00 2011 New Revision: 218844 URL: http://svn.freebsd.org/changeset/base/218844 Log: Improve 256 color support. - Add screen-256color, - Improve rxvt-256color to set pa and op properly. - Add rxvt-unicode-256color as an alias to rxvt-256color. PR: conf/152713, conf/153164 Submitted by: Alexander Verbod and Frédéric Perrin MFC after:2 weeks Modified: head/share/termcap/termcap.src Modified: head/share/termcap/termcap.src == --- head/share/termcap/termcap.src Sat Feb 19 10:36:05 2011 (r218843) +++ head/share/termcap/termcap.src Sat Feb 19 11:06:00 2011 (r218844) @@ -2784,6 +2784,9 @@ SH|screen-s|VT 100/ANSI X3.64 virtual te :ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen: SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\ :co#132:tc=screen: +screen-256color|VT 100/ANSI X3.64 terminal with 256 colors:\ + :Co#256:pa#32767:\ + :AB=\E[48;5;%dm:AF=\E[38;5;%dm:tc=screen: # $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $ # # Note: @@ -4632,7 +4635,11 @@ rxvt|rxvt terminal emulator (X Window Sy :pa#64:Co#8:AF=\E[3%dm:AB=\E[4%dm:op=\E[39;49m:tc=rxvt-mono: rxvt-256color|rxvt terminal emulator with 256 colors:\ - :Co#256:AF=\E[38;5;%dm:AB=\E[48;5;%dm:tc=rxvt-unicode: + :Co#256:pa#32767:\ + :AB=\E[48;5;%dm:AF=\E[38;5;%dm:op=\E[39;49m:tc=rxvt-unicode: + +rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System):\ + :tc=rxvt-256color: # Termcap entry for Eterm, taken from the sources of Eterm-0.9.2 Eterm|Eterm Terminal Emulator (X11 Window System):\ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218845 - head/sys/geom/part
Author: nyan Date: Sat Feb 19 11:09:38 2011 New Revision: 218845 URL: http://svn.freebsd.org/changeset/base/218845 Log: Add support to set a slice name. Modified: head/sys/geom/part/g_part_pc98.c Modified: head/sys/geom/part/g_part_pc98.c == --- head/sys/geom/part/g_part_pc98.cSat Feb 19 11:06:00 2011 (r218844) +++ head/sys/geom/part/g_part_pc98.cSat Feb 19 11:09:38 2011 (r218845) @@ -140,6 +140,20 @@ pc98_parse_type(const char *type, u_char return (EINVAL); } +static int +pc98_set_slicename(const char *label, u_char *dp_name) +{ + int len; + + len = strlen(label); + if (len > sizeof(((struct pc98_partition *)NULL)->dp_name)) + return (EINVAL); + bzero(dp_name, sizeof(((struct pc98_partition *)NULL)->dp_name)); + strncpy(dp_name, label, len); + + return (0); +} + static void pc98_set_chs(struct g_part_table *table, uint32_t lba, u_short *cylp, u_char *hdp, u_char *secp) @@ -164,9 +178,7 @@ g_part_pc98_add(struct g_part_table *bas struct g_part_pc98_entry *entry; struct g_part_pc98_table *table; uint32_t cyl, start, size; - - if (gpp->gpp_parms & G_PART_PARM_LABEL) - return (EINVAL); + int error; cyl = basetable->gpt_heads * basetable->gpt_sectors; @@ -199,8 +211,16 @@ g_part_pc98_add(struct g_part_table *bas &entry->ent.dp_shd, &entry->ent.dp_ssect); pc98_set_chs(basetable, baseentry->gpe_end, &entry->ent.dp_ecyl, &entry->ent.dp_ehd, &entry->ent.dp_esect); - return (pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid, - &entry->ent.dp_sid)); + + error = pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid, + &entry->ent.dp_sid); + if (error) + return (error); + + if (gpp->gpp_parms & G_PART_PARM_LABEL) + return (pc98_set_slicename(gpp->gpp_label, entry->ent.dp_name)); + + return (0); } static int @@ -231,7 +251,7 @@ g_part_pc98_create(struct g_part_table * pp = gpp->gpp_provider; cp = LIST_FIRST(&pp->consumers); - if (pp->sectorsize < SECSIZE || pp->mediasize < 2 * SECSIZE) + if (pp->sectorsize < SECSIZE || pp->mediasize < BOOTSIZE) return (ENOSPC); if (pp->sectorsize > SECSIZE) return (ENXIO); @@ -305,14 +325,20 @@ g_part_pc98_modify(struct g_part_table * struct g_part_entry *baseentry, struct g_part_parms *gpp) { struct g_part_pc98_entry *entry; + int error; + + entry = (struct g_part_pc98_entry *)baseentry; + + if (gpp->gpp_parms & G_PART_PARM_TYPE) { + error = pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid, + &entry->ent.dp_sid); + if (error) + return (error); + } if (gpp->gpp_parms & G_PART_PARM_LABEL) - return (EINVAL); + return (pc98_set_slicename(gpp->gpp_label, entry->ent.dp_name)); - entry = (struct g_part_pc98_entry *)baseentry; - if (gpp->gpp_parms & G_PART_PARM_TYPE) - return (pc98_parse_type(gpp->gpp_type, &entry->ent.dp_mid, - &entry->ent.dp_sid)); return (0); } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218846 - head/lib/libc/gen
Author: ed Date: Sat Feb 19 11:31:56 2011 New Revision: 218846 URL: http://svn.freebsd.org/changeset/base/218846 Log: Properly styleify utmpx code and document error codes in man page. Submitted by: Garrett Cooper Modified: head/lib/libc/gen/getutxent.3 head/lib/libc/gen/getutxent.c head/lib/libc/gen/pututxline.c head/lib/libc/gen/utxdb.c Modified: head/lib/libc/gen/getutxent.3 == --- head/lib/libc/gen/getutxent.3 Sat Feb 19 11:09:38 2011 (r218845) +++ head/lib/libc/gen/getutxent.3 Sat Feb 19 11:31:56 2011 (r218846) @@ -367,16 +367,15 @@ It returns .Dv NULL when the provided .Vt utmpx -is invalid. -This may be because -.Fa ut_type -is invalid or +is invalid, or .Fa ut_type has a value of .Dv DEAD_PROCESS and an entry with an identifier with a value equal to the field .Fa ut_id -was not found. +was not found; the global variable +.Va errno +is set to indicate the error. .Pp The .Fn setutxdb @@ -387,6 +386,24 @@ Otherwise, -1 is returned and the global is set to indicate the error. .Sh ERRORS In addition to the error conditions described in +.Xr fdopen 3 , +.Xr fopen 3 , +.Xr fseek 3 , +.Xr open 3 , +the +.Fn pututxline +function can generate the following errors: +.Bl -tag -width Er +.It Bq Er ESRCH +The value of +.Fa ut_type +is DEAD_PROCESS, and the process entry could not be found. +.It Bq Er EINVAL +The value of +.Fa ut_type +is not supported by this implementation. +.El +In addition to the error conditions described in .Xr fopen 3 , the .Fn setutxdb Modified: head/lib/libc/gen/getutxent.c == --- head/lib/libc/gen/getutxent.c Sat Feb 19 11:09:38 2011 (r218845) +++ head/lib/libc/gen/getutxent.c Sat Feb 19 11:31:56 2011 (r218846) @@ -112,22 +112,22 @@ getfutxent(struct futx *fu) if (udb == UTXDB_LOG) { uint16_t len; - if (fread(&len, sizeof len, 1, uf) != 1) + if (fread(&len, sizeof(len), 1, uf) != 1) return (-1); len = be16toh(len); if (len > sizeof *fu) { /* Forward compatibility. */ - if (fread(fu, sizeof *fu, 1, uf) != 1) + if (fread(fu, sizeof(*fu), 1, uf) != 1) return (-1); - fseek(uf, len - sizeof *fu, SEEK_CUR); + fseek(uf, len - sizeof(*fu), SEEK_CUR); } else { /* Partial record. */ - memset(fu, 0, sizeof *fu); + memset(fu, 0, sizeof(*fu)); if (fread(fu, len, 1, uf) != 1) return (-1); } } else { - if (fread(fu, sizeof *fu, 1, uf) != 1) + if (fread(fu, sizeof(*fu), 1, uf) != 1) return (-1); } return (0); @@ -163,7 +163,8 @@ getutxid(const struct utmpx *id) case LOGIN_PROCESS: case DEAD_PROCESS: if (memcmp(fu.fu_id, id->ut_id, - MIN(sizeof fu.fu_id, sizeof id->ut_id)) == 0) + MIN(sizeof(fu.fu_id), sizeof(id->ut_id))) == + 0) goto found; } break; @@ -191,7 +192,8 @@ getutxline(const struct utmpx *line) case USER_PROCESS: case LOGIN_PROCESS: if (strncmp(fu.fu_line, line->ut_line, - MIN(sizeof fu.fu_line, sizeof line->ut_line)) == 0) + MIN(sizeof(fu.fu_line), sizeof(line->ut_line))) == + 0) goto found; break; } @@ -212,7 +214,7 @@ getutxuser(const char *user) switch (fu.fu_type) { case USER_PROCESS: - if (strncmp(fu.fu_user, user, sizeof fu.fu_user) == 0) + if (strncmp(fu.fu_user, user, sizeof(fu.fu_user)) == 0) goto found; break; } Modified: head/lib/libc/gen/pututxline.c == --- head/lib/libc/gen/pututxline.c Sat Feb 19 11:09:38 2011 (r218845) +++ head/lib/libc/gen/pututxline.c Sat Feb 19 11:31:56 2011 (r218846) @@ -43,9 +43,9 @@ __FBSDID("$FreeBSD$"); static FILE * futx_open(const char *file) { - int fd; - FILE *fp; struct stat sb; + FILE *fp; + int fd; fd = _open(file, O_CREAT|O_RDWR|O_EXLOCK, 0644); if (fd < 0) @@
svn commit: r218847 - in head: lib/libc/gen usr.sbin usr.sbin/utxrm
Author: ed Date: Sat Feb 19 11:44:04 2011 New Revision: 218847 URL: http://svn.freebsd.org/changeset/base/218847 Log: Add a utility, utxrm(8). Most of the ports I broke when I imported utmpx, were simple management utilities for the utmp database, allowing you to add/remove entries manually. Add a small tool called utxrm(8), which allows you to remove an entry from the utmpx database by hand. This is useful when a login daemon crashes or fails to remove the entry during shutdown. Added: head/usr.sbin/utxrm/ head/usr.sbin/utxrm/Makefile (contents, props changed) head/usr.sbin/utxrm/utxrm.8 (contents, props changed) head/usr.sbin/utxrm/utxrm.c (contents, props changed) Modified: head/lib/libc/gen/getutxent.3 head/usr.sbin/Makefile Modified: head/lib/libc/gen/getutxent.3 == --- head/lib/libc/gen/getutxent.3 Sat Feb 19 11:31:56 2011 (r218846) +++ head/lib/libc/gen/getutxent.3 Sat Feb 19 11:44:04 2011 (r218847) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 8, 2010 +.Dd February 19, 2011 .Dt GETUTXENT 3 .Os .Sh NAME @@ -424,7 +424,8 @@ The file format is invalid. .Xr gettimeofday 2 , .Xr tty 4 , .Xr ac 8 , -.Xr newsyslog 8 +.Xr newsyslog 8 , +.Xr utxrm 8 .Sh STANDARDS The .Fn endutxent , Modified: head/usr.sbin/Makefile == --- head/usr.sbin/Makefile Sat Feb 19 11:31:56 2011(r218846) +++ head/usr.sbin/Makefile Sat Feb 19 11:44:04 2011(r218847) @@ -89,6 +89,7 @@ SUBDIR= adduser \ trpt \ tzsetup \ ugidfw \ + utxrm \ vipw \ wake \ watch \ Added: head/usr.sbin/utxrm/Makefile == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/utxrm/MakefileSat Feb 19 11:44:04 2011 (r218847) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +PROG= utxrm +MAN= utxrm.8 + +.include Added: head/usr.sbin/utxrm/utxrm.8 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/utxrm/utxrm.8 Sat Feb 19 11:44:04 2011(r218847) @@ -0,0 +1,72 @@ +.\" Copyright (c) 2011 Ed Schouten +.\" 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. +.\" +.\" $FreeBSD$ +.\" +.Dd February 19, 2011 +.Dt UTXRM 8 +.Os +.Sh NAME +.Nm utxrm +.Nd remove sessions from the user accounting database +.Sh SYNOPSIS +.Nm +.Ar identifier +.Ar ... +.Sh DESCRIPTION +The +.Nm +utility can be used to remove stale sessions from the user accounting +database, by referring to their +.Ar identifier . +Stale sessions can occur if a login service exits prematurely or fails +to remove the session from the accounting database. +.Pp +Utilities such as +.Xr w 1 +will not display the identifier corresponding with a login session, +since its value is typically only of use by the process managing the +record. +The following command can be used to obtain all records from the user +accounting database's active session table, including its identifiers: +.Pp +.Dl getent utmpx active +.Pp +Identifiers can either be supplied in hexadecimal form as displayed by +.Xr getent 1 , +or as a string if the identifier allows such a representation. +.Pp +Because this utility requires write-access to the user accounting +database, its use is limited to the super-user. +.Sh SEE ALSO +.Xr getent 1 , +.Xr w 1 , +.Xr pututxline 3 . +.Sh HISTORY +The +.Nm +utility appeared in +.Fx 9.0 . +.Sh AUT
svn commit: r218850 - head/tools/regression/bin/sh/execution
Author: jilles Date: Sat Feb 19 13:22:18 2011 New Revision: 218850 URL: http://svn.freebsd.org/changeset/base/218850 Log: sh: Make execution/fork1.0 work even if the basename of ${SH} is not "sh". Modified: head/tools/regression/bin/sh/execution/fork1.0 Modified: head/tools/regression/bin/sh/execution/fork1.0 == --- head/tools/regression/bin/sh/execution/fork1.0 Sat Feb 19 11:47:48 2011(r218849) +++ head/tools/regression/bin/sh/execution/fork1.0 Sat Feb 19 13:22:18 2011(r218850) @@ -1,7 +1,10 @@ # $FreeBSD$ +shname=${SH%% *} +shname=${shname##*/} + result=$(${SH} -c 'ps -p $$ -o comm=') test "$result" = "ps" || exit 1 result=$(${SH} -c 'ps -p $$ -o comm=; :') -test "$result" = "sh" || exit 1 +test "$result" = "$shname" || exit 1 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218851 - head/tools/regression/bin/sh
Author: jilles Date: Sat Feb 19 13:23:13 2011 New Revision: 218851 URL: http://svn.freebsd.org/changeset/base/218851 Log: sh: Do not use "local" in the test runner as POSIX and ksh93 do not have it. Modified: head/tools/regression/bin/sh/regress.sh Modified: head/tools/regression/bin/sh/regress.sh == --- head/tools/regression/bin/sh/regress.sh Sat Feb 19 13:22:18 2011 (r218850) +++ head/tools/regression/bin/sh/regress.sh Sat Feb 19 13:23:13 2011 (r218851) @@ -9,7 +9,6 @@ export SH=${SH} COUNTER=1 do_test() { - local c c=${COUNTER} COUNTER=$((COUNTER+1)) ${SH} $1 > tmp.stdout 2> tmp.stderr ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218852 - head/sys/kern
Author: jh Date: Sat Feb 19 14:27:14 2011 New Revision: 218852 URL: http://svn.freebsd.org/changeset/base/218852 Log: Don't restore old mount options and flags if VFS_MOUNT(9) succeeds but vfs_export() fails. Restoring old options and flags after successful VFS_MOUNT(9) call may cause the file system internal state to become inconsistent with mount options and flags. Specifically the FFS super block fs_ronly field and the MNT_RDONLY flag may get out of sync. PR: kern/133614 Discussed on: freebsd-hackers Modified: head/sys/kern/vfs_mount.c Modified: head/sys/kern/vfs_mount.c == --- head/sys/kern/vfs_mount.c Sat Feb 19 13:23:13 2011(r218851) +++ head/sys/kern/vfs_mount.c Sat Feb 19 14:27:14 2011(r218852) @@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$"); #defineVFS_MOUNTARG_SIZE_MAX (1024 * 64) static int vfs_domount(struct thread *td, const char *fstype, - char *fspath, int fsflags, void *fsdata); + char *fspath, int fsflags, struct vfsoptlist **optlist); static voidfree_mntarg(struct mntarg *ma); static int usermount = 0; @@ -667,7 +667,7 @@ vfs_donmount(struct thread *td, int fsfl goto bail; } - error = vfs_domount(td, fstype, fspath, fsflags, optlist); + error = vfs_domount(td, fstype, fspath, fsflags, &optlist); bail: /* copyout the errmsg */ if (errmsg_pos != -1 && ((2 * errmsg_pos + 1) < fsoptions->uio_iovcnt) @@ -683,7 +683,7 @@ bail: } } - if (error != 0) + if (optlist != NULL) vfs_freeopts(optlist); return (error); } @@ -762,12 +762,12 @@ mount(td, uap) */ static int vfs_domount_first( - struct thread *td, /* Calling thread. */ - struct vfsconf *vfsp, /* File system type. */ - char *fspath, /* Mount path. */ - struct vnode *vp, /* Vnode to be covered. */ - int fsflags,/* Flags common to all filesystems. */ - void *fsdata/* Options local to the filesystem. */ + struct thread *td, /* Calling thread. */ + struct vfsconf *vfsp, /* File system type. */ + char *fspath, /* Mount path. */ + struct vnode *vp, /* Vnode to be covered. */ + int fsflags,/* Flags common to all filesystems. */ + struct vfsoptlist **optlist /* Options local to the filesystem. */ ) { struct vattr va; @@ -807,7 +807,7 @@ vfs_domount_first( /* Allocate and initialize the filesystem. */ mp = vfs_mount_alloc(vp, vfsp, fspath, td->td_ucred); /* XXXMAC: pass to vfs_mount_alloc? */ - mp->mnt_optnew = fsdata; + mp->mnt_optnew = *optlist; /* Set the mount level flags. */ mp->mnt_flag = (fsflags & (MNT_UPDATEMASK | MNT_ROOTFS | MNT_RDONLY)); @@ -830,6 +830,7 @@ vfs_domount_first( if (mp->mnt_opt != NULL) vfs_freeopts(mp->mnt_opt); mp->mnt_opt = mp->mnt_optnew; + *optlist = NULL; (void)VFS_STATFS(mp, &mp->mnt_stat); /* @@ -872,16 +873,16 @@ vfs_domount_first( */ static int vfs_domount_update( - struct thread *td, /* Calling thread. */ - struct vnode *vp, /* Mount point vnode. */ - int fsflags,/* Flags common to all filesystems. */ - void *fsdata/* Options local to the filesystem. */ + struct thread *td, /* Calling thread. */ + struct vnode *vp, /* Mount point vnode. */ + int fsflags,/* Flags common to all filesystems. */ + struct vfsoptlist **optlist /* Options local to the filesystem. */ ) { struct oexport_args oexport; struct export_args export; struct mount *mp; - int error, flag; + int error, export_error, flag; mtx_assert(&Giant, MA_OWNED); ASSERT_VOP_ELOCKED(vp, __func__); @@ -932,7 +933,7 @@ vfs_domount_update( if ((mp->mnt_flag & MNT_ASYNC) == 0) mp->mnt_kern_flag &= ~MNTK_ASYNC; MNT_IUNLOCK(mp); - mp->mnt_optnew = fsdata; + mp->mnt_optnew = *optlist; vfs_mergeopts(mp->mnt_optnew, mp->mnt_opt); /* @@ -942,11 +943,12 @@ vfs_domount_update( */ error = VFS_MOUNT(mp); + export_error = 0; if (error == 0) { /* Process the export option. */ if (vfs_copyopt(mp->mnt_optnew, "export", &export, sizeof(export)) == 0) { - error = vfs_export(mp, &export); + export_error = vfs_export(mp, &export); } else if (vfs_copyopt(mp->mnt_optnew, "export", &oexport, sizeof(oexport)) == 0) { export.
svn commit: r218853 - head/usr.sbin/bsdinstall/partedit
Author: nwhitehorn Date: Sat Feb 19 14:49:49 2011 New Revision: 218853 URL: http://svn.freebsd.org/changeset/base/218853 Log: The PC98 gpart module supports labels now. Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c Modified: head/usr.sbin/bsdinstall/partedit/gpart_ops.c == --- head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Feb 19 14:27:14 2011(r218852) +++ head/usr.sbin/bsdinstall/partedit/gpart_ops.c Sat Feb 19 14:49:49 2011(r218853) @@ -65,6 +65,19 @@ gpart_show_error(const char *title, cons dialog_msgbox(title, message, 0, 0, TRUE); } +static int +scheme_supports_labels(const char *scheme) +{ + if (strcmp(scheme, "APM") == 0) + return (1); + if (strcmp(scheme, "GPT") == 0) + return (1); + if (strcmp(scheme, "PC98") == 0) + return (1); + + return (0); +} + int gpart_partition(const char *lg_name, const char *scheme) { @@ -389,11 +402,7 @@ gpart_edit(struct gprovider *pp) } } - /* Labels only supported on GPT and APM */ - if (strcmp(scheme, "GPT") == 0 || strcmp(scheme, "APM") == 0) - nitems = 4; - else - nitems = 3; + nitems = scheme_supports_labels(scheme) ? 4 : 3; /* Edit editable parameters of a partition */ hadlabel = 0; @@ -738,11 +747,7 @@ gpart_create(struct gprovider *pp, char if (strcmp(scheme, "MBR") == 0 || strcmp(scheme, "PC98") == 0) items[0].text = "freebsd"; - /* Labels only supported on GPT and APM */ - if (strcmp(scheme, "GPT") == 0 || strcmp(scheme, "APM") == 0) - nitems = 4; - else - nitems = 3; + nitems = scheme_supports_labels(scheme) ? 4 : 3; if (default_type != NULL) items[0].text = default_type; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218854 - head/share/examples/pf
Author: brucec Date: Sat Feb 19 14:57:00 2011 New Revision: 218854 URL: http://svn.freebsd.org/changeset/base/218854 Log: Update the icmp example to show allowing only the safe types. Suggested by: Tom Judge MFC after:3 days Modified: head/share/examples/pf/pf.conf Modified: head/share/examples/pf/pf.conf == --- head/share/examples/pf/pf.conf Sat Feb 19 14:49:49 2011 (r218853) +++ head/share/examples/pf/pf.conf Sat Feb 19 14:57:00 2011 (r218854) @@ -32,4 +32,4 @@ #pass in on $ext_if proto tcp to ($ext_if) port ssh #pass in log on $ext_if proto tcp to ($ext_if) port smtp #pass out log on $ext_if proto tcp from ($ext_if) to port smtp -#pass in on $ext_if proto icmp to ($ext_if) +#pass in on $ext_if inet proto icmp from any to ($ext_if) icmp-type { unreach, redir, timex } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218855 - head/usr.sbin/bsdinstall/partedit
Author: nwhitehorn Date: Sat Feb 19 15:22:06 2011 New Revision: 218855 URL: http://svn.freebsd.org/changeset/base/218855 Log: Don't present the user with spurious errors when overwriting a disk with a deleted, but uncommitted, gpart. Reported by: brucec Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c Modified: head/usr.sbin/bsdinstall/partedit/part_wizard.c == --- head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 19 14:57:00 2011(r218854) +++ head/usr.sbin/bsdinstall/partedit/part_wizard.c Sat Feb 19 15:22:06 2011(r218855) @@ -213,6 +213,10 @@ wizard_partition(struct gmesh *mesh, con } } + /* Treat uncommitted scheme deletions as no scheme */ + if (scheme != NULL && strcmp(scheme, "(none)") == 0) + scheme = NULL; + query: dialog_vars.yes_label = "Entire Disk"; dialog_vars.no_label = "Partition"; @@ -247,8 +251,9 @@ query: scheme = default_scheme(); } - if (scheme == NULL || strcmp(scheme, "(none)") == 0 || choice == 0) { - if (gpart != NULL) { /* Erase partitioned disk */ + if (scheme == NULL || choice == 0) { + if (gpart != NULL && scheme != NULL) { + /* Erase partitioned disk */ choice = dialog_yesno("Confirmation", "This will erase " "the disk. Are you sure you want to proceed?", 0, 0); if (choice != 0) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218861 - head/sys/dev/ppc
Author: miwi Date: Sat Feb 19 17:38:51 2011 New Revision: 218861 URL: http://svn.freebsd.org/changeset/base/218861 Log: - Add support for MosChip 9865 Single 1284 Printer port PR: kern/152663 Submitted by: Jonathan Chen Approved by: rwatson (mentor) Modified: head/sys/dev/ppc/ppc_pci.c Modified: head/sys/dev/ppc/ppc_pci.c == --- head/sys/dev/ppc/ppc_pci.c Sat Feb 19 17:14:03 2011(r218860) +++ head/sys/dev/ppc/ppc_pci.c Sat Feb 19 17:38:51 2011(r218861) @@ -89,6 +89,7 @@ static struct pci_id pci_ids[] = { { 0x84031415, "Oxford Semiconductor OX12PCI840 Parallel port", 0x10 }, { 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel port", 0x10 }, { 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 }, + { 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 }, { 0x99019710, "MosChip MCS9901 PCIe to Peripheral Controller", 0x10 }, { 0x } }; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Sun, Feb 13, 2011 at 4:18 PM, Bruce Cran wrote: > Author: brucec > Date: Sun Feb 13 18:18:56 2011 > New Revision: 218650 > URL: http://svn.freebsd.org/changeset/base/218650 > > Log: > Move potentially offensive fortune to fortunes-o. Did anybody complain about this? If not, would you mid either revert this commit or just go ahead and move all "potentially" offensive jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will probably qualify. > --- head/games/fortune/datfiles/fortunes Sun Feb 13 18:08:53 2011 > (r218649) > +++ head/games/fortune/datfiles/fortunes Sun Feb 13 18:18:56 2011 > (r218650) > @@ -38136,10 +38136,6 @@ couldn't compete successfully with poets > -- Kilgore Trout (Philip J. Farmer) "Venus on the Half > Shell" > % > -PLATONIC FRIENDSHIP: > - What develops when two people get > - tired of making love to each other. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > Did anybody complain about this? If not, would you mid either revert > this commit or just go ahead and move all "potentially" offensive > jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will > probably qualify. Yes, someone complained. From bin/137702: "A coworker pointed out a borderline offensive fortune that appeared in my email signature which is partially generated from `fortune -s` output. [...] I agree that it's probably not appropriate in a professional setting." -- Bruce Cran ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Sat, Feb 19, 2011 at 11:29, Bruce Cran wrote: > On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> Did anybody complain about this? If not, would you mid either revert >> this commit or just go ahead and move all "potentially" offensive >> jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will >> probably qualify. > > Yes, someone complained. From bin/137702: > > "A coworker pointed out a borderline offensive fortune that appeared in my > email signature which is partially generated from `fortune -s` output. > > [...] > > I agree that it's probably not appropriate in a professional setting." Professionally-appropriate is not the same as offensive, and such standards vary considerably more than ones for offensiveness. I don't think professionally-appropriate is the right standard for fortune. Certainly there's not really anything very professional about having a random E-Mail signature that's meant to amuse, for that matter. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > Did anybody complain about this? If not, would you mid either revert > this commit or just go ahead and move all "potentially" offensive > jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will > probably qualify. I'm happy to revert the checkin if you think the fortune should be in the main file, since it appears the PR submitter was complaining just as much about being unprofessional as offensive. Would you like me to go ahead and revert the move? -- Bruce Cran ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218863 - head/sys/fs/tmpfs
Author: alc Date: Sat Feb 19 21:04:36 2011 New Revision: 218863 URL: http://svn.freebsd.org/changeset/base/218863 Log: tmpfs_remove() isn't modifying the file's data, so it shouldn't set TMPFS_NODE_MODIFIED on the node. PR: 152488 Submitted by: Anton Yuzhaninov Reviewed by: kib MFC after:1 week Modified: head/sys/fs/tmpfs/tmpfs_vnops.c Modified: head/sys/fs/tmpfs/tmpfs_vnops.c == --- head/sys/fs/tmpfs/tmpfs_vnops.c Sat Feb 19 17:44:13 2011 (r218862) +++ head/sys/fs/tmpfs/tmpfs_vnops.c Sat Feb 19 21:04:36 2011 (r218863) @@ -853,8 +853,7 @@ tmpfs_remove(struct vop_remove_args *v) tmpfs_free_dirent(tmp, de, TRUE); if (node->tn_links > 0) - node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED | \ - TMPFS_NODE_MODIFIED; + node->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED; error = 0; out: ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Sat, Feb 19, 2011 at 5:29 PM, Bruce Cran wrote: > On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> Did anybody complain about this? If not, would you mid either revert >> this commit or just go ahead and move all "potentially" offensive >> jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will >> probably qualify. > > Yes, someone complained. From bin/137702: > > "A coworker pointed out a borderline offensive fortune that appeared in my > email signature which is partially generated from `fortune -s` output. So the PR submitter should stop using random fortunes in email signatures instead of asking FreeBSD to make fortunes compliant to the moral standards of his/her coworkers. How long do you think it will take until somebody else find a a borderline offensive fortune? > [...] > > I agree that it's probably not appropriate in a professional setting." Sure. People must understand that fortunes are an optional feature whose use has unpredictable consequences. Blaming FreeBSD for the possible inconveniences. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Sat, Feb 19, 2011 at 8:40 PM, Carlos A. M. dos Santos wrote: > On Sat, Feb 19, 2011 at 5:29 PM, Bruce Cran wrote: > Sure. People must understand that fortunes are an optional feature > whose use has unpredictable consequences. Blaming FreeBSD for the > possible inconveniences... ... is a big mistake. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218864 - in head/sys/dev/usb: . net
Author: hselasky Date: Sat Feb 19 22:53:50 2011 New Revision: 218864 URL: http://svn.freebsd.org/changeset/base/218864 Log: Add more udav device ID's. Submitted by: Rick van der Zwet MFC after:7 days Approved by: thompsa (mentor) Modified: head/sys/dev/usb/net/if_udav.c head/sys/dev/usb/usbdevs Modified: head/sys/dev/usb/net/if_udav.c == --- head/sys/dev/usb/net/if_udav.c Sat Feb 19 21:04:36 2011 (r218863) +++ head/sys/dev/usb/net/if_udav.c Sat Feb 19 22:53:50 2011 (r218864) @@ -206,6 +206,10 @@ static const struct usb_device_id udav_d {USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ST268, 0)}, /* Corega USB-TXC */ {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC, 0)}, + /* ShanTou AMD8515 USB NIC */ + {USB_VPI(USB_VENDOR_SHANTOU, USB_PRODUCT_SHANTOU_ADM8515, 0)}, + /* Kontron AG USB Ethernet */ + {USB_VPI(USB_VENDOR_KONTRON, USB_PRODUCT_KONTRON_DM9601, 0)}, }; static void Modified: head/sys/dev/usb/usbdevs == --- head/sys/dev/usb/usbdevsSat Feb 19 21:04:36 2011(r218863) +++ head/sys/dev/usb/usbdevsSat Feb 19 22:53:50 2011(r218864) @@ -551,6 +551,7 @@ vendor VTECH0x0f88 VTech vendor FALCOM 0x0f94 Falcom Wireless Communications GmbH vendor RIM 0x0fca Research In Motion vendor DYNASTREAM 0x0fcf Dynastream Innovations +vendor KONTRON 0x0fe6 Kontron AG vendor QUALCOMM0x1004 Qualcomm vendor APACER 0x1005 Apacer vendor MOTOROLA4 0x100d Motorola @@ -2008,6 +2009,9 @@ product KODAK DC290 0x0112 Digital Scie product KODAK DC2400x0120 Digital Science DC240 product KODAK DC2800x0130 Digital Science DC280 +/* Kontron AG products */ +product KONTRON DM9601 0x8101 USB Ethernet + /* Konica Corp. Products */ product KONICA CAMERA 0x0720 Digital Color Camera @@ -2843,6 +2847,7 @@ product SENAO RT3072_50x9801 RT3072 /* ShanTou products */ product SHANTOU ST268 0x0268 ST268 product SHANTOU DM9601 0x9601 DM 9601 +product SHANTOU ADM85150x8515 ADM8515 /* Shark products */ product SHARK PA 0x0400 Pocket Adapter ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran wrote: > On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> Did anybody complain about this? If not, would you mid either revert >> this commit or just go ahead and move all "potentially" offensive >> jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will >> probably qualify. > > I'm happy to revert the checkin if you think the fortune should be in the main > file, since it appears the PR submitter was complaining just as much about > being unprofessional as offensive. Would you like me to go ahead and revert > the move? I suggest you to revert the commit and add a prominent note to fortune(1) explaining that the interpretation of a joke ever depends on people's point of view. So the next time somebody comes with a vague complaint about offensiveness you can just answer "you have been warned". ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On 02/19/2011 15:12, Carlos A. M. dos Santos wrote: On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran wrote: On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: Did anybody complain about this? If not, would you mid either revert this commit or just go ahead and move all "potentially" offensive jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will probably qualify. I'm happy to revert the checkin if you think the fortune should be in the main file, since it appears the PR submitter was complaining just as much about being unprofessional as offensive. Would you like me to go ahead and revert the move? I suggest you to revert the commit Serious overkill, particularly since: 1. The commit has already been MFC'ed, and 2. The fortune in question actually _is_ potentially offensive And let me save you another loop through the arguments you've already put forward. I realize that this fortune does not offend _you_, that's not the issue. I also heard your argument that "If you're going to do this one, you have to do them all!" Which I reject with the standard error code, ENOTINTHIRDGRADE. The nerderati community likes to demonstrate how cool and sophisticated we are at least in part by showing how un-offended we get by things in fortune. Well, that's great for you. The problem with diving into editing the fortune databases is that you run right into the mother of all bikesheds with everyone trying to _prove_ how hip and sophisticated they are. For this reason in addition to the note that I sent to this list I spoke privately to Bruce about the fact that what we have now is a sort of detente, where the people who would like to move some of the fortunes into fortunes-o do not do that, but we apply a stricter standard to _new_ fortunes. This "works" in the sense that nothing is really made worse by it, and everyone is a little unhappy because no one is getting everything they want. Bruce did what he thought was the right thing in an effort to close a PR. There is no reason to castigate him for it, and there is certainly no reason to revert the commit. Every once in a while someone has to come along and step on this particular land mine, it was just Bruce's turn. Everyone can now move along and find more productive things to work on. Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218650 - head/games/fortune/datfiles
On Sat, Feb 19, 2011 at 03:27:12PM -0800, Doug Barton wrote: > On 02/19/2011 15:12, Carlos A. M. dos Santos wrote: > >On Sat, Feb 19, 2011 at 6:07 PM, Bruce Cran wrote: > >>On Saturday 19 February 2011 17:25:32 Carlos A. M. dos Santos wrote: > >> > >>>Did anybody complain about this? If not, would you mid either revert > >>>this commit or just go ahead and move all "potentially" offensive > >>>jokes to fortunes-o? Anything from Grouch Marx or Mark Twain will > >>>probably qualify. > >> > >>I'm happy to revert the checkin if you think the fortune should be in the > >>main > >>file, since it appears the PR submitter was complaining just as much about > >>being unprofessional as offensive. Would you like me to go ahead and > >>revert > >>the move? > > > >I suggest you to revert the commit > > Serious overkill, particularly since: > 1. The commit has already been MFC'ed, and So, 'svn revert' does not work on branches? -- Steve ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218865 - head/etc/namedb
Author: dougb Date: Sun Feb 20 00:59:39 2011 New Revision: 218865 URL: http://svn.freebsd.org/changeset/base/218865 Log: Add a note about AXFR of important zones being available from ICANN Modified: head/etc/namedb/named.conf Modified: head/etc/namedb/named.conf == --- head/etc/namedb/named.conf Sat Feb 19 22:53:50 2011(r218864) +++ head/etc/namedb/named.conf Sun Feb 20 00:59:39 2011(r218865) @@ -91,6 +91,11 @@ zone "." { type hint; file "/etc/namedb/ To use this mechanism, uncomment the entries below, and comment the hint zone above. + + As documented at http://dns.icann.org/services/axfr/ these zones: + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + are availble for AXFR from these servers on IPv4 and IPv6: + xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218753 - head/etc/namedb
On 2/16/2011 4:23 PM, Doug Barton wrote: > Author: dougb > Date: Wed Feb 16 21:23:09 2011 > New Revision: 218753 > URL: http://svn.freebsd.org/changeset/base/218753 > > Log: > Remove in-addr.arpa from the list of zones it is possible to slave locally This is b/c of the recent change to fix the list of root servers that serve this right ? > > Modified: > head/etc/namedb/named.conf > > Modified: head/etc/namedb/named.conf > == > --- head/etc/namedb/named.confWed Feb 16 21:21:23 2011 > (r218752) > +++ head/etc/namedb/named.confWed Feb 16 21:23:09 2011 > (r218753) > @@ -109,14 +109,6 @@ zone "arpa" { > }; > notify no; > }; > -zone "in-addr.arpa" { > - type slave; > - file "/etc/namedb/slave/in-addr.arpa.slave"; > - masters { > - 192.5.5.241;// F.ROOT-SERVERS.NET. > - }; > - notify no; > -}; > */ > > /* Serving the following zones locally will prevent any queries > ___ > svn-src-...@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" -- 1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70 3F8C 75B8 8FFB DB9B 8C1C Philip M. Gollucci (pgollu...@p6m7g8.com) c: 703.336.9354 VP Apache Infrastructure; Member, Apache Software Foundation Committer,FreeBSD Foundation Consultant, P6M7G8 Inc. Sr. System Admin, Ridecharge Inc. Work like you don't need the money, love like you'll never get hurt, and dance like nobody's watching. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r218753 - head/etc/namedb
On 02/19/2011 16:52, Philip M. Gollucci wrote: On 2/16/2011 4:23 PM, Doug Barton wrote: Author: dougb Date: Wed Feb 16 21:23:09 2011 New Revision: 218753 URL: http://svn.freebsd.org/changeset/base/218753 Log: Remove in-addr.arpa from the list of zones it is possible to slave locally This is b/c of the recent change to fix the list of root servers that serve this right ? Not precisely. in-addr.arpa has moved to its own set of servers operated jointly by the RIRs and ICANN. At some point in the near future this zone will no longer be available directly from the root servers at all. hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r218877 - in head/lib/msun: . man
Author: murray (doc committer) Date: Sun Feb 20 05:29:00 2011 New Revision: 218877 URL: http://svn.freebsd.org/changeset/base/218877 Log: Add complex(3) manual page documenting our partial support for C99 complex arithmetic in libm. Reviewed by: David Schultz MFC after:2 weeks Added: head/lib/msun/man/complex.3 (contents, props changed) Modified: head/lib/msun/Makefile Modified: head/lib/msun/Makefile == --- head/lib/msun/Makefile Sun Feb 20 03:35:59 2011(r218876) +++ head/lib/msun/Makefile Sun Feb 20 05:29:00 2011(r218877) @@ -131,7 +131,8 @@ MAN=acos.3 acosh.3 asin.3 asinh.3 atan. fma.3 fmax.3 fmod.3 hypot.3 ieee.3 ieee_test.3 ilogb.3 j0.3 \ lgamma.3 log.3 lrint.3 lround.3 math.3 nan.3 \ nextafter.3 remainder.3 rint.3 \ - round.3 scalbn.3 signbit.3 sin.3 sinh.3 sqrt.3 tan.3 tanh.3 trunc.3 + round.3 scalbn.3 signbit.3 sin.3 sinh.3 sqrt.3 tan.3 tanh.3 trunc.3 \ + complex.3 MLINKS+=acos.3 acosf.3 acos.3 acosl.3 MLINKS+=acosh.3 acoshf.3 Added: head/lib/msun/man/complex.3 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lib/msun/man/complex.3 Sun Feb 20 05:29:00 2011(r218877) @@ -0,0 +1,128 @@ +.\" Copyright (c) 2011 Murray Stokely +.\" 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 ``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 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. +.\" +.\" $FreeBSD$ +.\" +.Dd February 19, 2011 +.Dt COMPLEX 3 +.Os +.Sh NAME +.Nm complex +.Nd "complex arithmetic" +.Sh LIBRARY +.Lb libm +.Sh SYNOPSIS +.In complex.h +.Sh DESCRIPTION +These functions support complex arithmetic in the C math library. +.Sh "LIST OF FUNCTIONS" +Each of the following +.Vt "double complex" +functions has a +.Vt "float complex" +counterpart with an +.Ql f +appended to the name and a +.Vt "long double complex" +counterpart with an +.Ql l +appended. +As an example, the +.Vt "float complex" +and +.Vt "long double complex" +counterparts of +.Ft double +.Fn cabs "double complex z" +are +.Ft float +.Fn cabsf "float complex z" +and +.Ft "long double" +.Fn cabsl "long double complex z" , +respectively. +.de Cl +.Bl -column "csqrt" "complex absolute value (i.e. norm, modulus, magnitude)" +.Em "Name Description" +.. +.\" Section 7.3.5 - 7.3.7 of ISO C99 standard unimplemented, see BUGS +.\" Section 7.3.8 of ISO C99 standard +.Ss Absolute-value Functions +.Cl +cabs complex absolute value (i.e. norm, modulus, magnitude) +csqrt complex square root +.El +.\" Section 7.3.9 of ISO C99 standard +.Ss Manipulation Functions +.Cl +carg compute the argument (i.e. phase angle) +cimag compute the imaginary part +conj compute the complex conjugate +cproj compute projection onto Riemann sphere +creal compute the real part +.El +.Sh SEE ALSO +.Xr math 3 , +.Xr fenv 3 , +.Xr ieee 3 , +.Xr tgmath 3 +.Rs +.%T "ISO/IEC 9899:TC3" +.%U http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf +.Re +.Sh STANDARDS +The +.In complex.h +functions described here conform to +.St -isoC-99 . +.Sh BUGS +The trigonmetric functions +.Fn cacos , +.Fn casin , +.Fn catan , +.Fn ccos , +.Fn csin , +and +.Fn ctan +are not implemented. +.Pp +The hyperbolic functions +.Fn cacosh , +.Fn casinh , +.Fn catanh , +.Fn ccosh , +.Fn csinh , +and +.Fn ctanh +are not implemented. +.Pp +The exponential and logarithmic functions +.Fn cexp , +and +.Fn clog +are not implemented. +.Pp +The power functions +.Fn cpow +are not implemented. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "
svn commit: r218879 - head/sys/compat/linux
Author: dchagin Date: Sun Feb 20 07:58:30 2011 New Revision: 218879 URL: http://svn.freebsd.org/changeset/base/218879 Log: Do not clobber %rdx. Before calling vfork() syscall the linux user-space stores the current PID in the %rdx and restore it when the parent process will leave the kernel. Modified: head/sys/compat/linux/linux_fork.c Modified: head/sys/compat/linux/linux_fork.c == --- head/sys/compat/linux/linux_fork.c Sun Feb 20 07:46:35 2011 (r218878) +++ head/sys/compat/linux/linux_fork.c Sun Feb 20 07:58:30 2011 (r218879) @@ -104,7 +104,6 @@ linux_vfork(struct thread *td, struct li return (error); td->td_retval[0] = p2->p_pid; - td->td_retval[1] = 0; error = linux_proc_init(td, td->td_retval[0], 0); if (error) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"