From owner-svn-src-releng@FreeBSD.ORG Sun Oct 21 12:53:34 2012 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA4CD82A; Sun, 21 Oct 2012 12:53:34 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 693BE8FC0A; Sun, 21 Oct 2012 12:53:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9LCrYK4079471; Sun, 21 Oct 2012 12:53:34 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9LCrYSo079469; Sun, 21 Oct 2012 12:53:34 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201210211253.q9LCrYSo079469@svn.freebsd.org> From: Marius Strobl Date: Sun, 21 Oct 2012 12:53:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r241813 - releng/9.1/sys/dev/iicbus X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Oct 2012 12:53:34 -0000 Author: marius Date: Sun Oct 21 12:53:33 2012 New Revision: 241813 URL: http://svn.freebsd.org/changeset/base/241813 Log: MFC: r241679 It turns out that as documented, PCF8563_R_SECOND_VL (i.e. battery low) doesn't automatically clear when VDD rises above Vlow again and needs to be cleared manually. However, apparently this needs all of the time registers to be set, i.e. pcf8563_settime(), and not just PCF8563_R_SECOND in order for PCF8563_R_SECOND_VL to stick. Thus, we just issue a warning during pcf8563_attach() rather than failing with ENXIO in case it is set. Approved by: re (kib) Modified: releng/9.1/sys/dev/iicbus/pcf8563.c Directory Properties: releng/9.1/sys/ (props changed) releng/9.1/sys/dev/ (props changed) Modified: releng/9.1/sys/dev/iicbus/pcf8563.c ============================================================================== --- releng/9.1/sys/dev/iicbus/pcf8563.c Sun Oct 21 12:33:38 2012 (r241812) +++ releng/9.1/sys/dev/iicbus/pcf8563.c Sun Oct 21 12:53:33 2012 (r241813) @@ -83,6 +83,16 @@ pcf8563_attach(device_t dev) if (sc->sc_addr == 0) sc->sc_addr = PCF8563_ADDR; + /* + * NB: PCF8563_R_SECOND_VL doesn't automatically clear when VDD + * rises above Vlow again and needs to be cleared manually. + * However, apparently this needs all of the time registers to be + * set, i.e. pcf8563_settime(), and not just PCF8563_R_SECOND in + * order for PCF8563_R_SECOND_VL to stick. Thus, we just issue a + * warning here rather than failing with ENXIO in case it is set. + * Note that pcf8563_settime() will also clear PCF8563_R_SECOND_VL + * as a side-effect. + */ msgs[0].slave = msgs[1].slave = sc->sc_addr; error = iicbus_transfer(device_get_parent(dev), msgs, sizeof(msgs) / sizeof(*msgs)); @@ -90,10 +100,8 @@ pcf8563_attach(device_t dev) device_printf(dev, "%s: cannot read RTC\n", __func__); return (error); } - if ((val & PCF8563_R_SECOND_VL) != 0) { + if ((val & PCF8563_R_SECOND_VL) != 0) device_printf(dev, "%s: battery low\n", __func__); - return (ENXIO); - } sc->sc_year0 = 1900; clock_register(dev, 1000000); /* 1 second resolution */ From owner-svn-src-releng@FreeBSD.ORG Wed Oct 24 02:09:22 2012 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B4BC120; Wed, 24 Oct 2012 02:09:22 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1E59F8FC0C; Wed, 24 Oct 2012 02:09:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9O29Lx8013434; Wed, 24 Oct 2012 02:09:21 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9O29LWA013432; Wed, 24 Oct 2012 02:09:21 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201210240209.q9O29LWA013432@svn.freebsd.org> From: Ken Smith Date: Wed, 24 Oct 2012 02:09:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r241978 - releng/9.1/usr.sbin/pkg_install/add X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2012 02:09:22 -0000 Author: kensmith Date: Wed Oct 24 02:09:21 2012 New Revision: 241978 URL: http://svn.freebsd.org/changeset/base/241978 Log: MFC r241976: Add the release package directory for 9.1-RELEASE. Approved by: re (implicit) Modified: releng/9.1/usr.sbin/pkg_install/add/main.c Directory Properties: releng/9.1/usr.sbin/pkg_install/add/ (props changed) Modified: releng/9.1/usr.sbin/pkg_install/add/main.c ============================================================================== --- releng/9.1/usr.sbin/pkg_install/add/main.c Wed Oct 24 02:07:02 2012 (r241977) +++ releng/9.1/usr.sbin/pkg_install/add/main.c Wed Oct 24 02:09:21 2012 (r241978) @@ -89,6 +89,7 @@ struct { { 802000, 802499, "/packages-8.2-release" }, { 803000, 803499, "/packages-8.3-release" }, { 900000, 900499, "/packages-9.0-release" }, + { 901000, 901499, "/packages-9.1-release" }, { 300000, 399000, "/packages-3-stable" }, { 400000, 499000, "/packages-4-stable" }, { 502100, 502128, "/packages-5-current" }, From owner-svn-src-releng@FreeBSD.ORG Wed Oct 24 02:20:08 2012 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4A4262FD; Wed, 24 Oct 2012 02:20:08 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 311118FC0C; Wed, 24 Oct 2012 02:20:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9O2K81V015623; Wed, 24 Oct 2012 02:20:08 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9O2K7es015621; Wed, 24 Oct 2012 02:20:07 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201210240220.q9O2K7es015621@svn.freebsd.org> From: Ken Smith Date: Wed, 24 Oct 2012 02:20:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r241979 - releng/9.1/release X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2012 02:20:08 -0000 Author: kensmith Date: Wed Oct 24 02:20:07 2012 New Revision: 241979 URL: http://svn.freebsd.org/changeset/base/241979 Log: Update for being on releng/9.1 (RELENG_9_1). Approved by: re (implicit) Modified: releng/9.1/release/Makefile.sysinstall Modified: releng/9.1/release/Makefile.sysinstall ============================================================================== --- releng/9.1/release/Makefile.sysinstall Wed Oct 24 02:09:21 2012 (r241978) +++ releng/9.1/release/Makefile.sysinstall Wed Oct 24 02:20:07 2012 (r241979) @@ -33,7 +33,7 @@ BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release # If this is a -stable snapshot, then set -#RELEASETAG=RELENG_9 +#RELEASETAG=RELENG_9_1 # # To test a release with a source tree containing patches and # other work. This tree will get copied instead of getting the From owner-svn-src-releng@FreeBSD.ORG Wed Oct 24 02:21:40 2012 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3B665472; Wed, 24 Oct 2012 02:21:40 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2288E8FC08; Wed, 24 Oct 2012 02:21:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9O2Ld80015962; Wed, 24 Oct 2012 02:21:39 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9O2Ldlc015960; Wed, 24 Oct 2012 02:21:39 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201210240221.q9O2Ldlc015960@svn.freebsd.org> From: Ken Smith Date: Wed, 24 Oct 2012 02:21:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r241980 - releng/9.1/share/examples/cvsup X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Oct 2012 02:21:40 -0000 Author: kensmith Date: Wed Oct 24 02:21:39 2012 New Revision: 241980 URL: http://svn.freebsd.org/changeset/base/241980 Log: Update branch tag from RELENG_9 to RELENG_9_1. Approved by: re (implicit) Modified: releng/9.1/share/examples/cvsup/standard-supfile Modified: releng/9.1/share/examples/cvsup/standard-supfile ============================================================================== --- releng/9.1/share/examples/cvsup/standard-supfile Wed Oct 24 02:20:07 2012 (r241979) +++ releng/9.1/share/examples/cvsup/standard-supfile Wed Oct 24 02:21:39 2012 (r241980) @@ -46,7 +46,7 @@ *default host=CHANGE_THIS.FreeBSD.org *default base=/var/db *default prefix=/usr -*default release=cvs tag=RELENG_9 +*default release=cvs tag=RELENG_9_1 *default delete use-rel-suffix # If you seem to be limited by CPU rather than network or disk bandwidth, try From owner-svn-src-releng@FreeBSD.ORG Sat Oct 27 19:40:26 2012 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F347B2BC; Sat, 27 Oct 2012 19:40:25 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C90AD8FC0A; Sat, 27 Oct 2012 19:40:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9RJePoQ044420; Sat, 27 Oct 2012 19:40:25 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RJePqc044417; Sat, 27 Oct 2012 19:40:25 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201210271940.q9RJePqc044417@svn.freebsd.org> From: Hiroki Sato Date: Sat, 27 Oct 2012 19:40:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r242186 - releng/9.1/release X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2012 19:40:26 -0000 Author: hrs Date: Sat Oct 27 19:40:25 2012 New Revision: 242186 URL: http://svn.freebsd.org/changeset/base/242186 Log: MFC of 240586 and 240587 to unbreak release building: Update generate-release.sh script: - Use svn for ports and doc trees - When installing a binary textproc/docproj package, switch pkg_add(1) to pkg(8) [1] Approved by: re (implicitly) Modified: releng/9.1/release/generate-release.sh Directory Properties: releng/9.1/release/ (props changed) Modified: releng/9.1/release/generate-release.sh ============================================================================== --- releng/9.1/release/generate-release.sh Sat Oct 27 19:37:26 2012 (r242185) +++ releng/9.1/release/generate-release.sh Sat Oct 27 19:40:25 2012 (r242186) @@ -3,14 +3,10 @@ # generate-release.sh: check out source trees, and build release components with # totally clean, fresh trees. # -# Usage: generate-release.sh svn-branch scratch-dir +# Usage: generate-release.sh [-r revision] [-d docrevision] \ +# [-p portsrevision] svn-branch scratch-dir # # Environment variables: -# CVSUP_HOST: Host of a cvsup server to obtain the ports and documentation -# trees. This or CVSROOT must be set to include ports and documentation. -# CVSROOT: CVS root to obtain the ports and documentation trees. This or -# CVSUP_HOST must be set to include ports and documentation. -# CVS_TAG: CVS tag for ports and documentation (HEAD by default) # SVNROOT: SVN URL to FreeBSD source repository (by default, # svn://svn.freebsd.org/base) # MAKE_FLAGS: optional flags to pass to make (e.g. -j) @@ -20,26 +16,42 @@ # $FreeBSD$ # -mkdir -p $2/usr/src +usage() +{ + echo "Usage: $0 [-r revision] [-d docrevision] [-p portsrevision] svn-branch scratch-dir" + exit 1 +} + +REVISION= +DOCREVISION= +PORTSREVISION= +while getopts d:r:p: opt; do + case $opt in + d) + DOCREVISION="-r $OPTARG" + ;; + r) + REVISION="-r $OPTARG" + ;; + p) + PORTSREVISION="-r $OPTARG" + ;; + \?) + usage + ;; + esac +done +shift $(($OPTIND - 1)) + +if [ $# -lt 2 ]; then + usage +fi + set -e # Everything must succeed svn co ${SVNROOT:-svn://svn.freebsd.org/base}/$1 $2/usr/src -if [ ! -z $CVSUP_HOST ]; then - cat > $2/docports-supfile << EOF - *default host=$CVSUP_HOST - *default base=/var/db - *default prefix=/usr - *default release=cvs tag=${CVS_TAG:-.} - *default delete use-rel-suffix - *default compress - ports-all - doc-all -EOF -elif [ ! -z $CVSROOT ]; then - cd $2/usr - cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} ports - cvs -R ${CVSARGS} -d ${CVSROOT} co -P -r ${CVS_TAG:-HEAD} doc -fi +svn co ${SVNROOT:-svn://svn.freebsd.org/doc}/head $2/usr/doc $DOCREVISION +svn co ${SVNROOT:-svn://svn.freebsd.org/ports}/head $2/usr/ports $PORTSREVISION cd $2/usr/src make $MAKE_FLAGS buildworld @@ -47,18 +59,11 @@ make installworld distribution DESTDIR=$ mount -t devfs devfs $2/dev trap "umount $2/dev" EXIT # Clean up devfs mount on exit -if [ ! -z $CVSUP_HOST ]; then - cp /etc/resolv.conf $2/etc/resolv.conf - - # Checkout ports and doc trees - chroot $2 /usr/bin/csup /docports-supfile -fi - if [ -d $2/usr/doc ]; then cp /etc/resolv.conf $2/etc/resolv.conf - # Build ports to build release documentation - chroot $2 /bin/sh -c 'pkg_add -r docproj || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)' + # Install docproj to build release documentation + chroot $2 /bin/sh -c '(export ASSUME_ALWAYS_YES=1 && /usr/sbin/pkg install -y docproj) || (cd /usr/ports/textproc/docproj && make install clean BATCH=yes WITHOUT_X11=yes JADETEX=no WITHOUT_PYTHON=yes)' fi chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel From owner-svn-src-releng@FreeBSD.ORG Sat Oct 27 20:18:00 2012 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E495F8A; Sat, 27 Oct 2012 20:18:00 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 23D7B8FC12; Sat, 27 Oct 2012 20:18:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9RKHxxR050960; Sat, 27 Oct 2012 20:17:59 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9RKHxcH050958; Sat, 27 Oct 2012 20:17:59 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201210272017.q9RKHxcH050958@svn.freebsd.org> From: Hiroki Sato Date: Sat, 27 Oct 2012 20:17:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r242189 - releng/9.1/etc X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Oct 2012 20:18:00 -0000 Author: hrs Date: Sat Oct 27 20:17:59 2012 New Revision: 242189 URL: http://svn.freebsd.org/changeset/base/242189 Log: MFC of r242187: Fix an issue when ipv6_enable=YES && ipv6_gateway_enable=YES which could prevent rtadvd(8) from working as intended. Approved by: re (kib) Modified: releng/9.1/etc/network.subr Directory Properties: releng/9.1/etc/ (props changed) Modified: releng/9.1/etc/network.subr ============================================================================== --- releng/9.1/etc/network.subr Sat Oct 27 19:56:57 2012 (r242188) +++ releng/9.1/etc/network.subr Sat Oct 27 20:17:59 2012 (r242189) @@ -109,7 +109,9 @@ ifconfig_up() # backward compatibility: $ipv6_enable case $ipv6_enable in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - _ipv6_opts="${_ipv6_opts} accept_rtadv" + if ! checkyesno ipv6_gateway_enable; then + _ipv6_opts="${_ipv6_opts} accept_rtadv" + fi ;; esac @@ -488,7 +490,11 @@ ipv6_autoconfif() # backward compatibility: $ipv6_enable case $ipv6_enable in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - return 0 + if checkyesno ipv6_gateway_enable; then + return 1 + else + return 0 + fi ;; esac