From owner-svn-src-user@FreeBSD.ORG Sun May 2 03:28:29 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AAEDF1065670; Sun, 2 May 2010 03:28:29 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 9BD058FC15; Sun, 2 May 2010 03:28:29 +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 o423STrH031451; Sun, 2 May 2010 03:28:29 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o423STaw031449; Sun, 2 May 2010 03:28:29 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005020328.o423STaw031449@svn.freebsd.org> From: Doug Barton Date: Sun, 2 May 2010 03:28:29 +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: r207489 - 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: Sun, 02 May 2010 03:28:29 -0000 Author: dougb Date: Sun May 2 03:28:29 2010 New Revision: 207489 URL: http://svn.freebsd.org/changeset/base/207489 Log: In a couple places where default value setting is overly complex (including a couple of the places related to the recent ro_upg_port changes) simplify the code. When checking stat(1) for the INDEX updates we really want to check the time when the file was last modified for pedantic value, although in this scenario the practical effect was the same. In --check-port-dbdir we now need to check if the values in the loop are directories, since origin_from_pdb() now emits an error if it can't find ORIGIN. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun May 2 02:00:20 2010 (r207488) +++ user/dougb/portmaster/portmaster Sun May 2 03:28:29 2010 (r207489) @@ -129,7 +129,7 @@ kill_bad_children () { } parent_exit () { - local files p f show_list + local files f show_list if [ -s "$DI_FILES" ]; then grep -q '%%%%%%%%%%%%' $DI_FILES || kill_bad_children @@ -169,11 +169,11 @@ parent_exit () { echo '' fi - [ -n "$PAGER" ] && p=$PAGER || p='less -e' + : ${PAGER:='less -e'} ( for f in $DISPLAY_LIST; do echo "===>>> pkg-message for $f" ; cat $pdb/$f/+DISPLAY ; echo '' done - echo "===>>> Done displaying pkg-message files" ) | $p + echo "===>>> Done displaying pkg-message files" ) | $PAGER ;; esac @@ -504,10 +504,10 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then fi PM_INDEX="${INDEXDIR}/${INDEXFILE}" - index_time=`stat -f '%Ua' ${PM_INDEX}.bz2 2>/dev/null` + index_time=`stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` pm_sv Updating INDEX file $PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2 - if [ $index_time -ne `stat -f '%Ua' ${PM_INDEX}.bz2 2>/dev/null` ]; then + if [ $index_time -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then temp_index=`pm_mktemp index` bunzip2 < ${PM_INDEX}.bz2 > $temp_index pm_install_s $temp_index $PM_INDEX @@ -997,6 +997,8 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then echo "===>>> Building list of installed port names"; echo '' for pkg in $pdb/*; do + [ -d $pkg ] || continue + unset unique_name iport=${pkg#$pdb/} @@ -3196,9 +3198,7 @@ fi # Ignore if no old port exists if [ -n "$upg_port" -o -n "$ro_upg_port" ]; then - UPGRADE_PORT=$upg_port - [ -n "$ro_upg_port" ] && UPGRADE_PORT="$ro_upg_port" - + UPGRADE_PORT="${ro_upg_port:-$upg_port}" UPGRADE_PORT_VER=`echo $UPGRADE_PORT | sed 's#.*-\(.*\)#\1#'` export UPGRADE_PORT UPGRADE_PORT_VER @@ -3253,7 +3253,7 @@ fi install_failed () { local upg_port - [ -n "$ro_upg_port" ] && upg_port="$ro_upg_port" + upg_port="${ro_upg_port:-$upg_port}" if [ -z "$NO_BACKUP" -a -n "$upg_port" ]; then echo '' From owner-svn-src-user@FreeBSD.ORG Sun May 2 21:11:47 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DEB57106566C; Sun, 2 May 2010 21:11:47 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id CF5548FC0C; Sun, 2 May 2010 21:11: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 o42LBlYQ074848; Sun, 2 May 2010 21:11:47 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o42LBlDq074846; Sun, 2 May 2010 21:11:47 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201005022111.o42LBlDq074846@svn.freebsd.org> From: Doug Barton Date: Sun, 2 May 2010 21:11: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: r207542 - 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: Sun, 02 May 2010 21:11:48 -0000 Author: dougb Date: Sun May 2 21:11:47 2010 New Revision: 207542 URL: http://svn.freebsd.org/changeset/base/207542 Log: Minor whitespace twiddles Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun May 2 21:04:59 2010 (r207541) +++ user/dougb/portmaster/portmaster Sun May 2 21:11:47 2010 (r207542) @@ -173,7 +173,7 @@ parent_exit () { ( for f in $DISPLAY_LIST; do echo "===>>> pkg-message for $f" ; cat $pdb/$f/+DISPLAY ; echo '' done - echo "===>>> Done displaying pkg-message files" ) | $PAGER + echo "===>>> Done displaying pkg-message files" ; echo '' ) | $PAGER ;; esac @@ -1363,7 +1363,7 @@ pm_pkg_create () { pkgdir=${PACKAGES}/All echo "===>>> Creating a package for new version $2" else - pkgdir=$1 + pkgdir=$1 ; echo '' echo "===>>> Creating a backup package for old version $2" fi @@ -2602,7 +2602,7 @@ all_config () { fi done - echo "===>>> Update check of installed ports complete" + echo "===>>> Update check of installed ports complete" ; echo '' safe_exit fi From owner-svn-src-user@FreeBSD.ORG Mon May 3 06:25:36 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C1231065679; Mon, 3 May 2010 06:25:36 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 546508FC22; Mon, 3 May 2010 06:25:36 +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 o436PaRN096179; Mon, 3 May 2010 06:25:36 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o436Pahh096178; Mon, 3 May 2010 06:25:36 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201005030625.o436Pahh096178@svn.freebsd.org> From: Warner Losh Date: Mon, 3 May 2010 06:25:36 +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: r207549 - user/imp/masq 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, 03 May 2010 06:25:36 -0000 Author: imp Date: Mon May 3 06:25:36 2010 New Revision: 207549 URL: http://svn.freebsd.org/changeset/base/207549 Log: branch for masq Added: user/imp/masq/ From owner-svn-src-user@FreeBSD.ORG Mon May 3 06:26:53 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 45D911065670; Mon, 3 May 2010 06:26:53 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 1D3C98FC12; Mon, 3 May 2010 06:26:53 +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 o436QqPj096506; Mon, 3 May 2010 06:26:52 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o436Qqun096505; Mon, 3 May 2010 06:26:52 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201005030626.o436Qqun096505@svn.freebsd.org> From: Warner Losh Date: Mon, 3 May 2010 06:26:52 +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: r207550 - user/imp/masq/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, 03 May 2010 06:26:53 -0000 Author: imp Date: Mon May 3 06:26:52 2010 New Revision: 207550 URL: http://svn.freebsd.org/changeset/base/207550 Log: Kernel branch for masq project... Added: - copied from r207549, head/sys/ Directory Properties: user/imp/masq/sys/ (props changed) From owner-svn-src-user@FreeBSD.ORG Mon May 3 08:57:49 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 64F271065673; Mon, 3 May 2010 08:57:49 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 5396D8FC12; Mon, 3 May 2010 08:57:49 +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 o438vnxn029801; Mon, 3 May 2010 08:57:49 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o438vnsW029762; Mon, 3 May 2010 08:57:49 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201005030857.o438vnsW029762@svn.freebsd.org> From: Juli Mallett Date: Mon, 3 May 2010 08:57:49 +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: r207556 - in user/jmallett/octeon/sys/dev/ath/ath_hal: ar5210 ar5211 ar5212 ar5312 ar5416 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, 03 May 2010 08:57:49 -0000 Author: jmallett Date: Mon May 3 08:57:48 2010 New Revision: 207556 URL: http://svn.freebsd.org/changeset/base/207556 Log: Print bus handles with uintmax_t casts and %#jx not pointer casts and %p. Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -180,8 +180,8 @@ ar5210Attach(uint16_t devid, HAL_SOFTC s int i; HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, - "%s: devid 0x%x sc %p st %p sh %p\n", __func__, devid, - sc, (void*) st, (void*) sh); + "%s: devid 0x%x sc %p st %p sh %#jx\n", __func__, devid, + sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp = ath_hal_malloc(sizeof (struct ath_hal_5210)); Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -197,8 +197,8 @@ ar5211Attach(uint16_t devid, HAL_SOFTC s uint16_t eeval; HAL_STATUS ecode; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp = ath_hal_malloc(sizeof (struct ath_hal_5211)); Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -305,8 +305,8 @@ ar5212Attach(uint16_t devid, HAL_SOFTC s uint16_t eeval; HAL_STATUS ecode; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp = ath_hal_malloc(sizeof (struct ath_hal_5212)); Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -70,8 +70,8 @@ ar5312Attach(uint16_t devid, HAL_SOFTC s uint16_t eeval; HAL_STATUS ecode; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp = ath_hal_malloc(sizeof (struct ath_hal_5212)); Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -198,8 +198,8 @@ ar5416Attach(uint16_t devid, HAL_SOFTC s HAL_STATUS ecode; HAL_BOOL rfStatus; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416) + Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -98,8 +98,8 @@ ar9160Attach(uint16_t devid, HAL_SOFTC s HAL_STATUS ecode; HAL_BOOL rfStatus; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416)); Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -86,8 +86,8 @@ ar9280Attach(uint16_t devid, HAL_SOFTC s HAL_STATUS ecode; HAL_BOOL rfStatus; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp9280 = ath_hal_malloc(sizeof (struct ath_hal_9280)); Modified: user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c ============================================================================== --- user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c Mon May 3 07:39:51 2010 (r207555) +++ user/jmallett/octeon/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c Mon May 3 08:57:48 2010 (r207556) @@ -88,8 +88,8 @@ ar9285Attach(uint16_t devid, HAL_SOFTC s HAL_STATUS ecode; HAL_BOOL rfStatus; - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); + HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %#jx\n", + __func__, sc, (void*) st, (uintmax_t) sh); /* NB: memory is returned zero'd */ ahp9285 = ath_hal_malloc(sizeof (struct ath_hal_9285)); From owner-svn-src-user@FreeBSD.ORG Mon May 3 09:28:12 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3489F106566C; Mon, 3 May 2010 09:28:12 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44]) by mx1.freebsd.org (Postfix) with ESMTP id 2030E8FC27; Mon, 3 May 2010 09:28:12 +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 o439SCt7036456; Mon, 3 May 2010 09:28:12 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o439SBlM036426; Mon, 3 May 2010 09:28:11 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201005030928.o439SBlM036426@svn.freebsd.org> From: Juli Mallett Date: Mon, 3 May 2010 09:28: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: r207557 - in user/jmallett/octeon: . bin/ln bin/sh contrib/telnet/telnet contrib/top contrib/tzdata crypto/openssh crypto/openssh/openbsd-compat etc etc/defaults etc/devd etc/mtree etc/... 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, 03 May 2010 09:28:12 -0000 Author: jmallett Date: Mon May 3 09:28:10 2010 New Revision: 207557 URL: http://svn.freebsd.org/changeset/base/207557 Log: Merge from head. Added: user/jmallett/octeon/lib/libpkg/ - copied from r207556, head/lib/libpkg/ user/jmallett/octeon/sbin/fsck_ffs/suj.c - copied unchanged from r207556, head/sbin/fsck_ffs/suj.c user/jmallett/octeon/share/man/man4/mvs.4 - copied unchanged from r207556, head/share/man/man4/mvs.4 user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype1i.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/compiler/aslrestype1i.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype2d.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/compiler/aslrestype2d.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype2e.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/compiler/aslrestype2e.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype2q.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/compiler/aslrestype2q.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype2w.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/compiler/aslrestype2w.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeinit.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/events/evgpeinit.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeutil.c - copied unchanged from r207556, head/sys/contrib/dev/acpica/events/evgpeutil.c user/jmallett/octeon/sys/dev/io/iodev.h - copied unchanged from r207556, head/sys/dev/io/iodev.h user/jmallett/octeon/sys/dev/mvs/ - copied from r207556, head/sys/dev/mvs/ user/jmallett/octeon/sys/modules/mvs/ - copied from r207556, head/sys/modules/mvs/ user/jmallett/octeon/sys/sparc64/include/mcntl.h - copied unchanged from r207556, head/sys/sparc64/include/mcntl.h user/jmallett/octeon/sys/sparc64/sparc64/zeus.c - copied unchanged from r207556, head/sys/sparc64/sparc64/zeus.c user/jmallett/octeon/tools/regression/bin/sh/expansion/trim3.0 - copied unchanged from r207556, head/tools/regression/bin/sh/expansion/trim3.0 user/jmallett/octeon/tools/test/testfloat/ - copied from r207556, head/tools/test/testfloat/ Deleted: user/jmallett/octeon/sys/cddl/dev/cyclic/amd64/ user/jmallett/octeon/usr.sbin/pkg_install/lib/ Modified: user/jmallett/octeon/Makefile.inc1 user/jmallett/octeon/UPDATING user/jmallett/octeon/bin/ln/ln.c user/jmallett/octeon/bin/ln/symlink.7 user/jmallett/octeon/bin/sh/arith.y user/jmallett/octeon/bin/sh/arith_lex.l user/jmallett/octeon/bin/sh/expand.c user/jmallett/octeon/contrib/telnet/telnet/commands.c user/jmallett/octeon/contrib/telnet/telnet/externs.h user/jmallett/octeon/contrib/telnet/telnet/network.c user/jmallett/octeon/contrib/telnet/telnet/sys_bsd.c user/jmallett/octeon/contrib/telnet/telnet/telnet.c user/jmallett/octeon/contrib/telnet/telnet/terminal.c user/jmallett/octeon/contrib/top/utils.c user/jmallett/octeon/contrib/tzdata/africa user/jmallett/octeon/contrib/tzdata/asia user/jmallett/octeon/contrib/tzdata/southamerica user/jmallett/octeon/crypto/openssh/ChangeLog user/jmallett/octeon/crypto/openssh/README user/jmallett/octeon/crypto/openssh/auth-options.c user/jmallett/octeon/crypto/openssh/auth2-pubkey.c user/jmallett/octeon/crypto/openssh/channels.c user/jmallett/octeon/crypto/openssh/clientloop.c user/jmallett/octeon/crypto/openssh/config.h user/jmallett/octeon/crypto/openssh/config.h.in user/jmallett/octeon/crypto/openssh/defines.h user/jmallett/octeon/crypto/openssh/key.c user/jmallett/octeon/crypto/openssh/key.h user/jmallett/octeon/crypto/openssh/loginrec.c user/jmallett/octeon/crypto/openssh/logintest.c user/jmallett/octeon/crypto/openssh/openbsd-compat/bsd-arc4random.c user/jmallett/octeon/crypto/openssh/servconf.c user/jmallett/octeon/crypto/openssh/session.c user/jmallett/octeon/crypto/openssh/ssh-keygen.1 user/jmallett/octeon/crypto/openssh/ssh-keygen.c user/jmallett/octeon/crypto/openssh/ssh-pkcs11-helper.c user/jmallett/octeon/crypto/openssh/ssh.1 user/jmallett/octeon/crypto/openssh/ssh_config user/jmallett/octeon/crypto/openssh/ssh_config.5 user/jmallett/octeon/crypto/openssh/sshd_config user/jmallett/octeon/crypto/openssh/sshd_config.5 user/jmallett/octeon/crypto/openssh/version.h user/jmallett/octeon/etc/defaults/rc.conf user/jmallett/octeon/etc/devd.conf user/jmallett/octeon/etc/devd/uath.conf user/jmallett/octeon/etc/mtree/BSD.usr.dist user/jmallett/octeon/etc/rc.d/named user/jmallett/octeon/etc/rc.d/routing user/jmallett/octeon/gnu/usr.bin/groff/tmac/mdoc.local user/jmallett/octeon/include/stdlib.h user/jmallett/octeon/lib/Makefile user/jmallett/octeon/lib/libc/gen/sysctl.3 user/jmallett/octeon/lib/libc/stdlib/realpath.3 user/jmallett/octeon/lib/libc/stdlib/realpath.c user/jmallett/octeon/lib/libc/sys/unlink.2 user/jmallett/octeon/lib/libkvm/kvm.3 user/jmallett/octeon/lib/libpam/modules/pam_krb5/pam_krb5.8 user/jmallett/octeon/lib/libpam/modules/pam_krb5/pam_krb5.c user/jmallett/octeon/lib/libpmc/libpmc.c user/jmallett/octeon/lib/libufs/Makefile user/jmallett/octeon/lib/libufs/cgroup.c user/jmallett/octeon/lib/libufs/inode.c user/jmallett/octeon/lib/libufs/libufs.h user/jmallett/octeon/lib/libufs/sblock.c user/jmallett/octeon/lib/libufs/type.c user/jmallett/octeon/lib/libz/ChangeLog user/jmallett/octeon/lib/libz/README user/jmallett/octeon/lib/libz/crc32.c user/jmallett/octeon/lib/libz/deflate.c user/jmallett/octeon/lib/libz/deflate.h user/jmallett/octeon/lib/libz/gzguts.h user/jmallett/octeon/lib/libz/gzlib.c user/jmallett/octeon/lib/libz/inffast.c user/jmallett/octeon/lib/libz/inffast.h user/jmallett/octeon/lib/libz/inftrees.c user/jmallett/octeon/lib/libz/inftrees.h user/jmallett/octeon/lib/libz/trees.c user/jmallett/octeon/lib/libz/trees.h user/jmallett/octeon/lib/libz/zconf.h user/jmallett/octeon/lib/libz/zlib.3 user/jmallett/octeon/lib/libz/zlib.h user/jmallett/octeon/lib/libz/zutil.c user/jmallett/octeon/lib/libz/zutil.h user/jmallett/octeon/release/powerpc/boot_crunch.conf user/jmallett/octeon/sbin/camcontrol/camcontrol.8 user/jmallett/octeon/sbin/camcontrol/camcontrol.c user/jmallett/octeon/sbin/devd/devd.conf.5 user/jmallett/octeon/sbin/dumpfs/dumpfs.c user/jmallett/octeon/sbin/fsck_ffs/Makefile user/jmallett/octeon/sbin/fsck_ffs/fsck.h user/jmallett/octeon/sbin/fsck_ffs/gjournal.c user/jmallett/octeon/sbin/fsck_ffs/main.c user/jmallett/octeon/sbin/fsck_ffs/pass5.c user/jmallett/octeon/sbin/fsdb/fsdb.c user/jmallett/octeon/sbin/fsdb/fsdbutil.c user/jmallett/octeon/sbin/geom/class/part/geom_part.c user/jmallett/octeon/sbin/geom/class/part/gpart.8 user/jmallett/octeon/sbin/hastctl/Makefile user/jmallett/octeon/sbin/hastd/Makefile user/jmallett/octeon/sbin/hastd/hast.conf.5 user/jmallett/octeon/sbin/hastd/hast.h user/jmallett/octeon/sbin/hastd/hast_proto.c user/jmallett/octeon/sbin/hastd/hastd.c user/jmallett/octeon/sbin/hastd/metadata.c user/jmallett/octeon/sbin/hastd/parse.y user/jmallett/octeon/sbin/hastd/primary.c user/jmallett/octeon/sbin/hastd/proto.c user/jmallett/octeon/sbin/hastd/proto.h user/jmallett/octeon/sbin/hastd/proto_common.c user/jmallett/octeon/sbin/hastd/proto_tcp4.c user/jmallett/octeon/sbin/hastd/secondary.c user/jmallett/octeon/sbin/hastd/token.l user/jmallett/octeon/sbin/ifconfig/ifconfig.8 user/jmallett/octeon/sbin/ifconfig/ifieee80211.c user/jmallett/octeon/sbin/ipfw/dummynet.c user/jmallett/octeon/sbin/ipfw/ipfw2.c user/jmallett/octeon/sbin/ipfw/ipfw2.h user/jmallett/octeon/sbin/ping6/ping6.8 user/jmallett/octeon/sbin/ping6/ping6.c user/jmallett/octeon/sbin/tunefs/Makefile user/jmallett/octeon/sbin/tunefs/tunefs.8 user/jmallett/octeon/sbin/tunefs/tunefs.c user/jmallett/octeon/share/examples/Makefile user/jmallett/octeon/share/man/man1/builtin.1 user/jmallett/octeon/share/man/man4/Makefile user/jmallett/octeon/share/man/man4/bwn.4 user/jmallett/octeon/share/man/man4/msk.4 user/jmallett/octeon/share/man/man4/sge.4 user/jmallett/octeon/share/man/man4/vlan.4 user/jmallett/octeon/share/man/man5/rc.conf.5 user/jmallett/octeon/share/man/man9/alq.9 user/jmallett/octeon/share/man/man9/ieee80211.9 user/jmallett/octeon/share/man/man9/ieee80211_node.9 user/jmallett/octeon/share/misc/committers-src.dot user/jmallett/octeon/share/mk/bsd.cpu.mk user/jmallett/octeon/share/mk/bsd.libnames.mk user/jmallett/octeon/sys/amd64/amd64/bpf_jit_machdep.c user/jmallett/octeon/sys/amd64/amd64/bpf_jit_machdep.h user/jmallett/octeon/sys/amd64/amd64/io.c user/jmallett/octeon/sys/amd64/amd64/local_apic.c user/jmallett/octeon/sys/amd64/amd64/pmap.c user/jmallett/octeon/sys/amd64/amd64/trap.c user/jmallett/octeon/sys/amd64/conf/GENERIC user/jmallett/octeon/sys/amd64/ia32/ia32_signal.c user/jmallett/octeon/sys/amd64/include/iodev.h user/jmallett/octeon/sys/amd64/include/pmap.h user/jmallett/octeon/sys/amd64/include/proc.h user/jmallett/octeon/sys/amd64/include/vmparam.h user/jmallett/octeon/sys/arm/arm/pmap.c user/jmallett/octeon/sys/arm/at91/if_ate.c user/jmallett/octeon/sys/arm/conf/DB-78XXX user/jmallett/octeon/sys/arm/conf/DB-88F5XXX user/jmallett/octeon/sys/arm/conf/DB-88F6XXX user/jmallett/octeon/sys/arm/conf/HL200 user/jmallett/octeon/sys/arm/conf/KB920X user/jmallett/octeon/sys/arm/conf/LN2410SBC user/jmallett/octeon/sys/arm/conf/SHEEVAPLUG user/jmallett/octeon/sys/arm/include/pmap.h user/jmallett/octeon/sys/arm/include/proc.h user/jmallett/octeon/sys/arm/mv/files.mv user/jmallett/octeon/sys/arm/xscale/ixp425/if_npe.c user/jmallett/octeon/sys/boot/sparc64/loader/main.c user/jmallett/octeon/sys/cam/ata/ata_da.c user/jmallett/octeon/sys/cam/ata/ata_pmp.c user/jmallett/octeon/sys/cam/ata/ata_xpt.c user/jmallett/octeon/sys/cam/cam_ccb.h user/jmallett/octeon/sys/cam/cam_xpt.c user/jmallett/octeon/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c user/jmallett/octeon/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c user/jmallett/octeon/sys/cddl/dev/cyclic/i386/cyclic_machdep.c user/jmallett/octeon/sys/compat/freebsd32/freebsd32.h user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c user/jmallett/octeon/sys/compat/freebsd32/freebsd32_util.h user/jmallett/octeon/sys/compat/x86bios/x86bios.c user/jmallett/octeon/sys/conf/NOTES user/jmallett/octeon/sys/conf/files user/jmallett/octeon/sys/conf/files.sparc64 user/jmallett/octeon/sys/conf/files.sun4v user/jmallett/octeon/sys/conf/kern.pre.mk user/jmallett/octeon/sys/conf/kmod.mk user/jmallett/octeon/sys/conf/options user/jmallett/octeon/sys/contrib/dev/acpica/acpica_prep.sh user/jmallett/octeon/sys/contrib/dev/acpica/changes.txt user/jmallett/octeon/sys/contrib/dev/acpica/common/adisasm.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompile.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asldefine.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslfiles.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslglobal.h user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asllisting.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslmain.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslpredef.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslresource.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype1.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslrestype2.c user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltypes.h user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbcmds.c user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbdisply.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpe.c user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeblk.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exconfig.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exoparg1.c user/jmallett/octeon/sys/contrib/dev/acpica/executer/exsystem.c user/jmallett/octeon/sys/contrib/dev/acpica/include/acevents.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acglobal.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acinterp.h user/jmallett/octeon/sys/contrib/dev/acpica/include/aclocal.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acpiosxf.h user/jmallett/octeon/sys/contrib/dev/acpica/include/acpixf.h user/jmallett/octeon/sys/contrib/dev/acpica/include/actypes.h user/jmallett/octeon/sys/contrib/dev/acpica/include/amlresrc.h user/jmallett/octeon/sys/contrib/dev/acpica/osunixxf.c user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbfind.c user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbinstal.c user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbutils.c user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbxface.c user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utcopy.c user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utglobal.c user/jmallett/octeon/sys/contrib/dev/acpica/utilities/uttrack.c user/jmallett/octeon/sys/contrib/ipfilter/netinet/ip_auth.c user/jmallett/octeon/sys/dev/acpica/Osd/OsdHardware.c user/jmallett/octeon/sys/dev/ae/if_ae.c user/jmallett/octeon/sys/dev/age/if_age.c user/jmallett/octeon/sys/dev/ahci/ahci.c user/jmallett/octeon/sys/dev/ahci/ahci.h user/jmallett/octeon/sys/dev/alc/if_alc.c user/jmallett/octeon/sys/dev/ale/if_ale.c user/jmallett/octeon/sys/dev/an/if_an.c user/jmallett/octeon/sys/dev/ata/ata-all.c user/jmallett/octeon/sys/dev/ata/ata-queue.c user/jmallett/octeon/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c user/jmallett/octeon/sys/dev/ath/if_ath.c user/jmallett/octeon/sys/dev/atkbdc/atkbdc.c user/jmallett/octeon/sys/dev/atkbdc/atkbdc_ebus.c user/jmallett/octeon/sys/dev/atkbdc/atkbdc_isa.c user/jmallett/octeon/sys/dev/atkbdc/atkbdcreg.h user/jmallett/octeon/sys/dev/bce/if_bce.c user/jmallett/octeon/sys/dev/bce/if_bcereg.h user/jmallett/octeon/sys/dev/bge/if_bge.c user/jmallett/octeon/sys/dev/bwi/if_bwi.c user/jmallett/octeon/sys/dev/bwn/if_bwn.c user/jmallett/octeon/sys/dev/ce/if_ce.c user/jmallett/octeon/sys/dev/ciss/ciss.c user/jmallett/octeon/sys/dev/cm/smc90cx6.c user/jmallett/octeon/sys/dev/cp/if_cp.c user/jmallett/octeon/sys/dev/cs/if_cs.c user/jmallett/octeon/sys/dev/ctau/if_ct.c user/jmallett/octeon/sys/dev/cx/if_cx.c user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c user/jmallett/octeon/sys/dev/drm/ati_pcigart.c user/jmallett/octeon/sys/dev/drm/drmP.h user/jmallett/octeon/sys/dev/drm/drm_bufs.c user/jmallett/octeon/sys/dev/drm/drm_context.c user/jmallett/octeon/sys/dev/drm/drm_drv.c user/jmallett/octeon/sys/dev/drm/drm_hashtab.c user/jmallett/octeon/sys/dev/drm/drm_memory.c user/jmallett/octeon/sys/dev/drm/drm_mm.c user/jmallett/octeon/sys/dev/drm/drm_scatter.c user/jmallett/octeon/sys/dev/drm/drm_sman.c user/jmallett/octeon/sys/dev/drm/drm_sysctl.c user/jmallett/octeon/sys/dev/drm/drm_vm.c user/jmallett/octeon/sys/dev/drm/i915_dma.c user/jmallett/octeon/sys/dev/drm/mach64_dma.c user/jmallett/octeon/sys/dev/drm/mga_dma.c user/jmallett/octeon/sys/dev/drm/mga_warp.c user/jmallett/octeon/sys/dev/drm/r128_cce.c user/jmallett/octeon/sys/dev/drm/r128_state.c user/jmallett/octeon/sys/dev/drm/r600_blit.c user/jmallett/octeon/sys/dev/drm/r600_cp.c user/jmallett/octeon/sys/dev/drm/radeon_cp.c user/jmallett/octeon/sys/dev/drm/radeon_cs.c user/jmallett/octeon/sys/dev/drm/radeon_state.c user/jmallett/octeon/sys/dev/drm/savage_bci.c user/jmallett/octeon/sys/dev/drm/via_dma.c user/jmallett/octeon/sys/dev/drm/via_dmablit.c user/jmallett/octeon/sys/dev/drm/via_map.c user/jmallett/octeon/sys/dev/drm/via_mm.c user/jmallett/octeon/sys/dev/drm/via_video.c user/jmallett/octeon/sys/dev/e1000/if_em.c user/jmallett/octeon/sys/dev/ed/if_ed.c user/jmallett/octeon/sys/dev/ep/if_ep.c user/jmallett/octeon/sys/dev/esp/esp_sbus.c user/jmallett/octeon/sys/dev/ex/if_ex.c user/jmallett/octeon/sys/dev/fe/if_fe.c user/jmallett/octeon/sys/dev/fxp/if_fxp.c user/jmallett/octeon/sys/dev/hwpmc/hwpmc_mod.c user/jmallett/octeon/sys/dev/ie/if_ie.c user/jmallett/octeon/sys/dev/iicbus/if_ic.c user/jmallett/octeon/sys/dev/io/iodev.c user/jmallett/octeon/sys/dev/ipw/if_ipw.c user/jmallett/octeon/sys/dev/iwi/if_iwi.c user/jmallett/octeon/sys/dev/iwn/if_iwn.c user/jmallett/octeon/sys/dev/le/lance.c user/jmallett/octeon/sys/dev/malo/if_malo.c user/jmallett/octeon/sys/dev/mii/brgphy.c user/jmallett/octeon/sys/dev/mii/e1000phy.c user/jmallett/octeon/sys/dev/mii/miidevs user/jmallett/octeon/sys/dev/mpt/mpt.c user/jmallett/octeon/sys/dev/mpt/mpt.h user/jmallett/octeon/sys/dev/mpt/mpt_cam.c user/jmallett/octeon/sys/dev/mpt/mpt_pci.c user/jmallett/octeon/sys/dev/msk/if_msk.c user/jmallett/octeon/sys/dev/msk/if_mskreg.h user/jmallett/octeon/sys/dev/mwl/if_mwl.c user/jmallett/octeon/sys/dev/my/if_my.c user/jmallett/octeon/sys/dev/nfe/if_nfe.c user/jmallett/octeon/sys/dev/nxge/if_nxge.c user/jmallett/octeon/sys/dev/pdq/pdq_ifsubr.c user/jmallett/octeon/sys/dev/ppbus/if_plip.c user/jmallett/octeon/sys/dev/quicc/quicc_bfe.h user/jmallett/octeon/sys/dev/ral/rt2560.c user/jmallett/octeon/sys/dev/ral/rt2661.c user/jmallett/octeon/sys/dev/sbni/if_sbni.c user/jmallett/octeon/sys/dev/sge/if_sge.c user/jmallett/octeon/sys/dev/sge/if_sgereg.h user/jmallett/octeon/sys/dev/siis/siis.c user/jmallett/octeon/sys/dev/siis/siis.h user/jmallett/octeon/sys/dev/sis/if_sis.c user/jmallett/octeon/sys/dev/smc/if_smc.c user/jmallett/octeon/sys/dev/sn/if_sn.c user/jmallett/octeon/sys/dev/snc/dp83932.c user/jmallett/octeon/sys/dev/sound/pcm/buffer.c user/jmallett/octeon/sys/dev/sound/usb/uaudio.c user/jmallett/octeon/sys/dev/sym/sym_hipd.c user/jmallett/octeon/sys/dev/uart/uart_dev_ns8250.c user/jmallett/octeon/sys/dev/usb/controller/ehci.c user/jmallett/octeon/sys/dev/usb/controller/uhci.c user/jmallett/octeon/sys/dev/usb/controller/uss820dci.c user/jmallett/octeon/sys/dev/usb/input/atp.c user/jmallett/octeon/sys/dev/usb/input/uhid.c user/jmallett/octeon/sys/dev/usb/input/ukbd.c user/jmallett/octeon/sys/dev/usb/input/ums.c user/jmallett/octeon/sys/dev/usb/misc/udbp.c user/jmallett/octeon/sys/dev/usb/net/if_aue.c user/jmallett/octeon/sys/dev/usb/net/if_axe.c user/jmallett/octeon/sys/dev/usb/net/if_cdce.c user/jmallett/octeon/sys/dev/usb/net/if_cue.c user/jmallett/octeon/sys/dev/usb/net/if_kue.c user/jmallett/octeon/sys/dev/usb/net/if_rue.c user/jmallett/octeon/sys/dev/usb/net/if_udav.c user/jmallett/octeon/sys/dev/usb/net/uhso.c user/jmallett/octeon/sys/dev/usb/net/usb_ethernet.c user/jmallett/octeon/sys/dev/usb/serial/u3g.c user/jmallett/octeon/sys/dev/usb/serial/ubsa.c user/jmallett/octeon/sys/dev/usb/serial/ubser.c user/jmallett/octeon/sys/dev/usb/serial/uchcom.c user/jmallett/octeon/sys/dev/usb/serial/uftdi.c user/jmallett/octeon/sys/dev/usb/serial/ulpt.c user/jmallett/octeon/sys/dev/usb/serial/umodem.c user/jmallett/octeon/sys/dev/usb/serial/umoscom.c user/jmallett/octeon/sys/dev/usb/serial/uplcom.c user/jmallett/octeon/sys/dev/usb/serial/usb_serial.c user/jmallett/octeon/sys/dev/usb/serial/uslcom.c user/jmallett/octeon/sys/dev/usb/serial/uvisor.c user/jmallett/octeon/sys/dev/usb/serial/uvscom.c user/jmallett/octeon/sys/dev/usb/storage/umass.c user/jmallett/octeon/sys/dev/usb/storage/urio.c user/jmallett/octeon/sys/dev/usb/storage/ustorage_fs.c user/jmallett/octeon/sys/dev/usb/usb_compat_linux.c user/jmallett/octeon/sys/dev/usb/usb_debug.h user/jmallett/octeon/sys/dev/usb/usb_dev.c user/jmallett/octeon/sys/dev/usb/usb_device.c user/jmallett/octeon/sys/dev/usb/usb_device.h user/jmallett/octeon/sys/dev/usb/usb_freebsd.h user/jmallett/octeon/sys/dev/usb/usb_generic.c user/jmallett/octeon/sys/dev/usb/usb_hub.c user/jmallett/octeon/sys/dev/usb/usb_request.c user/jmallett/octeon/sys/dev/usb/usb_transfer.c user/jmallett/octeon/sys/dev/usb/usb_transfer.h user/jmallett/octeon/sys/dev/usb/wlan/if_rum.c user/jmallett/octeon/sys/dev/usb/wlan/if_run.c user/jmallett/octeon/sys/dev/usb/wlan/if_uath.c user/jmallett/octeon/sys/dev/usb/wlan/if_upgt.c user/jmallett/octeon/sys/dev/usb/wlan/if_ural.c user/jmallett/octeon/sys/dev/usb/wlan/if_urtw.c user/jmallett/octeon/sys/dev/usb/wlan/if_zyd.c user/jmallett/octeon/sys/dev/vx/if_vx.c user/jmallett/octeon/sys/dev/wi/if_wi.c user/jmallett/octeon/sys/dev/wl/if_wl.c user/jmallett/octeon/sys/dev/wpi/if_wpi.c user/jmallett/octeon/sys/dev/xe/if_xe.c user/jmallett/octeon/sys/fs/nfs/nfs_commonkrpc.c user/jmallett/octeon/sys/fs/nfs/nfs_commonport.c user/jmallett/octeon/sys/fs/nfs/nfs_var.h user/jmallett/octeon/sys/fs/nfs/nfsport.h user/jmallett/octeon/sys/fs/nfsclient/nfs.h user/jmallett/octeon/sys/fs/nfsclient/nfs_clbio.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clnfsiod.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clnode.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clrpcops.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clstate.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clvfsops.c user/jmallett/octeon/sys/fs/nfsclient/nfs_clvnops.c user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdstate.c user/jmallett/octeon/sys/fs/pseudofs/pseudofs_vnops.c user/jmallett/octeon/sys/fs/tmpfs/tmpfs_vnops.c user/jmallett/octeon/sys/geom/geom_subr.c user/jmallett/octeon/sys/geom/part/g_part.c user/jmallett/octeon/sys/geom/part/g_part_apm.c user/jmallett/octeon/sys/geom/part/g_part_bsd.c user/jmallett/octeon/sys/geom/part/g_part_gpt.c user/jmallett/octeon/sys/geom/part/g_part_if.m user/jmallett/octeon/sys/geom/part/g_part_mbr.c user/jmallett/octeon/sys/geom/part/g_part_pc98.c user/jmallett/octeon/sys/geom/part/g_part_vtoc8.c user/jmallett/octeon/sys/i386/conf/GENERIC user/jmallett/octeon/sys/i386/conf/XBOX user/jmallett/octeon/sys/i386/i386/bpf_jit_machdep.c user/jmallett/octeon/sys/i386/i386/bpf_jit_machdep.h user/jmallett/octeon/sys/i386/i386/io.c user/jmallett/octeon/sys/i386/i386/local_apic.c user/jmallett/octeon/sys/i386/i386/pmap.c user/jmallett/octeon/sys/i386/include/iodev.h user/jmallett/octeon/sys/i386/include/pmap.h user/jmallett/octeon/sys/i386/include/proc.h user/jmallett/octeon/sys/i386/xen/pmap.c user/jmallett/octeon/sys/ia64/conf/GENERIC user/jmallett/octeon/sys/ia64/ia64/iodev_machdep.c user/jmallett/octeon/sys/ia64/ia64/pmap.c user/jmallett/octeon/sys/ia64/include/iodev.h user/jmallett/octeon/sys/ia64/include/pmap.h user/jmallett/octeon/sys/ia64/include/proc.h user/jmallett/octeon/sys/kern/imgact_elf.c user/jmallett/octeon/sys/kern/kern_alq.c user/jmallett/octeon/sys/kern/kern_clock.c user/jmallett/octeon/sys/kern/kern_descrip.c user/jmallett/octeon/sys/kern/kern_exec.c user/jmallett/octeon/sys/kern/kern_gzio.c user/jmallett/octeon/sys/kern/kern_ntptime.c user/jmallett/octeon/sys/kern/kern_proc.c user/jmallett/octeon/sys/kern/kern_resource.c user/jmallett/octeon/sys/kern/kern_shutdown.c user/jmallett/octeon/sys/kern/kern_sig.c user/jmallett/octeon/sys/kern/subr_bus.c user/jmallett/octeon/sys/kern/subr_taskqueue.c user/jmallett/octeon/sys/kern/subr_witness.c user/jmallett/octeon/sys/kern/sys_pipe.c user/jmallett/octeon/sys/kern/sys_process.c user/jmallett/octeon/sys/kern/uipc_cow.c user/jmallett/octeon/sys/kern/uipc_mbuf.c user/jmallett/octeon/sys/kern/uipc_syscalls.c user/jmallett/octeon/sys/kern/vfs_bio.c user/jmallett/octeon/sys/kern/vfs_cache.c user/jmallett/octeon/sys/kern/vfs_subr.c user/jmallett/octeon/sys/mips/adm5120/if_admsw.c user/jmallett/octeon/sys/mips/atheros/if_arge.c user/jmallett/octeon/sys/mips/cavium/uart_dev_oct16550.c user/jmallett/octeon/sys/mips/conf/AR71XX user/jmallett/octeon/sys/mips/conf/SENTRY5 user/jmallett/octeon/sys/mips/conf/SWARM user/jmallett/octeon/sys/mips/conf/XLR user/jmallett/octeon/sys/mips/include/pmap.h user/jmallett/octeon/sys/mips/include/proc.h user/jmallett/octeon/sys/mips/malta/gt_pci.c user/jmallett/octeon/sys/mips/mips/pmap.c user/jmallett/octeon/sys/mips/mips/tick.c user/jmallett/octeon/sys/mips/sibyte/sb_machdep.c user/jmallett/octeon/sys/modules/Makefile user/jmallett/octeon/sys/modules/acpi/acpi/Makefile user/jmallett/octeon/sys/modules/cyclic/Makefile user/jmallett/octeon/sys/modules/usb/usb/Makefile user/jmallett/octeon/sys/net/bpf.c user/jmallett/octeon/sys/net/bpf_zerocopy.c user/jmallett/octeon/sys/net/bpfdesc.h user/jmallett/octeon/sys/net/flowtable.c user/jmallett/octeon/sys/net/if.c user/jmallett/octeon/sys/net/if_ef.c user/jmallett/octeon/sys/net/if_gif.c user/jmallett/octeon/sys/net/if_gif.h user/jmallett/octeon/sys/net/if_gre.c user/jmallett/octeon/sys/net/if_stf.c user/jmallett/octeon/sys/net/route.c user/jmallett/octeon/sys/net/rtsock.c user/jmallett/octeon/sys/net80211/ieee80211.c user/jmallett/octeon/sys/net80211/ieee80211_amrr.c user/jmallett/octeon/sys/net80211/ieee80211_ht.h user/jmallett/octeon/sys/net80211/ieee80211_node.c user/jmallett/octeon/sys/net80211/ieee80211_rssadapt.c user/jmallett/octeon/sys/net80211/ieee80211_var.h user/jmallett/octeon/sys/netgraph/ng_eiface.c user/jmallett/octeon/sys/netgraph/ng_fec.c user/jmallett/octeon/sys/netgraph/ng_iface.c user/jmallett/octeon/sys/netgraph/ng_pipe.c user/jmallett/octeon/sys/netgraph/ng_tty.c user/jmallett/octeon/sys/netinet/icmp6.h user/jmallett/octeon/sys/netinet/if_ether.c user/jmallett/octeon/sys/netinet/igmp.c user/jmallett/octeon/sys/netinet/in.c user/jmallett/octeon/sys/netinet/in_gif.c user/jmallett/octeon/sys/netinet/in_proto.c user/jmallett/octeon/sys/netinet/in_rmx.c user/jmallett/octeon/sys/netinet/ip_dummynet.h user/jmallett/octeon/sys/netinet/ip_icmp.c user/jmallett/octeon/sys/netinet/ip_icmp.h user/jmallett/octeon/sys/netinet/ip_input.c user/jmallett/octeon/sys/netinet/ip_var.h user/jmallett/octeon/sys/netinet/ipfw/dn_sched.h user/jmallett/octeon/sys/netinet/ipfw/dn_sched_rr.c user/jmallett/octeon/sys/netinet/ipfw/dn_sched_wf2q.c user/jmallett/octeon/sys/netinet/ipfw/ip_dn_private.h user/jmallett/octeon/sys/netinet/ipfw/ip_dummynet.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_pfil.c user/jmallett/octeon/sys/netinet/ipfw/ip_fw_private.h user/jmallett/octeon/sys/netinet/raw_ip.c user/jmallett/octeon/sys/netinet/sctp_asconf.c user/jmallett/octeon/sys/netinet/sctp_indata.c user/jmallett/octeon/sys/netinet/sctp_output.c user/jmallett/octeon/sys/netinet/sctputil.c user/jmallett/octeon/sys/netinet/tcp_hostcache.c user/jmallett/octeon/sys/netinet/tcp_input.c user/jmallett/octeon/sys/netinet/tcp_output.c user/jmallett/octeon/sys/netinet/tcp_reass.c user/jmallett/octeon/sys/netinet/tcp_sack.c user/jmallett/octeon/sys/netinet/tcp_subr.c user/jmallett/octeon/sys/netinet/tcp_syncache.c user/jmallett/octeon/sys/netinet/tcp_timewait.c user/jmallett/octeon/sys/netinet/tcp_var.h user/jmallett/octeon/sys/netinet/udp_usrreq.c user/jmallett/octeon/sys/netinet/udp_var.h user/jmallett/octeon/sys/netinet6/frag6.c user/jmallett/octeon/sys/netinet6/icmp6.c user/jmallett/octeon/sys/netinet6/in6.c user/jmallett/octeon/sys/netinet6/in6_gif.c user/jmallett/octeon/sys/netinet6/in6_ifattach.c user/jmallett/octeon/sys/netinet6/in6_proto.c user/jmallett/octeon/sys/netinet6/in6_rmx.c user/jmallett/octeon/sys/netinet6/in6_src.c user/jmallett/octeon/sys/netinet6/in6_var.h user/jmallett/octeon/sys/netinet6/ip6_input.c user/jmallett/octeon/sys/netinet6/ip6_mroute.c user/jmallett/octeon/sys/netinet6/ip6_var.h user/jmallett/octeon/sys/netinet6/nd6.c user/jmallett/octeon/sys/netinet6/nd6.h user/jmallett/octeon/sys/netinet6/nd6_nbr.c user/jmallett/octeon/sys/netinet6/nd6_rtr.c user/jmallett/octeon/sys/netinet6/raw_ip6.c user/jmallett/octeon/sys/netinet6/scope6.c user/jmallett/octeon/sys/netipsec/ah_var.h user/jmallett/octeon/sys/netipsec/esp_var.h user/jmallett/octeon/sys/netipsec/ipcomp_var.h user/jmallett/octeon/sys/netipsec/ipip_var.h user/jmallett/octeon/sys/netipsec/ipsec.c user/jmallett/octeon/sys/netipsec/ipsec.h user/jmallett/octeon/sys/netipsec/ipsec6.h user/jmallett/octeon/sys/netipsec/key.c user/jmallett/octeon/sys/netipsec/xform_esp.c user/jmallett/octeon/sys/pc98/cbus/clock.c user/jmallett/octeon/sys/pc98/conf/GENERIC user/jmallett/octeon/sys/pc98/pc98/machdep.c user/jmallett/octeon/sys/pci/if_rl.c user/jmallett/octeon/sys/powerpc/aim/mmu_oea.c user/jmallett/octeon/sys/powerpc/aim/mmu_oea64.c user/jmallett/octeon/sys/powerpc/booke/pmap.c user/jmallett/octeon/sys/powerpc/conf/GENERIC user/jmallett/octeon/sys/powerpc/conf/MPC85XX user/jmallett/octeon/sys/powerpc/include/pmap.h user/jmallett/octeon/sys/powerpc/include/proc.h user/jmallett/octeon/sys/powerpc/powerpc/mmu_if.m user/jmallett/octeon/sys/powerpc/powerpc/pmap_dispatch.c user/jmallett/octeon/sys/sparc64/conf/GENERIC user/jmallett/octeon/sys/sparc64/include/asi.h user/jmallett/octeon/sys/sparc64/include/cache.h user/jmallett/octeon/sys/sparc64/include/ofw_machdep.h user/jmallett/octeon/sys/sparc64/include/pmap.h user/jmallett/octeon/sys/sparc64/include/proc.h user/jmallett/octeon/sys/sparc64/isa/isa.c user/jmallett/octeon/sys/sparc64/sparc64/cache.c user/jmallett/octeon/sys/sparc64/sparc64/cheetah.c user/jmallett/octeon/sys/sparc64/sparc64/identcpu.c user/jmallett/octeon/sys/sparc64/sparc64/interrupt.S user/jmallett/octeon/sys/sparc64/sparc64/locore.S user/jmallett/octeon/sys/sparc64/sparc64/machdep.c user/jmallett/octeon/sys/sparc64/sparc64/mp_locore.S user/jmallett/octeon/sys/sparc64/sparc64/mp_machdep.c user/jmallett/octeon/sys/sparc64/sparc64/nexus.c user/jmallett/octeon/sys/sparc64/sparc64/ofw_machdep.c user/jmallett/octeon/sys/sparc64/sparc64/pmap.c user/jmallett/octeon/sys/sparc64/sparc64/tick.c user/jmallett/octeon/sys/sun4v/conf/GENERIC user/jmallett/octeon/sys/sun4v/include/ofw_machdep.h user/jmallett/octeon/sys/sun4v/include/pmap.h user/jmallett/octeon/sys/sun4v/include/proc.h user/jmallett/octeon/sys/sun4v/sun4v/pmap.c user/jmallett/octeon/sys/sys/_task.h user/jmallett/octeon/sys/sys/alq.h user/jmallett/octeon/sys/sys/buf.h user/jmallett/octeon/sys/sys/dtrace_bsd.h user/jmallett/octeon/sys/sys/mount.h user/jmallett/octeon/sys/sys/param.h user/jmallett/octeon/sys/sys/taskqueue.h user/jmallett/octeon/sys/sys/thr.h user/jmallett/octeon/sys/sys/user.h user/jmallett/octeon/sys/ufs/ffs/ffs_alloc.c user/jmallett/octeon/sys/ufs/ffs/ffs_balloc.c user/jmallett/octeon/sys/ufs/ffs/ffs_extern.h user/jmallett/octeon/sys/ufs/ffs/ffs_inode.c user/jmallett/octeon/sys/ufs/ffs/ffs_snapshot.c user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c user/jmallett/octeon/sys/ufs/ffs/ffs_subr.c user/jmallett/octeon/sys/ufs/ffs/ffs_vfsops.c user/jmallett/octeon/sys/ufs/ffs/ffs_vnops.c user/jmallett/octeon/sys/ufs/ffs/fs.h user/jmallett/octeon/sys/ufs/ffs/softdep.h user/jmallett/octeon/sys/ufs/ufs/dinode.h user/jmallett/octeon/sys/ufs/ufs/inode.h user/jmallett/octeon/sys/ufs/ufs/ufs_dirhash.c user/jmallett/octeon/sys/ufs/ufs/ufs_extern.h user/jmallett/octeon/sys/ufs/ufs/ufs_lookup.c user/jmallett/octeon/sys/ufs/ufs/ufs_vnops.c user/jmallett/octeon/sys/ufs/ufs/ufsmount.h user/jmallett/octeon/sys/vm/device_pager.c user/jmallett/octeon/sys/vm/pmap.h user/jmallett/octeon/sys/vm/sg_pager.c user/jmallett/octeon/sys/vm/swap_pager.c user/jmallett/octeon/sys/vm/uma_core.c user/jmallett/octeon/sys/vm/vm_contig.c user/jmallett/octeon/sys/vm/vm_fault.c user/jmallett/octeon/sys/vm/vm_glue.c user/jmallett/octeon/sys/vm/vm_kern.c user/jmallett/octeon/sys/vm/vm_map.c user/jmallett/octeon/sys/vm/vm_mmap.c user/jmallett/octeon/sys/vm/vm_object.c user/jmallett/octeon/sys/vm/vm_page.c user/jmallett/octeon/sys/vm/vm_page.h user/jmallett/octeon/sys/vm/vm_pageout.c user/jmallett/octeon/sys/vm/vm_param.h user/jmallett/octeon/sys/vm/vnode_pager.c user/jmallett/octeon/sys/x86/isa/clock.c user/jmallett/octeon/tools/regression/bpf/bpf_filter/tests/test0083.h user/jmallett/octeon/tools/test/README user/jmallett/octeon/tools/tools/ath/common/dumpregs_5416.c user/jmallett/octeon/tools/tools/nanobsd/nanobsd.sh user/jmallett/octeon/tools/tools/netrate/tcpp/tcpp_client.c user/jmallett/octeon/tools/tools/netrate/tcpp/tcpp_server.c user/jmallett/octeon/usr.bin/alias/Makefile user/jmallett/octeon/usr.bin/gzip/gzip.1 user/jmallett/octeon/usr.bin/gzip/gzip.c user/jmallett/octeon/usr.bin/pathchk/pathchk.1 user/jmallett/octeon/usr.bin/pathchk/pathchk.c user/jmallett/octeon/usr.bin/script/script.c user/jmallett/octeon/usr.bin/stat/stat.1 user/jmallett/octeon/usr.bin/stat/stat.c user/jmallett/octeon/usr.sbin/acpi/acpidb/Makefile user/jmallett/octeon/usr.sbin/acpi/iasl/Makefile user/jmallett/octeon/usr.sbin/config/config.h user/jmallett/octeon/usr.sbin/config/configvers.h user/jmallett/octeon/usr.sbin/config/main.c user/jmallett/octeon/usr.sbin/config/mkmakefile.c user/jmallett/octeon/usr.sbin/config/mkoptions.c user/jmallett/octeon/usr.sbin/makefs/ffs/ffs_bswap.c user/jmallett/octeon/usr.sbin/pkg_install/Makefile user/jmallett/octeon/usr.sbin/pkg_install/Makefile.inc user/jmallett/octeon/usr.sbin/pkg_install/add/Makefile user/jmallett/octeon/usr.sbin/pkg_install/add/extract.c user/jmallett/octeon/usr.sbin/pkg_install/add/futil.c user/jmallett/octeon/usr.sbin/pkg_install/add/main.c user/jmallett/octeon/usr.sbin/pkg_install/add/perform.c user/jmallett/octeon/usr.sbin/pkg_install/create/Makefile user/jmallett/octeon/usr.sbin/pkg_install/create/main.c user/jmallett/octeon/usr.sbin/pkg_install/create/perform.c user/jmallett/octeon/usr.sbin/pkg_install/create/pl.c user/jmallett/octeon/usr.sbin/pkg_install/delete/Makefile user/jmallett/octeon/usr.sbin/pkg_install/delete/main.c user/jmallett/octeon/usr.sbin/pkg_install/delete/perform.c user/jmallett/octeon/usr.sbin/pkg_install/info/Makefile user/jmallett/octeon/usr.sbin/pkg_install/info/info.h user/jmallett/octeon/usr.sbin/pkg_install/info/main.c user/jmallett/octeon/usr.sbin/pkg_install/info/perform.c user/jmallett/octeon/usr.sbin/pkg_install/info/show.c user/jmallett/octeon/usr.sbin/pkg_install/updating/Makefile user/jmallett/octeon/usr.sbin/pkg_install/updating/main.c user/jmallett/octeon/usr.sbin/pkg_install/version/Makefile user/jmallett/octeon/usr.sbin/pkg_install/version/main.c user/jmallett/octeon/usr.sbin/pkg_install/version/perform.c user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_calltree.c user/jmallett/octeon/usr.sbin/sade/disks.c user/jmallett/octeon/usr.sbin/sade/menus.c user/jmallett/octeon/usr.sbin/sysinstall/disks.c user/jmallett/octeon/usr.sbin/sysinstall/menus.c user/jmallett/octeon/usr.sbin/sysinstall/tcpip.c Directory Properties: user/jmallett/octeon/ (props changed) user/jmallett/octeon/contrib/gnu-sort/ (props changed) user/jmallett/octeon/contrib/tzdata/ (props changed) user/jmallett/octeon/crypto/openssh/ (props changed) user/jmallett/octeon/lib/libz/ (props changed) user/jmallett/octeon/sys/ (props changed) user/jmallett/octeon/sys/contrib/dev/acpica/ (props changed) user/jmallett/octeon/sys/contrib/x86emu/ (props changed) user/jmallett/octeon/sys/mips/rmi/debug.h (props changed) user/jmallett/octeon/sys/mips/rmi/msgring.h (props changed) user/jmallett/octeon/sys/mips/rmi/shared_structs.h (props changed) user/jmallett/octeon/sys/mips/rmi/shared_structs_func.h (props changed) user/jmallett/octeon/sys/mips/rmi/shared_structs_offsets.h (props changed) Modified: user/jmallett/octeon/Makefile.inc1 ============================================================================== --- user/jmallett/octeon/Makefile.inc1 Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/Makefile.inc1 Mon May 3 09:28:10 2010 (r207557) @@ -259,7 +259,7 @@ WMAKEENV= ${CROSSENV} \ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} -.if ${MK_CDDL} == "no" || defined(NO_CTF) +.if ${MK_CDDL} == "no" WMAKEENV+= NO_CTF=1 .endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} @@ -780,7 +780,7 @@ buildkernel: @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) @@ -1111,7 +1111,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ lib/libbz2 lib/libcom_err lib/libcrypt \ - lib/libexpat \ + lib/libexpat lib/libfetch \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ @@ -1138,6 +1138,7 @@ _cddl_lib= cddl/lib _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L +lib/libfetch__L: secure/lib/libcrypto__L secure/lib/libssl__L lib/libmd__L .if ${MK_OPENSSH} != "no" _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L @@ -1173,7 +1174,7 @@ _lib_libypclnt= lib/libypclnt .endif .if ${MK_OPENSSL} == "no" -lib/libradius__L: lib/libmd__L +lib/libfetch__L lib/libradius__L: lib/libmd__L .endif .for _lib in ${_prereq_libs} Modified: user/jmallett/octeon/UPDATING ============================================================================== --- user/jmallett/octeon/UPDATING Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/UPDATING Mon May 3 09:28:10 2010 (r207557) @@ -22,6 +22,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) + +20100429: + 'vm_page's are now hashed by physical address to an array of mutexes. + Currently this is only used to serialize access to hold_count. Over + time the page queue mutex will be peeled away. This changes the size + of pmap on every architecture. And requires all callers of vm_page_hold + and vm_page_unhold to be updated. + 20100402: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also Modified: user/jmallett/octeon/bin/ln/ln.c ============================================================================== --- user/jmallett/octeon/bin/ln/ln.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/bin/ln/ln.c Mon May 3 09:28:10 2010 (r207557) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -226,6 +227,7 @@ linkit(const char *source, const char *t int ch, exists, first; char path[PATH_MAX]; char wbuf[PATH_MAX]; + char bbuf[PATH_MAX]; if (!sflag) { /* If source doesn't exist, quit now. */ @@ -248,11 +250,9 @@ linkit(const char *source, const char *t if (isdir || (lstat(target, &sb) == 0 && S_ISDIR(sb.st_mode)) || (!hflag && stat(target, &sb) == 0 && S_ISDIR(sb.st_mode))) { - if ((p = strrchr(source, '/')) == NULL) - p = source; - else - ++p; - if (snprintf(path, sizeof(path), "%s/%s", target, p) >= + if (strlcpy(bbuf, source, sizeof(bbuf)) >= sizeof(bbuf) || + (p = basename(bbuf)) == NULL || + snprintf(path, sizeof(path), "%s/%s", target, p) >= (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; warn("%s", source); @@ -276,15 +276,14 @@ linkit(const char *source, const char *t * absolute path of the source, by appending `source' * to the parent directory of the target. */ - p = strrchr(target, '/'); - if (p != NULL) - p++; - else - p = target; - (void)snprintf(wbuf, sizeof(wbuf), "%.*s%s", - (int)(p - target), target, source); - if (stat(wbuf, &sb) != 0) - warn("warning: %s", source); + strlcpy(bbuf, target, sizeof(bbuf)); + p = dirname(bbuf); + if (p != NULL) { + (void)snprintf(wbuf, sizeof(wbuf), "%s/%s", + p, source); + if (stat(wbuf, &sb) != 0) + warn("warning: %s", source); + } } } Modified: user/jmallett/octeon/bin/ln/symlink.7 ============================================================================== --- user/jmallett/octeon/bin/ln/symlink.7 Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/bin/ln/symlink.7 Mon May 3 09:28:10 2010 (r207557) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd March 31, 1994 +.Dd April 25, 2010 .Dt SYMLINK 7 .Os .Sh NAME @@ -103,19 +103,23 @@ the system call would return a file descriptor to the file .Dq afile . .Pp -There are nine system calls that do not follow links, and which operate +There are thirteen system calls that do not follow links, and which operate on the symbolic link itself. They are: .Xr lchflags 2 , .Xr lchmod 2 , .Xr lchown 2 , +.Xr lpathconf 2 , .Xr lstat 2 , .Xr lutimes 2 , .Xr readlink 2 , +.Xr readlinkat 2 , .Xr rename 2 , +.Xr renameat 2 , .Xr rmdir 2 , +.Xr unlink 2 , and -.Xr unlink 2 . +.Xr unlinkat 2 . Because .Xr remove 3 is an alias for @@ -123,9 +127,30 @@ is an alias for it also does not follow symbolic links. When .Xr rmdir 2 +or +.Xr unlinkat 2 +with the +.Dv AT_REMOVEDIR +flag is applied to a symbolic link, it fails with the error .Er ENOTDIR . .Pp +The +.Xr linkat 2 +system call does not follow symbolic links +unless given the +.Dv AT_SYMLINK_FOLLOW +flag. +.Pp +The following system calls follow symbolic links +unless given the +.Dv AT_SYMLINK_NOFOLLOW +flag: +.Xr fchmodat 2 , +.Xr fchownat 2 +and +.Xr fstatat 2 . +.Pp The owner and group of an existing symbolic link can be changed by means of the .Xr lchown 2 @@ -138,8 +163,8 @@ an existing symbolic link can be changed and .Xr lutimes 2 system calls, respectively. -Of these, only the flags are used by the system; -the access permissions and ownership are ignored. +Of these, only the flags and ownership are used by the system; +the access permissions are ignored. .Pp The .Bx 4.4 Modified: user/jmallett/octeon/bin/sh/arith.y ============================================================================== --- user/jmallett/octeon/bin/sh/arith.y Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/bin/sh/arith.y Mon May 3 09:28:10 2010 (r207557) @@ -287,7 +287,9 @@ arith_t arith(const char *s) { arith_t result; + struct stackmark smark; + setstackmark(&smark); arith_buf = arith_startbuf = s; INTOFF; @@ -295,6 +297,8 @@ arith(const char *s) arith_lex_reset(); /* Reprime lex. */ INTON; + popstackmark(&smark); + return result; } Modified: user/jmallett/octeon/bin/sh/arith_lex.l ============================================================================== --- user/jmallett/octeon/bin/sh/arith_lex.l Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/bin/sh/arith_lex.l Mon May 3 09:28:10 2010 (r207557) @@ -51,13 +51,6 @@ __FBSDID("$FreeBSD$"); int yylex(void); -struct varname -{ - struct varname *next; - char name[1]; -}; -static struct varname *varnames; - #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -87,14 +80,11 @@ static struct varname *varnames; * If variable doesn't exist, we should initialize * it to zero. */ - struct varname *temp; + char *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = ckmalloc(sizeof(struct varname) + - strlen(yytext)); - temp->next = varnames; - varnames = temp; - yylval.s_value = strcpy(temp->name, yytext); + temp = stalloc(strlen(yytext) + 1); + yylval.s_value = strcpy(temp, yytext); return ARITH_VAR; } @@ -140,15 +130,5 @@ static struct varname *varnames; void arith_lex_reset(void) { - struct varname *name, *next; - YY_NEW_FILE; - - name = varnames; - while (name != NULL) { - next = name->next; - ckfree(name); - name = next; - } - varnames = NULL; } Modified: user/jmallett/octeon/bin/sh/expand.c ============================================================================== --- user/jmallett/octeon/bin/sh/expand.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/bin/sh/expand.c Mon May 3 09:28:10 2010 (r207557) @@ -360,7 +360,7 @@ removerecordregions(int endoff) void expari(int flag) { - char *p, *start; + char *p, *q, *start; arith_t result; int begoff; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); @@ -398,7 +398,9 @@ expari(int flag) removerecordregions(begoff); if (quotes) rmescapes(p+2); + q = grabstackstr(expdest); result = arith(p+2); + ungrabstackstr(q, expdest); fmtstr(p, DIGITS(result), ARITH_FORMAT_STR, result); while (*p++) ; Modified: user/jmallett/octeon/contrib/telnet/telnet/commands.c ============================================================================== --- user/jmallett/octeon/contrib/telnet/telnet/commands.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/telnet/telnet/commands.c Mon May 3 09:28:10 2010 (r207557) @@ -2491,8 +2491,7 @@ tn(int argc, char *argv[]) env_export("USER"); } (void) call(status, "status", "notmuch", 0); - if (setjmp(peerdied) == 0) - telnet(user); + telnet(user); (void) NetClose(net); ExitString("Connection closed by foreign host.\n",1); /*NOTREACHED*/ Modified: user/jmallett/octeon/contrib/telnet/telnet/externs.h ============================================================================== --- user/jmallett/octeon/contrib/telnet/telnet/externs.h Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/telnet/telnet/externs.h Mon May 3 09:28:10 2010 (r207557) @@ -233,7 +233,6 @@ extern void SetNetTrace(char *); /* Function to change where debugging goes */ extern jmp_buf - peerdied, toplevel; /* For error conditions. */ extern void Modified: user/jmallett/octeon/contrib/telnet/telnet/network.c ============================================================================== --- user/jmallett/octeon/contrib/telnet/telnet/network.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/telnet/telnet/network.c Mon May 3 09:28:10 2010 (r207557) @@ -158,7 +158,7 @@ netflush(void) perror(hostname); (void)NetClose(net); ring_clear_mark(&netoring); - longjmp(peerdied, -1); + ExitString("Connection closed by foreign host.\n", 1); /*NOTREACHED*/ } n = 0; Modified: user/jmallett/octeon/contrib/telnet/telnet/sys_bsd.c ============================================================================== --- user/jmallett/octeon/contrib/telnet/telnet/sys_bsd.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/telnet/telnet/sys_bsd.c Mon May 3 09:28:10 2010 (r207557) @@ -809,14 +809,6 @@ NetNonblockingIO(int fd, int onoff) */ /* ARGSUSED */ -static SIG_FUNC_RET -deadpeer(int sig __unused) -{ - setcommandmode(); - longjmp(peerdied, -1); -} - -/* ARGSUSED */ SIG_FUNC_RET intr(int sig __unused) { @@ -884,7 +876,7 @@ sys_telnet_init(void) { (void) signal(SIGINT, intr); (void) signal(SIGQUIT, intr2); - (void) signal(SIGPIPE, deadpeer); + (void) signal(SIGPIPE, SIG_IGN); #ifdef SIGWINCH (void) signal(SIGWINCH, sendwin); #endif Modified: user/jmallett/octeon/contrib/telnet/telnet/telnet.c ============================================================================== --- user/jmallett/octeon/contrib/telnet/telnet/telnet.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/telnet/telnet/telnet.c Mon May 3 09:28:10 2010 (r207557) @@ -146,7 +146,6 @@ unsigned char telopt_environ = TELOPT_NE #endif jmp_buf toplevel; -jmp_buf peerdied; int flushline; int linemode; Modified: user/jmallett/octeon/contrib/telnet/telnet/terminal.c ============================================================================== --- user/jmallett/octeon/contrib/telnet/telnet/terminal.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/telnet/telnet/terminal.c Mon May 3 09:28:10 2010 (r207557) @@ -111,7 +111,8 @@ init_terminal(void) } /* - * Send as much data as possible to the terminal. + * Send as much data as possible to the terminal, else exits if + * it encounters a permanent failure when writing to the tty. * * Return value: * -1: No useful work done, data waiting to go out. @@ -152,8 +153,19 @@ ttyflush(int drop) } ring_consumed(&ttyoring, n); } - if (n < 0) + if (n < 0) { + if (errno == EAGAIN || errno == EINTR) { + return -1; + } else { + ring_consumed(&ttyoring, ring_full_count(&ttyoring)); + setconnmode(0); + setcommandmode(); + NetClose(net); + fprintf(stderr, "Write error on local output.\n"); + exit(1); + } return -1; + } if (n == n0) { if (n0) return -1; Modified: user/jmallett/octeon/contrib/top/utils.c ============================================================================== --- user/jmallett/octeon/contrib/top/utils.c Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/top/utils.c Mon May 3 09:28:10 2010 (r207557) @@ -499,7 +499,7 @@ unsigned long long amt; } } - p = strecpy(p, itoa(amt)); + p = strecpy(p, itoa((int)amt)); *p++ = tag; *p = '\0'; Modified: user/jmallett/octeon/contrib/tzdata/africa ============================================================================== --- user/jmallett/octeon/contrib/tzdata/africa Mon May 3 08:57:48 2010 (r207556) +++ user/jmallett/octeon/contrib/tzdata/africa Mon May 3 09:28:10 2010 (r207557) @@ -1,5 +1,5 @@ # 
-# @(#)africa	8.23
+# @(#)africa	8.26
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -680,6 +680,21 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 J
 # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
 # 
 
+# From Steffen Thorsen (2010-04-13):
+# Several news media in Morocco report that the Ministry of Modernization
+# of Public Sectors has announced that Morocco will have DST from
+# 2010-05-02 to 2010-08-08.
+#
+# Example:
+# 
+# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
+# 
+# (French)
+# Our page:
+# 
+# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
+# 
+
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
@@ -701,6 +716,8 @@ Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:
 Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
 Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
@@ -942,6 +959,24 @@ Zone	Africa/Lome	0:04:52 -	LMT	1893
 # Therefore, the standard time will be kept unchanged the whole year long."
 # So foregoing DST seems to be an exception (albeit one that may be repeated in the  future).
 
+# From Alexander Krivenyshev (2010-03-27):
+# According to some news reports Tunis confirmed not to use DST in 2010
+#
+# (translation):
+# "The Tunisian government has decided to abandon DST, which was scheduled on
+# Sunday...
+# Tunisian authorities had suspended the DST for the first time last year also
+# coincided with the month of Ramadan..."
+#
+# (in Arabic)
+# 
+# http://www.moheet.com/show_news.aspx?nid=358861&pg=1
+# 
+# http://www.almadenahnews.com/newss/news.php?c=118&id=38036
+# or
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
 Rule	Tunisia	1939	only	-	Nov	18	23:00s	0	-
@@ -968,8 +1003,7 @@ Rule	Tunisia	2005	only	-	May	 1	 0:00s	1
 Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
 Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
 Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
-Rule	Tunisia	2010	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Tunisia	2010	max	-	Oct	lastSun	 2:00s	0	-
+
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.

Modified: user/jmallett/octeon/contrib/tzdata/asia
==============================================================================
--- user/jmallett/octeon/contrib/tzdata/asia	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/contrib/tzdata/asia	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,4 @@
-# @(#)asia	8.58
+# @(#)asia	8.60
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -566,6 +566,28 @@ Zone	Asia/Hong_Kong	7:36:36 -	LMT	1904 O
 # was still controlled by Japan.  This is hard to believe, but we don't
 # have any other information.
 
+# From smallufo (2010-04-03):
+# According to Taiwan's CWB,
+# 
+# http://www.cwb.gov.tw/V6/astronomy/cdata/summert.htm
+# 
+# Taipei has DST in 1979 between July 1st and Sep 30.
+
+# From Arthur David Olson (2010-04-07):
+# Here's Google's translation of the table at the bottom of the "summert.htm" page:
+# Decade 	                                                    Name                      Start and end date
+# Republic of China 34 years to 40 years (AD 1945-1951 years) Summer Time               May 1 to September 30 
+# 41 years of the Republic of China (AD 1952)                 Daylight Saving Time      March 1 to October 31 
+# Republic of China 42 years to 43 years (AD 1953-1954 years) Daylight Saving Time      April 1 to October 31 
+# In the 44 years to 45 years (AD 1955-1956 years)            Daylight Saving Time      April 1 to September 30 
+# Republic of China 46 years to 48 years (AD 1957-1959)       Summer Time               April 1 to September 30 
+# Republic of China 49 years to 50 years (AD 1960-1961)       Summer Time               June 1 to September 30 
+# Republic of China 51 years to 62 years (AD 1962-1973 years) Stop Summer Time 
+# Republic of China 63 years to 64 years (1974-1975 AD)       Daylight Saving Time      April 1 to September 30 
+# Republic of China 65 years to 67 years (1976-1978 AD)       Stop Daylight Saving Time 
+# Republic of China 68 years (AD 1979)                        Daylight Saving Time      July 1 to September 30 
+# Republic of China since 69 years (AD 1980)                  Stop Daylight Saving Time
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Taiwan	1945	1951	-	May	1	0:00	1:00	D
 Rule	Taiwan	1945	1951	-	Oct	1	0:00	0	S
@@ -576,8 +598,9 @@ Rule	Taiwan	1955	1961	-	Oct	1	0:00	0	S
 Rule	Taiwan	1960	1961	-	Jun	1	0:00	1:00	D
 Rule	Taiwan	1974	1975	-	Apr	1	0:00	1:00	D
 Rule	Taiwan	1974	1975	-	Oct	1	0:00	0	S
-Rule	Taiwan	1980	only	-	Jun	30	0:00	1:00	D
-Rule	Taiwan	1980	only	-	Sep	30	0:00	0	S
+Rule	Taiwan	1979	only	-	Jun	30	0:00	1:00	D
+Rule	Taiwan	1979	only	-	Sep	30	0:00	0	S
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Taipei	8:06:00 -	LMT	1896 # or Taibei or T'ai-pei
 			8:00	Taiwan	C%sT
@@ -1912,13 +1935,35 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # [T]he German Consulate General in Karachi reported me today that Pakistan
 # will go back to standard time on 1st of November.
 
+# From Steffen Thorsen (2010-03-26):
+# Steffen Thorsen wrote:
+# > On Thursday (2010-03-25) it was announced that DST would start in
+# > Pakistan on 2010-04-01.
+# >
+# > Then today, the president said that they might have to revert the
+# > decision if it is not supported by the parliament. So at the time
+# > being, it seems unclear if DST will be actually observed or not - but
+# > April 1 could be a more likely date than April 15.
+# Now, it seems that the decision to not observe DST in final:
+#
+# "Govt Withdraws Plan To Advance Clocks"
+# 
+# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
+# 
+#
+# "People laud PM's announcement to end DST"
+# 
+# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
-Rule Pakistan	2009	max	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	max	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Modified: user/jmallett/octeon/contrib/tzdata/southamerica
==============================================================================
--- user/jmallett/octeon/contrib/tzdata/southamerica	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/contrib/tzdata/southamerica	Mon May  3 09:28:10 2010	(r207557)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.43
+# @(#)southamerica	8.44
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -437,6 +437,27 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:
 # of the country calls it "ART".
 # ...
 
+# From Alexander Krivenyshev (2010-04-09):
+# According to news reports from El Diario de la Republica Province San
+# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
+# after April 11, 2010--will continue to have same time as rest of
+# Argentina (UTC-3) (no DST).
+#
+# Confirmaron la prórroga del huso horario de verano (Spanish)
+# 
+# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
+# 
+# or (some English translation):
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
+# 
+
+# From Mariano Absatz (2010-04-12):
+# yes...I can confirm this...and given that San Luis keeps calling
+# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
+# rules...San Luis is still using "Western ARgentina Time" and it got
+# stuck on Summer daylight savings time even though the summer is over.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),
@@ -570,8 +591,8 @@ Zone America/Argentina/Mendoza -4:35:16 
 #
 # San Luis (SL)
 
-Rule	SanLuis	2008	max	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	max	-	Oct	Sun>=8	0:00	1:00	S
+Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
+Rule	SanLuis	2007	2009	-	Oct	Sun>=8	0:00	1:00	S
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May

Modified: user/jmallett/octeon/crypto/openssh/ChangeLog
==============================================================================
--- user/jmallett/octeon/crypto/openssh/ChangeLog	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/ChangeLog	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,120 @@
-20100307
+20100410
+ - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
+   back so we disable the IPv6 tests if we don't have it.
+
+20100409
+ - (dtucker) [contrib/cygwin/Makefile] Don't overwrite files with the wrong
+   ones.  Based on a patch from Roumen Petrov.
+ - (dtucker) [configure.ac] Bug #1744: use pkg-config for libedit flags if we
+   have it and the path is not provided to --with-libedit.  Based on a patch
+   from Iain Morgan.
+ - (dtucker) [configure.ac defines.h loginrec.c logintest.c] Bug #1732: enable
+   utmpx support on FreeBSD where possible.  Patch from Ed Schouten, ok djm@
+
+20100326
+ - (djm) [openbsd-compat/bsd-arc4random.c] Fix preprocessor detection
+   for arc4random_buf() and arc4random_uniform(); from Josh Gilkerson
+ - (dtucker) [configure.ac] Bug #1741: Add section for Haiku, patch originally
+   by Ingo Weinhold via Scott McCreary, ok djm@
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2010/03/25 23:38:28
+     [servconf.c]
+     from portable: getcwd(NULL, 0) doesn't work on all platforms, so
+     use a stack buffer; ok dtucker@
+   - djm@cvs.openbsd.org 2010/03/26 00:26:58
+     [ssh.1]
+     mention that -S none disables connection sharing; from Colin Watson
+ - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
+   set up SELinux execution context before chroot() call. From Russell
+   Coker via Colin watson; bz#1726 ok dtucker@
+ - (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
+   ok dtucker@
+ - (dtucker) Bug #1725: explicitly link libX11 into gnome-ssh-askpass2 using
+   pkg-config, patch from Colin Watson.  Needed for newer linkers (ie gold).
+ - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys;
+   bz#1723 patch from Adeodato Simóvia Colin Watson; ok dtucker@
+ - (dtucker) OpenBSD CVS Sync
+   - dtucker@cvs.openbsd.org 2010/03/26 01:06:13
+     [ssh_config.5]
+     Reformat default value of PreferredAuthentications entry (current
+     formatting implies ", " is acceptable as a separator, which it's not.
+     ok djm@
+
+20100324
+ - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory
+   containing the services file explicitely case-insensitive.  This allows to
+   tweak the Windows services file reliably.  Patch from vinschen at redhat.
+
+20100321
+ - (djm) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2010/03/08 09:41:27
+     [ssh-keygen.1]
+     sort the list of constraints (to -O); ok djm
+   - jmc@cvs.openbsd.org 2010/03/10 07:40:35
+     [ssh-keygen.1]
+     typos; from Ross Richardson
+     closes prs 6334 and 6335
+   - djm@cvs.openbsd.org 2010/03/10 23:27:17
+     [auth2-pubkey.c]
+     correct certificate logging and make it more consistent between
+     authorized_keys and TrustedCAKeys; ok markus@
+   - djm@cvs.openbsd.org 2010/03/12 01:06:25
+     [servconf.c]
+     unbreak AuthorizedKeys option with a $HOME-relative path; reported by
+     vinschen AT redhat.com, ok dtucker@
+   - markus@cvs.openbsd.org 2010/03/12 11:37:40
+     [servconf.c]
+     do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths
+     free() (not xfree()) the buffer returned by getcwd()
+   - djm@cvs.openbsd.org 2010/03/13 21:10:38
+     [clientloop.c]
+     protocol conformance fix: send language tag when disconnecting normally;
+     spotted by 1.41421 AT gmail.com, ok markus@ deraadt@
+   - djm@cvs.openbsd.org 2010/03/13 21:45:46
+     [ssh-keygen.1]
+     Certificates are named *-cert.pub, not *_cert.pub; committing a diff
+     from stevesk@ ok me
+   - jmc@cvs.openbsd.org 2010/03/13 23:38:13
+     [ssh-keygen.1]
+     fix a formatting error (args need quoted); noted by stevesk
+   - stevesk@cvs.openbsd.org 2010/03/15 19:40:02
+     [key.c key.h ssh-keygen.c]
+     also print certificate type (user or host) for ssh-keygen -L
+     ok djm kettenis
+   - stevesk@cvs.openbsd.org 2010/03/16 15:46:52
+     [auth-options.c]
+     spelling in error message. ok djm kettenis
+   - djm@cvs.openbsd.org 2010/03/16 16:36:49
+     [version.h]
+     crank version to openssh-5.5 since we have a few fixes since 5.4;
+     requested deraadt@ kettenis@
+ - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Crank version numbers
+
+20100314
+ - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
+   compilation failure when !HAVE_DLOPEN. Reported by felix-mindrot
+   AT fefe.de
+ - (djm) [Makefile.in] Respecify -lssh after -lopenbsd-compat for
+   ssh-pkcs11-helper to repair static builds (we do the same for
+   ssh-keyscan). Reported by felix-mindrot AT fefe.de
+
+20100312
+ - (tim) [Makefile.in] Now that scard is gone, no need to make $(datadir)
+ - (tim) [Makefile.in] Add missing $(EXEEXT) to install targets.
+   Patch from Corinna Vinschen.
+ - (tim) [contrib/cygwin/Makefile] Fix list of documentation files to install
+   on a Cygwin installation. Patch from Corinna Vinschen.
+
+20100311
+ - (tim) [contrib/suse/openssh.spec] crank version number here too.
+   report by imorgan AT nas.nasa.gov
+
+20100309
+ - (dtucker) [configure.ac] Use a proper AC_CHECK_DECL for BROKEN_GETADDRINFO
+   so setting it in CFLAGS correctly skips IPv6 tests.
+
+20100428
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2010/03/07 22:16:01
      [ssh-keygen.c]

Modified: user/jmallett/octeon/crypto/openssh/README
==============================================================================
--- user/jmallett/octeon/crypto/openssh/README	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/README	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.4 for the release notes.
+See http://www.openssh.com/txt/release-5.5 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.72 2010/03/07 22:41:02 djm Exp $
+$Id: README,v 1.73 2010/03/21 19:11:55 djm Exp $

Modified: user/jmallett/octeon/crypto/openssh/auth-options.c
==============================================================================
--- user/jmallett/octeon/crypto/openssh/auth-options.c	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/auth-options.c	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.48 2010/03/07 11:57:13 dtucker Exp $ */
+/* $OpenBSD: auth-options.c,v 1.49 2010/03/16 15:46:52 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen 
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -434,7 +434,7 @@ auth_cert_constraints(Buffer *c_orig, st
 				goto out;
 			}
 			if (strlen(command) != clen) {
-				error("force-command constrain contains \\0");
+				error("force-command constraint contains \\0");
 				goto out;
 			}
 			if (cert_forced_command != NULL) {
@@ -454,7 +454,7 @@ auth_cert_constraints(Buffer *c_orig, st
 				goto out;
 			}
 			if (strlen(allowed) != clen) {
-				error("source-address constrain contains \\0");
+				error("source-address constraint contains \\0");
 				goto out;
 			}
 			if (cert_source_address_done++) {

Modified: user/jmallett/octeon/crypto/openssh/auth2-pubkey.c
==============================================================================
--- user/jmallett/octeon/crypto/openssh/auth2-pubkey.c	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/auth2-pubkey.c	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.21 2010/03/04 10:36:03 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.22 2010/03/10 23:27:17 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -240,22 +240,26 @@ user_key_allowed2(struct passwd *pw, Key
 				continue;
 			if (!key_equal(found, key->cert->signature_key))
 				continue;
-			debug("matching CA found: file %s, line %lu",
-			    file, linenum);
 			fp = key_fingerprint(found, SSH_FP_MD5,
 			    SSH_FP_HEX);
-			verbose("Found matching %s CA: %s",
-			    key_type(found), fp);
-			xfree(fp);
+			debug("matching CA found: file %s, line %lu, %s %s",
+			    file, linenum, key_type(found), fp);
 			if (key_cert_check_authority(key, 0, 0, pw->pw_name,
 			    &reason) != 0) {
+				xfree(fp);
 				error("%s", reason);
 				auth_debug_add("%s", reason);
 				continue;
 			}
 			if (auth_cert_constraints(&key->cert->constraints,
-			    pw) != 0)
+			    pw) != 0) {
+				xfree(fp);
 				continue;
+			}
+			verbose("Accepted certificate ID \"%s\" "
+			    "signed by %s CA %s via %s", key->cert->key_id,
+			    key_type(found), fp, file);
+			xfree(fp);
 			found_key = 1;
 			break;
 		} else if (!key_is_cert_authority && key_equal(found, key)) {
@@ -281,15 +285,15 @@ user_key_allowed2(struct passwd *pw, Key
 static int
 user_cert_trusted_ca(struct passwd *pw, Key *key)
 {
-	char *key_fp, *ca_fp;
+	char *ca_fp;
 	const char *reason;
 	int ret = 0;
 
 	if (!key_is_cert(key) || options.trusted_user_ca_keys == NULL)
 		return 0;
 
-	key_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
-	ca_fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
+	ca_fp = key_fingerprint(key->cert->signature_key,
+	    SSH_FP_MD5, SSH_FP_HEX);
 
 	if (key_in_file(key->cert->signature_key,
 	    options.trusted_user_ca_keys, 1) != 1) {
@@ -306,13 +310,12 @@ user_cert_trusted_ca(struct passwd *pw, 
 	if (auth_cert_constraints(&key->cert->constraints, pw) != 0)
 		goto out;
 
-	verbose("%s certificate %s allowed by trusted %s key %s",
-	    key_type(key), key_fp, key_type(key->cert->signature_key), ca_fp);
+	verbose("Accepted certificate ID \"%s\" signed by %s CA %s via %s",
+	    key->cert->key_id, key_type(key->cert->signature_key), ca_fp,
+	    options.trusted_user_ca_keys);
 	ret = 1;
 
  out:
-	if (key_fp != NULL)
-		xfree(key_fp);
 	if (ca_fp != NULL)
 		xfree(ca_fp);
 	return ret;

Modified: user/jmallett/octeon/crypto/openssh/channels.c
==============================================================================
--- user/jmallett/octeon/crypto/openssh/channels.c	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/channels.c	Mon May  3 09:28:10 2010	(r207557)
@@ -3252,7 +3252,11 @@ x11_create_display_inet(int x11_display_
 			sock = socket(ai->ai_family, ai->ai_socktype,
 			    ai->ai_protocol);
 			if (sock < 0) {
-				if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) {
+				if ((errno != EINVAL) && (errno != EAFNOSUPPORT)
+#ifdef EPFNOSUPPORT
+				    && (errno != EPFNOSUPPORT)
+#endif 
+				    ) {
 					error("socket: %.100s", strerror(errno));
 					freeaddrinfo(aitop);
 					return -1;

Modified: user/jmallett/octeon/crypto/openssh/clientloop.c
==============================================================================
--- user/jmallett/octeon/crypto/openssh/clientloop.c	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/clientloop.c	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm Exp $ */
 /*
  * Author: Tatu Ylonen 
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -1484,6 +1484,7 @@ client_loop(int have_pty, int escape_cha
 		packet_start(SSH2_MSG_DISCONNECT);
 		packet_put_int(SSH2_DISCONNECT_BY_APPLICATION);
 		packet_put_cstring("disconnected by user");
+		packet_put_cstring(""); /* language tag */
 		packet_send();
 		packet_write_wait();
 	}

Modified: user/jmallett/octeon/crypto/openssh/config.h
==============================================================================
--- user/jmallett/octeon/crypto/openssh/config.h	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/config.h	Mon May  3 09:28:10 2010	(r207557)
@@ -124,7 +124,7 @@
 #define DISABLE_WTMPX 1
 
 /* Enable for PKCS#11 support */
-#define ENABLE_PKCS11 
+#define ENABLE_PKCS11 /**/
 
 /* Builtin PRNG command timeout */
 #define ENTROPY_TIMEOUT_MSEC 200
@@ -456,6 +456,9 @@
 /* Define to 1 if you have the `getutxline' function. */
 #define HAVE_GETUTXLINE 1
 
+/* Define to 1 if you have the `getutxuser' function. */
+#define HAVE_GETUTXUSER 1
+
 /* Define to 1 if you have the `get_default_context_with_level' function. */
 /* #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL */
 
@@ -552,6 +555,9 @@
 /* Define if system has libiaf that supports set_id */
 /* #undef HAVE_LIBIAF */
 
+/* Define to 1 if you have the `network' library (-lnetwork). */
+/* #undef HAVE_LIBNETWORK */
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 /* #undef HAVE_LIBNSL */
 
@@ -805,6 +811,9 @@
 /* Define to 1 if you have the `setutent' function. */
 /* #undef HAVE_SETUTENT */
 
+/* Define to 1 if you have the `setutxdb' function. */
+#define HAVE_SETUTXDB 1
+
 /* Define to 1 if you have the `setutxent' function. */
 #define HAVE_SETUTXENT 1
 
@@ -1416,8 +1425,8 @@
 /* Define if you want SELinux support. */
 /* #undef WITH_SELINUX */
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
 #if defined __BIG_ENDIAN__
 # define WORDS_BIGENDIAN 1
 #elif ! defined __LITTLE_ENDIAN__

Modified: user/jmallett/octeon/crypto/openssh/config.h.in
==============================================================================
--- user/jmallett/octeon/crypto/openssh/config.h.in	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/config.h.in	Mon May  3 09:28:10 2010	(r207557)
@@ -80,9 +80,6 @@
 /* Define if you want to specify the path to your lastlog file */
 #undef CONF_LASTLOG_FILE
 
-/* Define if you want to specify the path to your utmpx file */
-#undef CONF_UTMPX_FILE
-
 /* Define if you want to specify the path to your utmp file */
 #undef CONF_UTMP_FILE
 
@@ -455,6 +452,9 @@
 /* Define to 1 if you have the `getutxline' function. */
 #undef HAVE_GETUTXLINE
 
+/* Define to 1 if you have the `getutxuser' function. */
+#undef HAVE_GETUTXUSER
+
 /* Define to 1 if you have the `get_default_context_with_level' function. */
 #undef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
 
@@ -551,6 +551,9 @@
 /* Define if system has libiaf that supports set_id */
 #undef HAVE_LIBIAF
 
+/* Define to 1 if you have the `network' library (-lnetwork). */
+#undef HAVE_LIBNETWORK
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
@@ -804,6 +807,9 @@
 /* Define to 1 if you have the `setutent' function. */
 #undef HAVE_SETUTENT
 
+/* Define to 1 if you have the `setutxdb' function. */
+#undef HAVE_SETUTXDB
+
 /* Define to 1 if you have the `setutxent' function. */
 #undef HAVE_SETUTXENT
 

Modified: user/jmallett/octeon/crypto/openssh/defines.h
==============================================================================
--- user/jmallett/octeon/crypto/openssh/defines.h	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/defines.h	Mon May  3 09:28:10 2010	(r207557)
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.159 2010/01/13 23:44:34 tim Exp $ */
+/* $Id: defines.h,v 1.160 2010/04/09 08:13:27 dtucker Exp $ */
 
 
 /* Constants */

Modified: user/jmallett/octeon/crypto/openssh/key.c
==============================================================================
--- user/jmallett/octeon/crypto/openssh/key.c	Mon May  3 08:57:48 2010	(r207556)
+++ user/jmallett/octeon/crypto/openssh/key.c	Mon May  3 09:28:10 2010	(r207557)
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.c,v 1.85 2010/03/04 01:44:57 djm Exp $ */
+/* $OpenBSD: key.c,v 1.86 2010/03/15 19:40:02 stevesk Exp $ */
 /*
  * read_bignum():
  * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland
@@ -802,6 +802,19 @@ key_type(const Key *k)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-user@FreeBSD.ORG  Mon May  3 10:07:06 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 9398E106566B;
	Mon,  3 May 2010 10:07:06 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 83D338FC20;
	Mon,  3 May 2010 10:07:06 +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 o43A76go045225;
	Mon, 3 May 2010 10:07:06 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43A767R045223;
	Mon, 3 May 2010 10:07:06 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201005031007.o43A767R045223@svn.freebsd.org>
From: Juli Mallett 
Date: Mon, 3 May 2010 10:07: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: r207562 - user/jmallett/octeon/sys/ufs/ffs
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, 03 May 2010 10:07:06 -0000

Author: jmallett
Date: Mon May  3 10:07:06 2010
New Revision: 207562
URL: http://svn.freebsd.org/changeset/base/207562

Log:
  Fix n32 build.

Modified:
  user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c

Modified: user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c
==============================================================================
--- user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c	Mon May  3 09:49:42 2010	(r207561)
+++ user/jmallett/octeon/sys/ufs/ffs/ffs_softdep.c	Mon May  3 10:07:06 2010	(r207562)
@@ -4258,7 +4258,7 @@ softdep_setup_blkmapdep(bp, mp, newblkno
 }
 
 #define	BMSAFEMAP_HASH(fs, cg) \
-      (&bmsafemap_hashtbl[((((register_t)(fs)) >> 13) + (cg)) & bmsafemap_hash])
+      (&bmsafemap_hashtbl[((((uintptr_t)(fs)) >> 13) + (cg)) & bmsafemap_hash])
 
 static int
 bmsafemap_find(bmsafemaphd, mp, cg, bmsafemapp)

From owner-svn-src-user@FreeBSD.ORG  Mon May  3 22:10:54 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BED90106566B;
	Mon,  3 May 2010 22:10:54 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id AE61D8FC14;
	Mon,  3 May 2010 22:10:54 +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 o43MAsf3015698;
	Mon, 3 May 2010 22:10:54 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43MAsn9015696;
	Mon, 3 May 2010 22:10:54 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005032210.o43MAsn9015696@svn.freebsd.org>
From: Doug Barton 
Date: Mon, 3 May 2010 22:10:54 +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: r207588 - 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: Mon, 03 May 2010 22:10:54 -0000

Author: dougb
Date: Mon May  3 22:10:54 2010
New Revision: 207588
URL: http://svn.freebsd.org/changeset/base/207588

Log:
  Remove no longer necessary local variable in version()
  
  Add a --no-index-fetch option for people who want to use the
  --index* options but do not want portmaster to do the fetching.
  
  Rework how some initial variables are set. Deriving the values via
  make works, but is very slow. So try to be more intelligent about
  recognizing the standard values for the ones we always need to have.
    * For PORTSDIR and PKG_DBDIR if those variables are not in the
      environment and the standard directories exist, use them.
    * Move the setting of pd (PORTSDIR) up to before the INDEX-related
      items so that we can use ${INDEXDIR:-$pd}
    * The derivation of the INDEX-related stuff wasn't working (since
      we didn't know $pd) and no one has complained, so just use the
      default values from bsd.port.mk unless the user specifies others.
    * If /var/db/ports exists, use it for port_dbdir
  
  In the test to see if we downloaded a new INDEX.bz2 file supply a
  default value for index_time so that if the file did not exist
  previously the test will not fail.
  
  Indicate that the -[lL] options are not compatible with -FRaefnors,
  updates, or installs

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Mon May  3 22:09:06 2010	(r207587)
+++ user/dougb/portmaster/portmaster	Mon May  3 22:10:54 2010	(r207588)
@@ -49,7 +49,7 @@ umask 022
 #=============== Begin functions we always want to have ===============
 
 version () {
-	local rcs cvs
+	local cvs
 
 	cvs='$FreeBSD$'
 
@@ -250,7 +250,8 @@ usage () {
 	echo "    [[[--packages|-P]|[--packages-only|-PP]] | [--packages-build]]"
 	echo "    [--packages-if-newer] [--delete-build-only] [--always-fetch]"
 	echo "    [--local-packagedir=] [--delete-packages]"
-	echo "    [--no-confirm] [--no-term-title] [--index|--index-first|--index-only]"
+	echo "    [--no-confirm] [--no-term-title] [--no-index-fetch]"
+	echo "    [--index|--index-first|--index-only]"
 	echo "    [-m ] [-x ]"
 	echo "${0##*/} [Common flags] "
 	echo "${0##*/} [Common flags] "
@@ -311,6 +312,7 @@ usage () {
 	echo '   installed and/or updated before proceeding'
 	echo '--no-term-title do not update the xterm title bar'
 	echo ''
+	echo '--no-index-fetch skip fetching the INDEX file'
 	echo '--index use INDEX-[6-9] exclusively to check if a port is up to date'
 	echo '--index-first use the INDEX for status, but double-check with the port'
 	echo '--index-only do not try to use /usr/ports'
@@ -450,6 +452,7 @@ for var in "$@" ; do
 				export PM_NO_CONFIRM ;;
 	--no-term-title)	PM_NO_TERM_TITLE=pm_no_term_title
 				export PM_NO_TERM_TITLE ;;
+	--no-index-fetch)	PM_NO_INDEX_FETCH=pm_no_index_fetch ;;
 	--index)		cross_idx index ; PM_INDEX=pm_index ; export PM_INDEX ;;
 	--index-first)		PM_INDEX=pm_index ; PM_INDEX_FIRST=pm_index_first
 				cross_idx first ; export PM_INDEX PM_INDEX_FIRST ;;
@@ -478,66 +481,61 @@ unset var
 # Do this here so it can use the fancy functions above, and default values
 # can be overridden in the rc files
 if [ "$$" -eq "$PM_PARENT_PID" ]; then
-	if [ -n "$PM_INDEX" ]; then
-		[ -d "$pd" ] && pm_cd_pd
-		if [ -z "$FETCHINDEX" ]; then
-			[ -d "$pd" ] && FETCHINDEX=`pm_make_b -V FETCHINDEX`
-			[ -n "$FETCHINDEX" ] || FETCHINDEX='fetch -am -o'
-		fi
-		if [ -z "$MASTER_SITE_INDEX" ]; then
-			[ -d "$pd" ] &&
-			MASTER_SITE_INDEX=`pm_make_b -V MASTER_SITE_INDEX`
-			[ -n "$MASTER_SITE_INDEX" ] ||
-			MASTER_SITE_INDEX='http://www.FreeBSD.org/ports/'
-		fi
-		if [ -z "$INDEXDIR" ]; then
-			[ -d "$pd" ] && INDEXDIR=`pm_make_b -V INDEXDIR`
-			[ -n "$INDEXDIR" ] || INDEXDIR="$TMPDIR"
+	if [ -z "$pd" ]; then
+		if [ -z "$PORTSDIR" ]; then
+			[ -d /usr/ports ] && pd=/usr/ports
+			[ -z "$pd" ] &&
+				pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null`
+		else
+			pd=$PORTSDIR
 		fi
+	fi
+
+	if [ -n "$PM_INDEX" ]; then
 		if [ -z "$INDEXFILE" ]; then
-			[ -d "$pd" ] && INDEXFILE=`pm_make_b -V INDEXFILE`
-			if [ -z "$INDEXFILE" ]; then
-				ver=`uname -r`
-				INDEXFILE=INDEX-${ver%%\.*}
-				unset ver
+			ver=`uname -r`
+			INDEXFILE=INDEX-${ver%%\.*}
+			unset ver
+		fi
+		PM_INDEX="${INDEXDIR:-$pd}/${INDEXFILE}"
+
+		if [ -z "$PM_NO_INDEX_FETCH" ]; then
+			: ${FETCHINDEX:='fetch -am -o'}
+			: ${MASTER_SITE_INDEX:='http://www.FreeBSD.org/ports/'}
+
+			index_time=`stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null`
+			pm_sv Updating INDEX file
+			$PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
+			if [ ${index_time:-0} -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then
+				temp_index=`pm_mktemp index`
+				bunzip2 < ${PM_INDEX}.bz2 > $temp_index
+				pm_install_s $temp_index $PM_INDEX
+				unlink $temp_index
+				unset temp_index
 			fi
+			unset index_time
+		else
+			[ -r "$PM_INDEX" ] ||
+				fail "The --no-index-fetch option was used, but $PM_INDEX does not exist"
 		fi
 
-		PM_INDEX="${INDEXDIR}/${INDEXFILE}"
-		index_time=`stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null`
-		pm_sv Updating INDEX file
-		$PM_SU_CMD $FETCHINDEX ${PM_INDEX}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
-		if [ $index_time -ne `stat -f '%Um' ${PM_INDEX}.bz2 2>/dev/null` ]; then
-			temp_index=`pm_mktemp index`
-			bunzip2 < ${PM_INDEX}.bz2 > $temp_index
-			pm_install_s $temp_index $PM_INDEX
-			unlink $temp_index
-			unset temp_index
-		fi
-		unset index_time
-
 		PM_INDEX_PORTS=`pkg_version -Ivl\< $PM_INDEX | cut -f1 -d\<`
 		export PM_INDEX_PORTS
 	fi
 
 	if [ -z "$pd" ]; then
-		if [ -z "$PORTSDIR" ]; then
-			pd=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORTSDIR 2>/dev/null`
-		else
-			pd=$PORTSDIR
-		fi
-		if [ -z "$pd" ]; then
-			if [ -n "$PM_INDEX_ONLY" ]; then
-				pd=`head -1 $PM_INDEX | cut -f 2 -d\|`
-				pd=${pd%/*}
-				pd=${pd%/*}
-			fi
+		if [ -n "$PM_INDEX_ONLY" ]; then
+			pd=`head -1 $PM_INDEX | cut -f 2 -d\|`
+			pd=${pd%/*}
+			pd=${pd%/*}
 		fi
 		[ -z "$pd" ] && fail 'The value of PORTSDIR cannot be empty'
 	fi
 	if [ -z "$pdb" ]; then
 		if [ -z "$PKG_DBDIR" ]; then
-			pdb=`pm_make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null`
+			[ -d /var/db/pkg ] && pdb=/var/db/pkg
+			[ -z "$pdb" ] &&
+				pdb=`pm_make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null`
 		else
 			pdb=$PKG_DBDIR
 		fi
@@ -554,14 +552,13 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then
 		# In case it is a symlink
 		distdir="${distdir%/}/"
 	fi
-	if [ -z "$port_dbdir" ]; then
-		port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null`
-		[ -z "$port_dbdir" -a -d /var/db/ports ] && port_dbdir='/var/db/ports'
-		[ -n "$port_dbdir" ] && export port_dbdir
-	fi
-
 	export pd pdb distdir
 
+	[ -z "$port_dbdir" -a -d /var/db/ports ] && port_dbdir=/var/db/ports
+	[ -z "$port_dbdir" ] &&
+		port_dbdir=`pm_make_b -f/usr/share/mk/bsd.port.mk -V PORT_DBDIR 2>/dev/null`
+	[ -n "$port_dbdir" ] && export port_dbdir
+
 	if [ -n "$PM_PACKAGES_BUILD" -o -n "$PM_DEL_BUILD_ONLY" ]; then
 		PM_BUILD_ONLY_LIST=pm_bol
 		export PM_BUILD_ONLY_LIST
@@ -1152,6 +1149,14 @@ if [ -n "$NO_RECURSIVE_CONFIG" ]; then
 	[ -n "$FORCE_CONFIG" ] &&
 		fail 'The --force-config and -G options are mutually exclusive'
 fi
+if [ -n "$LIST" -o -n "$LIST_PLUS" ]; then
+	if [ -n "$FETCH_ONLY" -o -n "$RESTART" -o -n "$UPDATE_ALL" -o \
+	    -n "$EXPUNGE" -o -n "$PM_FORCE" -o -n "$NO_ACTION" -o \
+	    -n "$REPLACE_ORIGIN" -o -n "$UPDATE_REQ_BYS" -o -n "$CLEAN_STALE" ]; then
+		fail 'The -[lL] options are not compatible with -FRaefnors'
+	fi
+	[ $# -gt 0 ] && fail 'The -[lL] options are not compatible with updates or installs'
+fi
 unset my_environment
 
 #=============== Begin functions for getopts features and main ===============

From owner-svn-src-user@FreeBSD.ORG  Mon May  3 22:14:06 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D2B4D1065673;
	Mon,  3 May 2010 22:14:06 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id C29B28FC15;
	Mon,  3 May 2010 22:14:06 +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 o43ME6S7017070;
	Mon, 3 May 2010 22:14:06 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o43ME6ed017067;
	Mon, 3 May 2010 22:14:06 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005032214.o43ME6ed017067@svn.freebsd.org>
From: Doug Barton 
Date: Mon, 3 May 2010 22:14: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: r207589 - 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: Mon, 03 May 2010 22:14:06 -0000

Author: dougb
Date: Mon May  3 22:14:06 2010
New Revision: 207589
URL: http://svn.freebsd.org/changeset/base/207589

Log:
  Document the --no-index-fetch option

Modified:
  user/dougb/portmaster/portmaster.8

Modified: user/dougb/portmaster/portmaster.8
==============================================================================
--- user/dougb/portmaster/portmaster.8	Mon May  3 22:10:54 2010	(r207588)
+++ user/dougb/portmaster/portmaster.8	Mon May  3 22:14:06 2010	(r207589)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 1, 2010
+.Dd May 3, 2010
 .Dt PORTMASTER 8
 .Os
 .Sh NAME
@@ -41,6 +41,7 @@ Common Flags:
 .Op Fl -delete-packages
 .Op Fl -no-confirm
 .Op Fl -no-term-title
+.Op Fl -no-index-fetch
 .Op --index|--index-first|--index-only
 .Op Fl m Ar arguments for make
 .Op Fl x Ar glob pattern to exclude from building
@@ -432,6 +433,8 @@ do not ask the user to confirm the list 
 be installed and/or updated before proceeding
 .It Fl -no-term-title
 do not update the xterm title bar
+.It Fl -no-index-fetch
+skip fetching the INDEX file
 .It Fl -index
 use INDEX-[6-9] exclusively to check if a port is up to date
 .It Fl -index-first
@@ -660,6 +663,9 @@ along with their related options.
 # Do not update the xterm title bar (--no-term-title)
 # PM_NO_TERM_TITLE=pm_no_term_title
 #
+# Do not fetch the INDEX file (--no-index-fetch)
+# PM_NO_INDEX_FETCH=pm_no_index_fetch
+#
 # Use only the INDEX file to check if a port is out of date (--index)
 # PM_INDEX=pm_index
 #

From owner-svn-src-user@FreeBSD.ORG  Fri May  7 04:04:24 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B809C1065672;
	Fri,  7 May 2010 04:04:24 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id A885C8FC16;
	Fri,  7 May 2010 04:04:24 +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 o4744ONR082167;
	Fri, 7 May 2010 04:04:24 GMT (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4744OhM082164;
	Fri, 7 May 2010 04:04:24 GMT (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201005070404.o4744OhM082164@svn.freebsd.org>
From: Juli Mallett 
Date: Fri, 7 May 2010 04:04: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: r207737 - in user/jmallett/octeon/sys: dev/puc mips/conf
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, 07 May 2010 04:04:24 -0000

Author: jmallett
Date: Fri May  7 04:04:24 2010
New Revision: 207737
URL: http://svn.freebsd.org/changeset/base/207737

Log:
  Detect the minipci multiport serial card I've got.

Modified:
  user/jmallett/octeon/sys/dev/puc/pucdata.c
  user/jmallett/octeon/sys/mips/conf/OCTEON1-32

Modified: user/jmallett/octeon/sys/dev/puc/pucdata.c
==============================================================================
--- user/jmallett/octeon/sys/dev/puc/pucdata.c	Fri May  7 00:41:12 2010	(r207736)
+++ user/jmallett/octeon/sys/dev/puc/pucdata.c	Fri May  7 04:04:24 2010	(r207737)
@@ -643,6 +643,12 @@ const struct puc_cfg puc_pci_devices[] =
 	    PUC_PORT_4S, 0x10, 0, 8,
 	},
 
+	{   0x1415, 0x950c, 0xffff, 0,
+	    "Oxford Semiconductor OX16PCI954 UARTs (function 0)",
+	    DEFAULT_RCLK,
+	    PUC_PORT_4S, 0x10, 0, 8,
+	},
+
 	{   0x1415, 0x9511, 0xffff, 0,
 	    "Oxford Semiconductor OX9160/OX16PCI954 UARTs (function 1)",
 	    DEFAULT_RCLK,

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Fri May  7 00:41:12 2010	(r207736)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Fri May  7 04:04:24 2010	(r207737)
@@ -71,6 +71,7 @@ device          miibus          # MII bu
 device		loop
 device		ether
 device		md
+device		puc
 device		uart
 nodevice	uart_ns8250
 device		octe

From owner-svn-src-user@FreeBSD.ORG  Fri May  7 18:22:52 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 24671106566B;
	Fri,  7 May 2010 18:22:52 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 152BC8FC18;
	Fri,  7 May 2010 18:22:52 +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 o47IMpRS074213;
	Fri, 7 May 2010 18:22:51 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o47IMpJQ074211;
	Fri, 7 May 2010 18:22:51 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005071822.o47IMpJQ074211@svn.freebsd.org>
From: Doug Barton 
Date: Fri, 7 May 2010 18:22:51 +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: r207751 - 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, 07 May 2010 18:22:52 -0000

Author: dougb
Date: Fri May  7 18:22:51 2010
New Revision: 207751
URL: http://svn.freebsd.org/changeset/base/207751

Log:
  Fix a braino for --index-first and --index-only ... the cross-checking of
  the command line options needs to happen before the environment variables
  are set.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri May  7 18:03:35 2010	(r207750)
+++ user/dougb/portmaster/portmaster	Fri May  7 18:22:51 2010	(r207751)
@@ -454,10 +454,12 @@ for var in "$@" ; do
 				export PM_NO_TERM_TITLE ;;
 	--no-index-fetch)	PM_NO_INDEX_FETCH=pm_no_index_fetch ;;
 	--index)		cross_idx index ; PM_INDEX=pm_index ; export PM_INDEX ;;
-	--index-first)		PM_INDEX=pm_index ; PM_INDEX_FIRST=pm_index_first
-				cross_idx first ; export PM_INDEX PM_INDEX_FIRST ;;
-	--index-only)		PM_INDEX=pm_index ; PM_INDEX_ONLY=pm_index_only
-				cross_idx only ; export PM_INDEX PM_INDEX_ONLY ;;
+	--index-first)		cross_idx first ; PM_INDEX=pm_index
+				PM_INDEX_FIRST=pm_index_first
+				export PM_INDEX PM_INDEX_FIRST ;;
+	--index-only)		cross_idx only ; PM_INDEX=pm_index
+				PM_INDEX_ONLY=pm_index_only
+				export PM_INDEX PM_INDEX_ONLY ;;
 	--help)			usage 0 ;;
 	--version)		version ; exit 0 ;;
 	--clean-distfiles)	CLEAN_DISTFILES=clean_distfiles ;;

From owner-svn-src-user@FreeBSD.ORG  Fri May  7 21:48:52 2010
Return-Path: 
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E29131065677;
	Fri,  7 May 2010 21:48:51 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id D310B8FC08;
	Fri,  7 May 2010 21:48:51 +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 o47LmpeK019995;
	Fri, 7 May 2010 21:48:51 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o47Lmpvc019993;
	Fri, 7 May 2010 21:48:51 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201005072148.o47Lmpvc019993@svn.freebsd.org>
From: Doug Barton 
Date: Fri, 7 May 2010 21:48:51 +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: r207760 - 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, 07 May 2010 21:48:52 -0000

Author: dougb
Date: Fri May  7 21:48:51 2010
New Revision: 207760
URL: http://svn.freebsd.org/changeset/base/207760

Log:
  Add a --packages-local option for those who wish to use only local
  packages, and never attempt to fetch from a remote site.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Fri May  7 21:06:52 2010	(r207759)
+++ user/dougb/portmaster/portmaster	Fri May  7 21:48:51 2010	(r207760)
@@ -249,7 +249,7 @@ usage () {
 	echo "Common flags: [--force-config] [-CGHKgntvw B|b f|i D|d]"
 	echo "    [[[--packages|-P]|[--packages-only|-PP]] | [--packages-build]]"
 	echo "    [--packages-if-newer] [--delete-build-only] [--always-fetch]"
-	echo "    [--local-packagedir=] [--delete-packages]"
+	echo "    [--local-packagedir=] [--packages-local] [--delete-packages]"
 	echo "    [--no-confirm] [--no-term-title] [--no-index-fetch]"
 	echo "    [--index|--index-first|--index-only]"
 	echo "    [-m ] [-x ]"
@@ -336,6 +336,7 @@ usage () {
 	echo '--always-fetch fetch package even if it already exists locally'
 	echo '--local-packagedir= where local packages can be found,'
 	echo '   will fall back to fetching if no local version exists'
+	echo '--packages-local use packages from --local-packagedir only'
 	echo '--delete-packages after installing from a package, delete it'
 	echo ''
 	echo '-l list installed ports by category'
@@ -409,6 +410,8 @@ e2="The --packages-build option and the 
 	build)		case "$PM_PACKAGES" in first|only) fail $e2 ;; esac ;;
 	newer)		[ -z "$PM_PACKAGES" -a -z "$PM_PACKAGES_BUILD" ] && {
 				PM_PACKAGES=newer ; export PM_PACKAGES; } ;;
+	local)		[ -z "$PM_PACKAGES" -a -z "$PM_PACKAGES_BUILD" ] && {
+				PM_PACKAGES=local ; export PM_PACKAGES; } ;;
 	esac
 }
 
@@ -439,6 +442,9 @@ for var in "$@" ; do
 	--packages-if-newer)	packages_init newer
 				PM_PACKAGES_NEWER=pmp_newer
 				export PM_PACKAGES_NEWER ;;
+	--packages-local)	packages_init local
+				PM_PACKAGES_LOCAL=pmp_local
+				export PM_PACKAGES_LOCAL ;;
 	--always-fetch)		PM_ALWAYS_FETCH=pm_always_fetch
 				export PM_ALWAYS_FETCH ;;
 	--local-packagedir=*)	LOCAL_PACKAGEDIR=${var#--local-packagedir=}
@@ -3003,7 +3009,7 @@ fetch_package () {
 			$PM_SU_CMD fetch $FETCH_ARGS -o $ppd ${sitepath}${1}.tbz 2>/dev/null; }
 	fi
 }
-	if [ -z "$PACKAGESITE" ]; then
+	if [ -z "$PACKAGESITE" -a -z "$PM_PACKAGES_LOCAL" ]; then
 		release=`uname -r`
 
 		case "$release" in
@@ -3049,7 +3055,7 @@ fetch_package () {
 		fi
 	fi
 
-	if [ -z "$latest_pv" ]; then
+	if [ -z "$latest_pv" -a -z "$PM_PACKAGES_LOCAL" ]; then
 		dirlist=`echo ${TMPDIR}/f-${PM_PARENT_PID}-dl-${portdir%/*}*`
 		if [ ! -r "$dirlist" ]; then
 			pm_unlink $dirlist		# JIC
@@ -3066,7 +3072,7 @@ fetch_package () {
 	fi
 	unset dirlist s
 
-	if [ -z "$latest_pv" ]; then
+	if [ -z "$latest_pv" -a -z "$PM_PACKAGES_LOCAL" ]; then
 		fetch_package $new_port try
 		if [ $? -eq 0 ]; then
 			latest_pv=$new_port
@@ -3077,7 +3083,13 @@ fetch_package () {
 
 	if [ -z "$latest_pv" ]; then
 		echo "===>>> Package and/or archive not found at:"
-		echo "${sitepath}"
+		if [ -n "$LOCAL_PACKAGEDIR" ]; then
+			echo "	$LOCAL_PACKAGEDIR"
+			if [ -z "$PM_PACKAGES_LOCAL" ]; then
+				echo '	or'
+			fi
+		fi
+		[ -z "$PM_PACKAGES_LOCAL" ] && echo "	${sitepath}"
 		echo ''
 		echo "       Check the pkg_add(1) man page for information"
 		echo "       on setting the PACKAGESITE environment variable"
@@ -3170,6 +3182,7 @@ if [ -z "$use_package" ]; then
 		fi
 	fi
 
+	[ -z "$PM_INDEX_ONLY" ] && pm_cd_pd $portdir
 	[ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd ||
 		fail 'make clean failed'; echo ''; }