From owner-svn-src-stable-7@FreeBSD.ORG Mon Nov 26 05:13:57 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C26A66D9; Mon, 26 Nov 2012 05:13:57 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A57EE8FC0C; Mon, 26 Nov 2012 05:13:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAQ5DvQp003030; Mon, 26 Nov 2012 05:13:57 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAQ5Dvc9003024; Mon, 26 Nov 2012 05:13:57 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211260513.qAQ5Dvc9003024@svn.freebsd.org> From: Eitan Adler Date: Mon, 26 Nov 2012 05:13:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243556 - stable/7/bin/mv X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2012 05:13:57 -0000 Author: eadler Date: Mon Nov 26 05:13:57 2012 New Revision: 243556 URL: http://svnweb.freebsd.org/changeset/base/243556 Log: MFC r243072: Follow the behavior as specified in POSIX: if (exists AND (NOT f_option) AND ((not_writable AND input_is_terminal) OR i_option)) prompt in particular, add the test for input_is_terminal PR: bin/173039 Approved by: cperciva (implicit) Modified: stable/7/bin/mv/mv.c Directory Properties: stable/7/bin/mv/ (props changed) Modified: stable/7/bin/mv/mv.c ============================================================================== --- stable/7/bin/mv/mv.c Mon Nov 26 05:13:57 2012 (r243555) +++ stable/7/bin/mv/mv.c Mon Nov 26 05:13:57 2012 (r243556) @@ -183,7 +183,7 @@ do_move(char *from, char *to) } else if (iflg) { (void)fprintf(stderr, "overwrite %s? %s", to, YESNO); ask = 1; - } else if (access(to, W_OK) && !stat(to, &sb)) { + } else if (access(to, W_OK) && !stat(to, &sb) && isatty(STDIN_FILENO)) { strmode(sb.st_mode, modep); (void)fprintf(stderr, "override %s%s%s/%s for %s? %s", modep + 1, modep[9] == ' ' ? "" : " ", From owner-svn-src-stable-7@FreeBSD.ORG Tue Nov 27 19:35:21 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF6B7CE; Tue, 27 Nov 2012 19:35:21 +0000 (UTC) (envelope-from peterj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B49768FC15; Tue, 27 Nov 2012 19:35:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qARJZLPS041652; Tue, 27 Nov 2012 19:35:21 GMT (envelope-from peterj@svn.freebsd.org) Received: (from peterj@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qARJZLgG041651; Tue, 27 Nov 2012 19:35:21 GMT (envelope-from peterj@svn.freebsd.org) Message-Id: <201211271935.qARJZLgG041651@svn.freebsd.org> From: Peter Jeremy Date: Tue, 27 Nov 2012 19:35:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243626 - stable/7/etc X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 19:35:21 -0000 Author: peterj Date: Tue Nov 27 19:35:21 2012 New Revision: 243626 URL: http://svnweb.freebsd.org/changeset/base/243626 Log: MFC r241708: Explicitly specify 'np' so that getty(8) does not simulate even parity on local.9600. PR: 76226 Approved by: jhb (mentor) Modified: stable/7/etc/gettytab Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/gettytab ============================================================================== --- stable/7/etc/gettytab Tue Nov 27 19:33:25 2012 (r243625) +++ stable/7/etc/gettytab Tue Nov 27 19:35:21 2012 (r243626) @@ -96,7 +96,7 @@ local.9600|CLOCAL tty @ 9600 Bd:\ :o0#0x00000007:o1#0x00000002:o2#0x00000007:\ :i0#0x00000704:i1#0x00000000:i2#0x00000704:\ :l0#0x000005cf:l1#0x00000000:l2#0x000005cf:\ - :sp#9600: + :sp#9600:np: # # Dial in rotary tables, speed selection via 'break' From owner-svn-src-stable-7@FreeBSD.ORG Fri Nov 30 03:38:02 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B2CB656; Fri, 30 Nov 2012 03:38:02 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1F51F8FC08; Fri, 30 Nov 2012 03:38:02 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAU3c1Iq008989; Fri, 30 Nov 2012 03:38:01 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAU3c1gx008988; Fri, 30 Nov 2012 03:38:01 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201211300338.qAU3c1gx008988@svn.freebsd.org> From: Eitan Adler Date: Fri, 30 Nov 2012 03:38:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243695 - stable/7/sys/dev/mfi X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Nov 2012 03:38:02 -0000 Author: eadler Date: Fri Nov 30 03:38:01 2012 New Revision: 243695 URL: http://svnweb.freebsd.org/changeset/base/243695 Log: MFC r243078: Add deviceid to the disk output on boot to help debugging. PR: kern/173290 Approved by: cperciva (implicit) Modified: stable/7/sys/dev/mfi/mfi_syspd.c Directory Properties: stable/7/sys/ (props changed) Modified: stable/7/sys/dev/mfi/mfi_syspd.c ============================================================================== --- stable/7/sys/dev/mfi/mfi_syspd.c Fri Nov 30 03:16:45 2012 (r243694) +++ stable/7/sys/dev/mfi/mfi_syspd.c Fri Nov 30 03:38:01 2012 (r243695) @@ -116,8 +116,8 @@ mfi_syspd_attach(device_t dev) mtx_lock(&sc->pd_controller->mfi_io_lock); TAILQ_INSERT_TAIL(&sc->pd_controller->mfi_syspd_tqh, sc, pd_link); mtx_unlock(&sc->pd_controller->mfi_io_lock); - device_printf(dev, "%juMB (%ju sectors) SYSPD volume\n", - sectors / (1024 * 1024 / secsize), sectors); + device_printf(dev, "%juMB (%ju sectors) SYSPD volume (deviceid: %d)\n", + sectors / (1024 * 1024 / secsize), sectors, sc->pd_id); sc->pd_disk = disk_alloc(); sc->pd_disk->d_drv1 = sc; sc->pd_disk->d_maxsize = sc->pd_controller->mfi_max_io * secsize; From owner-svn-src-stable-7@FreeBSD.ORG Sat Dec 1 11:12:04 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E8FB4D8; Sat, 1 Dec 2012 11:12:04 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B51118FC1A; Sat, 1 Dec 2012 11:12:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1BC4m2095099; Sat, 1 Dec 2012 11:12:04 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB1BC4VZ095098; Sat, 1 Dec 2012 11:12:04 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201212011112.qB1BC4VZ095098@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sat, 1 Dec 2012 11:12:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243749 - stable/7/contrib/sendmail/src X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 11:12:05 -0000 Author: ume Date: Sat Dec 1 11:12:04 2012 New Revision: 243749 URL: http://svnweb.freebsd.org/changeset/base/243749 Log: MFC r243649: cyrus-sasl 2.1.26 was released. In this version, the type of callback functions was changed from "unsigned long" to "size_t". Modified: stable/7/contrib/sendmail/src/sasl.c Directory Properties: stable/7/contrib/sendmail/ (props changed) Modified: stable/7/contrib/sendmail/src/sasl.c ============================================================================== --- stable/7/contrib/sendmail/src/sasl.c Sat Dec 1 11:08:46 2012 (r243748) +++ stable/7/contrib/sendmail/src/sasl.c Sat Dec 1 11:12:04 2012 (r243749) @@ -24,9 +24,15 @@ SM_RCSID("@(#)$Id: sasl.c,v 8.22 2006/08 ** using unsigned long: for portability, it should be size_t. */ -void *sm_sasl_malloc __P((unsigned long)); -static void *sm_sasl_calloc __P((unsigned long, unsigned long)); -static void *sm_sasl_realloc __P((void *, unsigned long)); +#if defined(SASL_VERSION_FULL) && SASL_VERSION_FULL >= 0x02011a +#define SM_SASL_SIZE_T size_t +#else /* defined(SASL_VERSION_FULL) && SASL_VERSION_FULL >= 0x02011a */ +#define SM_SASL_SIZE_T unsigned long +#endif /* defined(SASL_VERSION_FULL) && SASL_VERSION_FULL >= 0x02011a */ + +void *sm_sasl_malloc __P((SM_SASL_SIZE_T)); +static void *sm_sasl_calloc __P((SM_SASL_SIZE_T, SM_SASL_SIZE_T)); +static void *sm_sasl_realloc __P((void *, SM_SASL_SIZE_T)); void sm_sasl_free __P((void *)); /* @@ -50,7 +56,7 @@ void sm_sasl_free __P((void *)); void * sm_sasl_malloc(size) - unsigned long size; + SM_SASL_SIZE_T size; { return sm_malloc((size_t) size); } @@ -71,8 +77,8 @@ sm_sasl_malloc(size) static void * sm_sasl_calloc(nelem, elemsize) - unsigned long nelem; - unsigned long elemsize; + SM_SASL_SIZE_T nelem; + SM_SASL_SIZE_T elemsize; { size_t size; void *p; @@ -99,7 +105,7 @@ sm_sasl_calloc(nelem, elemsize) static void * sm_sasl_realloc(o, size) void *o; - unsigned long size; + SM_SASL_SIZE_T size; { return sm_realloc(o, (size_t) size); } From owner-svn-src-stable-7@FreeBSD.ORG Sat Dec 1 15:54:54 2012 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2DDD78; Sat, 1 Dec 2012 15:54:54 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B6C5A8FC15; Sat, 1 Dec 2012 15:54:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB1FssPX042547; Sat, 1 Dec 2012 15:54:54 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB1FssPL042546; Sat, 1 Dec 2012 15:54:54 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201212011554.qB1FssPL042546@svn.freebsd.org> From: Chris Rees Date: Sat, 1 Dec 2012 15:54:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r243756 - stable/7/etc X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Dec 2012 15:54:54 -0000 Author: crees (ports committer) Date: Sat Dec 1 15:54:54 2012 New Revision: 243756 URL: http://svnweb.freebsd.org/changeset/base/243756 Log: MFC r242183: Allow spaces in _chroot Approved by: hrs Modified: stable/7/etc/rc.subr Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/rc.subr ============================================================================== --- stable/7/etc/rc.subr Sat Dec 1 15:53:19 2012 (r243755) +++ stable/7/etc/rc.subr Sat Dec 1 15:54:54 2012 (r243756) @@ -286,8 +286,8 @@ _find_processes() _pref= if [ $_interpreter != "." ]; then # an interpreted script - _script=${_chroot}${_chroot:+"/"}$_procname - if [ -r $_script ]; then + _script="${_chroot}${_chroot:+/}$_procname" + if [ -r "$_script" ]; then read _interp < $_script # read interpreter name case "$_interp" in \#!*) @@ -710,7 +710,7 @@ run_rc_command() return 1 fi - if [ ! -x ${_chroot}${_chroot:+"/"}${command} ]; then + if [ ! -x "${_chroot}${_chroot:+/}${command}" ]; then warn "run_rc_command: cannot run $command" return 1 fi