FreeNAS

Revision: 12823
          http://freenas.svn.sourceforge.net/freenas/?rev=12823&view=rev
Author:   zippybr
Date:     2012-12-12 13:13:12 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Commit hard drive APM, AAM, HDD Standby Immediately at GUI

ticket: #308

Modified Paths:
--------------
    trunk/gui/middleware/notifier.py
    trunk/gui/storage/forms.py
    trunk/nanobsd/Files/etc/rc.d/ix-ataidle

Modified: trunk/gui/middleware/notifier.py
===================================================================
--- trunk/gui/middleware/notifier.py	2012-12-12 12:29:07 UTC (rev 12822)
+++ trunk/gui/middleware/notifier.py	2012-12-12 13:13:12 UTC (rev 12823)
@@ -831,6 +831,12 @@
                     break
         return res
 
+    def start_ataidle(self, what=None):
+        if what is not None:
+            self.__system("/usr/sbin/service ix-ataidle quietstart %s" % what)
+        else:
+            self.__system("/usr/sbin/service ix-ataidle quietstart")
+
     def start_ssl(self, what=None):
         if what is not None:
             self.__system("/usr/sbin/service ix-ssl quietstart %s" % what)

Modified: trunk/gui/storage/forms.py
===================================================================
--- trunk/gui/storage/forms.py	2012-12-12 12:29:07 UTC (rev 12822)
+++ trunk/gui/storage/forms.py	2012-12-12 13:13:12 UTC (rev 12823)
@@ -730,13 +730,25 @@
 
     def save(self, *args, **kwargs):
         obj = super(DiskFormPartial, self).save(*args, **kwargs)
-        if obj.disk_togglesmart != self._original_smart_en or \
-            obj.disk_smartoptions != self._original_smart_opts:
+        # Commit ataidle changes, if any
+        if (
+            obj.disk_hddstandby != obj._original_state['disk_hddstandby'] or
+            obj.disk_advpowermgmt != obj._original_state['disk_advpowermgmt'] or
+            obj.disk_acousticlevel != obj._original_state['disk_acousticlevel']
+        ):
+            notifier().start_ataidle(obj.disk_name)
+
+        if (
+            obj.disk_togglesmart != self._original_smart_en or
+            obj.disk_smartoptions != self._original_smart_opts
+        ):
             started = notifier().restart("smartd")
             if started is False and \
               services.objects.get(srv_service='smartd').srv_enable:
-                raise ServiceFailed("smartd",
-                    _("The SMART service failed to restart."))
+                raise ServiceFailed(
+                    "smartd",
+                    _("The SMART service failed to restart.")
+                )
         return obj
 
 

Modified: trunk/nanobsd/Files/etc/rc.d/ix-ataidle
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-ataidle	2012-12-12 12:29:07 UTC (rev 12822)
+++ trunk/nanobsd/Files/etc/rc.d/ix-ataidle	2012-12-12 13:13:12 UTC (rev 12823)
@@ -20,6 +20,20 @@
 	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} \
 		"SELECT $sf FROM storage_disk WHERE disk_enabled = 1" | \
 	while eval read -r $f; do
+
+		# Run ataidle only in ${disks}
+		if [ -n "${disks}" ]; then
+			local ok_to_run
+			ok_to_run=$(echo "${disks}"| tr " " \\n | while read -r disk_en; do
+				if [ "${disk_en}" = "${disk_name}" ]; then
+					echo "OK"
+					break
+				fi
+			done)
+			if [ -z "${ok_to_run}" ]; then
+				continue
+			fi
+		fi
 		case "$disk_name" in
 		ad*)
 			;;
@@ -61,6 +75,15 @@
 rcvar="ataidle_enable"
 start_cmd="ataidle_start"
 stop_cmd=':'
+cmd="${1}"
 
+if [ $# -gt 0 ]; then
+	shift
+fi
+disks=""
+if [ -n "$*" ]; then
+	disks="$*"
+fi
+
 load_rc_config $name
-run_rc_command "$1"
+run_rc_command "${cmd}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12897
          http://freenas.svn.sourceforge.net/freenas/?rev=12897&view=rev
Author:   jhixson
Date:     2012-12-14 14:54:20 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Bring in newer pbi-manager plus additional sauce to make freenas plugins build faster and cache packages.

Modified Paths:
--------------
    trunk/build/pbi_env
    trunk/nanobsd/plugins/firefly
    trunk/nanobsd/plugins/minidlna
    trunk/nanobsd/plugins/transmission
    trunk/src/pbi-manager/pbi-manager

Modified: trunk/build/pbi_env
===================================================================
--- trunk/build/pbi_env	2012-12-14 13:45:56 UTC (rev 12896)
+++ trunk/build/pbi_env	2012-12-14 14:54:20 UTC (rev 12897)
@@ -7,12 +7,22 @@
 # Tell pbi_create what directory to use
 #
 PBI_APPDIR="${AVATAR_ROOT}/pbi"
+mkdir -p "${PBI_APPDIR}"
+if [ "$?" != "0" ]
+then
+	error "unable to create ${PBI_APPDIR}!"
+fi
 export PBI_APPDIR
 
 #
 # Tell the build system where pbi-manager is located
 #
 PBI_BINDIR="${AVATAR_ROOT}/sbin"
+mkdir -p "${PBI_BINDIR}"
+if [ "$?" != "0" ]
+then
+	error "unable to create ${PBI_BINDIR}!"
+fi
 export PBI_BINDIR
 
 #
@@ -31,19 +41,45 @@
 # Tell pbi_create where to build PBI files
 #
 PBI_BUILDDIR="${PBI_APPDIR}/${PBI_OSARCH}"
+mkdir -p "${PBI_BUILDDIR}"
+if [ "$?" != "0" ]
+then
+	error "unable to create ${PBI_BUILDDIR}!"
+fi
 export PBI_BUILDDIR
 
 #
+# Where to put packages for PBI's
 #
+PBI_PKGDIR="${PBI_BUILDDIR}/pkgs"
+mkdir -p "${PBI_PKGDIR}"
+if [ "$?" != "0" ]
+then
+	error "unable to create ${PBI_PKGDIR}!"
+fi
+export PBI_PKGDIR
+
+#
+#
 # Tell pbi_create where the source code is
 # 
 PBI_BUILDSRC="${PBI_APPDIR}/src"
+mkdir -p "${PBI_BUILDSRC}"
+if [ "$?" != "0" ]
+then
+	error "unable to create ${PBI_BUILDSRC}!"
+fi
 export PBI_BUILDSRC
 
 #
 # Where to install the chroot
 # 
 PBI_BUILDTARGET="${PBI_APPDIR}/${PBI_OSARCH}/target"
+mkdir -p "${PBI_BUILDTARGET}"
+if [ "$?" != "0" ]
+then
+	error "unable to create ${PBI_BUILDTARGET}!"
+fi
 export PBI_BUILDTARGET
 
 #

Modified: trunk/nanobsd/plugins/firefly
===================================================================
--- trunk/nanobsd/plugins/firefly	2012-12-14 13:45:56 UTC (rev 12896)
+++ trunk/nanobsd/plugins/firefly	2012-12-14 14:54:20 UTC (rev 12897)
@@ -190,7 +190,17 @@
 		pprint 2 "Creating PBI"
 		pprint 3 "log: ${PLUGINLOG}"
 
-		${PBIMAKEPORT} -d "${PLUGINPORTSDIR}" -c "${PLUGINCONFDIR}" -o "${PLUGINOUT}" --tmpfs > "${PLUGINLOG}" 2>&1
+		PBI_ARCH_FLAGS=""
+		if [ "${NANO_ARCH}" = "i386" ]
+		then
+			PBI_ARCH_FLAGS="-32"
+		fi
+
+		${PBIMAKEPORT} -d "${PLUGINPORTSDIR}" \
+			-c "${PLUGINCONFDIR}" \
+			-o "${PLUGINOUT}" \
+			--pkgdir "${PBI_PKGDIR}" \
+			--tmpfs "${PBI_ARCH_FLAGS}" > "${PLUGINLOG}" 2>&1
 		if [ "$?" != "0" ]
 		then
 			echo "${PLUGIN}: failed to build PBI!"

Modified: trunk/nanobsd/plugins/minidlna
===================================================================
--- trunk/nanobsd/plugins/minidlna	2012-12-14 13:45:56 UTC (rev 12896)
+++ trunk/nanobsd/plugins/minidlna	2012-12-14 14:54:20 UTC (rev 12897)
@@ -190,7 +190,17 @@
 		pprint 2 "Creating PBI"
 		pprint 3 "log: ${PLUGINLOG}"
 
-		${PBIMAKEPORT} -d "${PLUGINPORTSDIR}" -c "${PLUGINCONFDIR}" -o "${PLUGINOUT}" --tmpfs > "${PLUGINLOG}" 2>&1
+		PBI_ARCH_FLAGS=""
+		if [ "${NANO_ARCH}" = "i386" ]
+		then
+			PBI_ARCH_FLAGS="-32"
+		fi
+
+		${PBIMAKEPORT} -d "${PLUGINPORTSDIR}" \
+			-c "${PLUGINCONFDIR}" \
+			-o "${PLUGINOUT}" \
+			--pkgdir "${PBI_PKGDIR}" \
+			--tmpfs "${PBI_ARCH_FLAGS}" > "${PLUGINLOG}" 2>&1
 		if [ "$?" != "0" ]
 		then
 			echo "${PLUGIN}: failed to build PBI!"

Modified: trunk/nanobsd/plugins/transmission
===================================================================
--- trunk/nanobsd/plugins/transmission	2012-12-14 13:45:56 UTC (rev 12896)
+++ trunk/nanobsd/plugins/transmission	2012-12-14 14:54:20 UTC (rev 12897)
@@ -189,7 +189,17 @@
 		pprint 2 "Creating PBI"
 		pprint 3 "log: ${PLUGINLOG}"
 
-		${PBIMAKEPORT} -d "${PLUGINPORTSDIR}" -c "${PLUGINCONFDIR}" -o "${PLUGINOUT}" --tmpfs > "${PLUGINLOG}" 2>&1
+		PBI_ARCH_FLAGS=""
+		if [ "${NANO_ARCH}" = "i386" ]
+		then
+			PBI_ARCH_FLAGS="-32"
+		fi
+
+		${PBIMAKEPORT} -d "${PLUGINPORTSDIR}" \
+			-c "${PLUGINCONFDIR}" \
+			-o "${PLUGINOUT}" \
+			--pkgdir "${PBI_PKGDIR}" \
+			--tmpfs "${PBI_ARCH_FLAGS}" > "${PLUGINLOG}" 2>&1
 		if [ "$?" != "0" ]
 		then
 			echo "${PLUGIN}: failed to build PBI!"

Modified: trunk/src/pbi-manager/pbi-manager
===================================================================
--- trunk/src/pbi-manager/pbi-manager	2012-12-14 13:45:56 UTC (rev 12896)
+++ trunk/src/pbi-manager/pbi-manager	2012-12-14 14:54:20 UTC (rev 12897)
@@ -61,6 +61,8 @@
   -d portdir   -- Use different ports dir (Default: /usr/ports)
   -h script    -- Call the following helper script after each build
   -o outdir    -- Where to place the finished PBI file(s) <required>
+  -p <num>     -- Number of PBI builds to run concurrently (Defaults to 1)
+  -32          -- Build i386 PBIs on amd64 host
   --genpatch   -- Generate patch files (*.pbp) from archived PBIs to current
   --keep <num> -- Keep <num> old versions in archive folder for each built PBI
   --prune      -- Remove files from 'outdir' that no longer have a module
@@ -118,6 +120,7 @@
   -k           -- Keep build files, don't delete when finished
   -o outdir    -- Where to place the finished PBI file
   -p prefix    -- Specify alternate PBI Compile PREFIX
+  -32          -- Build i386 PBI on amd64 host
   --delbuild   -- Delete existing build dirs if they exist
   --mkdebug    -- Drop to debug shell if port make fails
   --tmpfs      -- Use TMPFS for port WRKDIRPREFIX
@@ -165,6 +168,7 @@
                 
 Options:
   -o outdir      -- Save the .PBP file to outdir
+  --tmpfs        -- Use TMPFS for extracting PBIs 
   --sign key     -- Sign the PBI with specified openssl key
   --no-checksig  -- Ignore signature verification and force install
 
@@ -413,8 +417,8 @@
 			echo "Your meta and index files will begin refreshing in a moment..."
 			echo "Details available in /var/log/pbid.log"
 			rm ${PBI_DBINDEXDIR}/*.time >/dev/null 2>/dev/null
-			if [ -e "/usr/local/etc/rc.d/pbid" ]; then
-			   /usr/local/etc/rc.d/pbid restart >/dev/null 2>/dev/null
+			if [ -e "${PROGBASE}/etc/rc.d/pbid" ]; then
+			   ${PROGBASE}/etc/rc.d/pbid restart >/dev/null 2>/dev/null
 			fi
 			exit 0
                         ;;
@@ -458,6 +462,8 @@
             --sign)     if [ $# -eq 1 ]; then usage_makepatch_pbi; fi
                         shift; PBI_SSLPRIVKEY="$1"
                         ;;
+           --tmpfs)     PBI_MP_TMPFS="YES" 
+                        ;;
      --no-checksig)     PBI_SKIPSIGVERIFY="YES" ;;
                  *)	if [ $# -gt 2  ]; then usage_makepatch_pbi; fi
                        	PBI_OLDFILENAME="$1"
@@ -994,11 +1000,24 @@
                         get_abspath "$1"
                         PBI_AB_OUTDIR="$_ABSPATH"
                         ;;
+                -p)	if [ $# -eq 1 ]; then usage_autob_pbi; fi
+                        shift
+                        PBI_AB_BUILDERS="$1"
+			if [ ! $(is_num "$PBI_AB_BUILDERS") ] ; then 
+				exit_err "Invalid process number specifed!"
+			fi
+                        ;;
                 -h)	if [ $# -eq 1 ]; then usage_autob_pbi; fi
                         shift
                         get_abspath "$1"
                         PBI_AB_HELPS="$_ABSPATH"
                         ;;
+                -32)    if [ "$REALARCH" != "amd64" ] ; then 
+				exit_err "-32 can only be used on amd64 host"
+			fi	
+			PBI_AB32="YES"
+			ARCH=i386
+                        ;;
 
         --genpatch)     PBI_AB_GENPATCH="YES" 
                         ;;
@@ -1042,6 +1061,7 @@
 			if [ ! -d "${PBI_CONFDIR}" ] ; then
 				exit_err "Invalid confdir (${PBI_CONFDIR})"
 			fi
+			load_pbi_conffile
                         ;;
                 -d)	if [ $# -eq 1 ]; then usage_create_pbi; fi
                         shift; PORTSDIR="$1"
@@ -1132,6 +1152,12 @@
                         shift; PORTSDIR="$1" ; export PORTSDIR
                         ;;
 
+                -32)    if [ "$REALARCH" != "amd64" -a "`basename $0`" != "pbi_makeport_chroot" ] ; then 
+				exit_err "-32 can only be used on amd64 host"
+			fi	
+			ARCH=i386
+                        ;;
+
                 -k)	PBI_KEEPBUILDFILES="YES"
                         ;;
 
@@ -1245,6 +1271,11 @@
 # Make some of our required PBI dirs
 mk_required_dirs() {
 	if [ ! -d "${PBI_APPDIR}" ] ; then mkdir -p ${PBI_APPDIR} >/dev/null 2>/dev/null ; fi
+	if [ ! -d "${PBI_XDGCFGDIR}" ] ; then mkdir -p ${PBI_XDGCFGDIR} >/dev/null 2>/dev/null ; fi
+	if [ ! -d "${PBI_XDGAPPDIR}" ] ; then mkdir -p ${PBI_XDGAPPDIR} >/dev/null 2>/dev/null ; fi
+	if [ ! -d "${PBI_XDGDIRDIR}" ] ; then mkdir -p ${PBI_XDGDIRDIR} >/dev/null 2>/dev/null ; fi
+	if [ ! -d "${PBI_XDGICONDIR}" ] ; then mkdir -p ${PBI_XDGICONDIR} >/dev/null 2>/dev/null ; fi
+	if [ ! -d "${PBI_XDGMIMEDIR}" ] ; then mkdir -p ${PBI_XDGMIMEDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_RCDIR}" ] ; then mkdir -p ${PBI_RCDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_HASHDIR}" ] ; then mkdir -p ${PBI_HASHDIR} >/dev/null 2>/dev/null ; fi
 	if [ ! -d "${PBI_DBAPPDIR}" ] ; then mkdir -p ${PBI_DBAPPDIR} >/dev/null 2>/dev/null ; fi
@@ -1258,7 +1289,7 @@
 	# Set the permissions for directories if we are running as root
 	if [ `id -u` != "0" ] ; then return ; fi
 
-	for cDir in $PBI_APPDIR $PBI_DBAPPDIR $PBI_DBHASHQUEUEDIR
+	for cDir in $PBI_APPDIR $PBI_DBAPPDIR $PBI_DBHASHQUEUEDIR $PBI_XDGCFGDIR $PBI_XDGAPPDIR $PBI_XDGDIRDIR $PBI_XDGICONDIR $PBI_XDGMIMEDIR
 	do	
 		chown root:${PBI_INSTALLGROUP} ${cDir}
 		chmod 775 ${cDir}
@@ -1285,14 +1316,17 @@
 # Initialize some vars
 init_vars() {
 
+	# Set sys vars
+	REALARCH="`uname -m`"
+	ARCH="$REALARCH"
+
         # Where is pbi-manager installed?
-	FBSDMAJOR=`uname -r | cut -c 1`
-        PROGBASE="/usr/local" 
+        PROGBASE=/usr/local
+	SYS_LOCALBASE=/usr/local
 	if [ -z "${PBI_BINDIR}" ]
 	then
 		PBI_BINDIR="${PROGBASE}/sbin"
 	fi
-	SYS_LOCALBASE="/usr/local"
 	if [ -z "${PBI_APPDIR}" -o "`basename $0`" = "pbi_makeport_chroot" ] ; then
 		PBI_APPDIR="/usr/pbi"
         fi
@@ -1300,15 +1334,32 @@
 	if [ -n "${PBI_BUILDDIR}" ] ; then
 		PBI_WRAPPERFILE="${PBI_BUILDDIR}/.pbiwrapper"
 	fi
-	if [ -z "${PBI_OSARCH}" ] ; then
-		PBI_OSARCH=$(uname -m)
+
+	# Set the FreeBSD Major & Release
+  	FBSDREL=`uname -r`
+	if [ -n "${PBI_OSREL}" ]
+	then
+		FBSDREL="${PBI_OSREL}"
 	fi
-	PBI_CHROOTFILE="${PBI_APPDIR}/.pbi-world-${PBI_OSARCH}.txz"
+	FBSDMAJOR=${FBSDREL%%.*}
+
+	PKGEXT="txz"
+	if [ "${FBSDMAJOR}" -lt "9" ] ; then
+		PKGEXT="tbz"
+	fi
+
+	PBI_CHROOTFILE="${PBI_APPDIR}/.pbi-world-$ARCH.txz"
 	if [ `id -u` = "0" ] ; then 
 		PBI_HASHDIR="${PBI_APPDIR}/.hashdir"
 	else
 		PBI_HASHDIR="${PBI_APPDIR}/.hashdir-`whoami`"
 	fi
+	PBI_AB_BUILDERS=1
+	PBI_XDGCFGDIR="${PBI_APPDIR}/etc/xdg/menus"
+	PBI_XDGAPPDIR="${PBI_APPDIR}/share/applications"
+	PBI_XDGDIRDIR="${PBI_APPDIR}/share/desktop-directories"
+	PBI_XDGICONDIR="${PBI_APPDIR}/share/icons/hicolor"
+	PBI_XDGMIMEDIR="${PBI_APPDIR}/share/mime/packages"
 	PBI_RCDIR="${SYS_LOCALBASE}/etc/rc.d"
 	PBI_ETCCONF="${SYS_LOCALBASE}/etc/pbi.conf"
 	PCBSD_ETCCONF="${SYS_LOCALBASE}/etc/pcbsd.conf"
@@ -1343,6 +1394,10 @@
 	PBI_APPDESK_DIR=".${MOD_XDGDESK_DIR}"
 	PBI_APPMENU_DIR=".${MOD_XDGMENU_DIR}"
 	PBI_APPMIME_DIR=".${MOD_XDGMIME_DIR}"
+	PBI_BUILD_USERS=""
+	PBI_BUILD_GROUPS=""
+	PBI_INS_USERSFILE=".pbi-uids"
+	PBI_INS_GROUPSFILE=".pbi-gids"
 	PBI_DESKADD="NO"
 	PBI_MENUADD="NO"
 	PBI_MIMEADD="NO"
@@ -1365,6 +1420,7 @@
 	PBI_INS_MENUSCRIPT="install-menu-icons.sh"
 	PBI_INS_MIMESCRIPT="install-mime.sh"
 	PBI_INS_PATHSCRIPT="install-pathlinks.sh"
+	PBI_ICDIR="pbi-shared-icons"
 	PBI_LISTREPO_UP=""
 	PBI_LISTREPO_DOWN=""
 	PBI_LISTREPO_MIRROR=""
@@ -1453,6 +1509,23 @@
 	PORTSDIR="/usr/ports"
 }
 
+detect_pkgng()
+{
+	export PORTSDIR
+	# Are we using pkgng?
+	WITH_PKGNG=$(make -f ${PORTSDIR}/Mk/bsd.port.mk -V WITH_PKGNG)
+        if [ -n "${WITH_PKGNG}" ]; then
+                export PKGNG=1
+                export PKG_ADD="pkg add"
+                export PKG_DELETE="pkg delete -y -f"
+        else
+                export PKGNG=0
+                export PKG_ADD=pkg_add
+                export PKG_DELETE=pkg_delete
+        fi
+
+}
+
 # Set and export vars used by module scripts
 export_script_vars() {
 	# Load some initial values
@@ -1481,13 +1554,6 @@
 # rm tmpdir
 rm_buildfiles() {
 	if [ "${PBI_KEEPBUILDFILES}" = "YES" ] ; then return ; fi
-	if [ -z "${PBI_PROGDIRPATH}" ] ; then return ; fi
-	if [ "`basename $0`" = "pbi_makeport_chroot" -a -d "${PBI_PROGDIRPATH}" ] ; then 
-		echo "Cleaning ${PBI_PROGDIRPATH}"
-		rm -rf "${PBI_PROGDIRPATH}" >/dev/null 2>/dev/null
-		chflags -R noschg "${PBI_PROGDIRPATH}" >/dev/null 2>/dev/null
-		rm -rf "${PBI_PROGDIRPATH}" >/dev/null 2>/dev/null
-	fi
 	if [ -z "$PBI_CHROOTDIR" ] ; then return ; fi
 	chroot_make_cleanup
 }
@@ -1514,20 +1580,21 @@
 	fi
 
 	if [ -z "${PBI_PROGVERSION}" -a -n "${PORTSDIR}" -a -n "${PBI_MAKEPORT}" ] ; then
-		PORTVER="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION 2>/dev/null`"
+		PORTVER="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION PORTSDIR=${PORTSDIR} 2>/dev/null`"
 
   		# Check if we have a portrevision to use in version number
   		PORTREV=""
-  		PORTREV="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTREVISION 2>/dev/null`"
+  		PORTREV="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTREVISION PORTSDIR=${PORTSDIR} 2>/dev/null`"
   		if [ -n "${PORTREV}" -a "${PORTREV}" != "0" ]
  		then
-   			PORTVER="${PORTVER}_${PORTREV}"
+			PBI_PROGVERSION="${PORTVER}_${PORTREV}"
+		else
+			PBI_PROGVERSION="${PORTVER}"
 		fi
-		PBI_PROGVERSION="${PORTVER}"
 
 		if [ -z "${PBI_PROGVERSION}" ] ; then
 			echo "Warning: Unable to set PBI_PROGVERSION with:"
-		        echo "make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION"
+		        echo "make -C ${PORTSDIR}/${PBI_MAKEPORT} -V DISTVERSION PORTSDIR=${PORTSDIR}"
 		fi
 	else
 		echo "PBI_PROGVERSION - $PBI_PROGVERSION - PORTSDIR - ${PORTSDIR} - $PBI_MAKEPORT - $PBI_MAKE_PORT - pbi - $pbi"
@@ -1543,14 +1610,18 @@
 
 # Get the PBI_PROGNAME
 get_pbi_progname() {
-	if [ -z "${PBI_PROGNAME}" ] ; then
+	if [ -z "${PBI_PROGNAME}" -o "${PBI_PROGNAME}" = " " ] ; then
 		load_pbi_conffile
 	else
 		return 0
 	fi
 
 	if [ -z "${PBI_PROGNAME}" -a -n "${PORTSDIR}" -a -n "${PBI_MAKEPORT}" ] ; then
-		PBI_PROGNAME="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTNAME`"
+		# Get the proper package name from the prefix + name + suffix
+		local pkgPrefix="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PKGNAMEPREFIX PORTSDIR=${PORTSDIR}`"
+		local pkgName="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PORTNAME PORTSDIR=${PORTSDIR}`"
+		local pkgSuffix="`make -C ${PORTSDIR}/${PBI_MAKEPORT} -V PKGNAMESUFFIX PORTSDIR=${PORTSDIR}`"
+		PBI_PROGNAME="${pkgPrefix}${pkgName}${pkgSuffix}"
 	else
 		exit_err "Failed to locate PBI_PROGNAME"
 	fi
@@ -1563,10 +1634,6 @@
 	fi
 
 	tmp="`echo ${PBI_PROGNAME} | tr -d ' ' | tr '[A-Z]' '[a-z]'`"
-	ARCH="`uname -m`"
-	if [ -n "${PBI_OSARCH}" ] ; then
-		ARCH="${PBI_OSARCH}"
-	fi
 	if [ -z "${PBI_PROGDIRNAME}" ] ; then
 		PBI_PROGDIRNAME="${tmp}-${ARCH}"
 	fi
@@ -1594,6 +1661,13 @@
 		echo "Cleaning up patch data..."
 	fi
 
+	# If we used tmpfs, unmount the dirs
+        if [ "$PBI_MP_TMPFS" = "YES" ] ; then
+		umount "${_pbiNewDir}" 2>/dev/null
+		umount "${_pbiOldDir}" 2>/dev/null
+		umount "${_pbiPatchDir}" 2>/dev/null
+	fi
+
 	if [ -n "${_pbiNewDir}" -a -d "${_pbiNewDir}" -a "${_pbiNewDir}" != "/" ] ; then
 	 	rm -rf "${_pbiNewDir}" >/dev/null 2>/dev/null
 	 	chflags -R noschg "${_pbiNewDir}" >/dev/null 2>/dev/null
@@ -1643,14 +1717,8 @@
 	echo "NO_IGNORE=yes" >> ${MAKE_CONF}
 	echo "PACKAGE_BUILDING=yes" >> ${MAKE_CONF}
 
-	# If we plan on using TMPFS set it now
-	if [ "$MKTMPFS" = "YES" ] ; then 
-		echo "WRKDIRPREFIX=/tmpfs" >> ${MAKE_CONF}
-		echo "DEPENDS_CLEAN=YES" >> ${MAKE_CONF}
-	else
-		mkdir /usr/wrkdirprefix
-		echo "WRKDIRPREFIX=/usr/wrkdirprefix" >> ${MAKE_CONF}
-	fi
+	echo "WRKDIRPREFIX=/usr/wrkdirprefix" >> ${MAKE_CONF}
+	echo "DEPENDS_CLEAN=YES" >> ${MAKE_CONF}
 
 	if [ -n "$PBI_MAKEOPTS" ] ; then
 		# Check if we have custom make opts
@@ -1697,6 +1765,7 @@
 
 }
 
+
 # Confirm we are running as root
 require_root() {
   if [ `id -u` != "0" ] ; then
@@ -2025,17 +2094,26 @@
 	if [ -z "$PBI_IT_ADDKEEP" ]; then return ; fi
 
 	local found="0"
+	local added="0"
 	while read iLine
 	do
 		echo "$iLine" | grep "^${1}:${2}:" >/dev/null 2>/dev/null
 		if [ "$?" != "0" ] ; then
+			# Ready to add back the saved lines
+			if [ $found -ne 0 ] ; then
+				while read fLine
+				do
+				  if [ $found -le $PBI_IT_ADDKEEP ] ; then
+	 			     echo "$fLine" >> ${PBI_TMPDIR}/.indextmp	
+				  fi
+				  found=`expr $found - 1`
+				done < ${PBI_TMPDIR}/.foundtmp
+			fi
 	 		echo "$iLine" >> ${PBI_TMPDIR}/.indextmp	
 			continue
 		fi
-		if [ $found -lt $PBI_IT_ADDKEEP ] ; then
-	 		echo "$iLine" >> ${PBI_TMPDIR}/.indextmp	
-			found=`expr $found + 1`
-		fi
+		found=`expr $found + 1`
+	 	echo "$iLine" >> ${PBI_TMPDIR}/.foundtmp	
 	done < $PBI_IT_ADDINDEX	
 	mv "${PBI_TMPDIR}/.indextmp" "${PBI_IT_ADDINDEX}"
 }
@@ -2096,13 +2174,13 @@
 		# Make sure this application has an associated PBI available
 		check_pbi_update "$aName" "nodisplay" \
 		 "$aName" "current" \
-		 "`uname -r`" "$_rArch" "${PBI_BROWSE_RID}"
+		 "$FBSDMAJOR" "$_rArch" "${PBI_BROWSE_RID}"
 		if [ "$?" != "0" ] ; then
 			# On amd64, see if 32bit version exists
 			if [ "$_rArch" = "amd64" ] ; then
 				check_pbi_update "$aName" "nodisplay" \
 		 		"$aName" "current" \
-		 		"`uname -r`" "i386" "${PBI_BROWSE_RID}"
+		 		"$FBSDMAJOR" "i386" "${PBI_BROWSE_RID}"
 				if [ "$?" != "0" ] ; then 
 					continue
 				else
@@ -2752,6 +2830,16 @@
 		echo "MimeRegistration: YES"
 	fi
 
+	# If verbose mode, show file contents
+	if [ "$PBI_VERBOSE" = "YES" ] ; then
+		if [ -n "${PBI_FILENAME}" -a -e "${PBI_FILENAME}" ] ; then
+	  		pbi_find_archive_header
+                	echo "TOTALFILES: ${PBI_ARCHIVE_COUNT}"
+                	echo "Archive Contents:"
+                	echo "--------------------------------------"
+                	tail +$PBI_SKIP_ARCHLINES "${PBI_FILENAME}" | tar tvf - 
+		fi
+        fi
 }
 
 # See if we need to display gui header info
@@ -2948,6 +3036,9 @@
 	mk_pbi_extract_dir
 	pbi_extract_archive
 	
+	pbi_add_check_gids
+	pbi_add_check_uids
+
 	pbi_add_run_script
 	check_postinstall_script
 
@@ -2959,10 +3050,93 @@
 	clean_remote_dl
 }
 
+# Check for any GIDs we need to create
+pbi_add_check_gids() {
+	if [ ! -e "${PBI_PROGDIRPATH}/${PBI_INS_GROUPSFILE}" ] ; then return ; fi
+	runUID=`id -u`
+
+	while read gidLine
+	do
+		gName=`echo $gidLine | cut -d ':' -f 1`
+		gID=`echo $gidLine | cut -d ':' -f 3`
+		gUsers=`echo $gidLine | cut -d ':' -f 4`
+
+		# Is this group already on the system?
+		pw groupshow $gName >/dev/null 2>/dev/null
+		if [ $? -eq 0 ] ; then 
+			echo "Using existing group: $gName"
+		else
+			# Are we installing as root?
+			if [ "$runUID" != "0" ] ; then
+				echo "Please create group \"$gName\" manually or re-install PBI as root."
+			else
+				echo "Adding group: $gName"
+				pw groupadd $gName -g $gID;
+			fi
+		fi
+
+		if [ -n "$gUsers" ] ; then
+			for gUser in `echo $gUsers | sed 's|,| |g'`
+			do
+				pw groupshow ${gName} | grep -qw ${gUser}
+				if [ $? -ne 0 ] ; then
+					# Are we installing as root?
+					if [ "$runUID" != "0" ] ; then
+						echo "Please add user \"$gUser\" to group \"$gName\" manually or re-install PBI as root."
+						continue
+					fi
+
+					echo "Adding user ${gUser} to group ${gName}"
+					pw groupmod ${gName} -m ${gUser}
+				fi
+			done
+		fi
+	done < ${PBI_PROGDIRPATH}/${PBI_INS_GROUPSFILE}
+}
+
+# Check for any UIDs we need to create
+pbi_add_check_uids() {
+	if [ ! -e "${PBI_PROGDIRPATH}/${PBI_INS_USERSFILE}" ] ; then return ; fi
+	runUID=`id -u`
+
+	while read uidLine
+	do
+		uName=`echo $uidLine | cut -d ':' -f 1`
+
+		# Is this user already on the system?
+		pw usershow $uName >/dev/null 2>/dev/null
+		if [ $? -eq 0 ] ; then echo "Using existing user: $uName"; continue ; fi
+
+		# Are we installing as root?
+		if [ "$runUID" != "0" ] ; then
+			echo "Please create user \"$uName\" manually or re-install PBI as root."
+			continue
+		fi
+
+		uID=`echo $uidLine | cut -d ':' -f 3`
+		gID=`echo $uidLine | cut -d ':' -f 4`
+		uClass=`echo $uidLine | cut -d ':' -f 5`
+		uGecos=`echo $uidLine | cut -d ':' -f 8`
+		uHomedir=`echo $uidLine | cut -d ':' -f 9 | sed "s|^/usr/local|${PBI_PROGDIRPATH}|"`
+		uShell=`echo $uidLine | cut -d ':' -f 10`
+
+		echo "Adding user: $uName"
+		pw useradd $uName -u $uID -g $gID $uClass -c "$uGecos" -d $uHomedir -s $uShell;
+
+		# Create homedir
+		case $uHomedir in 
+			/nonexistent|/var/empty) ;; 
+			*) install -d -g $gID -o $uID $uHomedir ;;
+		esac 
+	done < ${PBI_PROGDIRPATH}/${PBI_INS_USERSFILE}
+}
+
 add_hashdir_trigger() {
 	get_dbdir
         _htrig=`echo ${APPDBDIR} | sed "s|${PBI_DBAPPDIR}|${PBI_DBHASHQUEUEDIR}|g"`
-	touch "${_htrig}"
+	if [ ! -e "${_htrig}" ] ; then
+		touch "${_htrig}"
+	fi
 }
 
 # Run the install script if exists
@@ -3272,15 +3446,33 @@
 		exit_trap
 	fi
 
-	PBI_CREATEONLY="YES"
-
 	load_pbi_conffile
 
 	parse_cmdline_overrides
 
+	# Copy over the application to the correct location
+        echo ${PBI_PROGDIRPATH} | grep -q "^${PBI_APPDIR}/"
+	if [ $? -ne 0 ] ; then
+	   _pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
+	   newPDP="${PBI_APPDIR}/${_pbilow}-${ARCH}"
+	   if [ -d "${newPDP}" ] ; then exit_err "Error: ${newPDP} already exists!" ; fi	
+	   cp -r ${PBI_PROGDIRPATH} ${newPDP}
+	   PBI_PROGDIRPATH="${newPDP}"
+	   export PBI_PROGDIRPATH
+	fi
+
+	PBI_CREATEONLY="YES"
+
 	check_create_required_vars
 
 	do_pbi_create
+
+	# Cleanup the copy dir
+ 	if [ -n "$newPDP" ] ; then
+		if [ "${newPDP}" != "/" -a "${newPDP}" != "${PBI_APPDIR}/-" ] ; then
+			rm -rf "${newPDP}"
+		fi
+	fi
 }
 
 # Start the pbi_create backup process
@@ -3332,28 +3524,38 @@
 
 # Start the pbi_create process
 do_pbi_create() {
+	get_pbi_progname
 	echo "Creating PBI: ${PBI_PROGNAME}-${PBI_PROGVERSION}"
 
-	mk_header_dir
-	mk_stage_dir
-	
+
+	if [ "`basename $0`" = "pbi_makeport" -o "`basename $0`" = "pbi_makeport_chroot" ] ; then
+	  PBI_STAGEDIR="${PBI_PROGDIRPATH}"
+	else
+	  mk_stage_dir
+	fi
+
 	copy_resource_dir
 	clean_stage_dir
 
 	mk_extlink_entries
+	clean_icons_dir
 	mk_xdg_scripts
 
+
 	mk_install_script
 	mk_deinstall_script
 
 	mk_hash_list
 
 	mk_archive_file
+
+	mk_header_dir
  	save_pbi_details_to_header
 	mk_header_file
+	rm_header_dir
+
 	mk_output_pbi
 
-	rm_header_dir
 	rm_stage_dir
 }
 
@@ -3458,6 +3660,17 @@
 
 			if [ -z "$src" -o -z "$tar" ] ; then continue ; fi
 
+			# Check if this is an icon we need to preserve
+			echo $src | grep -q "^share/icons/"
+			if [ $? -eq 0 -a "${PBI_USESYSFONTS}" != "NO" ] ; then
+				iDir=`dirname $src`
+				if [ ! -d "${PBI_STAGEDIR}/${PBI_ICDIR}/${iDir}" ] ; then 
+					mkdir -p "${PBI_STAGEDIR}/${PBI_ICDIR}/${iDir}"
+				fi
+				cp "${PBI_STAGEDIR}/${src}" "${PBI_STAGEDIR}/${PBI_ICDIR}/${iDir}"
+				src="${PBI_ICDIR}/${src}"
+			fi
+
 			if [ ! -e "${PBI_STAGEDIR}/$src" ] ; then
 				echo "WARN: external_link target: \"$src -> $tar $act\" does not exist!"
 				continue
@@ -3550,7 +3763,9 @@
 	fi
 
 	# Copy the wrapper binary
-	cp /usr/pbi/.pbiwrapper ${dir}/${fbin}
+	#PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper-$ARCH"
+	PBI_WRAPPERFILE="${PBI_APPDIR}/.pbiwrapper"
+	cp ${PBI_WRAPPERFILE} ${dir}/${fbin}
 	chmod 755 ${dir}/${fbin}
 
 	# Create the wrapper .pbiopt
@@ -3610,6 +3825,9 @@
 		| sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \
 		> "${dir}/PBI-${i}"
 
+		# Set the correct permissions on the desktop file
+		chmod 744 "${dir}/PBI-${i}"
+
 		ifi="$PBI_PROGDIRPATH/${PBI_APPDESK_DIR}/PBI-${i}"
 
 		echo "xdg-desktop-icon install --novendor ${ifi}" \
@@ -3651,6 +3869,9 @@
 		| sed "s|%%PBI_APPDIR%%|$PBI_PROGDIRPATH|g" \
 		> "${dir}/PBI-${i}"
 
+		# Set the correct permissions on the menu file
+		chmod 744 "${dir}/PBI-${i}"
+
 		ifi="$PBI_PROGDIRPATH/${PBI_APPMENU_DIR}/PBI-${i}"
 
 		# Check for a .directory file associated with this .desktop
@@ -3860,6 +4081,13 @@
 	fi
 }
 
+# See if we need to clean the icons dir
+clean_icons_dir() {
+	if [ "${PBI_USESYSFONTS}" != "NO" ] ; then
+		rm -rf ${PBI_STAGEDIR}/share/icons >/dev/null 2>/dev/null
+	fi
+}
+
 # See if we need to clean the stagedir
 clean_stage_dir() {
 	if [ "${PBI_USESYSGL}" != "NO" ] ; then
@@ -3871,7 +4099,6 @@
 		rm -rf ${PBI_STAGEDIR}/etc/fonts >/dev/null 2>/dev/null
 		rm -rf ${PBI_STAGEDIR}/lib/X11/fonts >/dev/null 2>/dev/null
 		rm -rf ${PBI_STAGEDIR}/lib/X11/icons >/dev/null 2>/dev/null
-		rm -rf ${PBI_STAGEDIR}/share/icons >/dev/null 2>/dev/null
 	fi
 }
 
@@ -3896,10 +4123,21 @@
 
 # Start creating the application archive 
 mk_archive_file() {
+        # Build module list of excludes
+        if [ -n "$PBI_EXCLUDELIST" ] ; then
+                for excl in $PBI_EXCLUDELIST
+                do
+                        if [ -z "$_excOpts" ] ; then
+                                _excOpts="--exclude ${excl}"
+                        else
+                                _excOpts="$_excOpts --exclude ${excl}"
+                        fi
+                done
+        fi
 	PBI_CREATE_ARCHIVE="${PBI_CREATE_OUTDIR}/.PBI.$$.tbz"
 	if test_tar_lzma ; then _tcmp="J" ; else _tcmp="j" ; fi
 	echo "Creating compressed archive..."
-	tar cv${_tcmp}f "${PBI_CREATE_ARCHIVE}" -C ${PBI_STAGEDIR} . 2>/dev/null 
+	tar cv${_tcmp}f "${PBI_CREATE_ARCHIVE}" ${_excOpts} -C ${PBI_STAGEDIR} . 2>/dev/null 
 }
 
 # Start creating the header archive
@@ -3910,16 +4148,9 @@
 
 # Start copying pbi details into header file
 save_pbi_details_to_header() {
-	local _osArch="`uname -m`"
-	if [ -n "${PBI_OSARCH}" ] ; then
-		_osArch="${PBI_OSARCH}"
-	fi
+	local _osArch="$ARCH"
+	local _osRel="$FBSDREL"
 
-	local _osRel="`uname -r`"
-	if [ -n "${PBI_OSREL}" ] ; then
-		_osRel="${PBI_OSREL}"
-	fi
-
 	if [ "${PBI_CREATEONLY}" = "YES" ] ; then
 		_pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
 		echo "${PBI_APPDIR}/${_pbilow}-${_osArch}" > "${PBI_HEADERDIR}/pbi_defaultpath"
@@ -3965,10 +4196,10 @@
 	if [ -n "${PBI_PROGICON}" -a -e "${PBI_STAGEDIR}/${PBI_PROGICON}" ] ; then
 		# Get the file extension
 		_iconExt=`echo "$PBI_PROGICON" | awk -F . '{print $NF}'`
-		cp "${PBI_STAGEDIR}/${PBI_PROGICON}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}"
+		cp "${PBI_STAGEDIR}/${PBI_PROGICON}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}" >/dev/null 2>/dev/null
 	else
 		_iconExt=`echo "$PBI_DEFAULT_ICON_CHROOT" | awk -F . '{print $NF}'`
-		cp "${PBI_DEFAULT_ICON_CHROOT}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}"
+		cp "${PBI_DEFAULT_ICON_CHROOT}" "${PBI_HEADERDIR}/pbi_icon.${_iconExt}" >/dev/null 2>/dev/null
 	fi
 
 	# Check for any gui images
@@ -4010,10 +4241,6 @@
 
 # All the pieces are ready, spit out the final PBI file
 mk_output_pbi() {
-	if [ -z "${PBI_OSARCH}" ] ; then
-		PBI_OSARCH="`uname -m`"
-	fi
-
         if [ -n "${PBI_PROGICON}" -a -e "${PBI_STAGEDIR}/${PBI_PROGICON}" ] ; then
                 icon="${PBI_STAGEDIR}/${PBI_PROGICON}"
         else
@@ -4021,7 +4248,7 @@
         fi
 	_pbilow="`echo ${PBI_PROGNAME} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
 
-	outfile="${PBI_CREATE_OUTDIR}/${_pbilow}-${PBI_PROGVERSION}-${PBI_OSARCH}.pbi"
+	outfile="${PBI_CREATE_OUTDIR}/${_pbilow}-${PBI_PROGVERSION}-${ARCH}.pbi"
 	mark1="${PBI_CREATE_OUTDIR}/.pbimark1.$$"
 	mark2="${PBI_CREATE_OUTDIR}/.pbimark2.$$"
 
@@ -4361,6 +4588,10 @@
 # Start the PBID daemon
 do_pbid() {
 
+	# Start by sourcing /etc/profile
+	# This grabs any HTTP_ / FTP_ PROXY variables
+	. /etc/profile
+
 	# Allow user supplied logfile
         if [ -z "${PBID_LOGFILE}" ] ; then
 	  _pbid_log="/var/log/pbid.log"
@@ -4666,51 +4897,54 @@
 {
 	if [ "${PBI_PRUNEBUILDPORTS}" = "NO" ] ; then return ; fi
 
+  	local iFile="$PORTSDIR/INDEX-$FBSDMAJOR"
+
 	get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}"
-	echo "${PKGNAME}" >/.keepports
+	echo "${PKGNAME}" > /.keepports
+	grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports
 
 	# Do the same for any OTHERPORTS
 	for port in ${PBI_MKPORTBEFORE}
 	do
                 if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi
 		get_pkgname "${PORTSDIR}/${port}"
-		echo "${PKGNAME}" >>/.keepports
+		echo "${PKGNAME}" >> /.keepports
+		grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports
         done
 
 	for port in ${PBI_MKPORTAFTER}
 	do
                 if [ ! -d "${PORTSDIR}/${port}" ] ; then continue ; fi
 		get_pkgname "${PORTSDIR}/${port}"
-		echo "${PKGNAME}" >>/.keepports
+		echo "${PKGNAME}" >> /.keepports
+		grep "^${PKGNAME}|" $iFile | cut -d '|' -f 9 | tr ' ' '\n' >>/.keepports
         done
+	
+	# Sort and clean the ports
+	cat /.keepports | sort | uniq > /.keepports.tmp
+	mv /.keepports.tmp /.keepports
 
-	# Now check what packages we have and prune those whom aren't needed
-	while
-	z="1"
+	# Define some commands
+     	if [ $PKGNG -eq 1 ] ; then
+		pkgInf="pkg info -f"
+     	else
+		pkgInf="pkg_info -I -a"
+	fi
+
+	# Now remove any unused ports
+	for j in `$pkgInf | cut -d " " -f 1`
 	do
-		FOUND=""
-		for j in `pkg_info -I -a | cut -d " " -f 1`
-		do
-			grep "${j}" "/.keepports" >/dev/null 2>/dev/null
-			if [ "$?" != "0" ] ; then 
-				pkg_info -R "${j}" | grep "Required" >/dev/null 2>/dev/null
-				if [ "$?" != "0" ] ; then 
-					echo "Removing non-required port: ${j}"
-					pkg_delete ${j} 
-					FOUND="1"
-					break 
-				fi
-			fi
-		done
-
-		# All done pruning ports
-		if [ -z "$FOUND" ] ; then break ; fi
+		grep -q "^${j}" "/.keepports"
+		if [ $? -ne 0 ] ; then 
+			echo "Removing non-required port: ${j}"
+			$PKG_DELETE ${j} 
+		fi
 	done
 }
 
 # Get the full package-name for a target port
 get_pkgname() {
-        name="`make -C ${1} -V PKGNAME`"
+        name="`make -C ${1} -V PKGNAME PORTSDIR=${PORTSDIR}`"
 	PKGNAME="${name}"
 }
 
@@ -4951,6 +5185,11 @@
 		fi
 		iName=`echo $line | cut -d ';' -f 1`
 		ext=`echo $aIcon | sed 's/.*\.//'`
+	
+		# If we already have this icon, we can skip
+		if [ -e "${PBI_DBICONDIR}/${_repoMd5}-${iName}.${ext}" ] ; then
+			continue
+		fi
 
 		# Now fetch the file
 		sFile="${PBI_DBICONDIR}/${_repoMd5}-${iName}.${ext}"
@@ -5103,7 +5342,7 @@
 
 	check_pbi_update "$_rtar" "nodisplay" \
 	 "$_rtar" "$_rVer" \
-	 "`uname -r`" "$_rArch" "${PBI_ADDREPO_ID}"
+	 "$FBSDMAJOR" "$_rArch" "${PBI_ADDREPO_ID}"
 	if [ "$?" != "0" ] ; then 
 		exit_err "Could not find \"$_rtar\" in any indexes" 
 	fi
@@ -5238,7 +5477,7 @@
 	local _CKSUM="$2"
 	
 	# Set local download location
-	_dl_loc="${PBI_APPDIR}/.`basename $PBI_UPFILE`.$$"
+	_dl_loc="${PBI_APPDIR}/.`basename $PBI_UPFILE`"
 
 	# Have a patch file to download instead, make that the active file to try
 	if [ -n "$_tPatch" ] ; then
@@ -5253,7 +5492,13 @@
 	# Start download from repos mirror(s) in order
 	for _cMirror in $_mirrorList
 	do
-		_furl="`echo $_cMirror | sed 's/\/*$//'`${_uFile}"
+		if [ "$_cMirror" = "PCBSDCDN" ] ; then
+			get_pcbsd_mirror
+			_furl="${VAL}${_uFile}"
+		else
+			_furl="`echo $_cMirror | sed 's/\/*$//'`${_uFile}"
+		fi
+
 		echo "Downloading ${_furl}"
 		pbi_get_file "$_furl" "$_dl_loc"
 		if [ "$?" != "0" ]  ; then 
@@ -5282,14 +5527,13 @@
 	_rf="${1}"
 	_lf="${2}"
 
-	# Wait a sec
-	sleep 1
-
 	init_tmpdir
-	if [ -e "${_lf}" ] ; then rm "$_lf" ; fi
+	if [ -e "${_lf}" ] ; then 
+		echo "Resuming download of: ${_lf}"
+	fi
 
 	if [ "$PBI_FETCH_PARSING" != "YES" ] ; then
-		fetch -o "${_lf}" "${_rf}"
+		fetch -r -o "${_lf}" "${_rf}"
 		_err=$?
 	else
 		# Doing a front-end download, parse the output of fetch
@@ -5298,20 +5542,18 @@
 		_fSize=`cat ${PBI_TMPDIR}/.fetch-size.$$ 2>/dev/null`
 		_fSize="`expr ${_fSize} / 1024 2>/dev/null`"
 		rm "${PBI_TMPDIR}/.fetch-size.$$" 2>/dev/null
-		_time=0
+		_time=1
 
-		( fetch -o "${_lf}" "${_rf}" >/dev/null 2>/dev/null ; echo "$?" > ${_eFile} ) &
-		FETCH_PID=`ps -auwwwx | grep -v grep | grep "fetch -o ${_lf}" | awk '{print $2}'`
-		FETCH_TFILE="${_lf}"
-		while
-		z=1
+		( fetch -r -o "${_lf}" "${_rf}" >/dev/null 2>/dev/null ; echo "$?" > ${_eFile} ) &
+		FETCH_PID=`ps -auwwwx | grep -v grep | grep "fetch -r -o ${_lf}" | awk '{print $2}'`
+		while : 
 		do
 			if [ -e "${_lf}" ] ; then
 				_dSize=`du -k ${_lf} | tr -d '\t' | cut -d '/' -f 1`
 				if [ $(is_num "$_dSize") ] ; then
 					if [ ${_fSize} -lt ${_dSize} ] ; then _dSize="$_fSize" ; fi
 					_kbs=`expr ${_dSize} \/ $_time`
-					echo "SIZE: ${_fSize} DOWNLOADED: ${_dSize} SPEED: ${_kbs}KBs"
+					echo "SIZE: ${_fSize} DOWNLOADED: ${_dSize} SPEED: ${_kbs} KB/s"
 				fi
 			fi
 
@@ -5324,7 +5566,7 @@
 
 		_err="`cat ${_eFile}`"
 		if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi
-		unset FETCH_PID FETCH_TFILE
+		unset FETCH_PID
 	fi
 
 	echo ""
@@ -5342,14 +5584,12 @@
 check_port_compat_arch()
 {
 	local sPort=$1
- 	local cValues="`make -C $sPort -V ONLY_FOR_ARCHS`"
+ 	local cValues="`make -C $sPort -V ONLY_FOR_ARCHS PORTSDIR=${PORTSDIR}`"
 	if [ -z "$cValues" ] ; then return 0 ; fi
 
 	for cArch in $cValues
 	do
-		if [ "$cArch" = "`uname -m`" ] ; then
-			return 0
-		fi
+		if [ "$cArch" = "$ARCH" ] ; then return 0; fi
 	done
 	
 	return 1
@@ -5362,13 +5602,54 @@
 
         parse_autob_pbi_cmdline "$@"
 
-
         do_pbi_autob
 }
 
+check_zfs_ab_destroy()
+{
+	local bNum=$1
+ 	if [ -e "${PBI_TMPDIR}/${bNum}.zmnt" ] ; then
+ 		zDir=`cat ${PBI_TMPDIR}/${bNum}.zmnt`
+  		# Make sure this zfs dataset is in the PBI_APPDIR directory
+ 		echo $zDir | grep -q "${PBI_APPDIR}/" 
+	    	if [ $? -eq 0 ] ; then
+		  # Make sure all is unmounted
+		  umount -f ${PBI_CHROOTDIR}/dev >/dev/null 2>/dev/null
+		  umount -f ${PBI_CHROOTDIR}/compat/linux/proc >/dev/null 2>/dev/null
+	  	  umount -f ${PBI_CHROOTDIR}/usr/ports >/dev/null 2>/dev/null
+	 	  umount -f ${PBI_CHROOTDIR}/pkgs >/dev/null 2>/dev/null
+		  umount -f ${PBI_CHROOTDIR}/.ccache >/dev/null 2>/dev/null
+		  umount -f ${PBI_CHROOTDIR}/usr/wrkdirprefix >/dev/null 2>/dev/null
+		  sleep 3
+		  umount -f ${PBI_CHROOTDIR}/dev >/dev/null 2>/dev/null
+		  sync
+		  sleep 3
+             	  zfs destroy ${zDir}
+       	 	  rmdir ${zDir} >/dev/null 2>/dev/null
+		fi
+  	fi
+}
+
+ab_clean_build_tmpfiles()
+{
+	local build=$1
+
+	# Cleanup 
+	rm ${PBI_TMPDIR}/${build}.result 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.pid 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.bPort 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.od 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.mp 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.cd 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.pv 2>/dev/null
+	rm ${PBI_TMPDIR}/${build}.zmnt 2>/dev/null
+}
+
 # Start the auto-build traversal process
 do_pbi_autob() {
 
+	echo "`basename ${0}` started: `date`"
+
 	# Prune any outdir files which we don't have modules for
 	do_pbi_autob_prune
 
@@ -5378,109 +5659,212 @@
 	# Get this runs timestamp
 	PBI_AB_TIMESTAMP=`date | md5`
 
-	while
-	z=1
-	do
-  	  AB_FOUND="0"
-	  unset CUR_PRIORITY_PBI CUR_WORKING_PBI
-		
-	  for pbi in `find . -type f -name "${PBI_CONFFILE}" | grep -v '\.svn' | sort`
-	  do
-		# Figure out the target port for this build
-		unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION
-		. ${pbi}
 
-		# If we have a PBI already and this one has no version we can continue
-	        if [ -z "${PBI_AB_PRIORITY}" -a -n "${CUR_WORKING_PBI}"  ] ; then continue ; fi
+	# Build our list of targets first
+	echo "=> Creating build queue list..."
+	ab_get_build_list
 
-		_cd=$(dirname $pbi | sed 's|./||')
+	done=0
+	rebuildlist=0
+	while :; do
+	  activity=0
+	  # Start checking each job
+	  for build in ${JOBS-$(jot -w %02d ${PBI_AB_BUILDERS})}; do
+		# Is this builder running?
+		if [ -e "${PBI_TMPDIR}/${build}.pid" ] ; then
+			if pgrep -qF "${PBI_TMPDIR}/${build}.pid" >/dev/null 2>&1; then 
+				activity=1
+				continue; 
+			else
+		 		# Do the ZFS destroy here if necessary
+				check_zfs_ab_destroy "$build"
+				
+				# Run the post-build process
+				ab_post_build ${build}
 
-		# Make sure PBI_MAKEPORT is set
-		if [ -z "${PBI_MAKEPORT}" ] ; then
-			PBI_MAKEPORT=`echo $pbi | sed 's|./||'`
-			export PBI_MAKEPORT
-		fi	
+				# Cleanup
+				ab_clean_build_tmpfiles ${build}
+			fi
+		fi
+		if [ $done -eq 1 ] ; then continue ; fi
 
-		if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then 
-			echo "Skipping invalid port ${PORTSDIR}/${PBI_MAKEPORT}"
-			continue
+		# Builder idle, lets figure out the next build
+  		echo "==> Finding target for build process [$build]"
+		start_next_ab_target "$build"
+		if [ $? -eq 0 ] ; then 
+			# Nothing left to build, lets wait for any existing build to finish before exiting
+			done=1
 		fi
+		activity=1
+          done
+
+	  # Every 2 hours, we can re-scan the modules directory, catch any ones which may have been added / changed
+	  if [ $rebuildlist -eq 7200 ] ; then
+	     rebuildlist=0
+	     ab_get_build_list
+	  else
+	     rebuildlist=`expr $rebuildlist + 1`
+          fi
+
+	  # Wait before checking again
+          [ $activity -eq 1 ] && sleep 1
+	  # Nothing to do? We can end now
+          [ $activity -eq 0 ] && break
+	done 
+
+	echo "`basename ${0}` Finished: `date`"
+};
+
+ab_get_build_list()
+{
+
+   AB_FOUND="0"
+   unset CUR_PRIORITY_PBI CUR_WORKING_PBI
+
+   # Clear the tmp build list
+   rm ${PBI_TMPDIR}/.ablist 2>/dev/null
 		
-		# Check if this port can be built on this architecture
-		check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}"
-		if [ "$?" = "1" ] ; then
-			#echo "Incompatiable port arch: ${PORTSDIR}/${PBI_MAKEPORT}"
-			continue
-		fi
-		
-		# Check for missing port target
-		if [ -z "$PBI_MAKEPORT" ] ; then
-			echo "Warning: Missing PBI_MAKEPORT for ${pbi}"
-			continue
-		fi
+   cd "${PBI_AB_CONFDIR}"
+   for pbi in `find . -type f -name "${PBI_CONFFILE}" | grep -v '\.svn' | sort`
+   do
+	# Figure out the target port for this build
+	unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION
+	. ${pbi}
 
-		check_ab_needed "$PBI_MAKEPORT" "${PBI_BUILDKEY}" "$_cd" "$PBI_AB_TIMESTAMP"
-	 	if [ "$?" = "0" ] ; then	
-		   AB_FOUND="1"
+	_cd=$(dirname $pbi | sed 's|./||')
+	PBI_CONFDIR="$_cd"
 
-		   # Check the priority of this PBI, see if it rises to the top
-		   if [ -z "${CUR_PRIORITY_PBI}" ] ; then 
-		     CUR_WORKING_PBI="${pbi}"
-		     if [ -z "$PBI_AB_PRIORITY" ] ; then 
-                       CUR_PRIORITY_PBI="0"
-	             else
-                       CUR_PRIORITY_PBI="$PBI_AB_PRIORITY"
-                     fi
-                     continue
-                   fi
+	# Make sure PBI_MAKEPORT is set
+	if [ -z "${PBI_MAKEPORT}" ] ; then
+		PBI_MAKEPORT=`echo $pbi | sed 's|./||'`
+		export PBI_MAKEPORT
+	fi	
 
-		   # No priority set, keep the previous build
-		   if [ -z "${PBI_AB_PRIORITY}" ] ; then continue ; fi
+	if [ ! -d "${PORTSDIR}/${PBI_MAKEPORT}" ] ; then 
+		#echo "Skipping invalid port ${PORTSDIR}/${PBI_MAKEPORT}"
+		continue
+	fi
+	
+	# Check if this port can be built on this architecture
+	check_port_compat_arch "${PORTSDIR}/${PBI_MAKEPORT}"
+	if [ "$?" = "1" ] ; then
+		#echo "${PBI_MAKEPORT} - Skipping for invalid system arch"
+		continue
+	fi
+	
+	# Check for missing port target
+	if [ -z "$PBI_MAKEPORT" ] ; then
+		#echo "Warning: Missing PBI_MAKEPORT for ${pbi}"
+		continue
+	fi
 
-		   if [ $CUR_PRIORITY_PBI -lt $PBI_AB_PRIORITY ] ; then
-		     CUR_WORKING_PBI="${pbi}"
-                     CUR_PRIORITY_PBI="$PBI_AB_PRIORITY"
-		     continue
-		   fi
-
-		   continue
+	# Check if another builder is already doing this port
+	pBuilding=0
+	for p in `ls ${PBI_TMPDIR}/*.bPort 2>/dev/null`
+	do
+		if [ "`cat $p`" = "$PBI_MAKEPORT" ] ; then
+			pBuilding=1
+			break
 		fi
+	done
+	if [ $pBuilding -eq 1 ] ; then
+		continue
+	fi
 
-	  done
+	check_ab_needed "$PBI_MAKEPORT" "${PBI_BUILDKEY}" "$_cd" "$PBI_AB_TIMESTAMP"
+ 	if [ "$?" = "0" ] ; then	
+	   AB_FOUND="1"
 
-	  # We have something to build lets do it!
-	  if [ "$AB_FOUND" = "1" ] ; then 
-	      pbi="$CUR_WORKING_PBI"
-	      unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION
-	      . ${pbi}
-	      get_pbi_progversion
+ 	           # Unset the priority if set to 00 / 0
+           if [ "${PBI_AB_PRIORITY}" = "00" -o "${PBI_AB_PRIORITY}" = "0" ] ; then 
+	   	unset PBI_AB_PRIORITY
+           fi
 
-	      _cd=$(dirname $pbi | sed 's|./||')
-	      if [ -z "${PBI_MAKEPORT}" ] ; then
-	 	PBI_MAKEPORT=$(dirname $pbi | sed 's|./||')
-	      fi	
+	   # Check the priority of this PBI, see if it rises to the top
+	   if [ -z "${CUR_PRIORITY_PBI}" ] ; then 
+	     CUR_WORKING_PBI="${pbi}"
+	     if [ -z "$PBI_AB_PRIORITY" ] ; then 
+                     CUR_PRIORITY_PBI="$internal_ab_priority"
+             else
+                     CUR_PRIORITY_PBI=`expr $PBI_AB_PRIORITY + 10`
+             fi
+	     #echo "Setting higher priority target: ${pbi} - Priority: ${CUR_PRIORITY_PBI}"
+   	     echo "${CUR_PRIORITY_PBI} $pbi" >> ${PBI_TMPDIR}/.abtmp
+             continue
+           fi
 
-	      echo "Starting build of: $pbi  - Priority: $CUR_PRIORITY_PBI"
+	   # Bump up the supplied AB priority
+	   if [ -n "${PBI_AB_PRIORITY}" ] ; then 
+              internal_ab_priority=`expr $PBI_AB_PRIORITY + 10`
+	   fi
 
-	      # Start the build now
-	      start_ext_ab "$PBI_MAKEPORT" \
-		"${PBI_BUILDKEY}" "${PBI_PROGVERSION}" \
-		"${_cd}" "${PBI_AB_OUTDIR}" "${PBI_AB_TIMESTAMP}"
+	   # Check if this PBI is a higher priority
+	   if [ $CUR_PRIORITY_PBI -lt $internal_ab_priority ] ; then
+	     #echo "Setting higher priority target: ${pbi} - Priority: ${internal_ab_priority}"
+	     CUR_WORKING_PBI="${pbi}"
+             CUR_PRIORITY_PBI="$internal_ab_priority"
+   	     echo "${internal_ab_priority} $pbi" >> ${PBI_TMPDIR}/.abtmp
+	     continue
+	   else 
+	     echo "${internal_ab_priority} $pbi" >> ${PBI_TMPDIR}/.abtmp
+	   fi
+	   continue
+  	 fi
 
-	      echo " "
+  done
 
-	  else
-	    # If no builds left, we are done!
-            break
-          fi
-	done 
-	
+  # Sort the list
+  sort -n -r ${PBI_TMPDIR}/.abtmp > ${PBI_TMPDIR}/.ablist
+  rm ${PBI_TMPDIR}/.abtmp
 }
 
+start_next_ab_target()
+{
+  local curBuilder="$1"
+  # No list to parse?
+  if [ ! -e "${PBI_TMPDIR}/.ablist" ] ; then return 0; fi
+
+  # Get the last on the list
+  CUR_WORKING_PBI=`cat ${PBI_TMPDIR}/.ablist | head -1 | cut -d ' ' -f 2`
+  if [ -z "${CUR_WORKING_PBI}" ] ; then return 0; fi
+
+  cd "${PBI_AB_CONFDIR}"
+
+  # We have something to build lets do it!
+  pbi="$CUR_WORKING_PBI"
+  unset PBI_MAKEPORT PBI_BUILDKEY PBI_PROGVERSION PBI_REQUIRESROOT PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MKPORTBEFORE PBI_MKPORTAFTER PBI_MAKEOPTS PBI_EXCLUDELIST PBI_AB_PRIORITY PBI_HASH_EXCLUDES PBI_AB_NOTMPFS PBI_PROGREVISION
+  . ${pbi}
+
+  _cd=$(dirname $pbi | sed 's|./||')
+  PBI_CONFDIR="$_cd"
+
+  # Get the prog version
+  get_pbi_progversion
+
+  if [ -z "${PBI_MAKEPORT}" ] ; then
+     PBI_MAKEPORT=$(dirname $pbi | sed 's|./||')
+  fi	
+
+  echo "==> Starting build process [$curBuilder]: $PBI_MAKEPORT"
+  echo "$PBI_MAKEPORT" >${PBI_TMPDIR}/${curBuilder}.bPort
+
+  # Remove this from the queue
+  cat ${PBI_TMPDIR}/.ablist | tail -n +2 > ${PBI_TMPDIR}/.abtmp
+  mv ${PBI_TMPDIR}/.abtmp ${PBI_TMPDIR}/.ablist
+
+  # Start the build now
+  start_ext_ab "$PBI_MAKEPORT" \
+  "${PBI_BUILDKEY}" "${PBI_PROGVERSION}" \
+  "${_cd}" "${PBI_AB_OUTDIR}" "${PBI_AB_TIMESTAMP}" "${curBuilder}"
+
+  return 1
+};
+
 # Prune any outdir files which don't have matching modules
 do_pbi_autob_prune() {
 	if [ "${PBI_AB_PRUNE}" != "YES" ] ; then return 0 ; fi
 
+	echo "=> Cleaning outgoing directory..."
     	# Prune outgoing dirs which don't have matching modules anymore
 	cd "${PBI_AB_OUTDIR}"
 	for i in `find . -type d | grep -v '\.svn'`
@@ -5506,6 +5890,7 @@
 	_cd="${4}"
 	_od="${5}/${_cd}"
 	local _abkey="$6"
+	local eBuilder="$7"
 	_flags=""
 	_flags="-c ${_cd} -d ${PORTSDIR} -o ${_od} --delbuild"
 	if [ -n "${PBI_AB_SSLPRIVKEY}" ] ; then
@@ -5513,8 +5898,10 @@
 	fi
 
 	# Check if we need to enable tmpfs
- 	if [ "$PBI_AB_TMPFS" = "YES" -a -z "$PBI_AB_NOTMPFS" ] ; then
-		_flags="${_flags} --tmpfs"
+ 	if [ "$PBI_AB_TMPFS" = "YES" ] ; then
+		if [ -z "${PBI_AB_NOTMPFS}" -o "$PBI_AB_NOTMPFS" != "YES" ] ; then
+		   	_flags="${_flags} --tmpfs"
+		fi
 	fi
 
 	# Check if we need to enable pkgcaching
@@ -5524,10 +5911,14 @@
 		fi
 		_flags="${_flags} --pkgdir ${_od}/pkgcache"
 	fi
+
+	# Are we doing 32bit builds?
+ 	if [ "$PBI_AB32" = "YES" ] ; then _flags="${_flags} -32"; fi
+
 	get_pbi_progversion
 
 	#echo "Starting build of ${_mp} - ${_pv}"
-	echo "pbi_makeport ${_flags} ${_mp}"
+	#echo "pbi_makeport ${_flags} ${_mp}"
 
 	if [ ! -d "${_od}" ] ; then mkdir -p "${_od}" ; fi
 
@@ -5555,21 +5946,41 @@
 	# Move old PBIs to archived folder
         oldVersion=`cat ${_od}/pbi-version 2>/dev/null`
 	if [ "$oldVersion" != "$PBI_PROGVERSION" ]; then
-		echo "Archiving old PBIs..."
+		#echo "Archiving old PBIs..."
 		archive_old_pbis "${_od}" "$PBI_AB_ARCHIVENUM"
 	fi
 
+	# Set some variables we can call in pbi_makeport
+	PBI_AB_TMPDIR="${PBI_TMPDIR}"
+	PBI_AB_BUILDER="$eBuilder"
+	export PBI_AB_TMPDIR PBI_AB_BUILDER
+
 	# Add some header info to log file
 	echo "Starting build: `date`" >${_od}/build.log
 	echo "Build Command:" >>${_od}/build.log
 	echo "pbi_makeport ${_flags} ${_mp}" >>${_od}/build.log
 	echo "------------------------------------------------------" >>${_od}/build.log
+	
+	echo "${_od}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.od"
+	echo "${_mp}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.mp"
+	echo "${_cd}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.cd"
+	echo "${PBI_PROGVERSION}" > "${PBI_TMPDIR}/${PBI_AB_BUILDER}.pv"
+	pbi_makeport ${_flags} ${_mp} >>${_od}/build.log 2>>${_od}/build.log &
+  	echo "$!" > ${PBI_TMPDIR}/${eBuilder}.pid
 
-	# Start the build now
-	pbi_makeport ${_flags} ${_mp} >>${_od}/build.log 2>>${_od}/build.log
-	if [ "$?" = "0" ] ; then
+}
 
-		echo "$PBI_PROGVERSION" > "${_od}/pbi-version"
+ab_post_build() 
+{
+	local build=$1
+	_od="`cat ${PBI_TMPDIR}/${build}.od`"
+	_mp="`cat ${PBI_TMPDIR}/${build}.mp`"
+	_cd="`cat ${PBI_TMPDIR}/${build}.cd`"
+	_pv="`cat ${PBI_TMPDIR}/${build}.pv`"
+	sleep 1
+
+	if [ -e "${PBI_TMPDIR}/${build}.result" -a "`cat ${PBI_TMPDIR}/${build}.result`" = "0" ] ; then
+		echo "$_pv" > "${_od}/pbi-version"
 		echo "OK" > "${_od}/pbi-result"
 
 		# Save the mdate file
@@ -5583,13 +5994,14 @@
 		if [ -e "${PORTSDIR}/${_mp}/pkg-descr" ] ; then
 			cp "${PORTSDIR}/${_mp}/pkg-descr" "${_od}/pbi-descr"
 		fi
-		if [ -e "${_cd}/pbi-descr" ] ; then
-			cp "${_cd}/pbi-descr" "${_od}/pbi-descr"
+		if [ -e "${PBI_AB_CONFDIR}/${_cd}/pbi-descr" ] ; then
+			cp "${PBI_AB_CONFDIR}/${_cd}/pbi-descr" "${_od}/pbi-descr"
 		fi
 
-		# Generate patch files to the new version of this PBI
+		# Check if we need to rebuild patches
 		if [ "$PBI_AB_GENPATCH" = "YES" -a -d "${_od}/archived" ] ; then
-			gen_pbi_patches "${_od}" "${_od}/archived" >>${_od}/build.log 2>>${_od}/build.log
+			echo "===> Generating patches for [$build]"
+			gen_pbi_patches "${_od}" "${_od}/archived"
 		fi
 
 		rm "${_od}/build.log.bz2" >/dev/null 2>/dev/null
@@ -5604,6 +6016,7 @@
 			${PBI_AB_HELPS} "FAILED" "${_od}"
 		fi
 	fi
+
 }
 
 # Function which begins to generate patch files from archived PBIs to current
@@ -5616,6 +6029,7 @@
 
 	# First remove any old patches
 	rm ${_curPBIdir}/*.pbp 2>/dev/null
+	rm ${_curPBIdir}/*.pbp.sha256 2>/dev/null
 
 	# Make sure to enable signing of the patch files
 	if [ -n "${PBI_AB_SSLPRIVKEY}" ] ; then
@@ -5624,13 +6038,16 @@
 		local _mpflags="-o $_curPBIdir"
 	fi
 
+	# Check if we need to enable tmpfs
+ 	if [ "$PBI_AB_TMPFS" = "YES" ] ; then _mpflags="${_mpflags} --tmpfs" ; fi
+
 	# Build a list of old PBIs we need to make patches from
 	for _oPBI in `ls ${_oldPBIdir}/*.pbi 2>/dev/null`
 	do
 		# Make sure we don't try to make a patch of identical files
 	  	if [ "`basename $_oPBI`" != "`basename $_curPBI`" ] ; then	
-			echo "Building pbp patch of ${_oPBI} -> ${_curPBI}"
-			pbi_makepatch $_mpflags "$_oPBI" "$_curPBI" 
+			#echo "Building pbp patch of ${_oPBI} -> ${_curPBI}"
+			pbi_makepatch $_mpflags "$_oPBI" "$_curPBI" >/dev/null 2>/dev/null
 			if [ "$?" != "0" ] ; then
 				echo "pbi_makepatch: Failed creating patchfile for $_oPBI -> $_curPBI"
 			fi
@@ -5681,6 +6098,18 @@
 		return
 	fi
 
+	# Get the arch type
+	get_arch_from_pbi_file "$_pbiNew"
+	_pbiNewArch="$VAL"
+	get_arch_from_pbi_file "$_pbiOld"
+	_pbiOldArch="$VAL"
+
+	# Sanity check these system types
+	if [ "${_pbiNewArch}" != "${_pbiOldArch}" ] ; then
+		echo "Error: Arch mismatch between $_pbiNew and $_pbiOld"
+		return
+	fi
+
 	# Make our extraction directories
 	if [ -e "$_pbiNewDir" ] ; then rm -rf "$_pbiNewDir"; fi
 	if [ -e "$_pbiOldDir" ] ; then rm -rf "$_pbiOldDir"; fi
@@ -5689,6 +6118,13 @@
 	mkdir -p "$_pbiOldDir"
 	mkdir -p "$_pbiPatchDir"
 
+	# If using tmpfs to speed up patch process
+        if [ "$PBI_MP_TMPFS" = "YES" ] ; then
+		mount -t tmpfs tmpfs "${_pbiNewDir}"
+		mount -t tmpfs tmpfs "${_pbiOldDir}"
+		mount -t tmpfs tmpfs "${_pbiPatchDir}"
+	fi
+
 	local _opts="-e --licagree"
 	if [ "${PBI_SKIPSIGVERIFY}" = "YES" ] ; then
 		_opts="${_opts} --no-checksig"
@@ -5770,7 +6206,7 @@
 	get_progname_from_pbi_file "$_pbiNew"
         _pbilow="`echo ${VAL} | tr '[:upper:]' '[:lower:]' | sed 's| ||g'`"
         
-        outfile="${_cDir}/${_pbilow}-${_pbiOldVer}_to_${_pbiNewVer}-`uname -m`.pbp"
+        outfile="${_cDir}/${_pbilow}-${_pbiOldVer}_to_${_pbiNewVer}-${_pbiNewArch}.pbp"
         mark1="${_cDir}/.pbimark1.$$"
         mark2="${_cDir}/.pbimark2.$$"
         
@@ -5875,8 +6311,8 @@
 		if [ -c "${1}/$line" ] ; then continue ; fi
 
 		# Check sha256 of each file, see if we have differences
-		sha1="`sha256 -q ${1}/${line}`" 
-		sha2="`sha256 -q ${2}/${line}`"
+		sha1=`sha256 -q "${1}/${line}"`
+		sha2=`sha256 -q "${2}/${line}"`
 		if [ "$sha1" != "$sha2" ] ; then
 			# These files differ, get a binary patch made of them
 			_tDir="${3}/`dirname $line`"
@@ -5987,6 +6423,12 @@
 	export VAL
 }
 
+get_arch_from_pbi_file()
+{
+	VAL="`pbi_add -i $1 | grep Arch: | cut -d ' ' -f 2-5 | tr -s ' '`"
+	export VAL
+}
+
 # Move old PBIs to the archive
 archive_old_pbis()
 {
@@ -6000,18 +6442,18 @@
 	ls ${_od}/*.pbi >/dev/null 2>/dev/null
         if [ "$?" != "0" ] ; then return ; fi
 
-	echo "Moving old PBIs from ${_od}/*.pbi -> ${_od}/archived/"
+	#echo "Moving old PBIs from ${_od}/*.pbi -> ${_od}/archived/"
 	mv ${_od}/*.pbi ${_od}/archived/ 2>/dev/null
-	mv ${_od}/*.sha256 ${_od}/archived/ 2>/dev/null
+	mv ${_od}/*pbi.sha256 ${_od}/archived/ 2>/dev/null
 
 	# Prune anything beyond the _keepnum
-        echo "Checking for more than $_keepnum PBIs in archive"
+        #echo "Checking for more than $_keepnum PBIs in archive"
 	oCount="1"
 	for oFile in `ls -t ${_od}/archived/*.pbi 2>/dev/null`
 	do
 		if [ -z "$oFile" ] ; then continue ; fi
 		if [ "$oCount" -gt "$_keepnum" ] ; then
-			echo "Removing old PBI ${oFile} from archive"
+			#echo "Removing old PBI ${oFile} from archive"
 			rm ${oFile}*
 		fi
 		oCount=`expr $oCount + 1`	
@@ -6024,21 +6466,27 @@
 	_bk="$2"
 	_cd="$3"
 	local _abkey="$4"
-
+        internal_ab_priority="1"
+	export internal_ab_priority
         unset PBI_PROGVERSION
-	get_pbi_progversion
 
 	# Check PBI_BUILDKEY, see if we have a manual rebuild triggered
 	if [ -e "${PBI_AB_OUTDIR}/${_cd}/pbi-buildkey" ] ; then
 		if [ "`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-buildkey`" != "$_bk" \
-			 -a -n "${_bk}" ]
-        	then echo "BUILDKEY bump, rebuild triggered." ; return 0 ; fi
+			 -a -n "${_bk}" ]; then 
+                   #echo "$_port BUILDKEY bump, rebuild triggered."
+                   internal_ab_priority="9"
+                   return 0
+                fi
 	fi
 
 	# Make sure this PBI hasn't already failed during this run
-	if [ -e "${PBI_AB_OUTDIR}/${_cd}/.abkey" ] ; then
+	if [ -e "${PBI_AB_OUTDIR}/${_cd}/.abkey" -a -e "${PBI_AB_OUTDIR}/${_cd}/pbi-result" ] ; then
 	  if [ "`cat ${PBI_AB_OUTDIR}/${_cd}/.abkey`" = "$_abkey" ] ; then
-	    return 1
+	    if [ "`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-result`" != "OK" ] ; then
+              #echo "$_port - Skipping failed from this run"
+	      return 1
+  	    fi
   	  fi
 	fi
 
@@ -6048,7 +6496,8 @@
 	if [ -e "${PBI_AB_OUTDIR}/${_cd}/.failed-csum" ] ; then
 		_fcsum="`cat ${PBI_AB_OUTDIR}/${_cd}/.failed-csum`"
 		_ncsum="`tar cvf - -C "${PORTSDIR}/${_port}" . 2>/dev/null | md5 -q`"
-		if [ "$_fcsum" != "$_ncsum" ] ; then
+		if [ "$_fcsum" = "$_ncsum" ] ; then
+            		#echo "$_port - Skipping failed"
 			return 1
 		fi
  	fi	
@@ -6056,23 +6505,39 @@
 	# See if we have an existing PBI
 	ls ${PBI_AB_OUTDIR}/${_cd}/*.pbi >/dev/null 2>/dev/null
 	if [ "${?}" != "0" ]; then 
-	  #echo "No existing PBI"
+	  #echo "$_port - No existing PBI"
+          internal_ab_priority="8"
           return 0 
         fi
 
 	# See if we have a saved version
 	if [ ! -e "${PBI_AB_OUTDIR}/${_cd}/pbi-version" ]; then 
 		#echo "No saved pbi-version"
+	  	#echo "$_port - No existing version"
+          	internal_ab_priority="7"
 		return 0
 	fi
 
+	# Get the programs port version
+	get_pbi_progversion
+
 	# See if the version is different now
 	oldVersion=`cat ${PBI_AB_OUTDIR}/${_cd}/pbi-version`
 	if [ "$oldVersion" != "$PBI_PROGVERSION" ]; then 
-		echo "$_port version bump: $oldVersion -> $PBI_PROGVERSION"
+		oldPortVer="`echo $oldVersion | rev | cut -d '_' -f 2- | rev`"
+		if [ "$PORTVER" = "$oldPortVer" ] ; then
+			# Just a minor portrev bump
+          		internal_ab_priority="2"
+			#echo "$_port revision bump: $oldVersion -> $PBI_PROGVERSION"
+		else
+			# Real version change
+          		internal_ab_priority="3"
+			#echo "$_port version bump: $oldVersion -> $PBI_PROGVERSION"
+		fi
 		return 0
 	fi
 
+	#echo "$_port - is Up2Date!"
 	return 1
 }
 
@@ -6088,6 +6553,9 @@
 
 do_pbi_make() {
 
+	# See if we need to enable pkgng
+	detect_pkgng
+
   	# Load the PBI settings
 	get_pbi_progversion
 	get_pbi_progname
@@ -6113,11 +6581,14 @@
 		chroot_make_cleanup
 		rm_tmpdir
 
+		# If running as an auto-build, show that we were successful
+		if [ -n "$PBI_AB_TMPDIR" ] ; then
+        		echo "$_err" > ${PBI_AB_TMPDIR}/${PBI_AB_BUILDER}.result
+		fi
 		exit $_err
 	fi
 
 	if [ "`basename $0`" != "pbi_makeport_chroot" ] ; then return ; fi
-	
 
   	# Check if we have some specific make options to use
   	load_pbi_conffile
@@ -6143,6 +6614,10 @@
   	# See if we need to run a post make script
   	run_pbi_postportmake
 
+	# Check for any users / groups we need to save for install time
+	mk_pbi_users_file
+	mk_pbi_groups_file
+
 	# Auto-generate a external_links directive from plist info
 	mk_auto_ext_linksfile
 
@@ -6158,9 +6633,52 @@
 	# Got this far, lets exit with success
 	rm_buildfiles
 	rm_tmpdir
+
 	exit 0
 }
 
+# Check if we need to save a list of GROUPS to create at install
+mk_pbi_groups_file()
+{
+	if [ -z "$PBI_BUILD_GROUPS" ] ; then return ; fi
+
+	for group in $PBI_BUILD_GROUPS
+	do
+		# Check /usr/ports/GIDs for group entry
+		gidLine=`cat /usr/ports/GIDs | grep "^$group:"`
+		if [ -z "$gidLine" ] ; then
+			echo "Warning: No entry for \"$group\" in GIDs file..."
+			continue
+		fi
+		grep -q "^$group:" ${PBI_PROGDIRPATH}/${PBI_INS_GROUPSFILE} 2>/dev/null
+		if [ $? -ne 0 ] ; then
+			echo "Saving gid details for group: $group"
+			echo "$gidLine" >> ${PBI_PROGDIRPATH}/${PBI_INS_GROUPSFILE}
+		fi
+	done
+}
+
+# Check if we need to save a list of users to create at install
+mk_pbi_users_file()
+{
+	if [ -z "$PBI_BUILD_USERS" ] ; then return ; fi
+
+	for user in $PBI_BUILD_USERS
+	do
+		# Check /usr/ports/UIDs for user entry
+		uidLine=`cat /usr/ports/UIDs | grep "^$user:"`
+		if [ -z "$uidLine" ] ; then
+			echo "Warning: No entry for \"$user\" in UIDs file..."
+			continue
+		fi
+		grep -q "^$user:" ${PBI_PROGDIRPATH}/${PBI_INS_USERSFILE} 2>/dev/null
+		if [ $? -ne 0 ] ; then
+			echo "Saving uid details for user: $user"
+			echo "$uidLine" >> ${PBI_PROGDIRPATH}/${PBI_INS_USERSFILE}
+		fi
+	done
+}
+
 # Source any pre-build script to allow a custom script to modify the port
 start_prebuild_script()
 {
@@ -6207,11 +6725,30 @@
 	umount -f ${PBI_CHROOTDIR}/dev >/dev/null 2>/dev/null
 	umount -f ${PBI_CHROOTDIR}/compat/linux/proc >/dev/null 2>/dev/null
 	umount -f ${PBI_CHROOTDIR}/usr/ports >/dev/null 2>/dev/null
-	umount -f ${PBI_CHROOTDIR}/tmpfs >/dev/null 2>/dev/null
 	umount -f ${PBI_CHROOTDIR}/pkgs >/dev/null 2>/dev/null
 	umount -f ${PBI_CHROOTDIR}/.ccache >/dev/null 2>/dev/null
+	umount -f ${PBI_CHROOTDIR}/usr/wrkdirprefix >/dev/null 2>/dev/null
 
+	# Sleep a moment before we try this again, seems it takes a moment to clear up
+	sleep 2
+	umount -f ${PBI_CHROOTDIR}/dev >/dev/null 2>/dev/null
+
 	if [ "${PBI_KEEPBUILDFILES}" = "YES" ] ; then return ; fi
+
+	# Cleanup ZFS dataset
+        isDirZFS "${PBI_CHROOTDIR}" "1"
+        if [ $? -eq 0 ] ; then
+   	     tank=`getZFSTank "$PBI_CHROOTDIR"`
+	     sleep 1
+	     # If we are running as a result of pbi_autobuild, let it do the ZFS cleanup
+	     if [ -z "${PBI_AB_TMPDIR}" ] ; then
+             	zfs destroy ${tank}${PBI_CHROOTDIR}
+  	     	rmdir ${PBI_CHROOTDIR} >/dev/null 2>/dev/null
+	     fi
+	     return
+        fi
+
+	# Cleanup normal directory
 	rm -rf "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null
 	chflags -R noschg ${PBI_CHROOTDIR} >/dev/null 2>/dev/null
 	rm -rf "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null
@@ -6220,8 +6757,17 @@
 # Function which extracts the clean chroot environment for the PBI
 chroot_extract() {
 
-	# If no chroot file exists, make it first
-	[ -e "${PBI_CHROOTFILE}" ] || mk_chroot_file
+	# If no freebsd base exists, make it first
+	isDirZFS "${PBI_APPDIR}"
+	if [ $? -eq 0 ] ; then
+		# Use ZFS base for cloning
+		PBI_CHROOTZFS="${PBI_APPDIR}/.pbi-world-$ARCH"
+		[ -e "${PBI_CHROOTZFS}/COPYRIGHT" ] || mk_chroot_file
+	else
+		# Use regular .txz file
+		PBI_CHROOTFILE="${PBI_APPDIR}/.pbi-world-$ARCH.txz"
+		[ -e "${PBI_CHROOTFILE}" ] || mk_chroot_file
+	fi
 
 	# Set the chroot path
 	PBI_CHROOTDIR="${PBI_PROGDIRPATH}.chroot"
@@ -6230,11 +6776,30 @@
 	# See if there is old chroot to clean first
 	chroot_make_cleanup
 
+	# Create the new chroot dir
 	mkdir -p "${PBI_CHROOTDIR}"
-	echo "Extracting chroot environment..."
-	tar xvf ${PBI_CHROOTFILE} -C "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null
-	[ $? -ne 0 ] && exit_err "Failed extracting chroot environment!"
 
+	# If on ZFS, we can just clone our existing base system
+	if [ -n "$PBI_CHROOTZFS" ] ; then
+           tank=`getZFSTank "$PBI_CHROOTZFS"`
+	   echo "Cloning ${PBI_CHROOTZFS} -> ${PBI_CHROOTDIR}"
+	   if [ -n "${PBI_AB_TMPDIR}" ] ; then
+              echo "${tank}${PBI_CHROOTDIR}" > ${PBI_AB_TMPDIR}/${PBI_AB_BUILDER}.zmnt
+	   fi
+           zfs clone -o mountpoint=${PBI_CHROOTDIR} ${tank}${PBI_CHROOTZFS}@clean ${tank}${PBI_CHROOTDIR}
+	   if [ $? -ne 0 ] ; then exit_err "Failed creating clean ZFS base snapshot"; fi
+	else
+	   echo "Extracting chroot environment..."
+	   tar xvf ${PBI_CHROOTFILE} -C "${PBI_CHROOTDIR}" >/dev/null 2>/dev/null
+	   [ $? -ne 0 ] && exit_err "Failed extracting chroot environment!"
+	fi
+
+	# If we plan on using TMPFS mount it now
+	mkdir -p ${PBI_CHROOTDIR}/usr/wrkdirprefix
+	if [ "$MKTMPFS" = "YES" ] ; then 
+		mount -t tmpfs tmpfs ${PBI_CHROOTDIR}/usr/wrkdirprefix
+	fi
+
 	# Copy resolv.conf
 	cp /etc/resolv.conf ${PBI_CHROOTDIR}/etc/resolv.conf
 
@@ -6245,24 +6810,30 @@
 	# If we have a custom PBI_MAKECONF include it
 	[ -e "${PBI_MAKECONF}" ] && cp ${PBI_MAKECONF} ${PBI_CHROOTDIR}/etc/make.conf
 
+	# Set any target arch vars
+        if [ "${ARCH}" = "i386" -a "${REALARCH}" = "amd64" ];then
+                LOGIN_ENV=",UNAME_p=i386,UNAME_m=i386"
+                cat >> ${PBI_CHROOTDIR}/etc/make.conf << EOF
+ARCH=i386
+MACHINE=i386
+MACHINE_ARCH=i386
+EOF
+        	sed -i .back -e "s/:\(setenv.*\):/:\1${LOGIN_ENV}:/" ${PBI_CHROOTDIR}/etc/login.conf
+        	cap_mkdb ${PBI_CHROOTDIR}/etc/login.conf
+        fi
+
 	#echo "Copying ${PORTSDIR} -> ${PBI_CHROOTDIR}/usr/ports"
 	#tar cvf - -C "${PORTSDIR}" --exclude ./distfiles . 2>/dev/null | tar xvf - -C "${PBI_CHROOTDIR}/usr/ports" 2>/dev/null
 	[ -d "${PORTSDIR}/distfiles" ] || mkdir -p ${PORTSDIR}/distfiles
-	mkdir -p ${PBI_CHROOTDIR}/usr/ports
+	mkdir -p ${PBI_CHROOTDIR}/usr/ports 2>/dev/null
 	mount_nullfs ${PORTSDIR} ${PBI_CHROOTDIR}/usr/ports
 
-	# Using tmpfs?
-	if [ "$MKTMPFS" = "YES" ] ; then 
-		mkdir ${PBI_CHROOTDIR}/tmpfs
-		mount -t tmpfs tmpfs ${PBI_CHROOTDIR}/tmpfs
-	fi
-
 	# Are we doing pkg caching?
 	if [ "$PBI_PKGCACHE" = "YES" ] ; then
 		mkdir ${PBI_CHROOTDIR}/pkgs
 		mount_nullfs ${PBI_PKGCACHEDIR} ${PBI_CHROOTDIR}/pkgs
 	fi
-
+	
 	# Now copy over the pbi_* scripts
 	mkdir -p ${PBI_CHROOTDIR}/usr/local/sbin
 	cp ${PBI_BINDIR}/pbi_* ${PBI_CHROOTDIR}/usr/local/sbin
@@ -6273,10 +6844,10 @@
 	cp ${PBI_DEFAULT_ICON} ${PBI_CHROOTDIR}${PBI_DEFAULT_ICON_CHROOT}
 
 	# Make sure the outgoing dir is created
-	mkdir -p ${PBI_CHROOTDIR}/pbiout
+	mkdir -p ${PBI_CHROOTDIR}/pbiout 2>/dev/null
 
 	# Copy over the PBI DB
-	mkdir -p ${PBI_CHROOTDIR}/var/db
+	mkdir -p ${PBI_CHROOTDIR}/var/db 2>/dev/null
 	cp -r ${PBI_DBDIR} ${PBI_CHROOTDIR}${PBI_DBDIR}
 	
 	# Copy over the confdir as well
@@ -6326,36 +6897,100 @@
 
 }
 
+# Get the default PC-BSD mirror to use
+get_pcbsd_mirror() {
+
+  # Check if we already looked up a mirror we can keep using
+  if [ -n "$CACHED_PCBSD_MIRROR" ] ; then
+     VAL="$CACHED_PCBSD_MIRROR"
+     export VAL
+     return
+  fi
+
+  # Set the mirror URL
+  VAL="`cat ${PCBSD_ETCCONF} 2>/dev/null | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR: ||g'`"
+  if [ -n "$VAL" ] ; then
+     echo "Using mirror: $VAL"
+     CACHED_PCBSD_MIRROR="$VAL"
+     export VAL CACHED_PCBSD_MIRROR
+     return
+  fi
+
+  echo "Getting regional mirror..."
+  . /etc/profile
+
+  # No URL? Lets get one from the master server
+  local mFile="${HOME}/.mirrorUrl.$$"
+  touch $mFile
+  fetch -o $mFile http://getmirror.pcbsd.org >/dev/null 2>/dev/null
+  VAL="`cat $mFile | grep 'URL: ' | sed 's|URL: ||g'`"
+  rm $mFile
+  if [ -n "$VAL" ] ; then
+     echo "Using mirror: $VAL"
+     CACHED_PCBSD_MIRROR="$VAL"
+     export VAL CACHED_PCBSD_MIRROR
+     return
+  fi
+
+  # Still no mirror? Lets try the PC-BSD FTP server...
+  VAL="ftp://ftp.pcbsd.org/pub/mirror"
+  CACHED_PCBSD_MIRROR="$VAL"
+  export VAL CACHED_PCBSD_MIRROR
+  echo "Using mirror: $VAL"
+  return 
+}
+
 # No chroot environment tar file exists yet, lets build or extract
 mk_chroot_file() {
 
 	# Check if on PC-BSD and we can instead fetch fbsd-release.txz
 	if [ -e "$PCBSD_ETCCONF" -a -z "$FORCE_FBSD_ONLY" ]; then
-		cd "$PBI_APPDIR"
 
-		# Set the mirror URL
-		MIRRORURL="`sed -n 's/PCBSD_MIRROR: //p' ${PCBSD_ETCCONF}`"
+	  cd "$PBI_APPDIR"
 
-		# Get the system version we are checking for updates to
-		SYSVER="`pbreg get /PC-BSD/Version`" ; export SYSVER
+	  # Set the mirror URL
+	  get_pcbsd_mirror
+          MIRRORURL="$VAL"
 
-		# Set the system arch type
-		ARCH=`uname -m`
-		if [ -n "${PBI_OSARCH}" ] ; then
-			ARCH="${PBI_OSARCH}"
-		fi
+  	  # Get the system version we are checking for updates to
+  	  SYSVER="`pbreg get /PC-BSD/Version`" ; export SYSVER
 
-		# To fetch the jail environment
-		echo "Fetching FreeBSD chroot environment... This may take a while..."
-		fetch -o rel.txz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz
-		fetch -o rel.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz.md5
+  	  # To fetch the jail environment
+ 	  echo "Fetching FreeBSD chroot environment... This may take a while..."
+  	  fetch -o rel-$ARCH.txz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz
+    	  fetch -o rel-$ARCH.md5 ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/fbsd-release.txz.md5
+  	  fetch -o src-$ARCH.txz ${MIRRORURL}/${SYSVER}/${ARCH}/netinstall/extras/components/src.txz
 
-		[ `md5 -q rel.txz` != `cat rel.md5` ] && \
-			exit_err "Error in download data, checksum mismatch.. Please try again later."
+    	  [ `md5 -q rel-$ARCH.txz` != `cat rel-$ARCH.md5` ] && exit_err "Error in download data, checksum mismatch.. Please try again later."
 
-		mv rel.txz ${PBI_CHROOTFILE}
-		rm rel.md5
-		return
+	  isDirZFS "${PBI_APPDIR}"
+          if [ $? -eq 0 ] ; then   
+            # Use ZFS base for cloning
+	    echo "Creating ZFS ${PBI_CHROOTZFS} dataset..."
+            tank=`getZFSTank "$PBI_APPDIR"`
+	    isDirZFS "${PBI_CHROOTZFS}" "1"
+            if [ $? -ne 0 ] ; then   
+              zfs create -o mountpoint=${PBI_CHROOTZFS} -p ${tank}${PBI_CHROOTZFS}
+	      if [ $? -ne 0 ] ; then exit_err "Failed creating ZFS base dataset"; fi
+	    fi
+	    echo "Extracting rel-$ARCH.txz..."
+	    tar xvpf rel-$ARCH.txz -C ${PBI_CHROOTZFS} 2>/dev/null
+	    if [ $? -ne 0 ] ; then exit_err "Failed extracting ZFS base dataset"; fi
+	    mkdir -p ${PBI_CHROOTZFS}/usr/src 2>/dev/null
+	    echo "Extracting src-$ARCH.txz..."
+	    tar xvpf src-$ARCH.txz -C ${PBI_CHROOTZFS}/usr/src 2>/dev/null
+	    if [ $? -ne 0 ] ; then exit_err "Failed extracting ZFS base src dataset"; fi
+	    rm rel-$ARCH.txz
+	    rm src-$ARCH.txz
+	    rm rel-$ARCH.md5
+            zfs snapshot ${tank}${PBI_CHROOTZFS}@clean
+	    if [ $? -ne 0 ] ; then exit_err "Failed creating clean ZFS base snapshot"; fi
+	  else
+	    mv rel-$ARCH.txz ${PBI_CHROOTFILE}
+	    rm rel-$ARCH.md5
+	  fi
+
+	  return
  	fi
 
         local _srcdir="/usr/src"
@@ -6375,7 +7010,7 @@
  
 	# Use existing sources
         if [ -e "${PBI_BUILDSRC}/COPYRIGHT" -a -z "${PBI_OSREL}" ] ; then
-		PBI_BUILDLOG="${PBI_APPDIR}/${PBI_OSARCH}/.buildWorldLog"
+		PBI_BUILDLOG="${PBI_APPDIR}/${ARCH}/.buildWorldLog"
 		: > ${PBI_BUILDLOG}
 		mkdir -p "${PBI_BUILDTARGET}"
 	
@@ -6384,13 +7019,10 @@
 		which svn >/dev/null 2>/dev/null
 		[ "$?" -ne 0 ] && exit_err "Subversion is required to rebuild the chroot environment!"
 
-                local _osRel=`uname -r`
-                if [ -n "${PBI_OSREL}" ]; then
-                        _osRel="${PBI_OSREL}"
-                fi
+                local _osRel=$FBSDREL
 
 		echo "Building the PBI chroot environment... This may take a while..."
-		PBI_BUILDLOG="${PBI_APPDIR}/${PBI_OSARCH}/.buildWorldLog"
+		PBI_BUILDLOG="${PBI_APPDIR}/${ARCH}/.buildWorldLog"
 		echo "" > ${PBI_BUILDLOG}
 		mkdir -p "${PBI_BUILDSRC}"
 		mkdir -p "${PBI_BUILDTARGET}"
@@ -6434,12 +7066,10 @@
 		fi
 	fi # End of subversion checkout
 
-        PBI_BUILDFLAGS="${PBI_BUILDFLAGS} TARGET=${PBI_OSARCH} TARGET_ARCH=${PBI_OSARCH}"
-
-	echo "Running buildworld / installworld"
+	echo "Running buildworld / installworld (into a chroot)"
 	touch ${PBI_BUILDSRC}/Makefile
 	cd ${PBI_BUILDSRC}
-        make ${PBI_BUILDFLAGS} buildworld >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
+        #make ${PBI_BUILDFLAGS} TARGET=$ARCH buildworld >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
         if [ "$?" != "0" ] ; then
                 cd
                 if [ "${PBI_BUILDSRC}" != "/usr/src" -a "${PBI_DELETE_BUILD}" != "0" ] ; then
@@ -6448,7 +7078,23 @@
                 fi
                 exit_err "Buildworld failed! Logfile saved: ${PBI_BUILDLOG}"
         fi
-        make ${PBI_BUILDFLAGS} installworld DESTDIR=${PBI_BUILDTARGET} >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
+
+	# See if we need to create a ZFS dataset
+	isDirZFS "${PBI_APPDIR}"
+        if [ $? -eq 0 ] ; then   
+            # Use ZFS base for cloning
+	    echo "Creating ZFS ${PBI_CHROOTZFS} dataset..."
+            tank=`getZFSTank "$PBI_APPDIR"`
+	    isDirZFS "${PBI_CHROOTZFS}" "1"
+            if [ $? -ne 0 ] ; then   
+              zfs create -o mountpoint=${PBI_CHROOTZFS} -p ${tank}${PBI_CHROOTZFS}
+	      if [ $? -ne 0 ] ; then exit_err "Failed creating ZFS base dataset"; fi
+	    fi
+            rmdir "${PBI_BUILDTARGET}"
+	    PBI_BUILDTARGET="$PBI_CHROOTZFS"
+	fi
+
+        make ${PBI_BUILDFLAGS} installworld TARGET=$ARCH DESTDIR=${PBI_BUILDTARGET} >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
         if [ "$?" != "0" ] ; then
                 cd
                 if [ "${PBI_BUILDSRC}" != "/usr/src" -a "${PBI_DELETE_BUILD}" != "0" ] ; then
@@ -6457,7 +7103,7 @@
                 fi
                 exit_err "Buildworld failed! Logfile saved: ${PBI_BUILDLOG}"
         fi
-        make ${PBI_BUILDFLAGS} distribution DESTDIR=${PBI_BUILDTARGET} >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
+        make ${PBI_BUILDFLAGS} distribution TARGET=$ARCH DESTDIR=${PBI_BUILDTARGET} >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
         if [ "$?" != "0" ] ; then
                 cd
                 if [ "${PBI_BUILDSRC}" != "/usr/src" -a "${PBI_DELETE_BUILD}" != "0" ] ; then
@@ -6472,6 +7118,14 @@
 	mkdir -p ${PBI_BUILDTARGET}/usr/src >/dev/null 2>/dev/null
 	tar cvf - -C "${PBI_BUILDSRC}" --exclude "\.svn/" . 2>/dev/null | tar xvf - -C "${PBI_BUILDTARGET}/usr/src" 2>/dev/null
 
+	# If using ZFS we can stop here
+	if [ -n "$PBI_CHROOTZFS" ] ; then
+           	zfs snapshot ${tank}${PBI_CHROOTZFS}@clean
+	    	if [ $? -ne 0 ] ; then exit_err "Failed creating clean ZFS base snapshot"; fi
+		rm ${PBI_BUILDLOG}
+		return
+	fi
+
 	echo "Creating chroot environment tarball"
 	tar cvjf ${PBI_CHROOTFILE} -C ${PBI_BUILDTARGET} . >>${PBI_BUILDLOG} 2>>${PBI_BUILDLOG}
 	if [ $? -ne 0 ] ; then
@@ -6501,9 +7155,15 @@
 	get_pkgname "${PORTSDIR}/${PBI_MAKEPORT}"
 	_pname="${PKGNAME}"
 
- 	pkg_info -L ${_pname} | sed "s|^${PBI_PROGDIRPATH}/||g" \
-		| grep -v "^Information for" \
-		| grep -v "^Files:" \
+	# Define some commands
+     	if [ $PKGNG -eq 1 ] ; then
+		pkgInf="pkg info -l"
+     	else
+		pkgInf="pkg_info -L"
+	fi
+
+ 	${pkgInf} ${_pname} | sed "s|^${PBI_PROGDIRPATH}/||g" \
+		| grep -v -e "^Information for" -e "^Files:" -e "owns the following" \
 		| tr -s '\t' ' ' \
 		| tr -d ' ' \
 		 > "${PBI_TMPDIR}/.pkg_flist.$$"
@@ -6587,11 +7247,29 @@
 	# If a download is running, kill it
 	if [ -n  "${FETCH_PID}" ] ; then 
 	   echo "Killing ${FETCH_PID}"
-	   kill -9 ${FETCH_PID}
-	   sleep 1
-	   rm ${FETCH_TFILE}
+	   kill -s INT ${FETCH_PID}
+           sleep 2
 	fi
+
+	# If we are running as an auto-build service we need to cleanup
+	if [ "`basename ${0}`" = "pbi_autobuild" ] ; then
+	   for j in `ls ${PBI_TMPDIR}/*.pid 2>/dev/null`
+	   do
+	      bNum=`basename $j | cut -d '.' -f 1 `
+	      if pgrep -qF "${j}" >/dev/null 2>&1; then 
+	         echo "===>Cleaning up processes [$bNum]"
+		 pkill -9 -P "`cat ${j}`"
+		 sleep 10 
+		 pkill -9 -F ${j}
+ 		 sleep 10 
+		 # Do the ZFS destroy here, since running zfs destroy concurrently as we cleanup can cause a panic
+		 check_zfs_ab_destroy "$bNum"
+	      fi
+	   done
+	fi
+
         chroot_make_cleanup
+	rm_pbipatchfiles
 	rm_tmpdir
 	exit 0
 }
@@ -6619,43 +7297,6 @@
 		PBIDSLEEP="${_ckPBID}"
 	fi
 
-        # Load Proxy Variables
-	if [ -z "$PBI_PROXYURL" -a -e "${PBI_ETCCONF}" ] ; then
-		PBI_PROXYURL="`sed -n 's/PBI_PROXYURL: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYPORT="`sed -n 's/PBI_PROXYPORT: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYTYPE="`sed -n 's/PBI_PROXYTYPE: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYUSER="`sed -n 's/PBI_PROXYUSER: //p' ${PBI_ETCCONF}`"
-		PBI_PROXYPASS="`sed -n 's/PBI_PROXYPASS: //p' ${PBI_ETCCONF}`"
-	fi
-
-	# If empty proxy config, check if configured for master pcbsd.conf file
-	if [ -z "$PBI_PROXYURL" -a -e "${PCBSD_ETCCONF}" ] ; then
-		PBI_PROXYURL="`sed -n 's/PCBSD_PROXYURL: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYPORT="`sed -n 's/PCBSD_PROXYPORT: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYTYPE="`sed -n 's/PCBSD_PROXYTYPE: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYUSER="`sed -n 's/PCBSD_PROXYUSER: //p' ${PCBSD_ETCCONF}`"
-		PBI_PROXYPASS="`sed -n 's/PCBSD_PROXYPASS: //p' ${PCBSD_ETCCONF}`"
-	fi
-
-
-        # Create the PROXY variables based upon proxy information supplied
-	if [ -n "$PBI_PROXYURL" ] ; then
-		if [ -n "$PBI_PROXYPORT" ] ; then
-			HTTP_PROXY="${PBI_PROXYURL}:${PBI_PROXYPORT}"
-			FTP_PROXY="${PBI_PROXYURL}:${PBI_PROXYPORT}"
-			export HTTP_PROXY FTP_PROXY
-		else
-			HTTP_PROXY="${PBI_PROXYURL}"
-			FTP_PROXY="${PBI_PROXYURL}"
-			export HTTP_PROXY FTP_PROXY
-		fi
-		if [ -n "$PBI_PROXYUSER" ] ; then
-			if [ -n "$PBI_PROXYPASS" ] ; then
-				HTTP_PROXY_AUTH="basic:*:${PBI_PROXYUSER}:${PBI_PROXYPASS}"
-				export HTTP_PROXY_AUTH
-			fi
-		fi
-	fi
 }
 
 # If the loaded file is a PBI PatchFile
@@ -6667,51 +7308,54 @@
 	fi
 }
 
+install_perl()
+{
+    local _n=`ls -ld ${PORTSDIR}/lang/perl5.*|awk '{ print $9 }'|cut -f2 -d.|sort -n|tail -1`
+    local _port="${PORTSDIR}/lang/perl5.${_n}"
 
-# Build the specified port
-do_port_build()
+    do_port_install "${_port}"
+}
+
+do_port_install()
 {
-  local _lPort="$1"
-  echo "Checking port: $_lPort"
+  local _lPort="${1}"
 
-  # Make sure this port isn't already loaded
-  local pkgName=`make -V PKGNAME -C $_lPort`
-  if [ -e "/var/db/pkg/${pkgName}" ] ; then return ; fi
+  get_pkgname "${_lPort}"
+  local pkgName="${PKGNAME}" 
 
-  # Parse the deps 
-  local TMPFILE=`mktemp /tmp/deplist.XXXXXXXX`
-  make all-depends-list -C $_lPort >$TMPFILE
-  while read line
-  do
-    local _port="$line"
-    local _depPkgName=`make -V PKGNAME -C $_port`
-    # is this installed?
-    if [ -e "/var/db/pkg/${_depPkgName}" ] ; then continue ; fi
+  if [ $PKGNG -eq 1 ] ; then
+  	pkgInf="pkg info -e"
+  	pkgDep="pkg info -d"
+  	pkgCreate="pkg create -f txz"
+  else
+  	pkgInf="pkg_info"
+  	pkgDep="pkg_info -r"
+  	pkgCreate="pkg_create -b"
+  fi
 
-    # Not installed, do this one now until we drill down to the base
-    do_port_build "${_port}" >&1 2>&1
-  done < $TMPFILE
-  rm ${TMPFILE}
-
   # Not installed, see if we have a pkg to install instead
-  if [ -e "/pkgs/${pkgName}.txz" ] ; then
+  if [ -e "/pkgs/${pkgName}.${PKGEXT}" ] ; then
+     REBUILDPKG="NO"
      echo "Checking package: ${pkgName}"
-     REBUILDPKG="NO"
-     pkg_info -r /pkgs/${pkgName}.txz | grep "Dependency:" | cut -d ' ' -f 2 > /tmp/deps.$$
+     $pkgDep /pkgs/${pkgName}.${PKGEXT} | grep -v -e "^Information" -e "depends on:" -e "^Depends" | sed '/^$/d' | sed 's|Dependency: ||g' > /tmp/deps.$$
      while read dLine
      do
-	pkg_info $dLine >/dev/null 2>/dev/null
+     	$pkgInf $dLine >/dev/null 2>/dev/null
         if [ $? -ne 0 ] ; then
-	   echo "Package dependencies updated! Rebuilding port..."
+           echo "Package dependencies updated! Rebuilding port..."
            REBUILDPKG="YES"
 	   break
         fi
      done < /tmp/deps.$$
      rm /tmp/deps.$$
 
+     # Fix some pkgs bugging us with license questions
+     PACKAGE_BUILDING=yes
+     export PACKAGE_BUILDING
+
      if [ "$REBUILDPKG" = "NO" ] ; then
        echo "Adding package: ${pkgName}"
-       pkg_add -f /pkgs/${pkgName}.txz
+       $PKG_ADD -f /pkgs/${pkgName}.${PKGEXT}
        return
      fi
   fi
@@ -6753,14 +7397,121 @@
     done
 
     # Create new pkg
-    pkg_create -J -b ${pkgName}
-    mv ${pkgName}.txz /pkgs/
-    sha256 -q /pkgs/${pkgName}.txz >/pkgs/${pkgName}.txz.sha256
+    ${pkgCreate} ${pkgName}
+    if [ $? -ne 0 ] ; then
+       exit_err "$pkgCreate ${pkgName} failed!"
+    fi
 
+    for p in *.${PKGEXT}
+    do
+        mv ${p} /pkgs/
+        sha256 -q /pkgs/${p} >/pkgs/${p}.sha256
+    done
+
+    #mv ${pkgName}.${PKGEXT} /pkgs/
+    #sha256 -q /pkgs/${pkgName}.${PKGEXT} >/pkgs/${pkgName}.${PKGEXT}.sha256
   fi
+}
+
+
+# Build the specified port
+do_port_build()
+{
+  local _lPort="$1"
+
+  local iFile="$PORTSDIR/INDEX-$FBSDMAJOR"
+  if [ ! -e "$iFile" ] ; then
+     which perl >/dev/null
+     if [ "$?" != "0" ] ; then
+         install_perl
+     fi
+     make -C "${PORTSDIR}" index
+  fi
+
+  echo "Checking port: $_lPort"
+
+  # Make sure this port isn't already loaded
+  get_pkgname "${_lPort}"
+  local pkgName="${PKGNAME}" 
+  if [ $PKGNG -eq 1 ] ; then
+	pkg info -e ${pkgName}
+	if [ $? -eq 0 ] ; then return ; fi
+  else
+	if [ -e "/var/db/pkg/${pkgName}" ] ; then return ; fi
+  fi
+
+  # Save any users / groups we need to create later
+  local pUsers="`make -V USERS -C $_lPort PORTSDIR=${PORTSDIR}`"
+  local pGroups="`make -V GROUPS -C $_lPort PORTSDIR=${PORTSDIR}`"
+  if [ -n "$pUsers" ] ; then
+     PBI_BUILD_USERS="$PBI_BUILD_USERS $pUsers"
+  fi
+  if [ -n "$pGroups" ] ; then
+     PBI_BUILD_GROUPS="$PBI_BUILD_GROUPS $pGroups"
+  fi
+
+  # Parse the pkg deps 
+  for cPkg in `grep "^${pkgName}|" $iFile | cut -d '|' -f 8-9 | sed 's/|/ /g'`
+  do
+    if [ -z "$cPkg" ] ; then continue ; fi
+
+    # is this installed?
+    if [ $PKGNG -eq 1 ] ; then
+	pkg info -e ${cPkg}
+        if [ $? -eq 0 ] ; then continue ; fi
+    else
+	if [ -e "/var/db/pkg/${cPkg}" ] ; then continue ; fi
+    fi
+
+    local _port=`grep "^${cPkg}|" $iFile | cut -d '|' -f 2`
+
+    # Not installed, do this one now until we drill down to the base
+    do_port_build "${_port}" >&1 2>&1
+  done
+
+  do_port_install "${_lPort}"
 };
 
+# Check if the target directory is on ZFS
+# Arg1 = The dir to check
+# Arg2 = If set to 1, don't dig down to lower level directory
+isDirZFS() {
+  local _chkDir="$1"
+  while :
+  do
+     # Is this dir a ZFS mount
+     mount | grep -Ew "on (.+)?$_chkDir " | grep -qw "(zfs," && return 0
+        
+     # Quit if not walking down
+     if [ "$2" = "1" ] ; then return 1 ; fi
+        
+     if [ "$_chkDir" = "/" ] ; then break ; fi
+     _chkDir=`dirname $_chkDir`
+  done
+ 
+  return 1
+}
 
+# Get the ZFS tank name for a directory
+# Arg1 = Directory to check
+getZFSTank() {
+  local _chkDir="$1"
+  while :
+  do
+     line=`mount | grep -w -e $_chkDir -e "(zfs,"`
+     mount | grep -qw -e $_chkDir -e "(zfs,"
+     if [ $? -eq 0 ] ; then
+        echo $line | cut -d '/' -f -1 | awk '{print $1}'
+        return 0
+     fi
+
+     if [ "$_chkDir" = "/" ] ; then return 1 ; fi
+     _chkDir=`dirname $_chkDir`
+  done
+
+  return 1
+}
+
 # Main program operation
 ##############################################################
 init_vars

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12904
          http://freenas.svn.sourceforge.net/freenas/?rev=12904&view=rev
Author:   jhixson
Date:     2012-12-15 00:26:29 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Move some things around. pcbsd directory created. Bring in libsh to make warden happy. Future pcbsd code can go here.

Modified Paths:
--------------
    trunk/build/do_build.sh
    trunk/nanobsd/os-base
    trunk/nanobsd/plugins-base

Added Paths:
-----------
    trunk/src/pcbsd/
    trunk/src/pcbsd/libsh/
    trunk/src/pcbsd/libsh/Makefile
    trunk/src/pcbsd/libsh/functions.sh
    trunk/src/pcbsd/pbi-manager/
    trunk/src/pcbsd/pbi-wrapper/
    trunk/src/pcbsd/warden/

Removed Paths:
-------------
    trunk/src/pbi-manager/
    trunk/src/pbi-wrapper/
    trunk/src/warden/

Modified: trunk/build/do_build.sh
===================================================================
--- trunk/build/do_build.sh	2012-12-14 20:53:56 UTC (rev 12903)
+++ trunk/build/do_build.sh	2012-12-15 00:26:29 UTC (rev 12904)
@@ -159,7 +159,7 @@
 
 install_pbi_manager()
 {
-	local src="${TOP}/src/pbi-manager"
+	local src="${TOP}/src/pcbsd/pbi-manager"
 
 	if [ -f "${PBI_BINDIR}/pbi_create" ]
 	then
@@ -403,7 +403,7 @@
 
 do_pbi_wrapper_hack()
 {
-	local _src="${AVATAR_ROOT}/src/pbi-wrapper"
+	local _src="${AVATAR_ROOT}/src/pcbsd/pbi-wrapper"
 	local _dst="${AVATAR_ROOT}/FreeBSD/src/pbi-wrapper"
 
 	if [ ! -d "${_dst}" ]

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2012-12-14 20:53:56 UTC (rev 12903)
+++ trunk/nanobsd/os-base	2012-12-15 00:26:29 UTC (rev 12904)
@@ -426,7 +426,7 @@
 add_pbi_manager()
 {
     local pm dst
-    pm=${AVATAR_ROOT}/src/pbi-manager
+    pm=${AVATAR_ROOT}/src/pcbsd/pbi-manager
     dst=${NANO_WORLDDIR}/usr/local
 
     pprint 2 "Adding pbi-manager"
@@ -459,7 +459,7 @@
 add_warden()
 {
 	local src dst share
-	src="${AVATAR_ROOT}/src/warden"
+	src="${AVATAR_ROOT}/src/pcbsd/warden"
 	dst="${NANO_WORLDDIR}/usr/local"
 	share="${dst}/share/warden"
 

Modified: trunk/nanobsd/plugins-base
===================================================================
--- trunk/nanobsd/plugins-base	2012-12-14 20:53:56 UTC (rev 12903)
+++ trunk/nanobsd/plugins-base	2012-12-15 00:26:29 UTC (rev 12904)
@@ -142,7 +142,7 @@
 add_pbi_manager()
 {
     local pm dst
-    pm=${AVATAR_ROOT}/src/pbi-manager
+    pm=${AVATAR_ROOT}/src/pcbsd/pbi-manager
     dst=${NANO_WORLDDIR}/usr/local
 
     pprint 2 "Adding pbi-manager"

Added: trunk/src/pcbsd/libsh/Makefile
===================================================================
--- trunk/src/pcbsd/libsh/Makefile	                        (rev 0)
+++ trunk/src/pcbsd/libsh/Makefile	2012-12-15 00:26:29 UTC (rev 12904)
@@ -0,0 +1,52 @@
+#############################################################################
+# Makefile for building: pc-su
+#############################################################################
+
+####### Compiler, tools and options
+
+AR            = ar cqs
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -R
+INSTALL_FILE  = $(COPY_FILE)
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = $(COPY_FILE)
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+first: all
+
+all: 
+
+clean:
+
+check: first
+
+install_scripts: first FORCE
+	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/
+	-$(INSTALL_FILE) functions.sh $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/
+
+
+uninstall_scripts:  FORCE
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/functions.sh
+	-$(DEL_DIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts
+
+
+install_dochmod: first FORCE
+	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/share/pcbsd/scripts/ 
+	chmod 755 /usr/local/share/pcbsd/scripts/functions.sh
+
+
+install:  install_scripts install_dochmod  FORCE
+
+uninstall: uninstall_scripts   FORCE
+
+FORCE:
+

Added: trunk/src/pcbsd/libsh/functions.sh
===================================================================
--- trunk/src/pcbsd/libsh/functions.sh	                        (rev 0)
+++ trunk/src/pcbsd/libsh/functions.sh	2012-12-15 00:26:29 UTC (rev 12904)
@@ -0,0 +1,268 @@
+#!/bin/sh
+# Functions we can source for pc-bsd scripts
+# Author: Kris Moore
+# Copyright: 2012
+# License: BSD
+##############################################################
+
+PCBSD_ETCCONF="/usr/local/etc/pcbsd.conf"
+
+get_mirror() {
+
+  # Check if we already looked up a mirror we can keep using
+  if [ -n "$CACHED_PCBSD_MIRROR" ] ; then
+     VAL="$CACHED_PCBSD_MIRROR"
+     export VAL
+     return
+  fi
+
+  # Set the mirror URL
+  VAL="`cat ${PCBSD_ETCCONF} 2>/dev/null | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR: ||g'`"
+  if [ -n "$VAL" ] ; then
+     echo "Using mirror: $VAL"
+     CACHED_PCBSD_MIRROR="$VAL"
+     export VAL CACHED_PCBSD_MIRROR
+     return
+  fi
+
+  echo "Getting regional mirror..."
+  . /etc/profile
+
+  # No URL? Lets get one from the master server
+  local mFile="${HOME}/.mirrorUrl.$$"
+  touch $mFile
+  fetch -o $mFile http://getmirror.pcbsd.org >/dev/null 2>/dev/null
+  VAL="`cat $mFile | grep 'URL: ' | sed 's|URL: ||g'`"
+  rm $mFile
+  if [ -n "$VAL" ] ; then
+     echo "Using mirror: $VAL"
+     CACHED_PCBSD_MIRROR="$VAL"
+     export VAL CACHED_PCBSD_MIRROR
+     return
+  fi
+
+  # Still no mirror? Lets try the PC-BSD FTP server...
+  VAL="ftp://ftp.pcbsd.org/pub/mirror"
+  CACHED_PCBSD_MIRROR="$VAL"
+  export VAL CACHED_PCBSD_MIRROR
+  echo "Using mirror: $VAL"
+  return 
+}
+
+# Function to download a file from remote using fetch
+# Arg1 = Remote File URL
+# Arg2 = Where to save file
+# Arg3 = Number of attempts to make before failing
+get_file() {
+
+	_rf="${1}"
+	_lf="${2}"
+        _ftries=${3}
+	if [ -z "$_ftries" ] ; then _ftries=3; fi
+
+        # Get any proxy information
+        . /etc/profile
+
+	if [ -e "${_lf}" ] ; then 
+		echo "Resuming download of: ${_lf}"
+	fi
+
+	if [ "$GUI_FETCH_PARSING" != "YES" -a -z "$PCFETCHGUI" ] ; then
+		fetch -r -o "${_lf}" "${_rf}"
+		_err=$?
+	else
+		echo "FETCH: ${_rf}"
+
+		# Doing a front-end download, parse the output of fetch
+		_eFile="/tmp/.fetch-exit.$$"
+		fetch -s "${_rf}" > /tmp/.fetch-size.$$ 2>/dev/null
+		_fSize=`cat /tmp/.fetch-size.$$ 2>/dev/null`
+		_fSize="`expr ${_fSize} / 1024 2>/dev/null`"
+		rm "/tmp/.fetch-size.$$" 2>/dev/null
+		_time=1
+
+		( fetch -r -o "${_lf}" "${_rf}" >/dev/null 2>/dev/null ; echo "$?" > ${_eFile} ) &
+		FETCH_PID=`ps -auwwwx | grep -v grep | grep "fetch -r -o ${_lf}" | awk '{print $2}'`
+		while : 
+		do
+			if [ -e "${_lf}" ] ; then
+				_dSize=`du -k ${_lf} | tr -d '\t' | cut -d '/' -f 1`
+				if [ $(is_num "$_dSize") ] ; then
+					if [ ${_fSize} -lt ${_dSize} ] ; then _dSize="$_fSize" ; fi
+					_kbs=`expr ${_dSize} \/ $_time`
+					echo "SIZE: ${_fSize} DOWNLOADED: ${_dSize} SPEED: ${_kbs} KB/s"
+				fi
+			fi
+
+			# Make sure download isn't finished
+			ps -p $FETCH_PID >/dev/null 2>/dev/null
+			if [ "$?" != "0" ] ; then break ; fi
+			sleep 2
+			_time=`expr $_time + 2`
+		done
+
+		_err="`cat ${_eFile}`"
+		if [ "$_err" = "0" ]; then echo "FETCHDONE" ; fi
+		unset FETCH_PID
+	fi
+
+	echo ""
+	if [ $_err -ne 0 -a $_ftries -gt 0 ] ; then
+		sleep 30
+		_ftries=`expr $_ftries - 1`
+
+		# Remove the local file if we failed
+		if [ -e "${_lf}" ]; then rm "${_lf}"; fi
+
+		get_file "${_rf}" "${_lf}" $_ftries	
+		_err=$?
+	fi
+	return $_err
+}
+
+# Check if a value is a number
+is_num()
+{
+        expr $1 + 1 2>/dev/null
+        return $?
+}
+
+# Exit with a error message
+exit_err() {
+	if [ -n "${LOGFILE}" ] ; then
+           echo "ERROR: $*" >> ${LOGFILE}
+	fi
+  	echo >&2 "ERROR: $*"
+        exit 1
+}
+
+
+### Print an error on STDERR and bail out
+printerror() {
+  exit_err $*
+}
+
+
+# Check if the target directory is on ZFS
+# Arg1 = The dir to check
+# Arg2 = If set to 1, don't dig down to lower level directory
+isDirZFS() {
+  local _chkDir="$1"
+  while :
+  do
+     # Is this dir a ZFS mount
+     mount | grep -w "on $_chkDir " | grep -qw "(zfs," && return 0
+      
+     # Quit if not walking down
+     if [ "$2" = "1" ] ; then return 1 ; fi
+  
+     if [ "$_chkDir" = "/" ] ; then break ; fi
+     _chkDir=`dirname $_chkDir`
+  done
+  
+  return 1
+}
+
+# Get the ZFS tank name for a directory
+# Arg1 = Directory to check
+getZFSTank() {
+  local _chkDir="$1"
+  while :
+  do
+     line=`mount | grep -w -e $_chkDir -e "(zfs,"`
+     mount | grep -qw -e $_chkDir -e "(zfs,"
+     if [ $? -eq 0 ] ; then
+        echo $line | cut -d '/' -f -1 | awk '{print $1}'
+        return 0
+     fi
+
+     if [ "$_chkDir" = "/" ] ; then return 1 ; fi
+     _chkDir=`dirname $_chkDir`
+  done
+
+  return 1
+}
+
+# Check if an address is IPv6
+isV6() {
+  echo ${1} | grep -q ":"
+  return $?
+}
+    
+# Is a mount point, or any of its parent directories, a symlink?
+is_symlinked_mountpoint()
+{
+        local _dir
+        _dir=$1
+        [ -L "$_dir" ] && return 0
+        [ "$_dir" = "/" ] && return 1
+        is_symlinked_mountpoint `dirname $_dir`
+        return $?
+}
+
+# Function to ask the user to press Return to continue
+rtn()
+{
+  echo -e "Press ENTER to continue\c";
+  read garbage
+};
+
+# Function to check if an IP address passes a basic sanity test
+check_ip()
+{
+  ip="$1"
+  
+  # If this is a V6 address, skip validation for now
+  isV6 "${ip}"
+  if [ $? -eq 0 ] ; then return ; fi
+
+  # Check if we can cut this IP into the right segments 
+  SEG="`echo $ip | cut -d '.' -f 1 2>/dev/null`"
+  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
+  if [ "$?" != "0" ]
+  then
+     return 1
+  fi
+  if [ $SEG -gt 255 -o $SEG -lt 0 ]
+  then
+     return 1
+  fi
+  
+  # Second segment
+  SEG="`echo $ip | cut -d '.' -f 2 2>/dev/null`"
+  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
+  if [ "$?" != "0" ]
+  then
+     return 1
+  fi
+  if [ $SEG -gt 255 -o $SEG -lt 0 ]
+  then
+     return 1
+  fi
+
+  # Third segment
+  SEG="`echo $ip | cut -d '.' -f 3 2>/dev/null`"
+  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
+  if [ "$?" != "0" ]
+  then
+     return 1
+  fi
+  if [ $SEG -gt 255 -o $SEG -lt 0 ]
+  then
+     return 1
+  fi
+  
+  # Fourth segment
+  SEG="`echo $ip | cut -d '.' -f 4 2>/dev/null`"
+  echo $SEG | grep -E "^[0-9]+$" >/dev/null 2>/dev/null
+  if [ "$?" != "0" ]
+  then
+     return 1
+  fi
+  if [ $SEG -gt 255 -o $SEG -lt 0 ]
+  then
+     return 1
+  fi
+
+  return 0
+};


Property changes on: trunk/src/pcbsd/libsh/functions.sh
___________________________________________________________________
Added: svn:executable
   + *

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12916
          http://freenas.svn.sourceforge.net/freenas/?rev=12916&view=rev
Author:   zippybr
Date:     2012-12-18 11:39:06 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
Update dojo to 1.8.2

Modified Paths:
--------------
    trunk/gui/settings.py
    trunk/nanobsd/Files/etc/rc.d/ix-nginx
    trunk/patches/ports-dojo.patch

Modified: trunk/gui/settings.py
===================================================================
--- trunk/gui/settings.py	2012-12-18 11:14:59 UTC (rev 12915)
+++ trunk/gui/settings.py	2012-12-18 11:39:06 UTC (rev 12916)
@@ -134,7 +134,7 @@
 )
 
 DOJANGO_DOJO_PROFILE = 'local_release'
-DOJANGO_DOJO_VERSION = '1.8.1'
+DOJANGO_DOJO_VERSION = '1.8.2'
 #DOJANGO_DOJO_BUILD_VERSION = '1.6.0b1'
 DOJANGO_DOJO_DEBUG = True
 

Modified: trunk/nanobsd/Files/etc/rc.d/ix-nginx
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-nginx	2012-12-18 11:14:59 UTC (rev 12915)
+++ trunk/nanobsd/Files/etc/rc.d/ix-nginx	2012-12-18 11:39:06 UTC (rev 12916)
@@ -202,7 +202,7 @@
         }
 
         #FIXME: get version from freenasUI.settings
-        location /dojango/dojo-media/release/1.8.1 {
+        location /dojango/dojo-media/release/1.8.2 {
             alias /usr/local/www/dojo;
         }
 

Modified: trunk/patches/ports-dojo.patch
===================================================================
--- trunk/patches/ports-dojo.patch	2012-12-18 11:14:59 UTC (rev 12915)
+++ trunk/patches/ports-dojo.patch	2012-12-18 11:39:06 UTC (rev 12916)
@@ -1,2385 +1,1214 @@
 Index: www/dojo/Makefile
 ===================================================================
---- www/dojo/Makefile	(revision 302583)
-+++ www/dojo/Makefile	(working copy)
-@@ -6,7 +6,7 @@
- #
+RCS file: /home/ncvs/ports/www/dojo/Makefile,v
+retrieving revision 1.14
+diff -u -r1.14 Makefile
+--- www/dojo/Makefile	20 Aug 2011 17:27:37 -0000	1.14
++++ www/dojo/Makefile	18 Dec 2012 11:35:04 -0000
+@@ -1,15 +1,9 @@
+-# New ports collection makefile for:	dojo
+-# Date created:		2008-01-29
+-# Whom:			Greg Larkin <glarkin@...>
+-#
+-# $FreeBSD: ports/www/dojo/Makefile,v 1.14 2011/08/20 17:27:37 ohauer Exp $
+-#
++# $FreeBSD: head/www/dojo/Makefile 306036 2012-10-17 19:23:20Z glarkin $
  
  PORTNAME=		dojo
 -PORTVERSION=		1.5.0
-+PORTVERSION=		1.8.1
++PORTVERSION=		1.8.2
  CATEGORIES=		www
- MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/ \
- 			LOCAL/glarkin
+-MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/ \
+-			LOCAL/glarkin
++MASTER_SITES=		http://download.dojotoolkit.org/release-${PORTVERSION}/
+ DISTNAME=		dojo-release-${PORTVERSION}
+ 
+ MAINTAINER=		glarkin@...
+@@ -17,12 +11,12 @@
+ 
+ NO_BUILD=		yes
+ 
+-OPTIONS=		APACHE  "Configure for Apache-2.x" off
++OPTIONS_DEFINE=		APACHE
+ 
+-.include <bsd.port.pre.mk>
++.include <bsd.port.options.mk>
+ 
+-.if defined(WITH_APACHE)
+-USE_APACHE=		20+
++.if ${PORT_OPTIONS:MAPACHE}
++USE_APACHE_RUN=		22+
+ CONFDIR=		${PREFIX}/${CONFDIR_REL}
+ CONFDIR_REL=		${APACHEETCDIR}/Includes
+ PLIST_SUB+=		NOAPACHE="" CONFDIR=${CONFDIR_REL}
+@@ -60,4 +54,4 @@
+ 	@${CAT} ${PKGMESSAGE}
+ .endif
+ 
+-.include <bsd.port.post.mk>
++.include <bsd.port.mk>
 Index: www/dojo/distinfo
 ===================================================================
---- www/dojo/distinfo	(revision 302583)
-+++ www/dojo/distinfo	(working copy)
+RCS file: /home/ncvs/ports/www/dojo/distinfo,v
+retrieving revision 1.13
+diff -u -r1.13 distinfo
+--- www/dojo/distinfo	19 Mar 2011 12:34:00 -0000	1.13
++++ www/dojo/distinfo	18 Dec 2012 11:35:04 -0000
 @@ -1,2 +1,2 @@
 -SHA256 (dojo-release-1.5.0.tar.gz) = da6c357d31c38b4eb27cf1d2860d0f504cf32a2fb2f423542b2c7dc11193a616
 -SIZE (dojo-release-1.5.0.tar.gz) = 3422622
-+SHA256 (dojo-release-1.8.1.tar.gz) = 913f8d0976fa09b29f3767fee26bbaa25b1928c73240a97abb93d1eeb9d8b927
-+SIZE (dojo-release-1.8.1.tar.gz) = 7720257
++SHA256 (dojo-release-1.8.2.tar.gz) = 5d6f67fdf453c4d1aea9f87387f04715fc29e2ca9028d4b9fbb5425adfe873d8
++SIZE (dojo-release-1.8.2.tar.gz) = 7734263
 Index: www/dojo/pkg-plist
 ===================================================================
---- www/dojo/pkg-plist	(revision 302583)
-+++ www/dojo/pkg-plist	(working copy)
-@@ -1,2832 +1,8199 @@
- %%NOAPACHE%%%%CONFDIR%%/dojo.conf
--%%WWWDIR%%/dijit/Calendar.js
--%%WWWDIR%%/dijit/CheckedMenuItem.js
--%%WWWDIR%%/dijit/ColorPalette.js
-+%%WWWDIR%%/dojo/on.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-style.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-prop.js.uncompressed.js
-+%%WWWDIR%%/dojo/io-query.js
-+%%WWWDIR%%/dojo/loadInit.js
-+%%WWWDIR%%/dojo/touch.js
-+%%WWWDIR%%/dojo/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/OpenAjax.js
-+%%WWWDIR%%/dojo/router.js
-+%%WWWDIR%%/dojo/data/ItemFileReadStore.js
-+%%WWWDIR%%/dojo/data/api/Write.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/api/Read.js
-+%%WWWDIR%%/dojo/data/api/Identity.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/api/Notification.js
-+%%WWWDIR%%/dojo/data/api/Item.js
-+%%WWWDIR%%/dojo/data/api/Write.js
-+%%WWWDIR%%/dojo/data/api/Read.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/api/Request.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/api/Notification.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/api/Item.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/api/Identity.js
-+%%WWWDIR%%/dojo/data/api/Request.js
-+%%WWWDIR%%/dojo/data/util/simpleFetch.js
-+%%WWWDIR%%/dojo/data/util/simpleFetch.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/util/sorter.js
-+%%WWWDIR%%/dojo/data/util/filter.js
-+%%WWWDIR%%/dojo/data/util/filter.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/util/sorter.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/ItemFileWriteStore.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/ItemFileWriteStore.js
-+%%WWWDIR%%/dojo/data/ObjectStore.js
-+%%WWWDIR%%/dojo/data/ObjectStore.js.uncompressed.js
-+%%WWWDIR%%/dojo/data/ItemFileReadStore.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-form.js
-+%%WWWDIR%%/dojo/currency.js
-+%%WWWDIR%%/dojo/main.js.uncompressed.js
-+%%WWWDIR%%/dojo/i18n.js.uncompressed.js
-+%%WWWDIR%%/dojo/regexp.js.uncompressed.js
-+%%WWWDIR%%/dojo/on.js
-+%%WWWDIR%%/dojo/sniff.js.uncompressed.js
-+%%WWWDIR%%/dojo/NodeList.js.uncompressed.js
-+%%WWWDIR%%/dojo/html.js.uncompressed.js
-+%%WWWDIR%%/dojo/errors/RequestTimeoutError.js
-+%%WWWDIR%%/dojo/errors/RequestTimeoutError.js.uncompressed.js
-+%%WWWDIR%%/dojo/errors/create.js.uncompressed.js
-+%%WWWDIR%%/dojo/errors/RequestError.js
-+%%WWWDIR%%/dojo/errors/CancelError.js
-+%%WWWDIR%%/dojo/errors/create.js
-+%%WWWDIR%%/dojo/errors/RequestError.js.uncompressed.js
-+%%WWWDIR%%/dojo/errors/CancelError.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/JsonRest.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/Observable.js
-+%%WWWDIR%%/dojo/store/JsonRest.js
-+%%WWWDIR%%/dojo/store/Observable.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/Memory.js
-+%%WWWDIR%%/dojo/store/README
-+%%WWWDIR%%/dojo/store/DataStore.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/DataStore.js
-+%%WWWDIR%%/dojo/store/Memory.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/Cache.js
-+%%WWWDIR%%/dojo/store/util/SimpleQueryEngine.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/util/QueryResults.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/util/SimpleQueryEngine.js
-+%%WWWDIR%%/dojo/store/util/QueryResults.js
-+%%WWWDIR%%/dojo/store/api/Store.js
-+%%WWWDIR%%/dojo/store/api/Store.js.uncompressed.js
-+%%WWWDIR%%/dojo/store/Cache.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Target.js
-+%%WWWDIR%%/dojo/dnd/Moveable.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/common.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Selector.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Container.js
-+%%WWWDIR%%/dojo/dnd/common.js
-+%%WWWDIR%%/dojo/dnd/Mover.js
-+%%WWWDIR%%/dojo/dnd/Target.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/AutoSource.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/AutoSource.js
-+%%WWWDIR%%/dojo/dnd/move.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/TimedMoveable.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Selector.js
-+%%WWWDIR%%/dojo/dnd/TimedMoveable.js
-+%%WWWDIR%%/dojo/dnd/Source.js
-+%%WWWDIR%%/dojo/dnd/move.js
-+%%WWWDIR%%/dojo/dnd/autoscroll.js
-+%%WWWDIR%%/dojo/dnd/Container.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/autoscroll.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Avatar.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Avatar.js
-+%%WWWDIR%%/dojo/dnd/Source.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Moveable.js
-+%%WWWDIR%%/dojo/dnd/Manager.js.uncompressed.js
-+%%WWWDIR%%/dojo/dnd/Manager.js
-+%%WWWDIR%%/dojo/dnd/Mover.js.uncompressed.js
-+%%WWWDIR%%/dojo/domReady.js.uncompressed.js
-+%%WWWDIR%%/dojo/domReady.js
-+%%WWWDIR%%/dojo/touch.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom.js.uncompressed.js
-+%%WWWDIR%%/dojo/Stateful.js.uncompressed.js
-+%%WWWDIR%%/dojo/fx.js
-+%%WWWDIR%%/dojo/cookie.js.uncompressed.js
-+%%WWWDIR%%/dojo/keys.js.uncompressed.js
-+%%WWWDIR%%/dojo/i18n.js
-+%%WWWDIR%%/dojo/regexp.js
-+%%WWWDIR%%/dojo/rpc/JsonService.js.uncompressed.js
-+%%WWWDIR%%/dojo/rpc/JsonpService.js.uncompressed.js
-+%%WWWDIR%%/dojo/rpc/RpcService.js
-+%%WWWDIR%%/dojo/rpc/JsonService.js
-+%%WWWDIR%%/dojo/rpc/RpcService.js.uncompressed.js
-+%%WWWDIR%%/dojo/rpc/JsonpService.js
-+%%WWWDIR%%/dojo/io-query.js.uncompressed.js
-+%%WWWDIR%%/dojo/dojo.profile.js
-+%%WWWDIR%%/dojo/colors.js
-+%%WWWDIR%%/dojo/jaxer.js.uncompressed.js
-+%%WWWDIR%%/dojo/query.js
-+%%WWWDIR%%/dojo/uacss.js
-+%%WWWDIR%%/dojo/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/io/iframe.js.uncompressed.js
-+%%WWWDIR%%/dojo/io/script.js
-+%%WWWDIR%%/dojo/io/iframe.js
-+%%WWWDIR%%/dojo/io/script.js.uncompressed.js
-+%%WWWDIR%%/dojo/DeferredList.js
-+%%WWWDIR%%/dojo/NodeList-dom.js.uncompressed.js
-+%%WWWDIR%%/dojo/back.js
-+%%WWWDIR%%/dojo/NodeList-dom.js
-+%%WWWDIR%%/dojo/aspect.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-class.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/iframe.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/util.js
-+%%WWWDIR%%/dojo/request/node.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/xhr.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/watch.js
-+%%WWWDIR%%/dojo/request/default.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/script.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/handlers.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/xhr.js
-+%%WWWDIR%%/dojo/request/default.js
-+%%WWWDIR%%/dojo/request/notify.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/registry.js
-+%%WWWDIR%%/dojo/request/node.js
-+%%WWWDIR%%/dojo/request/registry.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/script.js
-+%%WWWDIR%%/dojo/request/notify.js
-+%%WWWDIR%%/dojo/request/watch.js.uncompressed.js
-+%%WWWDIR%%/dojo/request/handlers.js
-+%%WWWDIR%%/dojo/request/iframe.js
-+%%WWWDIR%%/dojo/request/util.js.uncompressed.js
-+%%WWWDIR%%/dojo/NodeList-html.js.uncompressed.js
-+%%WWWDIR%%/dojo/json.js.uncompressed.js
-+%%WWWDIR%%/dojo/fx/easing.js.uncompressed.js
-+%%WWWDIR%%/dojo/fx/easing.js
-+%%WWWDIR%%/dojo/fx/Toggler.js
-+%%WWWDIR%%/dojo/fx/Toggler.js.uncompressed.js
-+%%WWWDIR%%/dojo/Stateful.js
-+%%WWWDIR%%/dojo/topic.js
-+%%WWWDIR%%/dojo/NodeList.js
-+%%WWWDIR%%/dojo/cookie.js
-+%%WWWDIR%%/dojo/ready.js.uncompressed.js
-+%%WWWDIR%%/dojo/node.js.uncompressed.js
-+%%WWWDIR%%/dojo/Deferred.js
-+%%WWWDIR%%/dojo/aspect.js
-+%%WWWDIR%%/dojo/has.js
-+%%WWWDIR%%/dojo/request.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-geometry.js
-+%%WWWDIR%%/dojo/hccss.js.uncompressed.js
-+%%WWWDIR%%/dojo/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/NodeList-traverse.js.uncompressed.js
-+%%WWWDIR%%/dojo/parser.js
-+%%WWWDIR%%/dojo/node.js
-+%%WWWDIR%%/dojo/selector/lite.js.uncompressed.js
-+%%WWWDIR%%/dojo/selector/_loader.js.uncompressed.js
-+%%WWWDIR%%/dojo/selector/_loader.js
-+%%WWWDIR%%/dojo/selector/lite.js
-+%%WWWDIR%%/dojo/selector/acme.js
-+%%WWWDIR%%/dojo/selector/acme.js.uncompressed.js
-+%%WWWDIR%%/dojo/keys.js
-+%%WWWDIR%%/dojo/window.js.uncompressed.js
-+%%WWWDIR%%/dojo/query.js.uncompressed.js
-+%%WWWDIR%%/dojo/dojo.js
-+%%WWWDIR%%/dojo/fx.js.uncompressed.js
-+%%WWWDIR%%/dojo/date.js.uncompressed.js
-+%%WWWDIR%%/dojo/hash.js
-+%%WWWDIR%%/dojo/date/locale.js
-+%%WWWDIR%%/dojo/date/stamp.js.uncompressed.js
-+%%WWWDIR%%/dojo/date/locale.js.uncompressed.js
-+%%WWWDIR%%/dojo/date/stamp.js
-+%%WWWDIR%%/dojo/NodeList-data.js
-+%%WWWDIR%%/dojo/when.js
-+%%WWWDIR%%/dojo/AdapterRegistry.js
-+%%WWWDIR%%/dojo/DeferredList.js.uncompressed.js
-+%%WWWDIR%%/dojo/NodeList-fx.js
-+%%WWWDIR%%/dojo/NodeList-html.js
-+%%WWWDIR%%/dojo/dom-form.js.uncompressed.js
-+%%WWWDIR%%/dojo/dojo.js.uncompressed.js
-+%%WWWDIR%%/dojo/NodeList-manipulate.js
-+%%WWWDIR%%/dojo/NodeList-fx.js.uncompressed.js
-+%%WWWDIR%%/dojo/html.js
-+%%WWWDIR%%/dojo/topic.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-construct.js.uncompressed.js
-+%%WWWDIR%%/dojo/has.js.uncompressed.js
-+%%WWWDIR%%/dojo/jaxer.js
-+%%WWWDIR%%/dojo/number.js
-+%%WWWDIR%%/dojo/text.js
-+%%WWWDIR%%/dojo/hash.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-attr.js
-+%%WWWDIR%%/dojo/parser.js.uncompressed.js
-+%%WWWDIR%%/dojo/gears.js.uncompressed.js
-+%%WWWDIR%%/dojo/gears.js
-+%%WWWDIR%%/dojo/cache.js.uncompressed.js
-+%%WWWDIR%%/dojo/Evented.js.uncompressed.js
-+%%WWWDIR%%/dojo/package.json
-+%%WWWDIR%%/dojo/dom-geometry.js.uncompressed.js
-+%%WWWDIR%%/dojo/window.js
-+%%WWWDIR%%/dojo/NodeList-data.js.uncompressed.js
-+%%WWWDIR%%/dojo/promise/all.js
-+%%WWWDIR%%/dojo/promise/all.js.uncompressed.js
-+%%WWWDIR%%/dojo/promise/first.js
-+%%WWWDIR%%/dojo/promise/Promise.js
-+%%WWWDIR%%/dojo/promise/instrumentation.js.uncompressed.js
-+%%WWWDIR%%/dojo/promise/first.js.uncompressed.js
-+%%WWWDIR%%/dojo/promise/tracer.js.uncompressed.js
-+%%WWWDIR%%/dojo/promise/instrumentation.js
-+%%WWWDIR%%/dojo/promise/Promise.js.uncompressed.js
-+%%WWWDIR%%/dojo/promise/tracer.js
-+%%WWWDIR%%/dojo/router.js.uncompressed.js
-+%%WWWDIR%%/dojo/Evented.js
-+%%WWWDIR%%/dojo/dom-attr.js.uncompressed.js
-+%%WWWDIR%%/dojo/router/RouterBase.js.uncompressed.js
-+%%WWWDIR%%/dojo/router/RouterBase.js
-+%%WWWDIR%%/dojo/loadInit.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom.js
-+%%WWWDIR%%/dojo/ready.js
-+%%WWWDIR%%/dojo/Deferred.js.uncompressed.js
-+%%WWWDIR%%/dojo/mouse.js
-+%%WWWDIR%%/dojo/NodeList-traverse.js
-+%%WWWDIR%%/dojo/text.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-style.js
-+%%WWWDIR%%/dojo/LICENSE
-+%%WWWDIR%%/dojo/when.js.uncompressed.js
-+%%WWWDIR%%/dojo/string.js
-+%%WWWDIR%%/dojo/main.js
-+%%WWWDIR%%/dojo/request.js
-+%%WWWDIR%%/dojo/_base/unload.js
-+%%WWWDIR%%/dojo/_base/lang.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/configSpidermonkey.js
-+%%WWWDIR%%/dojo/_base/kernel.js
-+%%WWWDIR%%/dojo/_base/query.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/array.js
-+%%WWWDIR%%/dojo/_base/array.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/Color.js
-+%%WWWDIR%%/dojo/_base/connect.js
-+%%WWWDIR%%/dojo/_base/sniff.js
-+%%WWWDIR%%/dojo/_base/window.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/declare.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/configNode.js
-+%%WWWDIR%%/dojo/_base/html.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/declare.js
-+%%WWWDIR%%/dojo/_base/lang.js
-+%%WWWDIR%%/dojo/_base/config.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/NodeList.js
-+%%WWWDIR%%/dojo/_base/connect.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/browser.js
-+%%WWWDIR%%/dojo/_base/loader.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/json.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/Deferred.js
-+%%WWWDIR%%/dojo/_base/config.js
-+%%WWWDIR%%/dojo/_base/xhr.js
-+%%WWWDIR%%/dojo/_base/event.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/NodeList.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/sniff.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/url.js
-+%%WWWDIR%%/dojo/_base/xhr.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/configFirefoxExtension.js
-+%%WWWDIR%%/dojo/_base/Deferred.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/json.js
-+%%WWWDIR%%/dojo/_base/browser.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/fx.js
-+%%WWWDIR%%/dojo/_base/html.js
-+%%WWWDIR%%/dojo/_base/configRhino.js
-+%%WWWDIR%%/dojo/_base/unload.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/window.js
-+%%WWWDIR%%/dojo/_base/fx.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/Color.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/event.js
-+%%WWWDIR%%/dojo/_base/query.js
-+%%WWWDIR%%/dojo/_base/loader.js
-+%%WWWDIR%%/dojo/_base/kernel.js.uncompressed.js
-+%%WWWDIR%%/dojo/_base/url.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-prop.js
-+%%WWWDIR%%/dojo/hccss.js
-+%%WWWDIR%%/dojo/mouse.js.uncompressed.js
-+%%WWWDIR%%/dojo/string.js.uncompressed.js
-+%%WWWDIR%%/dojo/dom-construct.js
-+%%WWWDIR%%/dojo/cache.js
-+%%WWWDIR%%/dojo/require.js.uncompressed.js
-+%%WWWDIR%%/dojo/sniff.js
-+%%WWWDIR%%/dojo/nls/sl/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/sl/colors.js
-+%%WWWDIR%%/dojo/nls/zh-tw/colors.js
-+%%WWWDIR%%/dojo/nls/zh-tw/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/kk/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/kk/colors.js
-+%%WWWDIR%%/dojo/nls/ro/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ro/colors.js
-+%%WWWDIR%%/dojo/nls/it/colors.js
-+%%WWWDIR%%/dojo/nls/it/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ca/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ca/colors.js
-+%%WWWDIR%%/dojo/nls/da/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/da/colors.js
-+%%WWWDIR%%/dojo/nls/tr/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/tr/colors.js
-+%%WWWDIR%%/dojo/nls/zh/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/zh/colors.js
-+%%WWWDIR%%/dojo/nls/sk/colors.js
-+%%WWWDIR%%/dojo/nls/sk/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/th/colors.js
-+%%WWWDIR%%/dojo/nls/th/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/el/colors.js
-+%%WWWDIR%%/dojo/nls/el/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ja/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ja/colors.js
-+%%WWWDIR%%/dojo/nls/de/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/de/colors.js
-+%%WWWDIR%%/dojo/nls/ru/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ru/colors.js
-+%%WWWDIR%%/dojo/nls/pt/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/pt/colors.js
-+%%WWWDIR%%/dojo/nls/ko/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ko/colors.js
-+%%WWWDIR%%/dojo/nls/az/colors.js
-+%%WWWDIR%%/dojo/nls/az/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/sv/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/sv/colors.js
-+%%WWWDIR%%/dojo/nls/fi/colors.js
-+%%WWWDIR%%/dojo/nls/fi/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/he/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/he/colors.js
-+%%WWWDIR%%/dojo/nls/ar/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/ar/colors.js
-+%%WWWDIR%%/dojo/nls/cs/colors.js
-+%%WWWDIR%%/dojo/nls/cs/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/nl/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/nl/colors.js
-+%%WWWDIR%%/dojo/nls/fr/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/fr/colors.js
-+%%WWWDIR%%/dojo/nls/pt-pt/colors.js
-+%%WWWDIR%%/dojo/nls/pt-pt/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/hr/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/hr/colors.js
-+%%WWWDIR%%/dojo/nls/colors.js
-+%%WWWDIR%%/dojo/nls/nb/colors.js
-+%%WWWDIR%%/dojo/nls/nb/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/hu/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/hu/colors.js
-+%%WWWDIR%%/dojo/nls/es/colors.js
-+%%WWWDIR%%/dojo/nls/es/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/pl/colors.js.uncompressed.js
-+%%WWWDIR%%/dojo/nls/pl/colors.js
-+%%WWWDIR%%/dojo/require.js
-+%%WWWDIR%%/dojo/uacss.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/ru/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/number.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-gb/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fi/number.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/number.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sv/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ko/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-au/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-au/number.js
-+%%WWWDIR%%/dojo/cldr/nls/en-au/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/en-au/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/en-au/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-au/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/el/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/el/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/el/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/el/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/el/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/el/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/el/number.js
-+%%WWWDIR%%/dojo/cldr/nls/el/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/el/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/el/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/th/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/th/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/th/number.js
-+%%WWWDIR%%/dojo/cldr/nls/th/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/th/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/th/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/de/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/de/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/de/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/de/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/de/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/de/number.js
-+%%WWWDIR%%/dojo/cldr/nls/de/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/de/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/de/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/de/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/ja/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/da/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/da/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/da/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/da/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/da/number.js
-+%%WWWDIR%%/dojo/cldr/nls/da/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/da/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/da/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/da/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/da/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sk/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/sk/number.js
-+%%WWWDIR%%/dojo/cldr/nls/sk/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/sk/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sk/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sk/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/number.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/number.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/tr/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/number.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/pt-pt/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/sl/number.js
-+%%WWWDIR%%/dojo/cldr/nls/sl/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sl/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sl/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/sl/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/sl/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ca/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/ca/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ca/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ca/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ca/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ca/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ro/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/it/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/it/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/it/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/it/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/it/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/it/number.js
-+%%WWWDIR%%/dojo/cldr/nls/it/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/it/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/it/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/it/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/number.js
-+%%WWWDIR%%/dojo/cldr/nls/en-ca/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-ca/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/en-ca/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en-ca/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/number.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/pl/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/es/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/es/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/es/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/es/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/es/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/es/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/es/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/es/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/es/number.js
-+%%WWWDIR%%/dojo/cldr/nls/es/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/number.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/hu/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/number.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nb/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/number.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/nl/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hk/number.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hk/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hk/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hk/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hk/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hk/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-tw/number.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-tw/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-tw/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-tw/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-tw/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-tw/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/en/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/en/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/en/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/en/number.js
-+%%WWWDIR%%/dojo/cldr/nls/en/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/number.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/number.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/ar/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/he/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/he/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/he/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/he/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/he/number.js
-+%%WWWDIR%%/dojo/cldr/nls/he/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/he/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/he/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/he/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/he/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/hebrew.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/hebrew.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/number.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/zh-hant/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/fr-ch/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr-ch/number.js
-+%%WWWDIR%%/dojo/cldr/nls/fr-ch/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/fr-ch/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/gregorian.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/currency.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/number.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/gregorian.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/number.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/islamic.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/islamic.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/currency.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/buddhist.js
-+%%WWWDIR%%/dojo/cldr/nls/cs/buddhist.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/nls/currency.js
-+%%WWWDIR%%/dojo/cldr/supplemental.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/monetary.js.uncompressed.js
-+%%WWWDIR%%/dojo/cldr/README
-+%%WWWDIR%%/dojo/cldr/LICENSE
-+%%WWWDIR%%/dojo/cldr/monetary.js
-+%%WWWDIR%%/dojo/cldr/supplemental.js
-+%%WWWDIR%%/dojo/NodeList-manipulate.js.uncompressed.js
-+%%WWWDIR%%/dojo/behavior.js
-+%%WWWDIR%%/dojo/back.js.uncompressed.js
-+%%WWWDIR%%/dojo/json.js
-+%%WWWDIR%%/dojo/date.js
-+%%WWWDIR%%/dojo/_firebug/errorIcon.png
-+%%WWWDIR%%/dojo/_firebug/firebug.js
-+%%WWWDIR%%/dojo/_firebug/tab_lft_over.png
-+%%WWWDIR%%/dojo/_firebug/firebug.css
-+%%WWWDIR%%/dojo/_firebug/tab_rgt_norm.png
-+%%WWWDIR%%/dojo/_firebug/tab_rgt_over.png
-+%%WWWDIR%%/dojo/_firebug/infoIcon.png
-+%%WWWDIR%%/dojo/_firebug/tab_lft_norm.png
-+%%WWWDIR%%/dojo/_firebug/firebug.js.uncompressed.js
-+%%WWWDIR%%/dojo/_firebug/LICENSE
-+%%WWWDIR%%/dojo/_firebug/warningIcon.png
-+%%WWWDIR%%/dojo/resources/images/dndNoMove.png
-+%%WWWDIR%%/dojo/resources/images/dndNoCopy.png
-+%%WWWDIR%%/dojo/resources/images/dndMove.png
-+%%WWWDIR%%/dojo/resources/images/dndCopy.png
-+%%WWWDIR%%/dojo/resources/dnd.css
-+%%WWWDIR%%/dojo/resources/blank.gif
-+%%WWWDIR%%/dojo/resources/iframe_history.html
-+%%WWWDIR%%/dojo/resources/blank.html
-+%%WWWDIR%%/dojo/resources/LICENSE
-+%%WWWDIR%%/dojo/resources/dojo.css
-+%%WWWDIR%%/dojo/dom-class.js
-+%%WWWDIR%%/dojo/AdapterRegistry.js.uncompressed.js
-+%%WWWDIR%%/dojo/behavior.js.uncompressed.js
+RCS file: /home/ncvs/ports/www/dojo/pkg-plist,v
+retrieving revision 1.12
+diff -u -r1.12 pkg-plist
+--- www/dojo/pkg-plist	22 Apr 2011 15:08:37 -0000	1.12
++++ www/dojo/pkg-plist	18 Dec 2012 11:35:07 -0000
+@@ -1,277 +1,650 @@
+-%%NOAPACHE%%%%CONFDIR%%/dojo.conf
 +%%WWWDIR%%/build-report.txt
-+%%WWWDIR%%/dijit/DialogUnderlay.js
++%%WWWDIR%%/dijit/BackgroundIframe.js
++%%WWWDIR%%/dijit/BackgroundIframe.js.uncompressed.js
+ %%WWWDIR%%/dijit/Calendar.js
++%%WWWDIR%%/dijit/Calendar.js.uncompressed.js
++%%WWWDIR%%/dijit/CalendarLite.js
++%%WWWDIR%%/dijit/CalendarLite.js.uncompressed.js
+ %%WWWDIR%%/dijit/CheckedMenuItem.js
++%%WWWDIR%%/dijit/CheckedMenuItem.js.uncompressed.js
+ %%WWWDIR%%/dijit/ColorPalette.js
++%%WWWDIR%%/dijit/ColorPalette.js.uncompressed.js
  %%WWWDIR%%/dijit/Declaration.js
--%%WWWDIR%%/dijit/Dialog.js
--%%WWWDIR%%/dijit/DialogUnderlay.js
--%%WWWDIR%%/dijit/Editor.js
--%%WWWDIR%%/dijit/InlineEditBox.js
--%%WWWDIR%%/dijit/LICENSE
--%%WWWDIR%%/dijit/Menu.js
--%%WWWDIR%%/dijit/MenuBar.js
++%%WWWDIR%%/dijit/Declaration.js.uncompressed.js
++%%WWWDIR%%/dijit/Destroyable.js
++%%WWWDIR%%/dijit/Destroyable.js.uncompressed.js
+ %%WWWDIR%%/dijit/Dialog.js
 +%%WWWDIR%%/dijit/Dialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/DialogUnderlay.js
++%%WWWDIR%%/dijit/DialogUnderlay.js.uncompressed.js
++%%WWWDIR%%/dijit/DropDownMenu.js
 +%%WWWDIR%%/dijit/DropDownMenu.js.uncompressed.js
-+%%WWWDIR%%/dijit/_WidgetBase.js.uncompressed.js
-+%%WWWDIR%%/dijit/registry.js.uncompressed.js
-+%%WWWDIR%%/dijit/_Widget.js.uncompressed.js
+ %%WWWDIR%%/dijit/Editor.js
++%%WWWDIR%%/dijit/Editor.js.uncompressed.js
+ %%WWWDIR%%/dijit/InlineEditBox.js
++%%WWWDIR%%/dijit/InlineEditBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/LICENSE
+ %%WWWDIR%%/dijit/Menu.js
++%%WWWDIR%%/dijit/Menu.js.uncompressed.js
+ %%WWWDIR%%/dijit/MenuBar.js
++%%WWWDIR%%/dijit/MenuBar.js.uncompressed.js
  %%WWWDIR%%/dijit/MenuBarItem.js
--%%WWWDIR%%/dijit/MenuItem.js
--%%WWWDIR%%/dijit/MenuSeparator.js
--%%WWWDIR%%/dijit/PopupMenuBarItem.js
--%%WWWDIR%%/dijit/PopupMenuItem.js
--%%WWWDIR%%/dijit/ProgressBar.js
--%%WWWDIR%%/dijit/TitlePane.js
--%%WWWDIR%%/dijit/Toolbar.js
--%%WWWDIR%%/dijit/ToolbarSeparator.js
--%%WWWDIR%%/dijit/Tooltip.js
--%%WWWDIR%%/dijit/TooltipDialog.js
--%%WWWDIR%%/dijit/Tree.js
--%%WWWDIR%%/dijit/_Calendar.js
--%%WWWDIR%%/dijit/_Contained.js
--%%WWWDIR%%/dijit/_Container.js
--%%WWWDIR%%/dijit/_CssStateMixin.js
--%%WWWDIR%%/dijit/_DialogMixin.js
--%%WWWDIR%%/dijit/_HasDropDown.js
--%%WWWDIR%%/dijit/_KeyNavContainer.js
--%%WWWDIR%%/dijit/_PaletteMixin.js
--%%WWWDIR%%/dijit/_Templated.js
--%%WWWDIR%%/dijit/_TimePicker.js
--%%WWWDIR%%/dijit/_Widget.js
--%%WWWDIR%%/dijit/_base.js
--%%WWWDIR%%/dijit/_base/focus.js
--%%WWWDIR%%/dijit/_base/manager.js
--%%WWWDIR%%/dijit/_base/place.js
--%%WWWDIR%%/dijit/_base/popup.js
--%%WWWDIR%%/dijit/_base/scroll.js
--%%WWWDIR%%/dijit/_base/sniff.js
--%%WWWDIR%%/dijit/_base/typematic.js
--%%WWWDIR%%/dijit/_base/wai.js
--%%WWWDIR%%/dijit/_base/window.js
--%%WWWDIR%%/dijit/_editor/RichText.js
--%%WWWDIR%%/dijit/_editor/_Plugin.js
--%%WWWDIR%%/dijit/_editor/html.js
--%%WWWDIR%%/dijit/_editor/nls/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ar/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/ar/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ar/commands.js
--%%WWWDIR%%/dijit/_editor/nls/ca/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/ca/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ca/commands.js
--%%WWWDIR%%/dijit/_editor/nls/commands.js
--%%WWWDIR%%/dijit/_editor/nls/cs/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/cs/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/cs/commands.js
--%%WWWDIR%%/dijit/_editor/nls/da/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/da/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/da/commands.js
--%%WWWDIR%%/dijit/_editor/nls/de/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/de/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/de/commands.js
--%%WWWDIR%%/dijit/_editor/nls/el/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/el/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/el/commands.js
--%%WWWDIR%%/dijit/_editor/nls/es/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/es/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/es/commands.js
--%%WWWDIR%%/dijit/_editor/nls/fi/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/fi/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/fi/commands.js
--%%WWWDIR%%/dijit/_editor/nls/fr/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/fr/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/fr/commands.js
--%%WWWDIR%%/dijit/_editor/nls/he/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/he/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/he/commands.js
--%%WWWDIR%%/dijit/_editor/nls/hu/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/hu/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/hu/commands.js
--%%WWWDIR%%/dijit/_editor/nls/it/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/it/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/it/commands.js
--%%WWWDIR%%/dijit/_editor/nls/ja/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/ja/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ja/commands.js
--%%WWWDIR%%/dijit/_editor/nls/ko/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/ko/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ko/commands.js
--%%WWWDIR%%/dijit/_editor/nls/nb/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/nb/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/nb/commands.js
--%%WWWDIR%%/dijit/_editor/nls/nl/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/nl/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/nl/commands.js
--%%WWWDIR%%/dijit/_editor/nls/pl/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/pl/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/pl/commands.js
--%%WWWDIR%%/dijit/_editor/nls/pt-pt/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/pt-pt/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/pt-pt/commands.js
--%%WWWDIR%%/dijit/_editor/nls/pt/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/pt/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/pt/commands.js
--%%WWWDIR%%/dijit/_editor/nls/ro/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/ro/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ro/commands.js
--%%WWWDIR%%/dijit/_editor/nls/ru/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/ru/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/ru/commands.js
--%%WWWDIR%%/dijit/_editor/nls/sk/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/sk/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/sk/commands.js
--%%WWWDIR%%/dijit/_editor/nls/sl/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/sl/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/sl/commands.js
--%%WWWDIR%%/dijit/_editor/nls/sv/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/sv/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/sv/commands.js
--%%WWWDIR%%/dijit/_editor/nls/th/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/th/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/th/commands.js
--%%WWWDIR%%/dijit/_editor/nls/tr/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/tr/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/tr/commands.js
--%%WWWDIR%%/dijit/_editor/nls/zh-tw/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/zh-tw/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/zh-tw/commands.js
--%%WWWDIR%%/dijit/_editor/nls/zh/FontChoice.js
--%%WWWDIR%%/dijit/_editor/nls/zh/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/nls/zh/commands.js
--%%WWWDIR%%/dijit/_editor/plugins/AlwaysShowToolbar.js
--%%WWWDIR%%/dijit/_editor/plugins/EnterKeyHandling.js
--%%WWWDIR%%/dijit/_editor/plugins/FontChoice.js
--%%WWWDIR%%/dijit/_editor/plugins/FullScreen.js
--%%WWWDIR%%/dijit/_editor/plugins/LinkDialog.js
--%%WWWDIR%%/dijit/_editor/plugins/NewPage.js
--%%WWWDIR%%/dijit/_editor/plugins/Print.js
--%%WWWDIR%%/dijit/_editor/plugins/TabIndent.js
--%%WWWDIR%%/dijit/_editor/plugins/TextColor.js
--%%WWWDIR%%/dijit/_editor/plugins/ToggleDir.js
--%%WWWDIR%%/dijit/_editor/plugins/ViewSource.js
--%%WWWDIR%%/dijit/_editor/range.js
--%%WWWDIR%%/dijit/_editor/selection.js
--%%WWWDIR%%/dijit/_tree/dndSource.js
--%%WWWDIR%%/dijit/dijit-all.js
--%%WWWDIR%%/dijit/dijit-all.js.uncompressed.js
--%%WWWDIR%%/dijit/dijit.js
--%%WWWDIR%%/dijit/dijit.js.uncompressed.js
--%%WWWDIR%%/dijit/form/Button.js
--%%WWWDIR%%/dijit/form/CheckBox.js
--%%WWWDIR%%/dijit/form/ComboBox.js
--%%WWWDIR%%/dijit/form/ComboButton.js
--%%WWWDIR%%/dijit/form/CurrencyTextBox.js
--%%WWWDIR%%/dijit/form/DateTextBox.js
--%%WWWDIR%%/dijit/form/DropDownButton.js
--%%WWWDIR%%/dijit/form/FilteringSelect.js
--%%WWWDIR%%/dijit/form/Form.js
--%%WWWDIR%%/dijit/form/HorizontalRule.js
--%%WWWDIR%%/dijit/form/HorizontalRuleLabels.js
--%%WWWDIR%%/dijit/form/HorizontalSlider.js
--%%WWWDIR%%/dijit/form/MappedTextBox.js
--%%WWWDIR%%/dijit/form/MultiSelect.js
--%%WWWDIR%%/dijit/form/NumberSpinner.js
--%%WWWDIR%%/dijit/form/NumberTextBox.js
--%%WWWDIR%%/dijit/form/RadioButton.js
--%%WWWDIR%%/dijit/form/RangeBoundTextBox.js
--%%WWWDIR%%/dijit/form/Select.js
--%%WWWDIR%%/dijit/form/SimpleTextarea.js
--%%WWWDIR%%/dijit/form/Slider.js
--%%WWWDIR%%/dijit/form/TextBox.js
--%%WWWDIR%%/dijit/form/Textarea.js
--%%WWWDIR%%/dijit/form/TimeTextBox.js
--%%WWWDIR%%/dijit/form/ToggleButton.js
--%%WWWDIR%%/dijit/form/ValidationTextBox.js
--%%WWWDIR%%/dijit/form/VerticalRule.js
--%%WWWDIR%%/dijit/form/VerticalRuleLabels.js
--%%WWWDIR%%/dijit/form/VerticalSlider.js
--%%WWWDIR%%/dijit/form/_DateTimeTextBox.js
--%%WWWDIR%%/dijit/form/_FormMixin.js
--%%WWWDIR%%/dijit/form/_FormSelectWidget.js
--%%WWWDIR%%/dijit/form/_FormWidget.js
--%%WWWDIR%%/dijit/form/_Spinner.js
--%%WWWDIR%%/dijit/form/nls/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ar/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/ar/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ar/validate.js
--%%WWWDIR%%/dijit/form/nls/ca/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/ca/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ca/validate.js
--%%WWWDIR%%/dijit/form/nls/cs/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/cs/Textarea.js
--%%WWWDIR%%/dijit/form/nls/cs/validate.js
--%%WWWDIR%%/dijit/form/nls/da/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/da/Textarea.js
--%%WWWDIR%%/dijit/form/nls/da/validate.js
--%%WWWDIR%%/dijit/form/nls/de/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/de/Textarea.js
--%%WWWDIR%%/dijit/form/nls/de/validate.js
--%%WWWDIR%%/dijit/form/nls/el/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/el/Textarea.js
--%%WWWDIR%%/dijit/form/nls/el/validate.js
--%%WWWDIR%%/dijit/form/nls/es/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/es/Textarea.js
--%%WWWDIR%%/dijit/form/nls/es/validate.js
--%%WWWDIR%%/dijit/form/nls/fi/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/fi/Textarea.js
--%%WWWDIR%%/dijit/form/nls/fi/validate.js
--%%WWWDIR%%/dijit/form/nls/fr/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/fr/Textarea.js
--%%WWWDIR%%/dijit/form/nls/fr/validate.js
--%%WWWDIR%%/dijit/form/nls/he/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/he/Textarea.js
--%%WWWDIR%%/dijit/form/nls/he/validate.js
--%%WWWDIR%%/dijit/form/nls/hu/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/hu/Textarea.js
--%%WWWDIR%%/dijit/form/nls/hu/validate.js
--%%WWWDIR%%/dijit/form/nls/it/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/it/Textarea.js
--%%WWWDIR%%/dijit/form/nls/it/validate.js
--%%WWWDIR%%/dijit/form/nls/ja/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/ja/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ja/validate.js
--%%WWWDIR%%/dijit/form/nls/ko/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/ko/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ko/validate.js
--%%WWWDIR%%/dijit/form/nls/nb/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/nb/Textarea.js
--%%WWWDIR%%/dijit/form/nls/nb/validate.js
--%%WWWDIR%%/dijit/form/nls/nl/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/nl/Textarea.js
--%%WWWDIR%%/dijit/form/nls/nl/validate.js
--%%WWWDIR%%/dijit/form/nls/pl/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/pl/Textarea.js
--%%WWWDIR%%/dijit/form/nls/pl/validate.js
--%%WWWDIR%%/dijit/form/nls/pt-pt/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/pt-pt/Textarea.js
--%%WWWDIR%%/dijit/form/nls/pt-pt/validate.js
--%%WWWDIR%%/dijit/form/nls/pt/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/pt/Textarea.js
--%%WWWDIR%%/dijit/form/nls/pt/validate.js
--%%WWWDIR%%/dijit/form/nls/ro/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/ro/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ro/validate.js
--%%WWWDIR%%/dijit/form/nls/ru/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/ru/Textarea.js
--%%WWWDIR%%/dijit/form/nls/ru/validate.js
--%%WWWDIR%%/dijit/form/nls/sk/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/sk/Textarea.js
--%%WWWDIR%%/dijit/form/nls/sk/validate.js
--%%WWWDIR%%/dijit/form/nls/sl/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/sl/Textarea.js
--%%WWWDIR%%/dijit/form/nls/sl/validate.js
--%%WWWDIR%%/dijit/form/nls/sv/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/sv/Textarea.js
--%%WWWDIR%%/dijit/form/nls/sv/validate.js
--%%WWWDIR%%/dijit/form/nls/th/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/th/Textarea.js
--%%WWWDIR%%/dijit/form/nls/th/validate.js
--%%WWWDIR%%/dijit/form/nls/tr/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/tr/Textarea.js
--%%WWWDIR%%/dijit/form/nls/tr/validate.js
--%%WWWDIR%%/dijit/form/nls/validate.js
--%%WWWDIR%%/dijit/form/nls/zh-tw/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/zh-tw/Textarea.js
--%%WWWDIR%%/dijit/form/nls/zh-tw/validate.js
--%%WWWDIR%%/dijit/form/nls/zh/ComboBox.js
--%%WWWDIR%%/dijit/form/nls/zh/Textarea.js
--%%WWWDIR%%/dijit/form/nls/zh/validate.js
++%%WWWDIR%%/dijit/MenuBarItem.js.uncompressed.js
+ %%WWWDIR%%/dijit/MenuItem.js
++%%WWWDIR%%/dijit/MenuItem.js.uncompressed.js
+ %%WWWDIR%%/dijit/MenuSeparator.js
++%%WWWDIR%%/dijit/MenuSeparator.js.uncompressed.js
+ %%WWWDIR%%/dijit/PopupMenuBarItem.js
++%%WWWDIR%%/dijit/PopupMenuBarItem.js.uncompressed.js
+ %%WWWDIR%%/dijit/PopupMenuItem.js
++%%WWWDIR%%/dijit/PopupMenuItem.js.uncompressed.js
+ %%WWWDIR%%/dijit/ProgressBar.js
++%%WWWDIR%%/dijit/ProgressBar.js.uncompressed.js
+ %%WWWDIR%%/dijit/TitlePane.js
++%%WWWDIR%%/dijit/TitlePane.js.uncompressed.js
+ %%WWWDIR%%/dijit/Toolbar.js
++%%WWWDIR%%/dijit/Toolbar.js.uncompressed.js
+ %%WWWDIR%%/dijit/ToolbarSeparator.js
++%%WWWDIR%%/dijit/ToolbarSeparator.js.uncompressed.js
+ %%WWWDIR%%/dijit/Tooltip.js
++%%WWWDIR%%/dijit/Tooltip.js.uncompressed.js
+ %%WWWDIR%%/dijit/TooltipDialog.js
++%%WWWDIR%%/dijit/TooltipDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/Tree.js
++%%WWWDIR%%/dijit/Tree.js.uncompressed.js
++%%WWWDIR%%/dijit/Viewport.js
++%%WWWDIR%%/dijit/Viewport.js.uncompressed.js
++%%WWWDIR%%/dijit/WidgetSet.js
++%%WWWDIR%%/dijit/WidgetSet.js.uncompressed.js
++%%WWWDIR%%/dijit/_BidiSupport.js
++%%WWWDIR%%/dijit/_BidiSupport.js.uncompressed.js
+ %%WWWDIR%%/dijit/_Calendar.js
++%%WWWDIR%%/dijit/_Calendar.js.uncompressed.js
+ %%WWWDIR%%/dijit/_Contained.js
++%%WWWDIR%%/dijit/_Contained.js.uncompressed.js
+ %%WWWDIR%%/dijit/_Container.js
++%%WWWDIR%%/dijit/_Container.js.uncompressed.js
+ %%WWWDIR%%/dijit/_CssStateMixin.js
++%%WWWDIR%%/dijit/_CssStateMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_DialogMixin.js
++%%WWWDIR%%/dijit/_DialogMixin.js.uncompressed.js
 +%%WWWDIR%%/dijit/_FocusMixin.js
++%%WWWDIR%%/dijit/_FocusMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_HasDropDown.js
++%%WWWDIR%%/dijit/_HasDropDown.js.uncompressed.js
+ %%WWWDIR%%/dijit/_KeyNavContainer.js
++%%WWWDIR%%/dijit/_KeyNavContainer.js.uncompressed.js
++%%WWWDIR%%/dijit/_MenuBase.js
++%%WWWDIR%%/dijit/_MenuBase.js.uncompressed.js
++%%WWWDIR%%/dijit/_OnDijitClickMixin.js
++%%WWWDIR%%/dijit/_OnDijitClickMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_PaletteMixin.js
++%%WWWDIR%%/dijit/_PaletteMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_Templated.js
++%%WWWDIR%%/dijit/_Templated.js.uncompressed.js
++%%WWWDIR%%/dijit/_TemplatedMixin.js
++%%WWWDIR%%/dijit/_TemplatedMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_TimePicker.js
++%%WWWDIR%%/dijit/_TimePicker.js.uncompressed.js
+ %%WWWDIR%%/dijit/_Widget.js
++%%WWWDIR%%/dijit/_Widget.js.uncompressed.js
++%%WWWDIR%%/dijit/_WidgetBase.js
++%%WWWDIR%%/dijit/_WidgetBase.js.uncompressed.js
++%%WWWDIR%%/dijit/_WidgetsInTemplateMixin.js
++%%WWWDIR%%/dijit/_WidgetsInTemplateMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base.js
++%%WWWDIR%%/dijit/_base.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/focus.js
++%%WWWDIR%%/dijit/_base/focus.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/manager.js
++%%WWWDIR%%/dijit/_base/manager.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/place.js
++%%WWWDIR%%/dijit/_base/place.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/popup.js
++%%WWWDIR%%/dijit/_base/popup.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/scroll.js
++%%WWWDIR%%/dijit/_base/scroll.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/sniff.js
++%%WWWDIR%%/dijit/_base/sniff.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/typematic.js
++%%WWWDIR%%/dijit/_base/typematic.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/wai.js
++%%WWWDIR%%/dijit/_base/wai.js.uncompressed.js
+ %%WWWDIR%%/dijit/_base/window.js
++%%WWWDIR%%/dijit/_base/window.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/RichText.js
++%%WWWDIR%%/dijit/_editor/RichText.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/_Plugin.js
++%%WWWDIR%%/dijit/_editor/_Plugin.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/html.js
++%%WWWDIR%%/dijit/_editor/html.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ar/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/ar/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ar/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/ar/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ar/commands.js
++%%WWWDIR%%/dijit/_editor/nls/ar/commands.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/az/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/az/FontChoice.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/az/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/az/LinkDialog.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/az/commands.js
++%%WWWDIR%%/dijit/_editor/nls/az/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ca/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/ca/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ca/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/ca/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ca/commands.js
++%%WWWDIR%%/dijit/_editor/nls/ca/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/commands.js
++%%WWWDIR%%/dijit/_editor/nls/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/cs/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/cs/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/cs/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/cs/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/cs/commands.js
++%%WWWDIR%%/dijit/_editor/nls/cs/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/da/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/da/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/da/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/da/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/da/commands.js
++%%WWWDIR%%/dijit/_editor/nls/da/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/de/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/de/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/de/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/de/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/de/commands.js
++%%WWWDIR%%/dijit/_editor/nls/de/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/el/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/el/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/el/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/el/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/el/commands.js
++%%WWWDIR%%/dijit/_editor/nls/el/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/es/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/es/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/es/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/es/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/es/commands.js
++%%WWWDIR%%/dijit/_editor/nls/es/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/fi/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/fi/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/fi/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/fi/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/fi/commands.js
++%%WWWDIR%%/dijit/_editor/nls/fi/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/fr/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/fr/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/fr/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/fr/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/fr/commands.js
++%%WWWDIR%%/dijit/_editor/nls/fr/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/he/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/he/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/he/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/he/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/he/commands.js
++%%WWWDIR%%/dijit/_editor/nls/he/commands.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/hr/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/hr/FontChoice.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/hr/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/hr/LinkDialog.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/hr/commands.js
++%%WWWDIR%%/dijit/_editor/nls/hr/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/hu/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/hu/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/hu/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/hu/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/hu/commands.js
++%%WWWDIR%%/dijit/_editor/nls/hu/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/it/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/it/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/it/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/it/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/it/commands.js
++%%WWWDIR%%/dijit/_editor/nls/it/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ja/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/ja/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ja/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/ja/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ja/commands.js
++%%WWWDIR%%/dijit/_editor/nls/ja/commands.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/kk/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/kk/FontChoice.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/kk/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/kk/LinkDialog.js.uncompressed.js
++%%WWWDIR%%/dijit/_editor/nls/kk/commands.js
++%%WWWDIR%%/dijit/_editor/nls/kk/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ko/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/ko/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ko/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/ko/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ko/commands.js
++%%WWWDIR%%/dijit/_editor/nls/ko/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/nb/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/nb/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/nb/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/nb/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/nb/commands.js
++%%WWWDIR%%/dijit/_editor/nls/nb/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/nl/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/nl/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/nl/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/nl/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/nl/commands.js
++%%WWWDIR%%/dijit/_editor/nls/nl/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pl/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/pl/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pl/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/pl/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pl/commands.js
++%%WWWDIR%%/dijit/_editor/nls/pl/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pt-pt/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/pt-pt/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pt-pt/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/pt-pt/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pt-pt/commands.js
++%%WWWDIR%%/dijit/_editor/nls/pt-pt/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pt/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/pt/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pt/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/pt/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/pt/commands.js
++%%WWWDIR%%/dijit/_editor/nls/pt/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ro/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/ro/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ro/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/ro/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ro/commands.js
++%%WWWDIR%%/dijit/_editor/nls/ro/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ru/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/ru/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ru/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/ru/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/ru/commands.js
++%%WWWDIR%%/dijit/_editor/nls/ru/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sk/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/sk/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sk/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/sk/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sk/commands.js
++%%WWWDIR%%/dijit/_editor/nls/sk/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sl/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/sl/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sl/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/sl/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sl/commands.js
++%%WWWDIR%%/dijit/_editor/nls/sl/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sv/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/sv/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sv/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/sv/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/sv/commands.js
++%%WWWDIR%%/dijit/_editor/nls/sv/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/th/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/th/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/th/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/th/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/th/commands.js
++%%WWWDIR%%/dijit/_editor/nls/th/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/tr/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/tr/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/tr/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/tr/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/tr/commands.js
++%%WWWDIR%%/dijit/_editor/nls/tr/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/zh-tw/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/zh-tw/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/zh-tw/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/zh-tw/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/zh-tw/commands.js
++%%WWWDIR%%/dijit/_editor/nls/zh-tw/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/zh/FontChoice.js
++%%WWWDIR%%/dijit/_editor/nls/zh/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/zh/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/nls/zh/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/nls/zh/commands.js
++%%WWWDIR%%/dijit/_editor/nls/zh/commands.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/AlwaysShowToolbar.js
++%%WWWDIR%%/dijit/_editor/plugins/AlwaysShowToolbar.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/EnterKeyHandling.js
++%%WWWDIR%%/dijit/_editor/plugins/EnterKeyHandling.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/FontChoice.js
++%%WWWDIR%%/dijit/_editor/plugins/FontChoice.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/FullScreen.js
++%%WWWDIR%%/dijit/_editor/plugins/FullScreen.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/LinkDialog.js
++%%WWWDIR%%/dijit/_editor/plugins/LinkDialog.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/NewPage.js
++%%WWWDIR%%/dijit/_editor/plugins/NewPage.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/Print.js
++%%WWWDIR%%/dijit/_editor/plugins/Print.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/TabIndent.js
++%%WWWDIR%%/dijit/_editor/plugins/TabIndent.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/TextColor.js
++%%WWWDIR%%/dijit/_editor/plugins/TextColor.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/ToggleDir.js
++%%WWWDIR%%/dijit/_editor/plugins/ToggleDir.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/plugins/ViewSource.js
++%%WWWDIR%%/dijit/_editor/plugins/ViewSource.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/range.js
++%%WWWDIR%%/dijit/_editor/range.js.uncompressed.js
+ %%WWWDIR%%/dijit/_editor/selection.js
++%%WWWDIR%%/dijit/_editor/selection.js.uncompressed.js
+ %%WWWDIR%%/dijit/_tree/dndSource.js
++%%WWWDIR%%/dijit/_tree/dndSource.js.uncompressed.js
++%%WWWDIR%%/dijit/a11y.js
++%%WWWDIR%%/dijit/a11y.js.uncompressed.js
 +%%WWWDIR%%/dijit/a11yclick.js
-+%%WWWDIR%%/dijit/icons/images/commonIconsObjActDisabled_rtl.png
-+%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled8bit.png
-+%%WWWDIR%%/dijit/icons/images/editorIconsEnabled_rtl.png
-+%%WWWDIR%%/dijit/icons/images/editorIconsDisabled.png
-+%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled_rtl.png
-+%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled.png
-+%%WWWDIR%%/dijit/icons/images/loadingAnimation_rtl.gif
-+%%WWWDIR%%/dijit/icons/images/editorIconsEnabled.png
-+%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled8bit_rtl.png
-+%%WWWDIR%%/dijit/icons/images/editorIconsDisabled_rtl.png
-+%%WWWDIR%%/dijit/icons/images/commonIconsObjActDisabled.png
++%%WWWDIR%%/dijit/a11yclick.js.uncompressed.js
+ %%WWWDIR%%/dijit/dijit-all.js
+ %%WWWDIR%%/dijit/dijit-all.js.uncompressed.js
+ %%WWWDIR%%/dijit/dijit.js
+ %%WWWDIR%%/dijit/dijit.js.uncompressed.js
++%%WWWDIR%%/dijit/dijit.profile.js
++%%WWWDIR%%/dijit/focus.js
++%%WWWDIR%%/dijit/focus.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/Button.js
++%%WWWDIR%%/dijit/form/Button.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/CheckBox.js
++%%WWWDIR%%/dijit/form/CheckBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/ComboBox.js
++%%WWWDIR%%/dijit/form/ComboBox.js.uncompressed.js
++%%WWWDIR%%/dijit/form/ComboBoxMixin.js
++%%WWWDIR%%/dijit/form/ComboBoxMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/ComboButton.js
++%%WWWDIR%%/dijit/form/ComboButton.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/CurrencyTextBox.js
++%%WWWDIR%%/dijit/form/CurrencyTextBox.js.uncompressed.js
++%%WWWDIR%%/dijit/form/DataList.js
++%%WWWDIR%%/dijit/form/DataList.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/DateTextBox.js
++%%WWWDIR%%/dijit/form/DateTextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/DropDownButton.js
++%%WWWDIR%%/dijit/form/DropDownButton.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/FilteringSelect.js
++%%WWWDIR%%/dijit/form/FilteringSelect.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/Form.js
++%%WWWDIR%%/dijit/form/Form.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/HorizontalRule.js
++%%WWWDIR%%/dijit/form/HorizontalRule.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/HorizontalRuleLabels.js
++%%WWWDIR%%/dijit/form/HorizontalRuleLabels.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/HorizontalSlider.js
++%%WWWDIR%%/dijit/form/HorizontalSlider.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/MappedTextBox.js
++%%WWWDIR%%/dijit/form/MappedTextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/MultiSelect.js
++%%WWWDIR%%/dijit/form/MultiSelect.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/NumberSpinner.js
++%%WWWDIR%%/dijit/form/NumberSpinner.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/NumberTextBox.js
++%%WWWDIR%%/dijit/form/NumberTextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/RadioButton.js
++%%WWWDIR%%/dijit/form/RadioButton.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/RangeBoundTextBox.js
++%%WWWDIR%%/dijit/form/RangeBoundTextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/Select.js
++%%WWWDIR%%/dijit/form/Select.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/SimpleTextarea.js
++%%WWWDIR%%/dijit/form/SimpleTextarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/Slider.js
++%%WWWDIR%%/dijit/form/Slider.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/TextBox.js
++%%WWWDIR%%/dijit/form/TextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/Textarea.js
++%%WWWDIR%%/dijit/form/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/TimeTextBox.js
++%%WWWDIR%%/dijit/form/TimeTextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/ToggleButton.js
++%%WWWDIR%%/dijit/form/ToggleButton.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/ValidationTextBox.js
++%%WWWDIR%%/dijit/form/ValidationTextBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/VerticalRule.js
++%%WWWDIR%%/dijit/form/VerticalRule.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/VerticalRuleLabels.js
++%%WWWDIR%%/dijit/form/VerticalRuleLabels.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/VerticalSlider.js
++%%WWWDIR%%/dijit/form/VerticalSlider.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_AutoCompleterMixin.js
++%%WWWDIR%%/dijit/form/_AutoCompleterMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ButtonMixin.js
++%%WWWDIR%%/dijit/form/_ButtonMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_CheckBoxMixin.js
++%%WWWDIR%%/dijit/form/_CheckBoxMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ComboBoxMenu.js
++%%WWWDIR%%/dijit/form/_ComboBoxMenu.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ComboBoxMenuMixin.js
++%%WWWDIR%%/dijit/form/_ComboBoxMenuMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/_DateTimeTextBox.js
++%%WWWDIR%%/dijit/form/_DateTimeTextBox.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ExpandingTextAreaMixin.js
++%%WWWDIR%%/dijit/form/_ExpandingTextAreaMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/_FormMixin.js
++%%WWWDIR%%/dijit/form/_FormMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/_FormSelectWidget.js
++%%WWWDIR%%/dijit/form/_FormSelectWidget.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_FormValueMixin.js
++%%WWWDIR%%/dijit/form/_FormValueMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_FormValueWidget.js
++%%WWWDIR%%/dijit/form/_FormValueWidget.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/_FormWidget.js
++%%WWWDIR%%/dijit/form/_FormWidget.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_FormWidgetMixin.js
++%%WWWDIR%%/dijit/form/_FormWidgetMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ListBase.js
++%%WWWDIR%%/dijit/form/_ListBase.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ListMouseMixin.js
++%%WWWDIR%%/dijit/form/_ListMouseMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_RadioButtonMixin.js
++%%WWWDIR%%/dijit/form/_RadioButtonMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_SearchMixin.js
++%%WWWDIR%%/dijit/form/_SearchMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/_Spinner.js
++%%WWWDIR%%/dijit/form/_Spinner.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_TextBoxMixin.js
++%%WWWDIR%%/dijit/form/_TextBoxMixin.js.uncompressed.js
++%%WWWDIR%%/dijit/form/_ToggleButtonMixin.js
++%%WWWDIR%%/dijit/form/_ToggleButtonMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/Textarea.js
++%%WWWDIR%%/dijit/form/nls/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ar/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ar/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ar/Textarea.js
++%%WWWDIR%%/dijit/form/nls/ar/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ar/validate.js
++%%WWWDIR%%/dijit/form/nls/ar/validate.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/az/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/az/ComboBox.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/az/Textarea.js
++%%WWWDIR%%/dijit/form/nls/az/Textarea.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/az/validate.js
++%%WWWDIR%%/dijit/form/nls/az/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ca/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ca/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ca/Textarea.js
++%%WWWDIR%%/dijit/form/nls/ca/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ca/validate.js
++%%WWWDIR%%/dijit/form/nls/ca/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/cs/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/cs/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/cs/Textarea.js
++%%WWWDIR%%/dijit/form/nls/cs/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/cs/validate.js
++%%WWWDIR%%/dijit/form/nls/cs/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/da/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/da/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/da/Textarea.js
++%%WWWDIR%%/dijit/form/nls/da/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/da/validate.js
++%%WWWDIR%%/dijit/form/nls/da/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/de/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/de/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/de/Textarea.js
++%%WWWDIR%%/dijit/form/nls/de/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/de/validate.js
++%%WWWDIR%%/dijit/form/nls/de/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/el/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/el/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/el/Textarea.js
++%%WWWDIR%%/dijit/form/nls/el/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/el/validate.js
++%%WWWDIR%%/dijit/form/nls/el/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/es/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/es/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/es/Textarea.js
++%%WWWDIR%%/dijit/form/nls/es/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/es/validate.js
++%%WWWDIR%%/dijit/form/nls/es/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/fi/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/fi/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/fi/Textarea.js
++%%WWWDIR%%/dijit/form/nls/fi/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/fi/validate.js
++%%WWWDIR%%/dijit/form/nls/fi/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/fr/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/fr/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/fr/Textarea.js
++%%WWWDIR%%/dijit/form/nls/fr/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/fr/validate.js
++%%WWWDIR%%/dijit/form/nls/fr/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/he/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/he/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/he/Textarea.js
++%%WWWDIR%%/dijit/form/nls/he/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/he/validate.js
++%%WWWDIR%%/dijit/form/nls/he/validate.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/hr/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/hr/ComboBox.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/hr/Textarea.js
++%%WWWDIR%%/dijit/form/nls/hr/Textarea.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/hr/validate.js
++%%WWWDIR%%/dijit/form/nls/hr/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/hu/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/hu/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/hu/Textarea.js
++%%WWWDIR%%/dijit/form/nls/hu/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/hu/validate.js
++%%WWWDIR%%/dijit/form/nls/hu/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/it/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/it/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/it/Textarea.js
++%%WWWDIR%%/dijit/form/nls/it/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/it/validate.js
++%%WWWDIR%%/dijit/form/nls/it/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ja/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ja/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ja/Textarea.js
++%%WWWDIR%%/dijit/form/nls/ja/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ja/validate.js
++%%WWWDIR%%/dijit/form/nls/ja/validate.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/kk/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/kk/ComboBox.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/kk/Textarea.js
++%%WWWDIR%%/dijit/form/nls/kk/Textarea.js.uncompressed.js
++%%WWWDIR%%/dijit/form/nls/kk/validate.js
++%%WWWDIR%%/dijit/form/nls/kk/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ko/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ko/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ko/Textarea.js
++%%WWWDIR%%/dijit/form/nls/ko/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ko/validate.js
++%%WWWDIR%%/dijit/form/nls/ko/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/nb/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/nb/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/nb/Textarea.js
++%%WWWDIR%%/dijit/form/nls/nb/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/nb/validate.js
++%%WWWDIR%%/dijit/form/nls/nb/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/nl/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/nl/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/nl/Textarea.js
++%%WWWDIR%%/dijit/form/nls/nl/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/nl/validate.js
++%%WWWDIR%%/dijit/form/nls/nl/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pl/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/pl/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pl/Textarea.js
++%%WWWDIR%%/dijit/form/nls/pl/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pl/validate.js
++%%WWWDIR%%/dijit/form/nls/pl/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pt-pt/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/pt-pt/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pt-pt/Textarea.js
++%%WWWDIR%%/dijit/form/nls/pt-pt/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pt-pt/validate.js
++%%WWWDIR%%/dijit/form/nls/pt-pt/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pt/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/pt/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pt/Textarea.js
++%%WWWDIR%%/dijit/form/nls/pt/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/pt/validate.js
++%%WWWDIR%%/dijit/form/nls/pt/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ro/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ro/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ro/Textarea.js
++%%WWWDIR%%/dijit/form/nls/ro/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ro/validate.js
++%%WWWDIR%%/dijit/form/nls/ro/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ru/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/ru/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ru/Textarea.js
++%%WWWDIR%%/dijit/form/nls/ru/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/ru/validate.js
++%%WWWDIR%%/dijit/form/nls/ru/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sk/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/sk/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sk/Textarea.js
++%%WWWDIR%%/dijit/form/nls/sk/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sk/validate.js
++%%WWWDIR%%/dijit/form/nls/sk/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sl/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/sl/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sl/Textarea.js
++%%WWWDIR%%/dijit/form/nls/sl/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sl/validate.js
++%%WWWDIR%%/dijit/form/nls/sl/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sv/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/sv/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sv/Textarea.js
++%%WWWDIR%%/dijit/form/nls/sv/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/sv/validate.js
++%%WWWDIR%%/dijit/form/nls/sv/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/th/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/th/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/th/Textarea.js
++%%WWWDIR%%/dijit/form/nls/th/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/th/validate.js
++%%WWWDIR%%/dijit/form/nls/th/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/tr/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/tr/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/tr/Textarea.js
++%%WWWDIR%%/dijit/form/nls/tr/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/tr/validate.js
++%%WWWDIR%%/dijit/form/nls/tr/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/validate.js
++%%WWWDIR%%/dijit/form/nls/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/zh-tw/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/zh-tw/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/zh-tw/Textarea.js
++%%WWWDIR%%/dijit/form/nls/zh-tw/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/zh-tw/validate.js
++%%WWWDIR%%/dijit/form/nls/zh-tw/validate.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/zh/ComboBox.js
++%%WWWDIR%%/dijit/form/nls/zh/ComboBox.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/zh/Textarea.js
++%%WWWDIR%%/dijit/form/nls/zh/Textarea.js.uncompressed.js
+ %%WWWDIR%%/dijit/form/nls/zh/validate.js
++%%WWWDIR%%/dijit/form/nls/zh/validate.js.uncompressed.js
++%%WWWDIR%%/dijit/hccss.js
++%%WWWDIR%%/dijit/hccss.js.uncompressed.js
  %%WWWDIR%%/dijit/icons/commonIcons.css
  %%WWWDIR%%/dijit/icons/commonIcons_rtl.css
  %%WWWDIR%%/dijit/icons/editorIcons.css
- %%WWWDIR%%/dijit/icons/editorIcons_rtl.css
--%%WWWDIR%%/dijit/icons/images/commonIconsObjActDisabled.png
--%%WWWDIR%%/dijit/icons/images/commonIconsObjActDisabled_rtl.png
--%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled.png
--%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled8bit.png
--%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled8bit_rtl.png
--%%WWWDIR%%/dijit/icons/images/commonIconsObjActEnabled_rtl.png
--%%WWWDIR%%/dijit/icons/images/editorIconsDisabled.png
--%%WWWDIR%%/dijit/icons/images/editorIconsDisabled_rtl.png
--%%WWWDIR%%/dijit/icons/images/editorIconsEnabled.png
--%%WWWDIR%%/dijit/icons/images/editorIconsEnabled_rtl.png
--%%WWWDIR%%/dijit/icons/images/loadingAnimation_rtl.gif
--%%WWWDIR%%/dijit/layout/AccordionContainer.js
--%%WWWDIR%%/dijit/layout/AccordionPane.js
--%%WWWDIR%%/dijit/layout/BorderContainer.js
--%%WWWDIR%%/dijit/layout/ContentPane.js
--%%WWWDIR%%/dijit/layout/LayoutContainer.js
--%%WWWDIR%%/dijit/layout/LinkPane.js
--%%WWWDIR%%/dijit/layout/ScrollingTabController.js
--%%WWWDIR%%/dijit/layout/SplitContainer.js
--%%WWWDIR%%/dijit/layout/StackContainer.js
--%%WWWDIR%%/dijit/layout/StackController.js
--%%WWWDIR%%/dijit/layout/TabContainer.js
--%%WWWDIR%%/dijit/layout/TabController.js
--%%WWWDIR%%/dijit/layout/_LayoutWidget.js
--%%WWWDIR%%/dijit/layout/_TabContainerBase.js
--%%WWWDIR%%/dijit/nls/ar/common.js
--%%WWWDIR%%/dijit/nls/ar/loading.js
--%%WWWDIR%%/dijit/nls/ca/common.js
--%%WWWDIR%%/dijit/nls/ca/loading.js
--%%WWWDIR%%/dijit/nls/common.js
--%%WWWDIR%%/dijit/nls/cs/common.js
--%%WWWDIR%%/dijit/nls/cs/loading.js
--%%WWWDIR%%/dijit/nls/da/common.js
--%%WWWDIR%%/dijit/nls/da/loading.js
--%%WWWDIR%%/dijit/nls/de/common.js
--%%WWWDIR%%/dijit/nls/de/loading.js
--%%WWWDIR%%/dijit/nls/dijit-all_ROOT.js
--%%WWWDIR%%/dijit/nls/dijit-all_ar.js
--%%WWWDIR%%/dijit/nls/dijit-all_ca.js
-+%%WWWDIR%%/dijit/MenuSeparator.js
-+%%WWWDIR%%/dijit/_BidiSupport.js.uncompressed.js
-+%%WWWDIR%%/dijit/_WidgetsInTemplateMixin.js.uncompressed.js
-+%%WWWDIR%%/dijit/Menu.js.uncompressed.js
-+%%WWWDIR%%/dijit/_TemplatedMixin.js
-+%%WWWDIR%%/dijit/Editor.js
-+%%WWWDIR%%/dijit/_WidgetsInTemplateMixin.js
-+%%WWWDIR%%/dijit/_OnDijitClickMixin.js.uncompressed.js
-+%%WWWDIR%%/dijit/_WidgetBase.js
-+%%WWWDIR%%/dijit/dijit.js.uncompressed.js
-+%%WWWDIR%%/dijit/dijit.profile.js
-+%%WWWDIR%%/dijit/_KeyNavContainer.js
-+%%WWWDIR%%/dijit/_PaletteMixin.js.uncompressed.js
-+%%WWWDIR%%/dijit/_OnDijitClickMixin.js
-+%%WWWDIR%%/dijit/InlineEditBox.js
-+%%WWWDIR%%/dijit/nls/nl/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/nl/loading.js
-+%%WWWDIR%%/dijit/nls/nl/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/nl/common.js
-+%%WWWDIR%%/dijit/nls/dijit-all_en-gb.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_de.js.uncompressed.js
+@@ -288,210 +661,361 @@
+ %%WWWDIR%%/dijit/icons/images/editorIconsEnabled_rtl.png
+ %%WWWDIR%%/dijit/icons/images/loadingAnimation_rtl.gif
+ %%WWWDIR%%/dijit/layout/AccordionContainer.js
++%%WWWDIR%%/dijit/layout/AccordionContainer.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/AccordionPane.js
++%%WWWDIR%%/dijit/layout/AccordionPane.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/BorderContainer.js
++%%WWWDIR%%/dijit/layout/BorderContainer.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/ContentPane.js
++%%WWWDIR%%/dijit/layout/ContentPane.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/LayoutContainer.js
++%%WWWDIR%%/dijit/layout/LayoutContainer.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/LinkPane.js
++%%WWWDIR%%/dijit/layout/LinkPane.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/ScrollingTabController.js
++%%WWWDIR%%/dijit/layout/ScrollingTabController.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/SplitContainer.js
++%%WWWDIR%%/dijit/layout/SplitContainer.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/StackContainer.js
++%%WWWDIR%%/dijit/layout/StackContainer.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/StackController.js
++%%WWWDIR%%/dijit/layout/StackController.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/TabContainer.js
++%%WWWDIR%%/dijit/layout/TabContainer.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/TabController.js
++%%WWWDIR%%/dijit/layout/TabController.js.uncompressed.js
++%%WWWDIR%%/dijit/layout/_ContentPaneResizeMixin.js
++%%WWWDIR%%/dijit/layout/_ContentPaneResizeMixin.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/_LayoutWidget.js
++%%WWWDIR%%/dijit/layout/_LayoutWidget.js.uncompressed.js
+ %%WWWDIR%%/dijit/layout/_TabContainerBase.js
++%%WWWDIR%%/dijit/layout/_TabContainerBase.js.uncompressed.js
++%%WWWDIR%%/dijit/layout/utils.js
++%%WWWDIR%%/dijit/layout/utils.js.uncompressed.js
++%%WWWDIR%%/dijit/main.js
++%%WWWDIR%%/dijit/main.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ar/common.js
++%%WWWDIR%%/dijit/nls/ar/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ar/loading.js
++%%WWWDIR%%/dijit/nls/ar/loading.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/az/common.js
++%%WWWDIR%%/dijit/nls/az/common.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/az/loading.js
++%%WWWDIR%%/dijit/nls/az/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ca/common.js
++%%WWWDIR%%/dijit/nls/ca/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ca/loading.js
++%%WWWDIR%%/dijit/nls/ca/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/common.js
 +%%WWWDIR%%/dijit/nls/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/fr/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/fr/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/fr/common.js
-+%%WWWDIR%%/dijit/nls/fr/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_sk.js
+ %%WWWDIR%%/dijit/nls/cs/common.js
++%%WWWDIR%%/dijit/nls/cs/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/cs/loading.js
++%%WWWDIR%%/dijit/nls/cs/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/da/common.js
++%%WWWDIR%%/dijit/nls/da/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/da/loading.js
++%%WWWDIR%%/dijit/nls/da/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/de/common.js
++%%WWWDIR%%/dijit/nls/de/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/de/loading.js
++%%WWWDIR%%/dijit/nls/de/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_ROOT.js
++%%WWWDIR%%/dijit/nls/dijit-all_ROOT.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_ar.js
++%%WWWDIR%%/dijit/nls/dijit-all_ar.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_ca.js
++%%WWWDIR%%/dijit/nls/dijit-all_ca.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/dijit-all_cs.js
--%%WWWDIR%%/dijit/nls/dijit-all_da.js
++%%WWWDIR%%/dijit/nls/dijit-all_cs.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_da.js
 -%%WWWDIR%%/dijit/nls/dijit-all_de-de.js
++%%WWWDIR%%/dijit/nls/dijit-all_da.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/dijit-all_de.js
--%%WWWDIR%%/dijit/nls/dijit-all_el.js
--%%WWWDIR%%/dijit/nls/dijit-all_en-gb.js
--%%WWWDIR%%/dijit/nls/dijit-all_en-us.js
++%%WWWDIR%%/dijit/nls/dijit-all_de.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_el.js
++%%WWWDIR%%/dijit/nls/dijit-all_el.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_en-gb.js
++%%WWWDIR%%/dijit/nls/dijit-all_en-gb.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_en-us.js
 -%%WWWDIR%%/dijit/nls/dijit-all_en.js
--%%WWWDIR%%/dijit/nls/dijit-all_es-es.js
++%%WWWDIR%%/dijit/nls/dijit-all_en-us.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_es-es.js
 -%%WWWDIR%%/dijit/nls/dijit-all_es.js
-+%%WWWDIR%%/dijit/nls/dijit-all_th.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_nl-nl.js
-+%%WWWDIR%%/dijit/nls/ar/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/ar/loading.js
-+%%WWWDIR%%/dijit/nls/ar/common.js
-+%%WWWDIR%%/dijit/nls/ar/common.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/dijit-all_es-es.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/dijit-all_fi-fi.js
 -%%WWWDIR%%/dijit/nls/dijit-all_fi.js
--%%WWWDIR%%/dijit/nls/dijit-all_fr-fr.js
++%%WWWDIR%%/dijit/nls/dijit-all_fi-fi.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_fr-fr.js
 -%%WWWDIR%%/dijit/nls/dijit-all_fr.js
--%%WWWDIR%%/dijit/nls/dijit-all_he-il.js
++%%WWWDIR%%/dijit/nls/dijit-all_fr-fr.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_he-il.js
 -%%WWWDIR%%/dijit/nls/dijit-all_he.js
--%%WWWDIR%%/dijit/nls/dijit-all_hu.js
++%%WWWDIR%%/dijit/nls/dijit-all_he-il.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_hu.js
++%%WWWDIR%%/dijit/nls/dijit-all_hu.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/dijit-all_it-it.js
 -%%WWWDIR%%/dijit/nls/dijit-all_it.js
--%%WWWDIR%%/dijit/nls/dijit-all_ja-jp.js
++%%WWWDIR%%/dijit/nls/dijit-all_it-it.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_ja-jp.js
 -%%WWWDIR%%/dijit/nls/dijit-all_ja.js
--%%WWWDIR%%/dijit/nls/dijit-all_ko-kr.js
++%%WWWDIR%%/dijit/nls/dijit-all_ja-jp.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_ko-kr.js
 -%%WWWDIR%%/dijit/nls/dijit-all_ko.js
--%%WWWDIR%%/dijit/nls/dijit-all_nb.js
--%%WWWDIR%%/dijit/nls/dijit-all_nl-nl.js
++%%WWWDIR%%/dijit/nls/dijit-all_ko-kr.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_nb.js
++%%WWWDIR%%/dijit/nls/dijit-all_nb.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_nl-nl.js
 -%%WWWDIR%%/dijit/nls/dijit-all_nl.js
--%%WWWDIR%%/dijit/nls/dijit-all_pl.js
-+%%WWWDIR%%/dijit/nls/loading.js
-+%%WWWDIR%%/dijit/nls/he/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/he/common.js
-+%%WWWDIR%%/dijit/nls/he/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/he/loading.js
-+%%WWWDIR%%/dijit/nls/cs/common.js
-+%%WWWDIR%%/dijit/nls/cs/loading.js
-+%%WWWDIR%%/dijit/nls/cs/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/cs/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_th.js
-+%%WWWDIR%%/dijit/nls/dijit-all_zh-cn.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/dijit-all_nl-nl.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_pl.js
++%%WWWDIR%%/dijit/nls/dijit-all_pl.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/dijit-all_pt-br.js
--%%WWWDIR%%/dijit/nls/dijit-all_pt-pt.js
++%%WWWDIR%%/dijit/nls/dijit-all_pt-br.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_pt-pt.js
 -%%WWWDIR%%/dijit/nls/dijit-all_pt.js
--%%WWWDIR%%/dijit/nls/dijit-all_ru.js
--%%WWWDIR%%/dijit/nls/dijit-all_sk.js
-+%%WWWDIR%%/dijit/nls/dijit-all_zh-tw.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/zh-tw/common.js
-+%%WWWDIR%%/dijit/nls/zh-tw/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/zh-tw/loading.js
-+%%WWWDIR%%/dijit/nls/zh-tw/common.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/dijit-all_pt-pt.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_ru.js
++%%WWWDIR%%/dijit/nls/dijit-all_ru.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_sk.js
++%%WWWDIR%%/dijit/nls/dijit-all_sk.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/dijit-all_sl.js
--%%WWWDIR%%/dijit/nls/dijit-all_sv.js
--%%WWWDIR%%/dijit/nls/dijit-all_th.js
--%%WWWDIR%%/dijit/nls/dijit-all_tr.js
++%%WWWDIR%%/dijit/nls/dijit-all_sl.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_sv.js
++%%WWWDIR%%/dijit/nls/dijit-all_sv.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_th.js
++%%WWWDIR%%/dijit/nls/dijit-all_th.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_tr.js
 -%%WWWDIR%%/dijit/nls/dijit-all_xx.js
--%%WWWDIR%%/dijit/nls/dijit-all_zh-cn.js
--%%WWWDIR%%/dijit/nls/dijit-all_zh-tw.js
--%%WWWDIR%%/dijit/nls/dijit-all_zh.js
--%%WWWDIR%%/dijit/nls/el/common.js
--%%WWWDIR%%/dijit/nls/el/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_pt-pt.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/hu/loading.js
-+%%WWWDIR%%/dijit/nls/hu/common.js
-+%%WWWDIR%%/dijit/nls/hu/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/hu/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_hu.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_es-es.js.uncompressed.js
 +%%WWWDIR%%/dijit/nls/dijit-all_tr.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/pl/common.js
-+%%WWWDIR%%/dijit/nls/pl/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/pl/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/pl/loading.js
-+%%WWWDIR%%/dijit/nls/es/loading.js
+ %%WWWDIR%%/dijit/nls/dijit-all_zh-cn.js
++%%WWWDIR%%/dijit/nls/dijit-all_zh-cn.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/dijit-all_zh-tw.js
+-%%WWWDIR%%/dijit/nls/dijit-all_zh.js
++%%WWWDIR%%/dijit/nls/dijit-all_zh-tw.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/el/common.js
++%%WWWDIR%%/dijit/nls/el/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/el/loading.js
++%%WWWDIR%%/dijit/nls/el/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/es/common.js
 +%%WWWDIR%%/dijit/nls/es/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/es/loading.js
 +%%WWWDIR%%/dijit/nls/es/loading.js.uncompressed.js
- %%WWWDIR%%/dijit/nls/es/common.js
--%%WWWDIR%%/dijit/nls/es/loading.js
--%%WWWDIR%%/dijit/nls/fi/common.js
--%%WWWDIR%%/dijit/nls/fi/loading.js
--%%WWWDIR%%/dijit/nls/fr/common.js
--%%WWWDIR%%/dijit/nls/fr/loading.js
--%%WWWDIR%%/dijit/nls/he/common.js
--%%WWWDIR%%/dijit/nls/he/loading.js
--%%WWWDIR%%/dijit/nls/hu/common.js
--%%WWWDIR%%/dijit/nls/hu/loading.js
--%%WWWDIR%%/dijit/nls/it/common.js
--%%WWWDIR%%/dijit/nls/it/loading.js
--%%WWWDIR%%/dijit/nls/ja/common.js
--%%WWWDIR%%/dijit/nls/ja/loading.js
--%%WWWDIR%%/dijit/nls/ko/common.js
--%%WWWDIR%%/dijit/nls/ko/loading.js
--%%WWWDIR%%/dijit/nls/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_it-it.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ar.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_pt-pt.js
-+%%WWWDIR%%/dijit/nls/dijit-all_nb.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_da.js
-+%%WWWDIR%%/dijit/nls/dijit-all_cs.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/fi/common.js
++%%WWWDIR%%/dijit/nls/fi/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/fi/loading.js
++%%WWWDIR%%/dijit/nls/fi/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/fr/common.js
++%%WWWDIR%%/dijit/nls/fr/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/fr/loading.js
++%%WWWDIR%%/dijit/nls/fr/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/he/common.js
++%%WWWDIR%%/dijit/nls/he/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/he/loading.js
++%%WWWDIR%%/dijit/nls/he/loading.js.uncompressed.js
 +%%WWWDIR%%/dijit/nls/hr/common.js
-+%%WWWDIR%%/dijit/nls/hr/loading.js.uncompressed.js
 +%%WWWDIR%%/dijit/nls/hr/common.js.uncompressed.js
 +%%WWWDIR%%/dijit/nls/hr/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ca.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ROOT.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ja-jp.js
-+%%WWWDIR%%/dijit/nls/nb/loading.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/hr/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/hu/common.js
++%%WWWDIR%%/dijit/nls/hu/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/hu/loading.js
++%%WWWDIR%%/dijit/nls/hu/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/it/common.js
++%%WWWDIR%%/dijit/nls/it/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/it/loading.js
++%%WWWDIR%%/dijit/nls/it/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ja/common.js
++%%WWWDIR%%/dijit/nls/ja/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ja/loading.js
++%%WWWDIR%%/dijit/nls/ja/loading.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/kk/common.js
++%%WWWDIR%%/dijit/nls/kk/common.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/kk/loading.js
++%%WWWDIR%%/dijit/nls/kk/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ko/common.js
++%%WWWDIR%%/dijit/nls/ko/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ko/loading.js
++%%WWWDIR%%/dijit/nls/ko/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/loading.js
++%%WWWDIR%%/dijit/nls/loading.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/nb/common.js
 +%%WWWDIR%%/dijit/nls/nb/common.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/nb/loading.js
--%%WWWDIR%%/dijit/nls/nl/common.js
--%%WWWDIR%%/dijit/nls/nl/loading.js
--%%WWWDIR%%/dijit/nls/pl/common.js
--%%WWWDIR%%/dijit/nls/pl/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_en-us.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ROOT.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ca.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ko-kr.js
-+%%WWWDIR%%/dijit/nls/dijit-all_sk.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/common.js
-+%%WWWDIR%%/dijit/nls/dijit-all_he-il.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/nb/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/nl/common.js
++%%WWWDIR%%/dijit/nls/nl/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/nl/loading.js
++%%WWWDIR%%/dijit/nls/nl/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/pl/common.js
++%%WWWDIR%%/dijit/nls/pl/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/pl/loading.js
++%%WWWDIR%%/dijit/nls/pl/loading.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/pt-pt/common.js
 +%%WWWDIR%%/dijit/nls/pt-pt/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/pt-pt/loading.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/pt-pt/loading.js
--%%WWWDIR%%/dijit/nls/pt/common.js
--%%WWWDIR%%/dijit/nls/pt/loading.js
--%%WWWDIR%%/dijit/nls/ro/common.js
--%%WWWDIR%%/dijit/nls/ro/loading.js
--%%WWWDIR%%/dijit/nls/ru/common.js
--%%WWWDIR%%/dijit/nls/ru/loading.js
-+%%WWWDIR%%/dijit/nls/da/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/da/common.js
-+%%WWWDIR%%/dijit/nls/da/loading.js
-+%%WWWDIR%%/dijit/nls/da/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_da.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_zh-tw.js
-+%%WWWDIR%%/dijit/nls/dijit-all_fi-fi.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/pt-pt/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/pt/common.js
++%%WWWDIR%%/dijit/nls/pt/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/pt/loading.js
++%%WWWDIR%%/dijit/nls/pt/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ro/common.js
++%%WWWDIR%%/dijit/nls/ro/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ro/loading.js
++%%WWWDIR%%/dijit/nls/ro/loading.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ru/common.js
++%%WWWDIR%%/dijit/nls/ru/common.js.uncompressed.js
+ %%WWWDIR%%/dijit/nls/ru/loading.js
++%%WWWDIR%%/dijit/nls/ru/loading.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/sk/common.js
 +%%WWWDIR%%/dijit/nls/sk/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/sk/loading.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/sk/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ja-jp.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_zh-cn.js
-+%%WWWDIR%%/dijit/nls/zh/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/zh/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/zh/common.js
-+%%WWWDIR%%/dijit/nls/zh/loading.js
-+%%WWWDIR%%/dijit/nls/tr/common.js
-+%%WWWDIR%%/dijit/nls/tr/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/tr/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/tr/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_pl.js
-+%%WWWDIR%%/dijit/nls/dijit-all_nb.js
-+%%WWWDIR%%/dijit/nls/sl/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/sl/loading.js.uncompressed.js
++%%WWWDIR%%/dijit/nls/sk/loading.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/sl/common.js
++%%WWWDIR%%/dijit/nls/sl/common.js.uncompressed.js
  %%WWWDIR%%/dijit/nls/sl/loading.js
-+%%WWWDIR%%/dijit/nls/dijit-all_ru.js
-+%%WWWDIR%%/dijit/nls/kk/loading.js
-+%%WWWDIR%%/dijit/nls/kk/common.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/kk/common.js
-+%%WWWDIR%%/dijit/nls/kk/loading.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_tr.js
-+%%WWWDIR%%/dijit/nls/dijit-all_sl.js.uncompressed.js
-+%%WWWDIR%%/dijit/nls/dijit-all_en-gb.js
-+%%WWWDIR%%/dijit/nls/dijit-all_el.js
-+%%WWWDIR%%/dijit/nls/dijit-all_pt-br.js.uncompressed.js

@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12963
          http://freenas.svn.sourceforge.net/freenas/?rev=12963&view=rev
Author:   zippybr
Date:     2013-01-02 10:44:30 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
Happy New Year 2013

Modified Paths:
--------------
    trunk/gui/templates/footer.html
    trunk/nanobsd/Files/etc/motd

Modified: trunk/gui/templates/footer.html
===================================================================
--- trunk/gui/templates/footer.html	2012-12-28 10:42:18 UTC (rev 12962)
+++ trunk/gui/templates/footer.html	2013-01-02 10:44:30 UTC (rev 12963)
@@ -1,6 +1,6 @@
 <div data-dojo-type="dijit.layout.BorderContainer" id="footer" data-dojo-props="gutters:false">
 <div data-dojo-type="dijit.layout.ContentPane" id="footerPane" data-dojo-props="region:'left'">
-{{ sw_name }}&reg; &copy; 2012 <a href="http://www.ixsystems.com" target="_blank" title="iXsystems, Inc.">iXsystems, Inc.</a>
+{{ sw_name }}&reg; &copy; 2011-2013 <a href="http://www.ixsystems.com" target="_blank" title="iXsystems, Inc.">iXsystems, Inc.</a>
 </div>
 <div data-dojo-type="dijit.layout.ContentPane" id="footerMessages" data-dojo-props="region:'center'">
 <pre class="message" id="msg_output" onClick="dijit.byId('log_dialog').show();"></pre>

Modified: trunk/nanobsd/Files/etc/motd
===================================================================
--- trunk/nanobsd/Files/etc/motd	2012-12-28 10:42:18 UTC (rev 12962)
+++ trunk/nanobsd/Files/etc/motd	2013-01-02 10:44:30 UTC (rev 12963)
@@ -1,6 +1,6 @@
 FreeBSD ?.?.?  (UNKNOWN)
 
-	FreeNAS (c) 2009-2012, The FreeNAS Development Team
+	FreeNAS (c) 2009-2013, The FreeNAS Development Team
 	All rights reserved.
 	FreeNAS is released under the modified BSD license.
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13027
          http://freenas.svn.sourceforge.net/freenas/?rev=13027&view=rev
Author:   jhixson
Date:     2013-01-15 04:34:34 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
Make all of the AD code aware of the new advanced fields in the gui. Eliminate knobs while here since it's all tunable from the gui now.

Modified Paths:
--------------
    trunk/gui/common/freenasldap.py
    trunk/nanobsd/Files/etc/rc.d/ix-kerberos
    trunk/nanobsd/Files/etc/rc.d/ix-samba
    trunk/nanobsd/Files/etc/rc.freenas

Modified: trunk/gui/common/freenasldap.py
===================================================================
--- trunk/gui/common/freenasldap.py	2013-01-14 22:09:08 UTC (rev 13026)
+++ trunk/gui/common/freenasldap.py	2013-01-15 04:34:34 UTC (rev 13027)
@@ -69,7 +69,6 @@
 FREENAS_AD_LOCAL_GROUPCACHE = os.path.join(FREENAS_AD_LOCALDIR, ".groups")
 
 FREENAS_AD_SEPARATOR = get_freenas_var("FREENAS_AD_SEPARATOR", '\\')
-FREENAS_AD_KNOBS_FILE = get_freenas_var("AD_KNOBS_FILE", "/etc/ActiveDirectory/knobs")
 FREENAS_AD_CONFIG_FILE = get_freenas_var("AD_CONFIG_FILE", "/etc/ActiveDirectory/config")
 
 FREENAS_LDAP_CACHE_EXPIRE = get_freenas_var("FREENAS_LDAP_CACHE_EXPIRE", 60)
@@ -1031,11 +1030,11 @@
         self.bindpw = None
         self.domain = None
         self.dcname = None
+        self.dchost = None
         self.dcport = None
-        self.dc = None
+        self.gcname = None
         self.gchost = None
         self.gcport = None
-        self.gc = None
         self.netbiosname = None
         self.unix = None
         self.default = None
@@ -1053,13 +1052,11 @@
             'basedn': None,
             'binddn': None,
             'dcname': None,
+            'dchost': None,
             'dcport': None,
-            'dc': None,
+            'gcname': None,
             'gchost': None,
-            'gcport': None,
-            'gc': None,
-            'krbhost': None,
-            'kpwdhost': None
+            'gcport': None
         }
 
         if os.access(FREENAS_AD_CONFIG_FILE, os.F_OK):
@@ -1077,24 +1074,24 @@
         #self.bindpw = self.adset(self.config['bindpw'])
         self.domain = self.adset(self.config['domainname'])
 
-        self.dcname = None
+        self.dchost = None
         self.dcport = None
-        self.dc = self.adset(self.config['dc'])
-        if self.dc:
-            parts = self.dc.split(':')
-            self.dcname = parts[0]
+        self.dcname = self.adset(self.config['dcname'])
+        if self.dcname:
+            parts = self.dcname.split(':')
+            self.dchost = parts[0]
             if len(parts) > 1:
                 self.dcport = parts[1]
 
-        self.dcname = self.adset(self.dcname, self.config['dcname'])
+        self.dchost = self.adset(self.dchost, self.config['dchost'])
         self.dcport = self.adset(self.dcport, self.config['dcport'])
         self.dcport = self.adset(self.dcport, 389)
 
         self.gchost = None
         self.gcport = None
-        self.gc = self.adset(self.config['gc'])
-        if self.gc:
-            parts = self.gc.split(':')
+        self.gcname = self.adset(self.config['gcname'])
+        if self.gcname:
+            parts = self.gcname.split(':')
             self.gchost = parts[0]
             if len(parts) > 1:
                 self.gcport = parts[1]
@@ -1106,78 +1103,7 @@
         log.debug("FreeNAS_ActiveDirectory_Base.__get_config: leave")
         return res
 
-    def __get_knobs(self):
-        log.debug("FreeNAS_ActiveDirectory_Base.__get_knobs: enter")
 
-        res = False
-        self.knobs = {
-            'adminname': None,
-            'allow_trusted_doms': None,
-            'basedn': None,
-            'binddn': None,
-            'bindpw': None,
-            'bindpw': None,
-            'dc': None,
-            'dcname': None,
-            'dcport': None,
-            'domainname': None,
-            'gc': None,
-            'gchost': None,
-            'gcport': None,
-            'unix_extensions': None,
-            'use_default_domain': None,
-            'workgroup': None
-        }
-
-        if os.access(FREENAS_AD_KNOBS_FILE, os.F_OK):
-            for knob in self.knobs:
-                self.knobs[knob] = get_freenas_var_by_file(FREENAS_AD_KNOBS_FILE, knob)
-                if self.knobs[knob]:
-                    res = True
-        else:
-            log.debug("FreeNAS_ActiveDirectory_Base.__get_knobs: leave")
-            return res
-
-        self.adminname = self.adset(self.knobs['adminname'])
-        self.trusted = self.adset(self.knobs['allow_trusted_doms'], False)
-        self.basedn = self.adset(self.knobs['basedn'])
-        self.binddn = self.adset(self.knobs['binddn'])
-        self.bindpw = self.adset(self.knobs['bindpw'])
-        self.domain = self.adset(self.knobs['domainname'])
-
-        self.dcname = None
-        self.dcport = None
-        self.dc = self.adset(self.knobs['dc'])
-        if self.dc:
-            parts = self.dc.split(':')
-            self.dcname = parts[0]
-            if len(parts) > 1:
-                self.dcport = parts[1]
-
-        self.dcname = self.adset(self.dcname, self.knobs['dcname'])
-        self.dcport = self.adset(self.dcport, self.knobs['dcport'])
-        self.dcport = self.adset(self.dcport, 389)
-
-        self.gchost = None
-        self.gcport = None
-        self.gc = self.adset(self.knobs['gc'])
-        if self.gc:
-            parts = self.gc.split(':')
-            self.gchost = parts[0]
-            if len(parts) > 1:
-                self.gcport = parts[1]
-
-        self.gchost = self.adset(self.gchost, self.knobs['gchost'])
-        self.gcport = self.adset(self.gcport, self.knobs['gcport'])
-        self.gcport = self.adset(self.gcport, 3268)
-
-        self.netbiosname = self.adset(self.knobs['workgroup'])
-        self.unix = self.adset(self.knobs['unix_extensions'], False)
-        self.default = self.adset(self.knobs['use_default_domain'], False)
-
-        log.debug("FreeNAS_ActiveDirectory_Base.__get_knobs: leave")
-        return res
-
     def __db_init__(self, **kwargs):
         log.debug("FreeNAS_ActiveDirectory_Base.__db_init__: enter")
 
@@ -1201,10 +1127,10 @@
         host = port = None
         args = {'binddn': self.binddn, 'bindpw': self.bindpw}
 
-        if not self.dcname:
+        if not self.dchost:
             (host, port) = self.dc_connect(self.domain, self.binddn, self.bindpw)
         else:
-            host = self.dcname
+            host = self.dchost
             port = self.dcport
 
         args['host'] = host
@@ -1230,7 +1156,7 @@
         self.default = False
         self.unix = False
 
-        self.dcname = self.adset(self.dcname, kwargs.get('host', None))
+        self.dchost = self.adset(self.dchost, kwargs.get('host', None))
         self.dcport = self.adset(self.dcport, kwargs.get('port', None))
 
         tmphost = kwargs.get('host', None)
@@ -1259,16 +1185,16 @@
                 "neither host nor domain specified, nothing will work, #fail.")
 
         (host, port) = (None, None) 
-        if self.dc:
-            parts = self.dc.split(':')
-            self.dcname = parts[0]
+        if self.dcname:
+            parts = self.dcname.split(':')
+            self.dchost = parts[0]
             if len(parts) > 1:
                 self.dcport = parts[1]
 
         if not self.dcname:
             (host, port) = self.dc_connect(self.domain, self.binddn, self.bindpw)
         else:
-            host = self.dcname
+            host = self.dchost
             port = self.dcport
 
         args['host'] = host
@@ -1289,7 +1215,6 @@
 
         self.__set_defaults()
         self.__get_config()
-        self.__get_knobs()
 
         __initfunc__ = self.__no_db_init__
         if kwargs.has_key('flags') and (kwargs['flags'] & FLAGS_DBINIT):

Modified: trunk/nanobsd/Files/etc/rc.d/ix-kerberos
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-kerberos	2013-01-14 22:09:08 UTC (rev 13026)
+++ trunk/nanobsd/Files/etc/rc.d/ix-kerberos	2013-01-15 04:34:34 UTC (rev 13027)
@@ -16,7 +16,10 @@
 	AD_init
 
 	local krbhost=$(AD_get krbhost)
+	local krbport=$(AD_get krbport)
+	local krbsvc=$(AD_get krbsvc)
 	local kpwdhost=$(AD_get kpwdhost)
+	local kpwdport=$(AD_get kpwdport)
 	local domainname=$(AD_get domainname)
 	local template="${PATH_KRB5_TEMPLATE}"
 
@@ -29,14 +32,32 @@
 	fi
 
 	awk -v realm="${domainname}" \
-		-v kdc="${krbhost}" \
-		-v kpwd="${kpwdhost}" \
+		-v krbhost="${krbhost}" \
+		-v krbport="${krbport}" \
+		-v krbsvc="${krbsvc}" \
+		-v kpwdhost="${kpwdhost}" \
+		-v kpwdport="${kpwdport}" \
 	'
 	BEGIN {
-		kdc = sprintf("%s", tolower(kdc));
+		kdc = tolower(krbhost);
+		if (krbsvc) {
+			kdc = sprintf("%s/%s", tolower(krbsvc), kdc);
+		}
+		if (krbport) {
+			kdc = sprintf("%s:%d", kdc, krbport);
+		}
+		admin_server = tolower(krbhost);
+		if (krbport) {
+			admin_server = sprintf("%s:%d", admin_server, krbport);
+		}
+		kpwd = tolower(kpwdhost);
+		if (kpwdport) {
+			kpwd = sprintf("%s:%d", kpwd, kpwdport);
+		}
+
 		vars["@@UPPER_REALM@@"]  = toupper(realm);	
 		vars["@@LOWER_REALM@@"]  = tolower(realm);	
-		vars["@@ADMIN_SERVER@@"]  = kdc;	
+		vars["@@ADMIN_SERVER@@"]  = admin_server;	
 		vars["@@KPASSWD_SERVER@@"] = kpwd;
 		vars["@@DOMAIN@@"]  = tolower(realm);
 		vars["@@KDC@@"]  = kdc;	

Modified: trunk/nanobsd/Files/etc/rc.d/ix-samba
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-samba	2013-01-14 22:09:08 UTC (rev 13026)
+++ trunk/nanobsd/Files/etc/rc.d/ix-samba	2013-01-15 04:34:34 UTC (rev 13027)
@@ -286,8 +286,8 @@
 			    client use spnego = yes
 			    cache directory = ${FREENAS_CACHEDIR}/.samba
 
-			    wins server = $(AD_get dcname)
-			    password server = $(AD_get dcname)
+			    wins server = $(AD_get dchost)
+			    password server = $(AD_get dchost)
 
 			    local master = no
 			    domain master = no

Modified: trunk/nanobsd/Files/etc/rc.freenas
===================================================================
--- trunk/nanobsd/Files/etc/rc.freenas	2013-01-14 22:09:08 UTC (rev 13026)
+++ trunk/nanobsd/Files/etc/rc.freenas	2013-01-15 04:34:34 UTC (rev 13027)
@@ -287,6 +287,15 @@
 	return ${res}
 }
 
+AD_get_root_domain()
+{
+	local domain="${1}"
+	local rdnc="$(AD_query_rootDSE|egrep '^rootDomainNamingContext'|cut -f2- -d:|xargs)"
+	local dnsroot="$(AD_get_partition "${rdnc}" dnsRoot|egrep '^dnsRoot'|cut -f2- -d:|xargs)"
+
+	echo "${dnsroot}"
+}
+
 AD_locate_domain_controllers_by_guid()
 {
 	local domain="${1}"
@@ -631,7 +640,7 @@
 
 __do_AD_query()
 {
-	local dcname="${1}"
+	local dchost="${1}"
 	local dcport="${2}"
 	local basedn="${3}"
 	local binddn="${4}"
@@ -641,7 +650,7 @@
 	local attributes="${8}"
 	local tmpfile="$(mktemp -q /var/tmp/.adbarXXXXXX)"
 
-	: ${dcname:="$(AD_get dcname)"}
+	: ${dchost:="$(AD_get dchost)"}
 	: ${dcport:="$(AD_get dcport)"}
 	: ${basedn:="$(AD_get basedn)"}
 	: ${binddn:="$(AD_get binddn)"}
@@ -651,7 +660,7 @@
 
 	cat<<-__EOF__>"${tmpfile}"
 	/usr/local/bin/ldapsearch \
-	    -H "ldap://${dcname}:${dcport}" \
+	    -H "ldap://${dchost}:${dcport}" \
 	    -b "${basedn}" \
 	    -D "${binddn}" \
 	    -w "${adminpw}" \
@@ -682,26 +691,39 @@
 
 	AD_log "AD_query: basedn = ${basedn}, filter = ${filter}, attributes = ${attributes}"
 
-	local dcname="$(AD_get dcname)"
+	local dchost="$(AD_get dchost)"
 	local dcport="$(AD_get dcport)"
 	local binddn="$(AD_get binddn)"
 	local adminpw="$(AD_get adminpw)"
 
-	__do_AD_query "${dcname}" "${dcport}" "${basedn}" \
+	__do_AD_query "${dchost}" "${dcport}" "${basedn}" \
 		"${binddn}" "${adminpw}" "sub" "${filter}" \
 		"${attributes}" 2>/dev/null
 }
 
-AD_query_partitions()
+AD_get_partitions()
 {
 	local config="$(AD_query_rootDSE|egrep '^configurationNamingContext'|cut -f2- -d:|xargs)"
 	local basedn="CN=Partitions,${config}"
 
-	AD_log "AD_query_partitions: config = ${config}, basedn = ${basedn}"
+	AD_log "AD_get_partitions: config = ${config}, basedn = ${basedn}"
 
 	AD_query "${basedn}" "" netbiosname|grep '^nETBIOSName'|cut -f2- -d:|xargs
 }
 
+AD_get_partition()
+{
+	local ncname="${1}"
+	shift
+	local attributes="${*}"
+
+	local config="$(AD_query_rootDSE|egrep '^configurationNamingContext'|cut -f2- -d:|xargs)"
+	local basedn="CN=Partitions,${config}"
+
+	AD_log "AD_get_partition: config = ${config}, basedn = ${basedn}, ncname = ${ncname}"
+	AD_query "${basedn}" "ncname=${ncname}" ${attributes}
+}
+
 AD_query_global_catalog()
 {
 	local filter="${1}"
@@ -747,14 +769,14 @@
 
 	AD_log "AD_query_rootDSE: filter = ${filter}, attributes = ${attributes}"
 
-	local dcname="$(AD_get dcname)"
+	local dchost="$(AD_get dchost)"
 	local dcport="$(AD_get dcport)"
 	local binddn="$(AD_get binddn)"
 	local adminpw="$(AD_get adminpw)"
 
 	cat<<-__EOF__>"${tmpfile}"
 	/usr/local/bin/ldapsearch \
-	    -H "ldap://${dcname}:${dcport}" \
+	    -H "ldap://${dchost}:${dcport}" \
 	    -D "${binddn}" \
 	    -w "${adminpw}" \
 	    -b "" \
@@ -831,8 +853,9 @@
 AD_save()
 {
 	local prefix="__save_"
-	local vars="dcname dcport domainname basedn adminname \
-		adminpw workgroup netbiosname gchost gcport"
+	local vars="adminname domainname basedn binddn dcname \
+		dchost dcport gcname gchost gcport krbname krbhost \
+		krbport kpwdname kpwdhost kpwdport"
 	
 	for v in ${vars}
 	do
@@ -843,8 +866,9 @@
 AD_restore()
 {
 	local prefix="__save_"
-	local vars="dcname dcport domainname basedn adminname \
-		adminpw workgroup netbiosname gchost gcport"
+	local vars="adminname domainname basedn binddn dcname \
+		dchost dcport gcname gchost gcport krbname krbhost \
+		krbport kpwdname kpwdhost kpwdport"
 	
 	for v in ${vars}
 	do
@@ -856,7 +880,7 @@
 {
 	printf "Active Directory Config:\n"
 	printf "+------------------------------------------+\n"
-	printf "dcname:       %s\n" $(AD_get dcname)
+	printf "dchost:       %s\n" $(AD_get dchost)
 	printf "dcport:       %d\n" $(AD_get dcport)
 	printf "domainname:   %s\n" $(AD_get domainname)
 	printf "basedn:       %s\n" $(AD_get basedn)
@@ -866,6 +890,14 @@
 	printf "netbiosname:  %s\n" $(AD_get netbiosname)
 	printf "gchost:       %s\n" $(AD_get gchost)
 	printf "gcport:       %d\n" $(AD_get gcport)
+	printf "krbhost:      %s\n" $(AD_get krbhost)
+	printf "krbport:      %d\n" $(AD_get krbport)
+	printf "kpwdhost:     %s\n" $(AD_get kpwdhost)
+	printf "kpwdport:     %d\n" $(AD_get kpwdport)
+	printf "unix:         %s\n" $(AD_get unix_extensions)
+	printf "trusted:      %s\n" $(AD_get allow_trusted_doms)
+	printf "default:      %s\n" $(AD_get use_default_domain)
+	printf "verbose:      %s\n" $(AD_get verbose_logging)
 	printf "+------------------------------------------+\n"
 }
 
@@ -964,7 +996,15 @@
 		ad_adminpw,
 		ad_workgroup,
 		ad_netbiosname,
-		ad_verbose_logging
+		ad_verbose_logging,
+		ad_unix_extensions,
+		ad_allow_trusted_doms,
+		ad_use_default_domain,
+		ad_dcname,
+		ad_gcname,
+		ad_krbname,
+		ad_kpwdname,
+		ad_timeout
  
 	FROM
 		services_activedirectory
@@ -996,13 +1036,17 @@
 		basedn \
 		binddn \
 		dcname \
+		dchost \
 		dcport \
-		dc \
+		gcname \
 		gchost \
 		gcport \
-		gc \
+		krbname\
 		krbhost \
+		krbport \
+		kpwdname \
 		kpwdhost \
+		kpwdport \
 	"
 
 	: > "${AD_CONFIG_FILE}"
@@ -1032,11 +1076,6 @@
 		config_exists=1
 	fi
 
-	if [ -f "${AD_KNOBS_FILE}" ]
-	then
-		. "${AD_KNOBS_FILE}"
-	fi
-
 	if [ "${config_exists}" = "1" ]
 	then
 		return 0
@@ -1048,49 +1087,71 @@
 	local binddn=$(AD_get binddn)
 	if [ -z "${binddn}" ]
 	then
-		AD_set binddn "${adminname}@$(echo ${domainname}|tr a-z A-Z)"
+		binddn="${adminname}@$(echo ${domainname}|tr a-z A-Z)"
+		AD_set binddn "${binddn}"
 	fi	
 	AD_log "AD_init: binddn = $(AD_get binddn)"
 
-	local dc=$(AD_get dc)
-	if [ -z "${dc}" ]
+	local dcname=$(AD_get dcname)
+	if [ -z "${dcname}" ]
 	then
-		dc=$(AD_get_domain_controller "${domainname}")
+		dcname=$(AD_get_domain_controller "${domainname}")
+		AD_set dcname "${dcname}"
 	fi
 
-	AD_set dcname "$(echo "${dc}"|cut -f1 -d:)"
-	AD_set dcport "$(echo "${dc}"|cut -f2 -d:)"
-	AD_log "AD_init: dcname = $(AD_get dcname), dcport = $(AD_get dcport)"
+	AD_set dchost "$(echo "${dcname}"|cut -f1 -d:)"
+	AD_set dcport "$(echo "${dcname}"|cut -f2 -d:)"
+	AD_log "AD_init: dchost = $(AD_get dchost), dcport = $(AD_get dcport)"
 
 	local basedn=$(AD_get basedn)
 	if [ -z "${basedn}" ]
 	then
-		AD_set basedn "$(AD_query_rootDSE|egrep '^defaultNamingContext'|cut -f2- -d:|xargs)"
+		basedn="$(AD_query_rootDSE|egrep '^defaultNamingContext'|cut -f2- -d:|xargs)"
+		AD_set basedn "${basedn}"
 	fi
 	AD_log "AD_init: basedn = $(AD_get basedn)"
 
-	local gc=$(AD_get gc)
-	if [ -z "${gc}" ]
+	local gcname=$(AD_get gcname)
+	if [ -z "${gcname}" ]
 	then
-		gc=$(AD_get_domain_global_catalog_server "${domainname}")
+
+		local rd="$(AD_get_root_domain "${domainname}")"
+		gcname="$(AD_get_domain_global_catalog_server "${rd}")"
+		AD_set gcname "${gcname}"
 	fi
 
-	AD_set gchost "$(echo "${gc}"|cut -f1 -d:)"
-	AD_set gcport "$(echo "${gc}"|cut -f2 -d:)"
+	AD_set gchost "$(echo "${gcname}"|cut -f1 -d:)"
+	AD_set gcport "$(echo "${gcname}"|cut -f2 -d:)"
 	AD_log "AD_init: gchost = $(AD_get gchost), gcport = $(AD_get gcport)"
 
-	local krbhost=$(AD_get krbhost)
-	if [ -z "${krbhost}" ]
+	local krbname=$(AD_get krbname)
+	if [ -z "${krbname}" ]
 	then
-		AD_set krbhost "$(AD_get_kerberos_server ${domainname})"
+		krbname="$(AD_get_kerberos_server ${domainname})"
+		AD_set krbname "${krbname}"
 	fi
 
-	local kpwdhost=$(AD_get kpwdhost)
-	if [ -z "${kpwdhost}" ]
+	krbsvc="$(echo "${krbname}"|cut -f1 -d/ -s)"
+	if [ -n "${krbsvc}" ]
 	then
-		AD_set kpwdhost "$(AD_get_kpasswd_server ${domainname})"
+		AD_set krbsvc "${krbsvc}"
 	fi
 
+	AD_set krbhost "$(echo "${krbname}"|cut -f1 -d:)"
+	AD_set krbport "$(echo "${krbname}"|cut -f2 -d:)"
+	AD_log "AD_init: krbhost = $(AD_get krbhost), krbport = $(AD_get krbport)"
+
+	local kpwdname=$(AD_get kpwdname)
+	if [ -z "${kpwdname}" ]
+	then
+		kpwdname="$(AD_get_kpasswd_server ${domainname})"
+		AD_set kpwdname "${kpwdname}"
+	fi
+
+	AD_set kpwdhost "$(echo "${kpwdname}"|cut -f1 -d:)"
+	AD_set kpwdport "$(echo "${kpwdname}"|cut -f2 -d:)"
+	AD_log "AD_init: kpwdhost = $(AD_get kpwdhost), kpwdport = $(AD_get kpwdport)"
+
 	AD_generate_config
 	return 0
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13050
          http://freenas.svn.sourceforge.net/freenas/?rev=13050&view=rev
Author:   jhixson
Date:     2013-01-16 00:45:09 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
Write out warden conf so we can see jails

Modified Paths:
--------------
    trunk/gui/jails/models.py

Added Paths:
-----------
    trunk/nanobsd/Files/etc/rc.d/ix-warden

Modified: trunk/gui/jails/models.py
===================================================================
--- trunk/gui/jails/models.py	2013-01-16 00:10:37 UTC (rev 13049)
+++ trunk/gui/jails/models.py	2013-01-16 00:45:09 UTC (rev 13050)
@@ -31,6 +31,8 @@
 from freenasUI.freeadmin.models import Model
 from freenasUI.common.warden import Warden, WARDEN_LIST_FLAGS_IDS
 
+from freenasUI.middleware.notifier import notifier
+
 import logging
 
 log = logging.getLogger('jails.jails')
@@ -150,6 +152,11 @@
         help_text=_("Path where to store jail data")
         )
 
+    def save(self):
+        super(JailsConfiguration, self).save()
+        notifier().start("ix-warden")
+
+
     class Meta:
         verbose_name = _("Jails Configuration")
         verbose_name_plural = _("Jails Configuration") 

Added: trunk/nanobsd/Files/etc/rc.d/ix-warden
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-warden	                        (rev 0)
+++ trunk/nanobsd/Files/etc/rc.d/ix-warden	2013-01-16 00:45:09 UTC (rev 13050)
@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ix-warden
+# BEFORE: jail
+
+. /etc/rc.freenas
+
+WARDENCONF="/usr/local/etc/warden.conf"
+
+generate_warden_conf()
+{
+	local tmpfile
+	local wconf="${WARDENCONF}"
+	local jc_path=$(${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+		SELECT
+			jc_path
+		FROM
+			jails_jailsconfiguration
+
+		ORDER BY
+			-id
+		LIMIT 1
+	")
+
+	if [ -n "${jc_path}" -a -d "${jc_path}" ]
+	then
+		if [ ! -f "${wconf}" ]
+		then
+			cat<<-__EOF__>>"${wconf}"
+			NIC: re0
+			WTMP: /usr/jails
+			JDIR: /usr/jails
+__EOF__
+		fi
+
+		tmpfile=$(mktemp /tmp/.warden.XXXXXX)
+		sed -e "s#^\(JDIR:.*\)#JDIR: ${jc_path}#g" \
+			-e "s#^\(WTMP:.*\)#WTMP: ${jc_path}#g" "${wconf}" > "${tmpfile}"
+		if [ "$?" = "0" -a -s "${tmpfile}" ]
+		then
+			mv "${tmpfile}" "${wconf}"
+		fi
+	fi
+}
+
+
+name="ix-warden"
+start_cmd='generate_warden_conf'
+            
+load_rc_config $name
+run_rc_command "$1"


Property changes on: trunk/nanobsd/Files/etc/rc.d/ix-warden
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13060
          http://freenas.svn.sourceforge.net/freenas/?rev=13060&view=rev
Author:   zippybr
Date:     2013-01-16 21:40:46 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
django/nginx changes for dojo 1.8.3

Modified Paths:
--------------
    trunk/gui/settings.py
    trunk/nanobsd/Files/etc/rc.d/ix-nginx

Modified: trunk/gui/settings.py
===================================================================
--- trunk/gui/settings.py	2013-01-16 21:38:36 UTC (rev 13059)
+++ trunk/gui/settings.py	2013-01-16 21:40:46 UTC (rev 13060)
@@ -135,7 +135,7 @@
 )
 
 DOJANGO_DOJO_PROFILE = 'local_release'
-DOJANGO_DOJO_VERSION = '1.8.2'
+DOJANGO_DOJO_VERSION = '1.8.3'
 #DOJANGO_DOJO_BUILD_VERSION = '1.6.0b1'
 DOJANGO_DOJO_DEBUG = True
 

Modified: trunk/nanobsd/Files/etc/rc.d/ix-nginx
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-nginx	2013-01-16 21:38:36 UTC (rev 13059)
+++ trunk/nanobsd/Files/etc/rc.d/ix-nginx	2013-01-16 21:40:46 UTC (rev 13060)
@@ -202,7 +202,7 @@
         }
 
         #FIXME: get version from freenasUI.settings
-        location /dojango/dojo-media/release/1.8.2 {
+        location /dojango/dojo-media/release/1.8.3 {
             alias /usr/local/www/dojo;
         }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13076
          http://freenas.svn.sourceforge.net/freenas/?rev=13076&view=rev
Author:   zippybr
Date:     2013-01-21 21:33:31 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
Support IPv6 binding for the WebGUI

ticket: #1300

Modified Paths:
--------------
    trunk/gui/choices.py
    trunk/gui/system/forms.py
    trunk/gui/system/models.py
    trunk/nanobsd/Files/etc/rc.d/ix-nginx

Added Paths:
-----------
    trunk/gui/system/migrations/0047_auto__add_field_settings_stg_guiv6address.py

Modified: trunk/gui/choices.py
===================================================================
--- trunk/gui/choices.py	2013-01-21 14:25:37 UTC (rev 13075)
+++ trunk/gui/choices.py	2013-01-21 21:33:31 UTC (rev 13076)
@@ -28,6 +28,7 @@
 import csv
 import cStringIO
 import freenasUI.settings
+import logging
 import os
 import re
 import sqlite3
@@ -36,6 +37,8 @@
 from os import popen
 from django.utils.translation import ugettext_lazy as _
 
+log = logging.getLogger('choices')
+
 SMTPAUTH_CHOICES = (
         ('plain', _('Plain')),
         ('ssl', _('SSL')),
@@ -418,18 +421,33 @@
 
 class IPChoices(NICChoices):
 
-    def __init__(self, nolagg=False, novlan=False, exclude_configured=False,
-            include_vlan_parent=True):
-        super(IPChoices, self).__init__(nolagg, novlan, exclude_configured,
-            include_vlan_parent)
+    def __init__(
+        self,
+        ipv4=True,
+        ipv6=True,
+        nolagg=False,
+        novlan=False,
+        exclude_configured=False,
+        include_vlan_parent=True
+    ):
+        super(IPChoices, self).__init__(
+            nolagg=nolagg,
+            novlan=novlan,
+            exclude_configured=exclude_configured,
+            include_vlan_parent=include_vlan_parent
+        )
 
         self._IPlist = []
         for iface in self._NIClist:
             pipe = popen("/sbin/ifconfig %s" % iface)
             lines = pipe.read().strip().split('\n')
             for line in lines:
-                if line.startswith('\tinet'):
-                    self._IPlist.append(line.split(' ')[1])
+                if line.startswith('\tinet6'):
+                    if ipv6 is True:
+                        self._IPlist.append(line.split(' ')[1])
+                elif line.startswith('\tinet'):
+                    if ipv4 is True:
+                        self._IPlist.append(line.split(' ')[1])
             pipe.close()
             self._IPlist.sort()
 

Modified: trunk/gui/system/forms.py
===================================================================
--- trunk/gui/system/forms.py	2013-01-21 14:25:37 UTC (rev 13075)
+++ trunk/gui/system/forms.py	2013-01-21 21:33:31 UTC (rev 13076)
@@ -203,8 +203,13 @@
         self.fields['stg_guiaddress'] = forms.ChoiceField(
             label=self.fields['stg_guiaddress'].label
             )
-        self.fields['stg_guiaddress'].choices = [['0.0.0.0', '0.0.0.0']] + list(choices.IPChoices())
+        self.fields['stg_guiaddress'].choices = [['0.0.0.0', '0.0.0.0']] + list(choices.IPChoices(ipv6=False))
 
+        self.fields['stg_guiv6address'] = forms.ChoiceField(
+            label=self.fields['stg_guiv6address'].label
+            )
+        self.fields['stg_guiv6address'].choices = [['::', '::']] + list(choices.IPChoices(ipv4=False))
+
     def clean_stg_guiport(self):
         val = self.cleaned_data.get("stg_guiport")
         if val == '':

Added: trunk/gui/system/migrations/0047_auto__add_field_settings_stg_guiv6address.py
===================================================================
--- trunk/gui/system/migrations/0047_auto__add_field_settings_stg_guiv6address.py	                        (rev 0)
+++ trunk/gui/system/migrations/0047_auto__add_field_settings_stg_guiv6address.py	2013-01-21 21:33:31 UTC (rev 13076)
@@ -0,0 +1,192 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Settings.stg_guiv6address'
+        db.add_column('system_settings', 'stg_guiv6address',
+                      self.gf('django.db.models.fields.CharField')(default='::', max_length=120, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Settings.stg_guiv6address'
+        db.delete_column('system_settings', 'stg_guiv6address')
+
+
+    models = {
+        'storage.disk': {
+            'Meta': {'ordering': "['disk_name']", 'object_name': 'Disk'},
+            'disk_acousticlevel': ('django.db.models.fields.CharField', [], {'default': "'Disabled'", 'max_length': '120'}),
+            'disk_advpowermgmt': ('django.db.models.fields.CharField', [], {'default': "'Disabled'", 'max_length': '120'}),
+            'disk_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'disk_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'disk_hddstandby': ('django.db.models.fields.CharField', [], {'default': "'Always On'", 'max_length': '120'}),
+            'disk_identifier': ('django.db.models.fields.CharField', [], {'max_length': '42'}),
+            'disk_multipath_member': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_multipath_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'disk_serial': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_smartoptions': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'disk_togglesmart': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'disk_transfermode': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.advanced': {
+            'Meta': {'object_name': 'Advanced'},
+            'adv_advancedmode': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_anonstats': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_anonstats_token': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'adv_autotune': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_consolemenu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_consolemsg': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_consolescreensaver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_firmwarevc': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_motd': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
+            'adv_powerdaemon': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_serialconsole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_serialspeed': ('django.db.models.fields.CharField', [], {'default': "'9600'", 'max_length': '120'}),
+            'adv_swapondrive': ('django.db.models.fields.IntegerField', [], {'default': '2'}),
+            'adv_systembeep': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_traceback': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_tuning': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_zeroconfbonjour': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.alert': {
+            'Meta': {'object_name': 'Alert'},
+            'dismiss': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'system.cronjob': {
+            'Meta': {'ordering': "['cron_description', 'cron_user']", 'object_name': 'CronJob'},
+            'cron_command': ('django.db.models.fields.TextField', [], {}),
+            'cron_daymonth': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'cron_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'cron_description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'cron_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cron_hour': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'cron_minute': ('django.db.models.fields.CharField', [], {'default': "'00'", 'max_length': '100'}),
+            'cron_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,a,b,c'", 'max_length': '100'}),
+            'cron_stderr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cron_stdout': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cron_user': ('freenasUI.freeadmin.models.UserField', [], {'max_length': '60'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.email': {
+            'Meta': {'object_name': 'Email'},
+            'em_fromemail': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'em_outgoingserver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'em_pass': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'em_port': ('django.db.models.fields.IntegerField', [], {'default': '25'}),
+            'em_security': ('django.db.models.fields.CharField', [], {'default': "'plain'", 'max_length': '120'}),
+            'em_smtp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'em_user': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.initshutdown': {
+            'Meta': {'object_name': 'InitShutdown'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ini_command': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}),
+            'ini_script': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ini_type': ('django.db.models.fields.CharField', [], {'default': "'command'", 'max_length': '15'}),
+            'ini_when': ('django.db.models.fields.CharField', [], {'max_length': '15'})
+        },
+        'system.ntpserver': {
+            'Meta': {'ordering': "['ntp_address']", 'object_name': 'NTPServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ntp_address': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ntp_burst': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ntp_iburst': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ntp_maxpoll': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ntp_minpoll': ('django.db.models.fields.IntegerField', [], {'default': '6'}),
+            'ntp_prefer': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'system.rsync': {
+            'Meta': {'ordering': "['rsync_path', 'rsync_desc']", 'object_name': 'Rsync'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsync_archive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_compress': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_daymonth': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'rsync_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'rsync_delete': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_desc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_direction': ('django.db.models.fields.CharField', [], {'default': "'push'", 'max_length': '10'}),
+            'rsync_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsync_hour': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'rsync_minute': ('django.db.models.fields.CharField', [], {'default': "'00'", 'max_length': '100'}),
+            'rsync_mode': ('django.db.models.fields.CharField', [], {'default': "'module'", 'max_length': '20'}),
+            'rsync_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,a,b,c'", 'max_length': '100'}),
+            'rsync_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsync_preserveattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_preserveperm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_quiet': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_recursive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_remotehost': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsync_remotemodule': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_remotepath': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_remoteport': ('django.db.models.fields.SmallIntegerField', [], {'default': '22'}),
+            'rsync_times': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_user': ('freenasUI.freeadmin.models.UserField', [], {'max_length': '60'})
+        },
+        'system.settings': {
+            'Meta': {'object_name': 'Settings'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'stg_guiaddress': ('django.db.models.fields.CharField', [], {'default': "'0.0.0.0'", 'max_length': '120', 'blank': 'True'}),
+            'stg_guiport': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120', 'blank': 'True'}),
+            'stg_guiprotocol': ('django.db.models.fields.CharField', [], {'default': "'http'", 'max_length': '120'}),
+            'stg_guiv6address': ('django.db.models.fields.CharField', [], {'default': "'::'", 'max_length': '120', 'blank': 'True'}),
+            'stg_kbdmap': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'stg_language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '120'}),
+            'stg_syslogserver': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120', 'blank': 'True'}),
+            'stg_timezone': ('django.db.models.fields.CharField', [], {'default': "'America/Los_Angeles'", 'max_length': '120'})
+        },
+        'system.smarttest': {
+            'Meta': {'ordering': "['smarttest_type']", 'object_name': 'SMARTTest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smarttest_daymonth': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'smarttest_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'smarttest_desc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'smarttest_disks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['storage.Disk']", 'symmetrical': 'False'}),
+            'smarttest_hour': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'smarttest_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,10,a,b,c'", 'max_length': '100'}),
+            'smarttest_type': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+        },
+        'system.ssl': {
+            'Meta': {'object_name': 'SSL'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssl_certfile': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'ssl_city': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_common': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_country': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_email': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_org': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_state': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_unit': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'})
+        },
+        'system.sysctl': {
+            'Meta': {'ordering': "['sysctl_mib']", 'object_name': 'Sysctl'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sysctl_comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'sysctl_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'sysctl_mib': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'sysctl_value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'system.tunable': {
+            'Meta': {'ordering': "['tun_var']", 'object_name': 'Tunable'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tun_comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'tun_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'tun_value': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'tun_var': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['system']
\ No newline at end of file

Modified: trunk/gui/system/models.py
===================================================================
--- trunk/gui/system/models.py	2013-01-21 14:25:37 UTC (rev 13075)
+++ trunk/gui/system/models.py	2013-01-21 21:33:31 UTC (rev 13076)
@@ -57,8 +57,14 @@
             max_length=120,
             blank=True,
             default='0.0.0.0',
-            verbose_name=_("WebGUI Address")
+            verbose_name=_("WebGUI IPv4 Address")
             )
+    stg_guiv6address = models.CharField(
+            max_length=120,
+            blank=True,
+            default='::',
+            verbose_name=_("WebGUI IPv6 Address")
+            )
     stg_guiport = models.CharField(
             max_length=120,
             blank=True,

Modified: trunk/nanobsd/Files/etc/rc.d/ix-nginx
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-nginx	2013-01-21 14:25:37 UTC (rev 13075)
+++ trunk/nanobsd/Files/etc/rc.d/ix-nginx	2013-01-21 21:33:31 UTC (rev 13076)
@@ -101,7 +101,8 @@
 	local res=1
 	local proto="${1}"
 	local addr="${2}"
-	local port="${3}"
+	local addr6="${3}"
+	local port="${4}"
 	local working_ssl=false
 	
 	{
@@ -151,6 +152,7 @@
 			working_ssl=true
 			cat << __EOF__
         listen       ${addr}:${port} default_server ssl;
+        listen       [${addr6}]:${port} default_server ssl;
 
         ssl_certificate      ${HTTPDCERT};
         ssl_certificate_key  ${HTTPDKEY};
@@ -163,6 +165,7 @@
 
 	if ! ${working_ssl}; then
 		echo "        listen       ${addr}:${port};"
+		echo "        listen       [${addr6}]:${port};"
 	fi
 
 	cat << __EOF__
@@ -322,6 +325,7 @@
 		SELECT
 			stg_guiprotocol,
 			stg_guiaddress,
+			stg_guiv6address,
 			stg_guiport
 
 		FROM
@@ -332,18 +336,20 @@
 
 		LIMIT 1
 		" | \
-		while read stg_guiprotocol stg_guiaddress stg_guiport
+		while read -r stg_guiprotocol stg_guiaddress stg_guiv6address stg_guiport
 		do
-			echo "${stg_guiprotocol}:${stg_guiaddress}:${stg_guiport}"
+			echo "${stg_guiprotocol}|${stg_guiaddress}|${stg_guiv6address}|${stg_guiport}"
 		done
 	)
 
-	local proto=$(echo ${settings}|cut -f1 -d: -s|tr A-Z a-z)
-	local addr=$(echo ${settings}|cut -f2 -d: -s)
-	local port=$(echo ${settings}|cut -f3 -d: -s)
+	local proto=$(echo ${settings}|cut -f1 -d"|" -s|tr A-Z a-z)
+	local addr=$(echo ${settings}|cut -f2 -d"|" -s)
+	local addr6=$(echo ${settings}|cut -f3 -d"|" -s)
+	local port=$(echo ${settings}|cut -f4 -d"|" -s)
 
 	: ${proto:="http"}
 	: ${addr:="0.0.0.0"}
+	: ${addr6:="::"}
 
 	if [ "${proto}" = "https" -a -z "${port}" ]
 	then
@@ -353,13 +359,17 @@
 		port="80"
 	fi
 
-	# XXX: IPv6
 	if [ "${addr}" != "0.0.0.0" -a \
 		-z "$(/sbin/ifconfig -a|grep ${addr})" ]; then
 		addr="0.0.0.0"
 	fi
 
-	echo "${proto}:${addr}:${port}"
+	if [ "${addr6}" != "::" -a \
+		-z "$(/sbin/ifconfig -a|grep ${addr6})" ]; then
+		addr6="::"
+	fi
+
+	echo "${proto}|${addr}|${addr6}|${port}"
 }
 
 
@@ -367,9 +377,10 @@
 {
 	local settings=$(get_nginx_settings)
 
-	local proto=$(echo "${settings}"|cut -f1 -d:)
-	local addr=$(echo "${settings}"|cut -f2 -d:)
-	local port=$(echo "${settings}"|cut -f3 -d:)
+	local proto=$(echo "${settings}"|cut -f1 -d"|")
+	local addr=$(echo "${settings}"|cut -f2 -d"|")
+	local addr6=$(echo "${settings}"|cut -f3 -d"|")
+	local port=$(echo "${settings}"|cut -f4 -d"|")
 
 	if [ "${proto}" = "https" -a ! -f "${SSLCONF}" ]
 	then
@@ -383,7 +394,7 @@
 	generate_plugins_conf
 	generate_fastcgi_params
 
-	generate_nginx_conf "${proto}" "${addr}" "${port}"
+	generate_nginx_conf "${proto}" "${addr}" "${addr6}" "${port}"
 
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13129
          http://freenas.svn.sourceforge.net/freenas/?rev=13129&view=rev
Author:   jhixson
Date:     2013-01-24 01:39:39 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
Don't strip the (ad|ldap|nt4) prefix off database variables, use the full name, modify all code
accordingly. 

Modified Paths:
--------------
    trunk/gui/common/freenasldap.py
    trunk/nanobsd/Files/etc/directoryservice/rc.ActiveDirectory
    trunk/nanobsd/Files/etc/directoryservice/rc.LDAP
    trunk/nanobsd/Files/etc/directoryservice/rc.NT4
    trunk/nanobsd/Files/etc/rc.d/ix-activedirectory
    trunk/nanobsd/Files/etc/rc.d/ix-kerberos
    trunk/nanobsd/Files/etc/rc.d/ix-kinit
    trunk/nanobsd/Files/etc/rc.d/ix-samba

Modified: trunk/gui/common/freenasldap.py
===================================================================
--- trunk/gui/common/freenasldap.py	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/gui/common/freenasldap.py	2013-01-24 01:39:39 UTC (rev 13129)
@@ -1061,7 +1061,7 @@
 
         if os.access(FREENAS_AD_CONFIG_FILE, os.F_OK):
             for var in self.config:
-                self.config[var] = get_freenas_var_by_file(FREENAS_AD_CONFIG_FILE, var)
+                self.config[var] = get_freenas_var_by_file(FREENAS_AD_CONFIG_FILE, "ad_%s" % var)
                 if self.config[var]:
                     res = True
         else:

Modified: trunk/nanobsd/Files/etc/directoryservice/rc.ActiveDirectory
===================================================================
--- trunk/nanobsd/Files/etc/directoryservice/rc.ActiveDirectory	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/directoryservice/rc.ActiveDirectory	2013-01-24 01:39:39 UTC (rev 13129)
@@ -93,7 +93,7 @@
 	do
 		local host=$(echo "${line}"|awk '{ print $4 }'|sed 's/\.$//')
 		local port=$(echo "${line}"|awk '{ print $3 }')
-		local nc_timeout="$(AD_get dns_timeout)"
+		local nc_timeout="$(AD_get ad_dns_timeout)"
 		local nc_args=
 
 		AD_log "__AD_get_SRV_host: trying ${host}:${port}"
@@ -563,11 +563,11 @@
 	local attributes="${8}"
 	local tmpfile="$(mktemp -q /var/tmp/.adbarXXXXXX)"
 
-	: ${dchost:="$(AD_get dchost)"}
-	: ${dcport:="$(AD_get dcport)"}
-	: ${basedn:="$(AD_get basedn)"}
-	: ${binddn:="$(AD_get binddn)"}
-	: ${adminpw:="$(AD_get adminpw)"}
+	: ${dchost:="$(AD_get ad_dchost)"}
+	: ${dcport:="$(AD_get ad_dcport)"}
+	: ${basedn:="$(AD_get ad_basedn)"}
+	: ${binddn:="$(AD_get ad_binddn)"}
+	: ${adminpw:="$(AD_get ad_adminpw)"}
 	: ${scope:="sub"}
 	: ${filter:="(objectclass=*)"}
 
@@ -599,15 +599,15 @@
 	shift
 	local attributes="${*}"
 
-	: ${basedn:="$(AD_get basedn)"}
+	: ${basedn:="$(AD_get ad_basedn)"}
 	: ${filter:='(objectclass=*)'}
 
 	AD_log "AD_query: basedn = ${basedn}, filter = ${filter}, attributes = ${attributes}"
 
-	local dchost="$(AD_get dchost)"
-	local dcport="$(AD_get dcport)"
-	local binddn="$(AD_get binddn)"
-	local adminpw="$(AD_get adminpw)"
+	local dchost="$(AD_get ad_dchost)"
+	local dcport="$(AD_get ad_dcport)"
+	local binddn="$(AD_get ad_binddn)"
+	local adminpw="$(AD_get ad_adminpw)"
 
 	__do_AD_query "${dchost}" "${dcport}" "${basedn}" \
 		"${binddn}" "${adminpw}" "sub" "${filter}" \
@@ -649,10 +649,10 @@
 
 	AD_log "AD_query_global_catalog: filter = ${filter}, attributes = ${attributes}"
 
-	local gchost="$(AD_get gchost)"
-	local gcport="$(AD_get gcport)"
-	local binddn="$(AD_get binddn)"
-	local adminpw="$(AD_get adminpw)"
+	local gchost="$(AD_get ad_gchost)"
+	local gcport="$(AD_get ad_gcport)"
+	local binddn="$(AD_get ad_binddn)"
+	local adminpw="$(AD_get ad_adminpw)"
 
 	cat<<-__EOF__>"${tmpfile}"
 	/usr/local/bin/ldapsearch \
@@ -682,10 +682,10 @@
 
 	AD_log "AD_query_rootDSE: filter = ${filter}, attributes = ${attributes}"
 
-	local dchost="$(AD_get dchost)"
-	local dcport="$(AD_get dcport)"
-	local binddn="$(AD_get binddn)"
-	local adminpw="$(AD_get adminpw)"
+	local dchost="$(AD_get ad_dchost)"
+	local dcport="$(AD_get ad_dcport)"
+	local binddn="$(AD_get ad_binddn)"
+	local adminpw="$(AD_get ad_adminpw)"
 
 	cat<<-__EOF__>"${tmpfile}"
 	/usr/local/bin/ldapsearch \
@@ -727,15 +727,21 @@
 
 AD_get()
 {
-	local name="${1}"
-	local cached="${2}"
-
+	local vars="${*}"
 	local prefix="__ad_"
-	local var=\$$(printf "${name}")
-	local val=$(eval "echo ${var} 2>/dev/null")
 
-	__do_AD_get "${prefix}" "${name}" 2>/dev/null
+	for v in ${vars}
+	do
+		local var=\$$(printf "${v}")
+		local val=$(eval "echo ${var} 2>/dev/null")
 
+		if [ -n "${val}" ]
+		then
+			echo "${val}"
+		else
+			__do_AD_get "${prefix}" "${v}" 2>/dev/null
+		fi
+	done
 }
 
 __do_AD_set()
@@ -760,9 +766,10 @@
 AD_save()
 {
 	local prefix="__save_"
-	local vars="adminname domainname basedn binddn dcname \
-		dchost dcport gcname gchost gcport krbname krbhost \
-		krbport kpwdname kpwdhost kpwdport timeout dns_timeout"
+	local vars="ad_adminname ad_domainname ad_basedn ad_binddn ad_dcname \
+		ad_dchost ad_dcport ad_gcname ad_gchost ad_gcport ad_krbname \
+		ad_krbhost ad_krbport ad_kpwdname ad_kpwdhost ad_kpwdport \
+		ad_timeout ad_dns_timeout"
 	
 	for v in ${vars}
 	do
@@ -773,9 +780,10 @@
 AD_restore()
 {
 	local prefix="__save_"
-	local vars="adminname domainname basedn binddn dcname \
-		dchost dcport gcname gchost gcport krbname krbhost \
-		krbport kpwdname kpwdhost kpwdport timeout dns_timeout"
+	local vars="ad_adminname ad_domainname ad_basedn ad_binddn ad_dcname \
+		ad_dchost ad_dcport ad_gcname ad_gchost ad_gcport ad_krbname \
+		ad_krbhost ad_krbport ad_kpwdname ad_kpwdhost ad_kpwdport \
+		ad_timeout ad_dns_timeout"
 	
 	for v in ${vars}
 	do
@@ -787,26 +795,26 @@
 {
 	printf "Active Directory Config:\n"
 	printf "+------------------------------------------+\n"
-	printf "dchost:       %s\n" $(AD_get dchost)
-	printf "dcport:       %d\n" $(AD_get dcport)
-	printf "domainname:   %s\n" $(AD_get domainname)
-	printf "basedn:       %s\n" $(AD_get basedn)
-	printf "adminname:    %s\n" $(AD_get adminname)
-	printf "adminpw:      %s\n" $(AD_get adminpw)
-	printf "workgroup:    %s\n" $(AD_get workgroup)
-	printf "netbiosname:  %s\n" $(AD_get netbiosname)
-	printf "gchost:       %s\n" $(AD_get gchost)
-	printf "gcport:       %d\n" $(AD_get gcport)
-	printf "krbhost:      %s\n" $(AD_get krbhost)
-	printf "krbport:      %d\n" $(AD_get krbport)
-	printf "kpwdhost:     %s\n" $(AD_get kpwdhost)
-	printf "kpwdport:     %d\n" $(AD_get kpwdport)
-	printf "unix:         %s\n" $(AD_get unix_extensions)
-	printf "trusted:      %s\n" $(AD_get allow_trusted_doms)
-	printf "default:      %s\n" $(AD_get use_default_domain)
-	printf "verbose:      %s\n" $(AD_get verbose_logging)
-	printf "timeout:      %s\n" $(AD_get timeout)
-	printf "dns_timeout:  %s\n" $(AD_get dns_timeout)
+	printf "ad_dchost:       %s\n" $(AD_get ad_dchost)
+	printf "ad_dcport:       %d\n" $(AD_get ad_dcport)
+	printf "ad_domainname:   %s\n" $(AD_get ad_domainname)
+	printf "ad_basedn:       %s\n" $(AD_get ad_basedn)
+	printf "ad_adminname:    %s\n" $(AD_get ad_adminname)
+	printf "ad_adminpw:      %s\n" $(AD_get ad_adminpw)
+	printf "ad_workgroup:    %s\n" $(AD_get ad_workgroup)
+	printf "ad_netbiosname:  %s\n" $(AD_get ad_netbiosname)
+	printf "ad_gchost:       %s\n" $(AD_get ad_gchost)
+	printf "ad_gcport:       %d\n" $(AD_get ad_gcport)
+	printf "ad_krbhost:      %s\n" $(AD_get ad_krbhost)
+	printf "ad_krbport:      %d\n" $(AD_get ad_krbport)
+	printf "ad_kpwdhost:     %s\n" $(AD_get ad_kpwdhost)
+	printf "ad_kpwdport:     %d\n" $(AD_get ad_kpwdport)
+	printf "ad_unix:         %s\n" $(AD_get ad_unix_extensions)
+	printf "ad_trusted:      %s\n" $(AD_get ad_allow_trusted_doms)
+	printf "ad_default:      %s\n" $(AD_get ad_use_default_domain)
+	printf "ad_verbose:      %s\n" $(AD_get ad_verbose_logging)
+	printf "ad_timeout:      %s\n" $(AD_get ad_timeout)
+	printf "ad_dns_timeout:  %s\n" $(AD_get ad_dns_timeout)
 	printf "+------------------------------------------+\n"
 }
 
@@ -816,12 +824,12 @@
 	local adminpw="${2}"
 	local res
 
-	: ${adminname:="$(AD_get adminname)"}
-	: ${adminpw:="$(AD_get adminpw)"}
+	: ${adminname:="$(AD_get ad_adminname)"}
+	: ${adminpw:="$(AD_get ad_adminpw)"}
 
 	AD_log "AD_join_domain: net ads join -U ${adminname}"
 
-	__AD_tc "$(AD_get timeout)" /usr/local/bin/net ads join -U "${adminname}%${adminpw}"
+	__AD_tc "$(AD_get ad_timeout)" /usr/local/bin/net ads join -U "${adminname}%${adminpw}"
 	res=$?
 
 	local ok="Failed"
@@ -840,12 +848,12 @@
 	local adminpw="${2}"
 	local res
 
-	: ${adminname:="$(AD_get adminname)"}
-	: ${adminpw:="$(AD_get adminpw)"}
+	: ${adminname:="$(AD_get ad_adminname)"}
+	: ${adminpw:="$(AD_get ad_adminpw)"}
 
 	AD_log "AD_status_domain: net ads status -U ${adminname}"
 
-	__AD_tc "$(AD_get timeout)" /usr/local/bin/net ads status -U "${adminname}%${adminpw}"
+	__AD_tc "$(AD_get ad_timeout)" /usr/local/bin/net ads status -U "${adminname}%${adminpw}"
 	res=$?
 
 	local ok="Not okay"
@@ -864,12 +872,12 @@
 	local adminpw="${2}"
 	local res
 
-	: ${adminname:="$(AD_get adminname)"}
-	: ${adminpw:="$(AD_get adminpw)"}
+	: ${adminname:="$(AD_get ad_adminname)"}
+	: ${adminpw:="$(AD_get ad_adminpw)"}
 
 	AD_log "AD_leave_domain: net ads leave -U ${adminname}"
 
-	__AD_tc "$(AD_get timeout)" /usr/local/bin/net ads leave -U "${adminname}%${adminpw}"
+	__AD_tc "$(AD_get ad_timeout)" /usr/local/bin/net ads leave -U "${adminname}%${adminpw}"
 	res=$?
 
 	local ok="Failed"
@@ -886,7 +894,7 @@
 {
 	local args="$*"
 
-	local on="$(AD_get verbose_logging)"
+	local on="$(AD_get ad_verbose_logging)"
 	if [ "${on}" = "1" ]
 	then
 		logger -t "ActiveDirectory" ${args} >/dev/null 2>&1
@@ -929,7 +937,7 @@
 	exec 0<"${tmpfile}"
 	while read -r line
 	do
-		var=$(echo ${line}|cut -f1 -d=|xargs|cut -f2- -d_)
+		var=$(echo ${line}|cut -f1 -d=|xargs)
 		val=$(echo ${line}|cut -f2- -d=|xargs)
 
 		AD_set "${var}" "${val}"
@@ -941,24 +949,24 @@
 AD_generate_config()
 {
 	local vars="\
-		adminname \
-		domainname \
-		basedn \
-		binddn \
-		dcname \
-		dchost \
-		dcport \
-		gcname \
-		gchost \
-		gcport \
-		krbname\
-		krbhost \
-		krbport \
-		kpwdname \
-		kpwdhost \
-		kpwdport \
-		timeout \
-		dns_timeout \
+		ad_adminname \
+		ad_domainname \
+		ad_basedn \
+		ad_binddn \
+		ad_dcname \
+		ad_dchost \
+		ad_dcport \
+		ad_gcname \
+		ad_gchost \
+		ad_gcport \
+		ad_krbname\
+		ad_krbhost \
+		ad_krbport \
+		ad_kpwdname \
+		ad_kpwdhost \
+		ad_kpwdport \
+		ad_timeout \
+		ad_dns_timeout \
 	"
 
 	: > "${AD_CONFIG_FILE}"
@@ -978,7 +986,7 @@
 
 	AD_load_database_values
 
-	verbose=$(AD_get verbose_logging)
+	verbose=$(AD_get ad_verbose_logging)
 
 	if [ -f "${AD_CONFIG_FILE}" ]
 	then
@@ -993,36 +1001,36 @@
 		return 0
 	fi
 
-	timeout=$(AD_get timeout)
+	timeout=$(AD_get ad_timeout)
 	if [ -z "${timeout}" ]
 	then
 		timeout="${AD_NET_ADS_TIMEOUT}"
-		AD_set timeout "${timeout}"
+		AD_set ad_timeout "${timeout}"
 	fi
 
-	dns_timeout=$(AD_get dns_timeout)
+	dns_timeout=$(AD_get ad_dns_timeout)
 	if [ -z "${dns_timeout}" ]
 	then
 		dns_timeout="${AD_DNS_TIMEOUT}"
-		AD_set dns_timeout "${dns_timeout}"
+		AD_set ad_dns_timeout "${dns_timeout}"
 	fi
 
-	local adminname=$(AD_get adminname)
-	local domainname=$(AD_get domainname)
+	local adminname=$(AD_get ad_adminname)
+	local domainname=$(AD_get ad_domainname)
 
-	local binddn=$(AD_get binddn)
+	local binddn=$(AD_get ad_binddn)
 	if [ -z "${binddn}" ]
 	then
 		binddn="${adminname}@$(echo ${domainname}|tr a-z A-Z)"
-		AD_set binddn "${binddn}"
+		AD_set ad_binddn "${binddn}"
 	fi	
-	AD_log "AD_init: binddn = $(AD_get binddn)"
+	AD_log "AD_init: binddn = $(AD_get ad_binddn)"
 
-	local dcname=$(AD_get dcname)
+	local dcname=$(AD_get ad_dcname)
 	if [ -z "${dcname}" ]
 	then
 		dcname=$(AD_get_domain_controller "${domainname}")
-		AD_set dcname "${dcname}"
+		AD_set ad_dcname "${dcname}"
 	fi
 
 	local dchost="$(echo "${dcname}"|cut -f1 -d:)"
@@ -1032,26 +1040,26 @@
 		dcport=389
 	fi
 
-	AD_set dchost "${dchost}"
-	AD_set dcport "${dcport}"
+	AD_set ad_dchost "${dchost}"
+	AD_set ad_dcport "${dcport}"
 	
-	AD_log "AD_init: dchost = $(AD_get dchost), dcport = $(AD_get dcport)"
+	AD_log "AD_init: dchost = $(AD_get ad_dchost), dcport = $(AD_get ad_dcport)"
 
-	local basedn=$(AD_get basedn)
+	local basedn=$(AD_get ad_basedn)
 	if [ -z "${basedn}" ]
 	then
 		basedn="$(AD_query_rootDSE|egrep '^defaultNamingContext'|cut -f2- -d:|xargs)"
-		AD_set basedn "${basedn}"
+		AD_set ad_basedn "${basedn}"
 	fi
-	AD_log "AD_init: basedn = $(AD_get basedn)"
+	AD_log "AD_init: basedn = $(AD_get ad_basedn)"
 
-	local gcname=$(AD_get gcname)
+	local gcname=$(AD_get ad_gcname)
 	if [ -z "${gcname}" ]
 	then
 
 		local rd="$(AD_get_root_domain "${domainname}")"
 		gcname="$(AD_get_domain_global_catalog_server "${rd}")"
-		AD_set gcname "${gcname}"
+		AD_set ad_gcname "${gcname}"
 	fi
 
 	local gchost="$(echo "${gcname}"|cut -f1 -d:)"
@@ -1062,21 +1070,21 @@
 		gcport=3268
 	fi
 
-	AD_set gchost "${gchost}"
-	AD_set gcport "${gcport}"
-	AD_log "AD_init: gchost = $(AD_get gchost), gcport = $(AD_get gcport)"
+	AD_set ad_gchost "${gchost}"
+	AD_set ad_gcport "${gcport}"
+	AD_log "AD_init: gchost = $(AD_get ad_gchost), gcport = $(AD_get ad_gcport)"
 
-	local krbname=$(AD_get krbname)
+	local krbname=$(AD_get ad_krbname)
 	if [ -z "${krbname}" ]
 	then
 		krbname="$(AD_get_kerberos_server ${domainname})"
-		AD_set krbname "${krbname}"
+		AD_set ad_krbname "${krbname}"
 	fi
 
 	krbsvc="$(echo "${krbname}"|cut -f1 -d/ -s)"
 	if [ -n "${krbsvc}" ]
 	then
-		AD_set krbsvc "${krbsvc}"
+		AD_set ad_krbsvc "${krbsvc}"
 	fi
 
 	krbhost="$(echo "${krbname}"|cut -f1 -d:)"
@@ -1087,15 +1095,15 @@
 		krbport=88
 	fi
 
-	AD_set krbhost "${krbhost}"
-	AD_set krbport "${krbport}"
-	AD_log "AD_init: krbhost = $(AD_get krbhost), krbport = $(AD_get krbport)"
+	AD_set ad_krbhost "${krbhost}"
+	AD_set ad_krbport "${krbport}"
+	AD_log "AD_init: krbhost = $(AD_get ad_krbhost), krbport = $(AD_get ad_krbport)"
 
-	local kpwdname=$(AD_get kpwdname)
+	local kpwdname=$(AD_get ad_kpwdname)
 	if [ -z "${kpwdname}" ]
 	then
 		kpwdname="$(AD_get_kpasswd_server ${domainname})"
-		AD_set kpwdname "${kpwdname}"
+		AD_set ad_kpwdname "${kpwdname}"
 	fi
 
 	kpwdhost="$(echo "${kpwdname}"|cut -f1 -d:)"
@@ -1106,9 +1114,9 @@
 		kpwdport=464
 	fi
 
-	AD_set kpwdhost "${kpwdhost}"
-	AD_set kpwdport "${kpwdport}"
-	AD_log "AD_init: kpwdhost = $(AD_get kpwdhost), kpwdport = $(AD_get kpwdport)"
+	AD_set ad_kpwdhost "${kpwdhost}"
+	AD_set ad_kpwdport "${kpwdport}"
+	AD_log "AD_init: kpwdhost = $(AD_get ad_kpwdhost), kpwdport = $(AD_get ad_kpwdport)"
 
 	AD_generate_config
 	return 0

Modified: trunk/nanobsd/Files/etc/directoryservice/rc.LDAP
===================================================================
--- trunk/nanobsd/Files/etc/directoryservice/rc.LDAP	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/directoryservice/rc.LDAP	2013-01-24 01:39:39 UTC (rev 13129)
@@ -87,28 +87,28 @@
 LDAP_show_config()
 {
 	printf "LDAP Config:\n"
-	printf "+------------------------------------------+\n"
-	printf "hostname:          %s\n" $(LDAP_get hostname)
-	printf "basedn:            %s\n" $(LDAP_get basedn)
-	printf "anonbind:          %s\n" $(LDAP_get anonbind)
-	printf "rootbasedn:        %s\n" $(LDAP_get rootbasedn)
-	printf "rootbindpw:        %s\n" $(LDAP_get rootbindpw)
-	printf "pwencryption:      %s\n" $(LDAP_get pwencryption)
-	printf "usersuffix:        %s\n" $(LDAP_get usersuffix)
-	printf "groupsuffix:       %s\n" $(LDAP_get groupsuffix)
-	printf "passwordsuffix:    %s\n" $(LDAP_get passwordsuffix)
-	printf "machinesuffix:     %s\n" $(LDAP_get machinesuffix)
-	printf "ssl:               %s\n" $(LDAP_get ssl)
-	printf "tls_cacertfile:    %s\n" $(LDAP_get tls_cacertfile)
-	#printf "options:           %s\n" $(LDAP_get options)
-	printf "+------------------------------------------+\n"
+	printf "+---------------------------------------------------------+\n"
+	printf "ldap_hostname:          %s\n" $(LDAP_get ldap_hostname)
+	printf "ldap_basedn:            %s\n" $(LDAP_get ldap_basedn)
+	printf "ldap_anonbind:          %s\n" $(LDAP_get ldap_anonbind)
+	printf "ldap_rootbasedn:        %s\n" $(LDAP_get ldap_rootbasedn)
+	printf "ldap_rootbindpw:        %s\n" $(LDAP_get ldap_rootbindpw)
+	printf "ldap_pwencryption:      %s\n" $(LDAP_get ldap_pwencryption)
+	printf "ldap_usersuffix:        %s\n" $(LDAP_get ldap_usersuffix)
+	printf "ldap_groupsuffix:       %s\n" $(LDAP_get ldap_groupsuffix)
+	printf "ldap_passwordsuffix:    %s\n" $(LDAP_get ldap_passwordsuffix)
+	printf "ldap_machinesuffix:     %s\n" $(LDAP_get ldap_machinesuffix)
+	printf "ldap_ssl:               %s\n" $(LDAP_get ldap_ssl)
+	printf "ldap_tls_cacertfile:    %s\n" $(LDAP_get ldap_tls_cacertfile)
+	#printf "ldap_options:           %s\n" $(LDAP_get ldap_options)
+	printf "+---------------------------------------------------------+\n"
 }
 
 LDAP_log()
 {
 	local args="$*"
 
-	local on="$(LDAP_get verbose_logging)"
+	local on="$(LDAP_get ldap_verbose_logging)"
 	if [ "${on}" = "1" ]
 	then
 		logger -t "LDAP" ${args} >/dev/null 2>&1
@@ -148,7 +148,7 @@
 	exec 0<"${tmpfile}"
 	while read -r line
 	do
-		var=$(echo ${line}|cut -f1 -d=|xargs|cut -f2- -d_)
+		var=$(echo ${line}|cut -f1 -d=|xargs)
 		val=$(echo ${line}|cut -f2- -d=|xargs)
 
 		LDAP_set "${var}" "${val}"

Modified: trunk/nanobsd/Files/etc/directoryservice/rc.NT4
===================================================================
--- trunk/nanobsd/Files/etc/directoryservice/rc.NT4	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/directoryservice/rc.NT4	2013-01-24 01:39:39 UTC (rev 13129)
@@ -89,7 +89,7 @@
 	exec 0<"${tmpfile}"
 	while read -r host
 	do
-		local dns_timeout="$(NT4_get dns_timeout)"
+		local dns_timeout="$(NT4_get nt4_dns_timeout)"
 		
 		NT4_log "__NT4_get_A_host: trying ${host}"
 
@@ -215,7 +215,12 @@
 		local var=\$$(printf "${v}")
 		local val=$(eval "echo ${var} 2>/dev/null")
 
-		__do_NT4_get "${prefix}" "${v}" 2>/dev/null
+		if [ -n "${val}" ]
+		then
+			echo "${val}"
+		else		
+			__do_NT4_get "${prefix}" "${v}" 2>/dev/null
+		fi
 	done
 }
 
@@ -242,12 +247,12 @@
 {
 	printf "NT4 Domain Config:\n"
 	printf "+------------------------------------------+\n"
-	printf "dcname:       %s\n" $(NT4_get dcname)
-	printf "dcip:         %s\n" $(NT4_get dcip)
-	printf "adminname:    %s\n" $(NT4_get adminname)
-	printf "adminpw:      %s\n" $(NT4_get adminpw)
-	printf "workgroup:    %s\n" $(NT4_get workgroup)
-	printf "netbiosname:  %s\n" $(NT4_get netbiosname)
+	printf "nt4_dcname:       %s\n" $(NT4_get nt4_dcname)
+	printf "nt4_dchost:       %s\n" $(NT4_get nt4_dchost)
+	printf "nt4_adminname:    %s\n" $(NT4_get nt4_adminname)
+	printf "nt4_adminpw:      %s\n" $(NT4_get nt4_adminpw)
+	printf "nt4_workgroup:    %s\n" $(NT4_get nt4_workgroup)
+	printf "nt4_netbiosname:  %s\n" $(NT4_get nt4_netbiosname)
 	printf "+------------------------------------------+\n"
 }
 
@@ -257,12 +262,12 @@
 	local adminpw="${2}"
 	local res
 
-	: ${adminname:="$(NT4_get adminname)"}
-	: ${adminpw:="$(NT4_get adminpw)"}
+	: ${adminname:="$(NT4_get nt4_adminname)"}
+	: ${adminpw:="$(NT4_get nt4_adminpw)"}
 
 	NT4_log "NT4_join_domain: net rpc join -U ${adminname}"
 
-	__NT4_tc "$(NT4_get timeout)" /usr/local/bin/net rpc join -U "${adminname}%${adminpw}"
+	__NT4_tc "$(NT4_get nt4_timeout)" /usr/local/bin/net rpc join -U "${adminname}%${adminpw}"
 	res=$?
 
 	local ok="Failed"
@@ -281,12 +286,12 @@
 	local adminpw="${2}"
 	local res
 
-	: ${adminname:="$(NT4_get adminname)"}
-	: ${adminpw:="$(NT4_get adminpw)"}
+	: ${adminname:="$(NT4_get nt4_adminname)"}
+	: ${adminpw:="$(NT4_get nt4_adminpw)"}
 
 	NT4_log "NT4_status_domain: net rpc status -U ${adminname}"
 
-	__NT4_tc "$(NT4_get timeout)" /usr/local/bin/net rpc testjoin -U "${adminname}%${adminpw}"
+	__NT4_tc "$(NT4_get nt4_timeout)" /usr/local/bin/net rpc testjoin -U "${adminname}%${adminpw}"
 	res=$?
 
 	local ok="Not okay"
@@ -305,12 +310,12 @@
 	local adminpw="${2}"
 	local res
 
-	: ${adminname:="$(NT4_get adminname)"}
-	: ${adminpw:="$(NT4_get adminpw)"}
+	: ${adminname:="$(NT4_get nt4_adminname)"}
+	: ${adminpw:="$(NT4_get nt4_adminpw)"}
 
 	NT4_log "NT4_leave_domain: net rpc leave -U ${adminname}"
 
-	__NT4_tc "$(NT4_get timeout)" /usr/local/bin/net rpc leave -U "${adminname}%${adminpw}"
+	__NT4_tc "$(NT4_get nt4_timeout)" /usr/local/bin/net rpc leave -U "${adminname}%${adminpw}"
 	res=$?
 
 	local ok="Failed"
@@ -327,7 +332,7 @@
 {
 	local args="$*"
 
-	local on="$(NT4_get verbose_logging)"
+	local on="$(NT4_get nt4_verbose_logging)"
 	if [ "${on}" = "1" ]
 	then
 		logger -t "NT4" ${args} >/dev/null 2>&1
@@ -359,7 +364,7 @@
 	exec 0<"${tmpfile}"
 	while read -r line
 	do
-		var=$(echo ${line}|cut -f1 -d=|xargs|cut -f2- -d_)
+		var=$(echo ${line}|cut -f1 -d=|xargs)
 		val=$(echo ${line}|cut -f2- -d=|xargs)
 
 		NT4_set "${var}" "${val}"
@@ -372,18 +377,18 @@
 {
 	NT4_load_database_values
 
-	NT4_set timeout "${NT4_NET_RPC_TIMEOUT}"
-	NT4_set dns_timeout "${NT4_DNS_TIMEOUT}"
+	NT4_set nt4_timeout "${NT4_NET_RPC_TIMEOUT}"
+	NT4_set nt4_dns_timeout "${NT4_DNS_TIMEOUT}"
 
-	dcname="$(NT4_get dcname)"
-	dcip="${dcname}"
+	local dcname="$(NT4_get nt4_dcname)"
+	local dchost="${dcname}"
 
 	if ! __NT4_isip "${dcname}"
 	then
-		local dcip="$(__NT4_get_A_record ${dcname})"
-		NT4_set dcip "${dcip}"
+		dchost="$(__NT4_get_A_record ${dcname})"
+		NT4_set nt4_dchost "${dchost}"
 	else
-		NT4_set dcip "${dcname}"
+		NT4_set nt4_dchost "${dcname}"
 	fi
 
 	return 0

Modified: trunk/nanobsd/Files/etc/rc.d/ix-activedirectory
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-activedirectory	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/rc.d/ix-activedirectory	2013-01-24 01:39:39 UTC (rev 13129)
@@ -33,8 +33,8 @@
 generate_ldap_conf()
 {
 	local ldapconf="${LDAP_CONF}"
-	local dcname="$(AD_get dcname)"
-	local domainname="$(AD_get domainname)"
+	local dcname="$(AD_get ad_dcname)"
+	local domainname="$(AD_get ad_domainname)"
 	local basedn="$(get_basename "${domainname}")"
 
 	echo "HOST ${dcname}" > "${ldapconf}"
@@ -45,10 +45,10 @@
 {
 	local nssconf="${NSS_LDAP_CONF}"
 	local secret="${NSS_LDAP_SECRET}"
-	local dcname="$(AD_get dcname)"
-	local domainname="$(AD_get domainname)"
-	local adminname="$(AD_get adminname)"
-	local adminpw="$(AD_get adminpw)"
+	local dcname="$(AD_get ad_dcname)"
+	local domainname="$(AD_get ad_domainname)"
+	local adminname="$(AD_get ad_adminname)"
+	local adminpw="$(AD_get ad_adminpw)"
 	local base="$(get_basename "${domainname}")"
 
 	[ -z "${dcname}" -o -z "${base}" ] && return 1 

Modified: trunk/nanobsd/Files/etc/rc.d/ix-kerberos
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-kerberos	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/rc.d/ix-kerberos	2013-01-24 01:39:39 UTC (rev 13129)
@@ -15,12 +15,12 @@
 {
 	AD_init
 
-	local krbhost=$(AD_get krbhost)
-	local krbport=$(AD_get krbport)
-	local krbsvc=$(AD_get krbsvc)
-	local kpwdhost=$(AD_get kpwdhost)
-	local kpwdport=$(AD_get kpwdport)
-	local domainname=$(AD_get domainname)
+	local krbhost=$(AD_get ad_krbhost)
+	local krbport=$(AD_get ad_krbport)
+	local krbsvc=$(AD_get ad_krbsvc)
+	local kpwdhost=$(AD_get ad_kpwdhost)
+	local kpwdport=$(AD_get ad_kpwdport)
+	local domainname=$(AD_get ad_domainname)
 	local template="${PATH_KRB5_TEMPLATE}"
 
 	AD_log "generate_krb5_conf: krbhost=${krbhost}, kpwdhost=${kpwdhost}, " \

Modified: trunk/nanobsd/Files/etc/rc.d/ix-kinit
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-kinit	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/rc.d/ix-kinit	2013-01-24 01:39:39 UTC (rev 13129)
@@ -20,9 +20,9 @@
 	then
 		AD_init
 
-		local domainname=$(AD_get domainname)
-		local adminname=$(AD_get adminname)
-		local adminpw=$(AD_get adminpw)
+		local domainname=$(AD_get ad_domainname)
+		local adminname=$(AD_get ad_adminname)
+		local adminpw=$(AD_get ad_adminpw)
 
 		if [ -n "${adminname}" -a -n "${domainname}" -a -n "${adminpw}" ]
 		then
@@ -60,9 +60,9 @@
 	then
 		AD_init
 
-		local domainname=$(AD_get domainname)
-		local adminname=$(AD_get adminname)
-		local adminpw=$(AD_get adminpw)
+		local domainname=$(AD_get ad_domainname)
+		local adminname=$(AD_get ad_adminname)
+		local adminpw=$(AD_get ad_adminpw)
 
 		if [ -n "${adminname}" -a -n "${domainname}" -a -n "${adminpw}" ]
 		then

Modified: trunk/nanobsd/Files/etc/rc.d/ix-samba
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-samba	2013-01-24 00:43:09 UTC (rev 13128)
+++ trunk/nanobsd/Files/etc/rc.d/ix-samba	2013-01-24 01:39:39 UTC (rev 13129)
@@ -67,17 +67,17 @@
 
 generate_nt4_smbconf()
 {
-	local dcip="$(NT4_get dcip)"
-	local nt4_netbiosname="$(NT4_get netbiosname)"
-	local nt4_workgroup="$(NT4_get workgroup)"
+	local dchost="$(NT4_get nt4_dchost)"
+	local netbiosname="$(NT4_get nt4_netbiosname)"
+	local workgroup="$(NT4_get nt4_workgroup)"
 
 	cat<<-__EOF__ >"${LMHOSTS}"
-	${dcip}	${nt4_workgroup}
+	${dchost}	${workgroup}
 __EOF__
 	
 	cat<<-__EOF__
-	    netbios name = ${nt4_netbiosname}
-	    workgroup = ${nt4_workgroup}
+	    netbios name = ${netbiosname}
+	    workgroup = ${workgroup}
 
 	    security = domain
 	    #password server = ...
@@ -96,36 +96,36 @@
 
 generate_activedirectory_smbconf()
 {
-	local domain=$(echo "$(AD_get domainname)"|tr a-z A-Z)
-	local ad_netbiosname="$(AD_get netbiosname)"
-	local ad_workgroup="$(AD_get workgroup)"
+	local domain=$(echo "$(AD_get ad_domainname)"|tr a-z A-Z)
+	local netbiosname="$(AD_get ad_netbiosname)"
+	local workgroup="$(AD_get ad_workgroup)"
 	local trusted="no"
 	local default="no"
 	local homedir="/home/%D/%U"
 
 	mkdir -p ${FREENAS_CACHEDIR}/.samba
 
-	if [ "$(AD_get allow_trusted_doms)" = "1" ]
+	if [ "$(AD_get ad_allow_trusted_doms)" = "1" ]
 	then
 		trusted="yes"
 	fi
-	if [ "$(AD_get use_default_domain)" = "1" ]
+	if [ "$(AD_get ad_use_default_domain)" = "1" ]
 	then
 		default="yes"
 		homedir="/home/%U"
 	fi
 
 	cat<<-__EOF__
-	    netbios name = ${ad_netbiosname}
-	    workgroup = ${ad_workgroup}
+	    netbios name = ${netbiosname}
+	    workgroup = ${workgroup}
 
 	    security = ADS
 	    realm = ${domain}
 	    client use spnego = yes
 	    cache directory = ${FREENAS_CACHEDIR}/.samba
 
-	    wins server = $(AD_get dchost)
-	    password server = $(AD_get dchost)
+	    wins server = $(AD_get ad_dchost)
+	    password server = $(AD_get ad_dchost)
 
 	    local master = no
 	    domain master = no
@@ -154,11 +154,11 @@
 	    template homedir = ${homedir}
 
 __EOF__
-	if [ "$(AD_get unix_extensions)" = "0" ]
+	if [ "$(AD_get ad_unix_extensions)" = "0" ]
 	then
 		cat<<-__EOF__
-		    idmap config $(AD_get workgroup): backend = rid
-		    idmap config $(AD_get workgroup): range = 20000-20000000
+		    idmap config $(AD_get ad_workgroup): backend = rid
+		    idmap config $(AD_get ad_workgroup): range = 20000-20000000
 __EOF__
 	fi
 }
@@ -171,35 +171,35 @@
 {
 	echo "    security = user"
 
-	if [ -n "$(LDAP_get hostname)" ]; then
-		echo "    passdb backend = ldapsam:ldap://$(LDAP_get hostname)"
+	if [ -n "$(LDAP_get ldap_hostname)" ]; then
+		echo "    passdb backend = ldapsam:ldap://$(LDAP_get ldap_hostname)"
 	fi
 
-	if [ -n "$(LDAP_get rootbasedn)" ]; then
-	    echo "    ldap admin dn = $(LDAP_get rootbasedn)"
+	if [ -n "$(LDAP_get ldap_rootbasedn)" ]; then
+	    echo "    ldap admin dn = $(LDAP_get ldap_rootbasedn)"
 	fi
 
-	if [ -n "$(LDAP_get rootbindpw)" ]; then
-		/usr/local/bin/smbpasswd -w "$(LDAP_get rootbindpw)" >/dev/null 2>&1
+	if [ -n "$(LDAP_get ldap_rootbindpw)" ]; then
+		/usr/local/bin/smbpasswd -w "$(LDAP_get ldap_rootbindpw)" >/dev/null 2>&1
 	fi
 
-	if [ -n "$(LDAP_get basedn)" ]; then
-	    echo "    ldap suffix = $(LDAP_get basedn)"
+	if [ -n "$(LDAP_get ldap_basedn)" ]; then
+	    echo "    ldap suffix = $(LDAP_get ldap_basedn)"
 	fi
 
-	if [ -n "$(LDAP_get usersuffix)" ]; then
-	    echo "    ldap user suffix = $(LDAP_get usersuffix)"
+	if [ -n "$(LDAP_get ldap_usersuffix)" ]; then
+	    echo "    ldap user suffix = $(LDAP_get ldap_usersuffix)"
 	fi
 
-	if [ -n "$(LDAP_get groupsuffix)" ]; then
-	    echo "    ldap group suffix = $(LDAP_get groupsuffix)"
+	if [ -n "$(LDAP_get ldap_groupsuffix)" ]; then
+	    echo "    ldap group suffix = $(LDAP_get ldap_groupsuffix)"
 	fi
 
-	if [ -n "$(LDAP_get machinesuffix)" ]; then
-	    echo "    ldap machine suffix = $(LDAP_get machinesuffix)"
+	if [ -n "$(LDAP_get ldap_machinesuffix)" ]; then
+	    echo "    ldap machine suffix = $(LDAP_get ldap_machinesuffix)"
 	fi
 
-	if [ "$(LDAP_get ssl)" = "start_tls" ]; then
+	if [ "$(LDAP_get ldap_ssl)" = "start_tls" ]; then
 		echo "    ldap ssl = start tls"
 	else
 		echo "    ldap ssl = off"
@@ -432,7 +432,7 @@
 
 		if [ "${cifs_homedir}" = "1" ]; then
 
-			if [ "${ad_enable}" = "1" -a "$(AD_get use_default_domain)" = "1" ]
+			if [ "${ad_enable}" = "1" -a "$(AD_get ad_use_default_domain)" = "1" ]
 			then
 				valid_users_path="%U"
 				valid_users="%U"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13220
          http://freenas.svn.sourceforge.net/freenas/?rev=13220&view=rev
Author:   zippybr
Date:     2013-02-01 15:23:39 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Merge from TrueNAS (r8589):

----
Use "pxz" (parallel xz) to speed up build.

This shaves at least 10 minutes off compressing
the images at the end of the build.
----

To use pxz:

env XZ=pxz build/do_build.sh


Conflicts:
	nanobsd/os-base
	truenas_vars

Revision Links:
--------------
    http://freenas.svn.sourceforge.net/freenas/?rev=8589&view=rev

Modified Paths:
--------------
    trunk/build/nano_env
    trunk/nanobsd/os-base

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2013-02-01 11:53:33 UTC (rev 13219)
+++ trunk/build/nano_env	2013-02-01 15:23:39 UTC (rev 13220)
@@ -148,4 +148,7 @@
 unset PACKAGEROOT
 unset PACKAGESITE
 
+: ${XZ=xz}
+export XZ
+
 # vim: syntax=sh

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-02-01 11:53:33 UTC (rev 13219)
+++ trunk/nanobsd/os-base	2013-02-01 15:23:39 UTC (rev 13220)
@@ -772,11 +772,10 @@
 		# NOTE: keep in synch with create_*_diskimage.
 		mv "$NANO_DISKIMGDIR/_.disk.image" "$firmware_img"
 
-		xz --keep --verbose -9 < "$firmware_img" > \
+		${XZ} --keep --verbose -9 < "$firmware_img" > \
 		    "$gui_upgrade_bname.xz"
 
-		tar --options=xz:compression-level=9 -cJpvf \
-		    "$gui_upgrade_bname.txz" \
+		tar -cpvf - \
 			-C "$NANO_WORLDDIR" \
 				etc/avatar.conf \
 			-C "$AVATAR_ROOT/nanobsd/Installer" \
@@ -784,7 +783,8 @@
 			-C "$AVATAR_ROOT/nanobsd/GUI_Upgrade" \
 				. \
 			-C "$NANO_DISKIMGDIR" \
-				${firmware_img##*/}
+				${firmware_img##*/} \
+		    | ${XZ} -9 -cz > "$gui_upgrade_bname.txz"
 
 		) > "${gui_image_log}" 2>&1
 
@@ -801,7 +801,7 @@
 	# added because pc-sysinstall doesn't support raw images
 	# (-.-).
 	mv "$NANO_DISKIMGDIR/$NANO_IMGNAME" "$full_image"
-	xz --verbose -9 -f "$full_image"
+	time ${XZ} --verbose -9 -f "$full_image"
 
 	) > "${full_image_log}" 2>&1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13224
          http://freenas.svn.sourceforge.net/freenas/?rev=13224&view=rev
Author:   jpaetzel
Date:     2013-02-01 16:55:43 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
r13223 tried to be too cute and didn't work in one case.

Revision Links:
--------------
    http://freenas.svn.sourceforge.net/freenas/?rev=13223&view=rev

Modified Paths:
--------------
    trunk/build/nano_env
    trunk/nanobsd/FREENAS.amd64
    trunk/nanobsd/FREENAS.i386
    trunk/nanobsd/Files/etc/devfs.rules
    trunk/nanobsd/os-base

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2013-02-01 16:37:08 UTC (rev 13223)
+++ trunk/build/nano_env	2013-02-01 16:55:43 UTC (rev 13224)
@@ -155,8 +155,12 @@
 # TODO: If XZ is set to something other than pxz or xz and pxz is installed
 # we may as well use pxz here.
 
-if [ $(which pxz) -a -z ${XZ} -o "${XZ}" = "pxz" ]; then
-    XZ=pxz
+if [ $(which pxz) ]; then
+    if [ x"${XZ}" == "xpxz" -a -z ${XZ} ]; then
+        XZ=pxz
+    else
+        XZ=xz
+    fi
 else
     XZ=xz
 fi

Modified: trunk/nanobsd/FREENAS.amd64
===================================================================
--- trunk/nanobsd/FREENAS.amd64	2013-02-01 16:37:08 UTC (rev 13223)
+++ trunk/nanobsd/FREENAS.amd64	2013-02-01 16:55:43 UTC (rev 13224)
@@ -90,6 +90,7 @@
 options		VIMAGE
 device		carp
 device		snp
+options		NETGRAPH
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: trunk/nanobsd/FREENAS.i386
===================================================================
--- trunk/nanobsd/FREENAS.i386	2013-02-01 16:37:08 UTC (rev 13223)
+++ trunk/nanobsd/FREENAS.i386	2013-02-01 16:55:43 UTC (rev 13224)
@@ -90,6 +90,7 @@
 options		VIMAGE
 device		carp
 device		snp
+options		NETGRAPH
 
 options		KVA_PAGES=512
 

Modified: trunk/nanobsd/Files/etc/devfs.rules
===================================================================
--- trunk/nanobsd/Files/etc/devfs.rules	2013-02-01 16:37:08 UTC (rev 13223)
+++ trunk/nanobsd/Files/etc/devfs.rules	2013-02-01 16:55:43 UTC (rev 13224)
@@ -2,4 +2,5 @@
 add path 'usbctl' mode 660 group uucp
 add path 'usb/*' mode 660 group uucp
 add path 'ttyU*' mode 660 group uucp
-
+add path vboxdrv0 unhide
+add path vboxnetctl unhide

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-02-01 16:37:08 UTC (rev 13223)
+++ trunk/nanobsd/os-base	2013-02-01 16:55:43 UTC (rev 13224)
@@ -153,6 +153,7 @@
 # Pull in common definitions.
 . ${NANO_CFG_BASE}/common
 
+add_port emulators/virtualbox-ose-kmod
 add_port archivers/lzo2
 add_port security/openvpn
 add_port converters/libiconv

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13225
          http://freenas.svn.sourceforge.net/freenas/?rev=13225&view=rev
Author:   jpaetzel
Date:     2013-02-01 18:32:38 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Revert 13324, which contained a bunch of stuff that shouldn't
have been in the rev.

Modified Paths:
--------------
    trunk/build/nano_env
    trunk/nanobsd/FREENAS.amd64
    trunk/nanobsd/FREENAS.i386
    trunk/nanobsd/Files/etc/devfs.rules
    trunk/nanobsd/os-base

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2013-02-01 16:55:43 UTC (rev 13224)
+++ trunk/build/nano_env	2013-02-01 18:32:38 UTC (rev 13225)
@@ -155,12 +155,8 @@
 # TODO: If XZ is set to something other than pxz or xz and pxz is installed
 # we may as well use pxz here.
 
-if [ $(which pxz) ]; then
-    if [ x"${XZ}" == "xpxz" -a -z ${XZ} ]; then
-        XZ=pxz
-    else
-        XZ=xz
-    fi
+if [ $(which pxz) -a -z ${XZ} -o "${XZ}" = "pxz" ]; then
+    XZ=pxz
 else
     XZ=xz
 fi

Modified: trunk/nanobsd/FREENAS.amd64
===================================================================
--- trunk/nanobsd/FREENAS.amd64	2013-02-01 16:55:43 UTC (rev 13224)
+++ trunk/nanobsd/FREENAS.amd64	2013-02-01 18:32:38 UTC (rev 13225)
@@ -90,7 +90,6 @@
 options		VIMAGE
 device		carp
 device		snp
-options		NETGRAPH
 
 # Make an SMP-capable kernel by default
 options 	SMP			# Symmetric MultiProcessor Kernel

Modified: trunk/nanobsd/FREENAS.i386
===================================================================
--- trunk/nanobsd/FREENAS.i386	2013-02-01 16:55:43 UTC (rev 13224)
+++ trunk/nanobsd/FREENAS.i386	2013-02-01 18:32:38 UTC (rev 13225)
@@ -90,7 +90,6 @@
 options		VIMAGE
 device		carp
 device		snp
-options		NETGRAPH
 
 options		KVA_PAGES=512
 

Modified: trunk/nanobsd/Files/etc/devfs.rules
===================================================================
--- trunk/nanobsd/Files/etc/devfs.rules	2013-02-01 16:55:43 UTC (rev 13224)
+++ trunk/nanobsd/Files/etc/devfs.rules	2013-02-01 18:32:38 UTC (rev 13225)
@@ -2,5 +2,4 @@
 add path 'usbctl' mode 660 group uucp
 add path 'usb/*' mode 660 group uucp
 add path 'ttyU*' mode 660 group uucp
-add path vboxdrv0 unhide
-add path vboxnetctl unhide
+

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-02-01 16:55:43 UTC (rev 13224)
+++ trunk/nanobsd/os-base	2013-02-01 18:32:38 UTC (rev 13225)
@@ -153,7 +153,6 @@
 # Pull in common definitions.
 . ${NANO_CFG_BASE}/common
 
-add_port emulators/virtualbox-ose-kmod
 add_port archivers/lzo2
 add_port security/openvpn
 add_port converters/libiconv

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13231
          http://freenas.svn.sourceforge.net/freenas/?rev=13231&view=rev
Author:   jpaetzel
Date:     2013-02-01 22:06:07 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
XZ conflicts with a variable the ports tree uses, which then blows
up building the plugins, so change the variable used by the compression
to XZ_BIN

Modified Paths:
--------------
    trunk/build/nano_env
    trunk/nanobsd/os-base

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2013-02-01 21:49:17 UTC (rev 13230)
+++ trunk/build/nano_env	2013-02-01 22:06:07 UTC (rev 13231)
@@ -152,18 +152,18 @@
 # if it's installed.
 # Since the only valid values are pxz and xz setting env XZ=whatever
 # will cause the build to fall back to using xz.
-# TODO: If XZ is set to something other than pxz or xz and pxz is installed
+# TODO: If XZ_BIN is set to something other than pxz or xz and pxz is installed
 # we may as well use pxz here.
 
 if [ $(which pxz) ]; then 
-    if [ x"${XZ}" == "xpxz" -o -z ${XZ} ]; then 
-        XZ=pxz 
+    if [ x"${XZ_BIN}" == "xpxz" -o -z ${XZ} ]; then 
+        XZ_BIN=pxz 
     else 
-        XZ=xz 
+        XZ_BIN=xz 
     fi 
 else
-    XZ=xz
+    XZ_BIN=xz
 fi
-export XZ
+export XZ_BIN
 
 # vim: syntax=sh

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-02-01 21:49:17 UTC (rev 13230)
+++ trunk/nanobsd/os-base	2013-02-01 22:06:07 UTC (rev 13231)
@@ -772,7 +772,7 @@
 		# NOTE: keep in synch with create_*_diskimage.
 		mv "$NANO_DISKIMGDIR/_.disk.image" "$firmware_img"
 
-		${XZ} --keep --verbose -9 < "$firmware_img" > \
+		${XZ_BIN} --keep --verbose -9 < "$firmware_img" > \
 		    "$gui_upgrade_bname.xz"
 
 		tar -cpvf - \
@@ -784,7 +784,7 @@
 				. \
 			-C "$NANO_DISKIMGDIR" \
 				${firmware_img##*/} \
-		    | ${XZ} -9 -cz > "$gui_upgrade_bname.txz"
+		    | ${XZ_BIN} -9 -cz > "$gui_upgrade_bname.txz"
 
 		) > "${gui_image_log}" 2>&1
 
@@ -801,7 +801,7 @@
 	# added because pc-sysinstall doesn't support raw images
 	# (-.-).
 	mv "$NANO_DISKIMGDIR/$NANO_IMGNAME" "$full_image"
-	time ${XZ} --verbose -9 -f "$full_image"
+	time ${XZ_BIN} --verbose -9 -f "$full_image"
 
 	) > "${full_image_log}" 2>&1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13237
          http://freenas.svn.sourceforge.net/freenas/?rev=13237&view=rev
Author:   zippybr
Date:     2013-02-01 23:04:41 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Add virtio toggle to the UI and loader enable bits

Modified Paths:
--------------
    trunk/gui/system/forms.py
    trunk/gui/system/models.py
    trunk/nanobsd/Files/etc/rc.d/ix-loader

Added Paths:
-----------
    trunk/gui/system/migrations/0049_auto__add_field_advanced_adv_virtio.py

Modified: trunk/gui/system/forms.py
===================================================================
--- trunk/gui/system/forms.py	2013-02-01 23:03:52 UTC (rev 13236)
+++ trunk/gui/system/forms.py	2013-02-01 23:04:41 UTC (rev 13237)
@@ -310,6 +310,7 @@
         self.instance._original_adv_consolemsg = self.instance.adv_consolemsg
         self.instance._original_adv_advancedmode = self.instance.adv_advancedmode
         self.instance._original_adv_autotune = self.instance.adv_autotune
+        self.instance._original_adv_virtio = self.instance.adv_virtio
 
     def save(self):
         super(AdvancedForm, self).save()
@@ -334,7 +335,11 @@
                 notifier().reload("loader")
                 loader_reloaded = True
         if (
-            self.instance._original_adv_autotune != self.instance.adv_autotune
+            (
+                self.instance._original_adv_autotune != self.instance.adv_autotune
+                or
+                self.instance._original_adv_virtio != self.instance.adv_virtio
+            )
             and not loader_reloaded
         ):
             notifier().reload("loader")

Added: trunk/gui/system/migrations/0049_auto__add_field_advanced_adv_virtio.py
===================================================================
--- trunk/gui/system/migrations/0049_auto__add_field_advanced_adv_virtio.py	                        (rev 0)
+++ trunk/gui/system/migrations/0049_auto__add_field_advanced_adv_virtio.py	2013-02-01 23:04:41 UTC (rev 13237)
@@ -0,0 +1,194 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Advanced.adv_virtio'
+        db.add_column('system_advanced', 'adv_virtio',
+                      self.gf('django.db.models.fields.BooleanField')(default=0),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Advanced.adv_virtio'
+        db.delete_column('system_advanced', 'adv_virtio')
+
+
+    models = {
+        'storage.disk': {
+            'Meta': {'ordering': "['disk_name']", 'object_name': 'Disk'},
+            'disk_acousticlevel': ('django.db.models.fields.CharField', [], {'default': "'Disabled'", 'max_length': '120'}),
+            'disk_advpowermgmt': ('django.db.models.fields.CharField', [], {'default': "'Disabled'", 'max_length': '120'}),
+            'disk_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'disk_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'disk_hddstandby': ('django.db.models.fields.CharField', [], {'default': "'Always On'", 'max_length': '120'}),
+            'disk_identifier': ('django.db.models.fields.CharField', [], {'max_length': '42'}),
+            'disk_multipath_member': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_multipath_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'disk_serial': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'disk_smartoptions': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'disk_togglesmart': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'disk_transfermode': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.advanced': {
+            'Meta': {'object_name': 'Advanced'},
+            'adv_advancedmode': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_anonstats': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_anonstats_token': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'adv_autotune': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_consolemenu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_consolemsg': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_consolescreensaver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_firmwarevc': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_motd': ('django.db.models.fields.TextField', [], {'max_length': '1024'}),
+            'adv_powerdaemon': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_serialconsole': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_serialspeed': ('django.db.models.fields.CharField', [], {'default': "'9600'", 'max_length': '120'}),
+            'adv_swapondrive': ('django.db.models.fields.IntegerField', [], {'default': '2'}),
+            'adv_systembeep': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_traceback': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'adv_tuning': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_virtio': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'adv_zeroconfbonjour': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.alert': {
+            'Meta': {'object_name': 'Alert'},
+            'dismiss': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+        },
+        'system.cronjob': {
+            'Meta': {'ordering': "['cron_description', 'cron_user']", 'object_name': 'CronJob'},
+            'cron_command': ('django.db.models.fields.TextField', [], {}),
+            'cron_daymonth': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'cron_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'cron_description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'cron_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cron_hour': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'cron_minute': ('django.db.models.fields.CharField', [], {'default': "'00'", 'max_length': '100'}),
+            'cron_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,a,b,c'", 'max_length': '100'}),
+            'cron_stderr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cron_stdout': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cron_user': ('freenasUI.freeadmin.models.UserField', [], {'max_length': '60'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.email': {
+            'Meta': {'object_name': 'Email'},
+            'em_fromemail': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'em_outgoingserver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'em_pass': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'em_port': ('django.db.models.fields.IntegerField', [], {'default': '25'}),
+            'em_security': ('django.db.models.fields.CharField', [], {'default': "'plain'", 'max_length': '120'}),
+            'em_smtp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'em_user': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'system.initshutdown': {
+            'Meta': {'object_name': 'InitShutdown'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ini_command': ('django.db.models.fields.CharField', [], {'max_length': '300', 'blank': 'True'}),
+            'ini_script': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ini_type': ('django.db.models.fields.CharField', [], {'default': "'command'", 'max_length': '15'}),
+            'ini_when': ('django.db.models.fields.CharField', [], {'max_length': '15'})
+        },
+        'system.ntpserver': {
+            'Meta': {'ordering': "['ntp_address']", 'object_name': 'NTPServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ntp_address': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ntp_burst': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ntp_iburst': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ntp_maxpoll': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ntp_minpoll': ('django.db.models.fields.IntegerField', [], {'default': '6'}),
+            'ntp_prefer': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'system.rsync': {
+            'Meta': {'ordering': "['rsync_path', 'rsync_desc']", 'object_name': 'Rsync'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsync_archive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_compress': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_daymonth': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'rsync_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'rsync_delete': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_desc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_direction': ('django.db.models.fields.CharField', [], {'default': "'push'", 'max_length': '10'}),
+            'rsync_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_extra': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsync_hour': ('django.db.models.fields.CharField', [], {'default': "'*'", 'max_length': '100'}),
+            'rsync_minute': ('django.db.models.fields.CharField', [], {'default': "'00'", 'max_length': '100'}),
+            'rsync_mode': ('django.db.models.fields.CharField', [], {'default': "'module'", 'max_length': '20'}),
+            'rsync_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,a,b,c'", 'max_length': '100'}),
+            'rsync_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsync_preserveattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_preserveperm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_quiet': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'rsync_recursive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_remotehost': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsync_remotemodule': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_remotepath': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsync_remoteport': ('django.db.models.fields.SmallIntegerField', [], {'default': '22'}),
+            'rsync_times': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'rsync_user': ('freenasUI.freeadmin.models.UserField', [], {'max_length': '60'})
+        },
+        'system.settings': {
+            'Meta': {'object_name': 'Settings'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'stg_directoryservice': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'stg_guiaddress': ('django.db.models.fields.CharField', [], {'default': "'0.0.0.0'", 'max_length': '120', 'blank': 'True'}),
+            'stg_guiport': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120', 'blank': 'True'}),
+            'stg_guiprotocol': ('django.db.models.fields.CharField', [], {'default': "'http'", 'max_length': '120'}),
+            'stg_guiv6address': ('django.db.models.fields.CharField', [], {'default': "'::'", 'max_length': '120', 'blank': 'True'}),
+            'stg_kbdmap': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'stg_language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '120'}),
+            'stg_syslogserver': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120', 'blank': 'True'}),
+            'stg_timezone': ('django.db.models.fields.CharField', [], {'default': "'America/Los_Angeles'", 'max_length': '120'})
+        },
+        'system.smarttest': {
+            'Meta': {'ordering': "['smarttest_type']", 'object_name': 'SMARTTest'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smarttest_daymonth': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'smarttest_dayweek': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7'", 'max_length': '100'}),
+            'smarttest_desc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'smarttest_disks': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['storage.Disk']", 'symmetrical': 'False'}),
+            'smarttest_hour': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'smarttest_month': ('django.db.models.fields.CharField', [], {'default': "'1,2,3,4,5,6,7,8,9,10,a,b,c'", 'max_length': '100'}),
+            'smarttest_type': ('django.db.models.fields.CharField', [], {'max_length': '2'})
+        },
+        'system.ssl': {
+            'Meta': {'object_name': 'SSL'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssl_certfile': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'ssl_city': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_common': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_country': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_email': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_org': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_state': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'ssl_unit': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'})
+        },
+        'system.sysctl': {
+            'Meta': {'ordering': "['sysctl_mib']", 'object_name': 'Sysctl'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'sysctl_comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'sysctl_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'sysctl_mib': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'}),
+            'sysctl_value': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'system.tunable': {
+            'Meta': {'ordering': "['tun_var']", 'object_name': 'Tunable'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tun_comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
+            'tun_enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'tun_value': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'tun_var': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '50'})
+        }
+    }
+
+    complete_apps = ['system']

Modified: trunk/gui/system/models.py
===================================================================
--- trunk/gui/system/models.py	2013-02-01 23:03:52 UTC (rev 13236)
+++ trunk/gui/system/models.py	2013-02-01 23:04:41 UTC (rev 13237)
@@ -217,6 +217,9 @@
     adv_autotune = models.BooleanField(
             verbose_name=_("Enable autotune"),
             default=False)
+    adv_virtio = models.BooleanField(
+            verbose_name=_("Enable Virtio"),
+            default=False)
     adv_anonstats = models.BooleanField(
             verbose_name=_("Enable report anonymous statistics"),
             default=True,

Modified: trunk/nanobsd/Files/etc/rc.d/ix-loader
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-loader	2013-02-01 23:03:52 UTC (rev 13236)
+++ trunk/nanobsd/Files/etc/rc.d/ix-loader	2013-02-01 23:04:41 UTC (rev 13237)
@@ -47,6 +47,33 @@
 	return $rc
 }
 
+loader_virtio()
+{
+	local virtio_enable="0"
+
+	virtio_enable=$(${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+	SELECT
+		adv_virtio
+
+	FROM
+		system_advanced
+
+	ORDER BY
+		-id
+	LIMIT 1")
+
+	if [ "${virtio_enable}" != "0" ]; then
+		cat << __EOF__
+virtio_load="YES"
+virtio_pci_load="YES"
+virtio_blk_load="YES"
+if_vtnet_load="YES"
+virtio_balloon_load="YES"
+__EOF__
+	fi
+}
+
+
 loader_serial()
 {
 	local serial_enable=0
@@ -118,7 +145,7 @@
 	local settings
 	local tmp
 
-	settings="serial user"
+	settings="serial user virtio"
 
 	tmp=$(mktemp /tmp/tmp.XXXXXX)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13270
          http://freenas.svn.sourceforge.net/freenas/?rev=13270&view=rev
Author:   jhixson
Date:     2013-02-07 02:28:33 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
Add SSL passphrase field to SSL model and form. If a passphrase is specified, use it to strip it out of the private key. Modify code to work with files that contain a chain of certificates. Modify form to look for a modulus that matches the private key no matter how many certificates are in a file.

Modified Paths:
--------------
    trunk/gui/system/forms.py
    trunk/gui/system/models.py
    trunk/nanobsd/Files/etc/rc.d/ix-ssl

Modified: trunk/gui/system/forms.py
===================================================================
--- trunk/gui/system/forms.py	2013-02-05 16:00:32 UTC (rev 13269)
+++ trunk/gui/system/forms.py	2013-02-07 02:28:33 UTC (rev 13270)
@@ -433,86 +433,141 @@
 
 
 class SSLForm(ModelForm):
+    ssl_passphrase2 = forms.CharField(max_length=120,
+            label=_("Confirm Passphrase"),
+            widget=forms.widgets.PasswordInput(),
+            required=False,
+            )
 
     class Meta:
         model = models.SSL
+        widgets = {
+            'ssl_passphrase': forms.widgets.PasswordInput(render_value=False),
+            }
 
-    def clean_ssl_certfile(self):
-        certfile = self.cleaned_data.get("ssl_certfile")
-        reg = re.search(
-            r'(-----BEGIN ([DR]SA) PRIVATE KEY-----.*?'
-            r'-----END \2 PRIVATE KEY-----)',
-            certfile,
-            re.M|re.S)
-        if not reg:
-            raise forms.ValidationError(
-                _("RSA or DSA private key not found")
-                )
-        priv = reg.group()
+    def __init__(self, *args, **kwargs):
+        super(SSLForm, self).__init__(*args, **kwargs)
+        self.fields.keyOrder = [
+            'ssl_org',
+            'ssl_unit',
+            'ssl_email',
+            'ssl_city',
+            'ssl_state',
+            'ssl_country',
+            'ssl_common',
+            'ssl_passphrase',
+            'ssl_passphrase2',
+            'ssl_certfile',
+            ]
 
-        priv_file = tempfile.mktemp(dir='/tmp/')
-        with open(priv_file, 'w') as f:
-            f.write(priv)
+    def clean_ssl_passphrase2(self):
+        passphrase1 = self.cleaned_data.get("ssl_passphrase")
+        passphrase2 = self.cleaned_data.get("ssl_passphrase2")
+        if passphrase1 != passphrase2:
+            raise forms.ValidationError(_("The two passphrase fields didn't match."))
+        return passphrase2
 
+    def get_x509_modulus(self, x509_file_path):
+        if not x509_file_path:
+            return None
+
         proc = subprocess.Popen([
             "/usr/bin/openssl",
-            "rsa",
+            "x509",
             "-noout",
             "-modulus",
-            "-in", priv_file,
+            "-in", x509_file_path,
             ],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             )
-        modulus1, err = proc.communicate()
-        os.unlink(priv_file)
+
+        modulus, err = proc.communicate()
         if proc.returncode != 0:
-            raise forms.ValidationError(
-                _("RSA or DSA private key is not valid: %s") % err
-                )
+            return None
 
-        cert = certfile.split('-----BEGIN CERTIFICATE-----')
-        if len(priv) < 2:
-            raise forms.ValidationError(
-                _("Certificate begin tag not found")
-                )
-        cert = cert[1].split('-----END CERTIFICATE-----')
-        if len(priv) < 2:
-            raise forms.ValidationError(
-                _("Certificate end tag not found")
-                )
-        cert = cert[0]
+        return modulus.strip()
 
-        x509_file = tempfile.mktemp(dir='/tmp/')
-        with open(x509_file, 'w') as f:
-            f.write('-----BEGIN CERTIFICATE-----')
-            f.write(cert)
-            f.write('-----END CERTIFICATE-----')
+    def get_key_modulus(self, key_file_path, type='rsa'):
+        if not key_file_path:
+            return None
 
         proc = subprocess.Popen([
             "/usr/bin/openssl",
-            "x509",
+            type,
             "-noout",
             "-modulus",
-            "-in", x509_file,
+            "-in", key_file_path,
             ],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             )
-        modulus2, err = proc.communicate()
-        os.unlink(x509_file)
+
+        modulus, err = proc.communicate()
         if proc.returncode != 0:
+            return None
+
+        return modulus.strip()
+
+    def clean_ssl_certfile(self):
+        certfile = self.cleaned_data.get("ssl_certfile")
+        reg = re.search(
+            r'(-----BEGIN ([DR]SA) PRIVATE KEY-----.*?'
+            r'-----END \2 PRIVATE KEY-----)',
+            certfile,
+            re.M|re.S)
+        if not reg:
             raise forms.ValidationError(
-                _("Certificate is not valid: %s") % err
+                _("RSA or DSA private key not found")
                 )
+        priv = reg.group()
 
-        if modulus1 != modulus2:
+        priv_file = tempfile.mktemp(dir='/tmp/')
+        with open(priv_file, 'w') as f:
+            f.write(priv)
+
+        keytype = None
+        reg = re.search(r'-----BEGIN ([DR]SA) PRIVATE KEY-----', priv)
+        if reg:
+            keytype = reg.group(1).lower()
+
+        modulus1 = self.get_key_modulus(priv_file, keytype)
+        os.unlink(priv_file)
+        if not modulus1:
             raise forms.ValidationError(
+                _("RSA or DSA private key is not valid"))
+
+        reg = re.findall(
+            r'(-----BEGIN CERTIFICATE-----.*?'
+            r'-----END CERTIFICATE-----)',
+            certfile,
+            re.M|re.S)
+
+        verified = False
+        for cert in reg:
+            x509_file = tempfile.mktemp(dir='/tmp')
+            with open(x509_file, 'w') as f:
+                f.write(cert)
+
+            modulus2 = self.get_x509_modulus(x509_file)
+            os.unlink(x509_file)
+            if modulus1 == modulus2:
+                verified = True
+                break
+
+        if not verified:
+            raise forms.ValidationError(
                 _("The modulus of certificate and key must match")
                 )
 
         return certfile
 
+    def clean(self):
+        cdata = self.cleaned_data
+        if not cdata.get("ssl_passphrase"):
+            cdata['ssl_passphrase'] = self.instance.ssl_passphrase
+        return cdata
+
     def save(self):
         super(SSLForm, self).save()
         notifier().start_ssl("nginx")

Modified: trunk/gui/system/models.py
===================================================================
--- trunk/gui/system/models.py	2013-02-05 16:00:32 UTC (rev 13269)
+++ trunk/gui/system/models.py	2013-02-07 02:28:33 UTC (rev 13270)
@@ -348,6 +348,13 @@
             verbose_name=_("Common Name"),
             help_text=_("Common Name (eg, YOUR name)"),
             )
+    ssl_passphrase = models.CharField(
+            blank=True,
+            null=True,
+            max_length=120,
+            verbose_name=_("Passphrase"),
+            help_text=_("Private key passphrase)"),
+            )
     ssl_certfile = models.TextField(
             blank=True,
             null=True,

Modified: trunk/nanobsd/Files/etc/rc.d/ix-ssl
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-ssl	2013-02-05 16:00:32 UTC (rev 13269)
+++ trunk/nanobsd/Files/etc/rc.d/ix-ssl	2013-02-07 02:28:33 UTC (rev 13270)
@@ -162,6 +162,31 @@
 	chmod 400 "${key}"
 }
 
+strip_passphrase()
+{
+	local keyfile="${1}"
+	local passfile="${2}"
+	local res=1
+
+	if [ ! -s "${keyfile}" -o ! -s "${passfile}" ]
+	then
+		return 1
+	fi
+
+	local tmp="$(mktemp /tmp/tmp.XXXXXXX)"
+	${OPENSSL} rsa -passin file:"${passfile}" -in "${keyfile}" -out "${tmp}"
+	if [ "$?" = "0" -a -s "${tmp}" ]
+	then
+		mv "${tmp}" "${keyfile}"
+		res=$?
+
+	else
+		rm -f "${tmp}" 2>/dev/null
+	fi
+
+	return ${res}
+}
+
 write_key()
 {
 	local infile="${1}"
@@ -178,11 +203,11 @@
 		keyfile[0] = null;
 		keyfile_size = 0;
 	}
-	/-----BEGIN (R|D)SA PRIVATE KEY-----/ {
+	/-----BEGIN (.+) PRIVATE KEY-----/ {
 		inkeyfile = 1;
 	}
 
-	/-----END (R|D)SA PRIVATE KEY-----/ {
+	/-----END (.+) PRIVATE KEY-----/ {
 		keyfile[keyfile_size++] = $0;
 		inkeyfile = 0;
 	}
@@ -209,25 +234,29 @@
 		return 1
 	fi
 
-	awk -v cert="${outfile}" '
+	local ncerts="$(grep 'BEGIN CERTIFICATE' ${infile}|wc -l|xargs)"
+	awk -v cert="${outfile}" -v ncerts="${ncerts}" '
 	BEGIN {
-		incertfile = 0
 		certfile[0] = null;
 		certfile_size = 0;
+		certbegin = 0;
+		certend = 0;
 	}
 	/-----BEGIN CERTIFICATE-----/ {
-		incertfile = 1;
+		certbegin++;
 	}
-	
 	/-----END CERTIFICATE-----/ {
-		certfile[certfile_size++] = $0;
-		incertfile = 0;
+		certend++;
 	}
+	
 	/.+/ {
-		if (incertfile)
+		if (certbegin > 0)
 			certfile[certfile_size++] = $0;
+		if (certbegin == certend && certbegin == ncerts)
+			exit(0);
 	}
 	END {
+
 		for (i = 0;i < certfile_size;i++)
 			print certfile[i] > cert
 	}
@@ -314,10 +343,11 @@
 _configure_generic_ssl()
 {
 	local ssldir="${1}"
-	local tmpfile="${2}"
-	local keyfile="${3}"
-	local certfile="${4}"
-	local importfunc="${5}"
+	local tmpcertfile="${2}"
+	local tmppassfile="${3}"
+	local keyfile="${4}"
+	local certfile="${5}"
+	local importfunc="${6}"
 	local new_cert
 	local res=0
 
@@ -325,20 +355,20 @@
 		-z "${keyfile}" -o \
 		-z "${certfile}" -o \
 		-z "${importfunc}" -o \
-		-z "${tmpfile}" -o ! -f "${tmpfile}" ]
+		-z "${tmpcertfile}" -o ! -f "${tmpcertfile}" ]
 	then
 		return 1
 	fi
 
 	mkdir -p "${ssldir}"
-	size=$(wc -c "${tmpfile}" | awk '{ print $1 }')
+	size=$(wc -c "${tmpcertfile}" | awk '{ print $1 }')
 	if [ ${size} -gt 1 ]
 	then
 		local tmpkey="$(mktemp /tmp/tmp.XXXXXX)"
 		local tmpcrt="$(mktemp /tmp/tmp.XXXXXX)"
 
-		write_key "${tmpfile}" "${tmpkey}"
-		write_cert "${tmpfile}" "${tmpcrt}"
+		write_key "${tmpcertfile}" "${tmpkey}"
+		write_cert "${tmpcertfile}" "${tmpcrt}"
 
 		diff -Nq "${tmpkey}" "${keyfile}" >/dev/null
 		local rc1=$?
@@ -346,7 +376,7 @@
 		diff -Nq "${tmpcrt}" "${certfile}" >/dev/null
 		local rc2=$?
 
-		if [ "${rc1}" != "0" -a "${rc2}" != "0" ]
+		if [ "${rc1}" != "0" -o "${rc2}" != "0" ]
 		then
 			mv "${tmpkey}" "${keyfile}"
 			mv "${tmpcrt}" "${certfile}"
@@ -380,6 +410,13 @@
 		res=1
 	fi
 
+	if [ "${res}" = "0" -a -s "${tmppassfile}" ]
+	then
+		strip_passphrase "${keyfile}" "${tmppassfile}"
+		res=$?
+	fi
+
+	rm -f "${tmppassfile}"
 	return ${res}
 }
 
@@ -439,9 +476,9 @@
 
 configure_nginx_ssl()
 {
-	local new_cert tmp
+	local tmpcertfile=$(mktemp /tmp/tmp.XXXXXX)
+	local tmppassfile=$(mktemp /tmp/tmp.XXXXXX)
 
-	tmpfile=$(mktemp /tmp/tmp.XXXXXX)
 	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
 	SELECT
 		ssl_certfile
@@ -453,14 +490,29 @@
 		-id
 
 	LIMIT 1
-	" > "${tmpfile}"
+	" > "${tmpcertfile}"
 
+	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "
+	SELECT
+		ssl_passphrase
+
+	FROM
+		system_ssl
+
+	ORDER BY
+		-id
+
+	LIMIT 1
+	" > "${tmppassfile}"
+
+
 	_configure_generic_ssl "${HTTPDSSLDIR}" \
-		"${tmpfile}" "${HTTPDKEY}" "${HTTPDCERT}" \
+		"${tmpcertfile}" "${tmppassfile}" \
+		"${HTTPDKEY}" "${HTTPDCERT}" \
 		"import_nginx_certificate"
 	res=$?
 
-	rm -f "${tmpfile}"
+	rm -f "${tmpcertfile}"
 	return ${res}
 }
 
@@ -537,7 +589,7 @@
 	" > "${tmpfile}"
 
 	_configure_generic_ssl "${FTPDSSLDIR}" \
-		"${tmpfile}" "${FTPDKEY}" "${FTPDCERT}" \
+		"${tmpfile}" "" "${FTPDKEY}" "${FTPDCERT}" \
 		"import_proftpd_certificate"
 	res=$?
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13305
          http://freenas.svn.sourceforge.net/freenas/?rev=13305&view=rev
Author:   jpaetzel
Date:     2013-02-17 03:54:47 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
Add testdisk and photorec to the image, these are
useful tools for recovering partitions as well
as recovering files from a scragged filesystem.

Modified Paths:
--------------
    trunk/nanobsd/os-base

Added Paths:
-----------
    trunk/patches/ports-testdisk.patch

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-02-16 00:25:37 UTC (rev 13304)
+++ trunk/nanobsd/os-base	2013-02-17 03:54:47 UTC (rev 13305)
@@ -315,6 +315,8 @@
 add_port www/wgetpaste
 add_port devel/py-greenlet
 add_port net/py-eventlet
+add_port graphics/jpeg
+add_port sysutils/testdisk WITH_NTFS3G=y
 
 # NOTE: in reality these aren't DEBUG apps, but this ensures that they aren't
 # counted against the release image's size because they aren't used in

Added: trunk/patches/ports-testdisk.patch
===================================================================
--- trunk/patches/ports-testdisk.patch	                        (rev 0)
+++ trunk/patches/ports-testdisk.patch	2013-02-17 03:54:47 UTC (rev 13305)
@@ -0,0 +1,32 @@
+--- testdisk/Makefile.orig	2013-02-16 18:30:54.334866580 -0800
++++ testdisk/Makefile	2013-02-16 19:03:51.629859547 -0800
+@@ -6,10 +6,11 @@
+ #
+ 
+ PORTNAME=	testdisk
+-PORTVERSION=	6.13
++PORTVERSION=	6.14
+ CATEGORIES=	sysutils
+ MASTER_SITES=	http://www.cgsecurity.org/
+-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
++DISTVERSIONSUFFIX=	-WIP
++DISTFILES=	${PORTNAME}-${PORTVERSION}-WIP${EXTRACT_SUFX}
+ 
+ MAINTAINER=	flz@...
+ COMMENT=	Tool to check and undelete partitions
+@@ -53,7 +54,7 @@
+ #.endif
+ 
+ .if defined(WITH_NTFS3G)
+-LIB_DEPENDS+=	ntfs-3g.81:${PORTSDIR}/sysutils/fusefs-ntfs
++LIB_DEPENDS+=	ntfs-3g.83:${PORTSDIR}/sysutils/fusefs-ntfs
+ .else
+ CONFIGURE_ARGS+=--without-ntfs3g
+ .endif
+--- testdisk/distinfo.orig	2013-02-16 18:33:55.543862988 -0800
++++ testdisk/distinfo	2013-02-16 19:03:26.929863121 -0800
+@@ -1,2 +1,2 @@
+-SHA256 (testdisk-6.13.tar.bz2) = 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220
+-SIZE (testdisk-6.13.tar.bz2) = 560696
++SHA256 (testdisk-6.14-WIP.tar.bz2) = 75b7370308c31deae147cf43599c82e712dd805b445757ca620083716bee6c01
++SIZE (testdisk-6.14-WIP.tar.bz2) = 577932

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13312
          http://freenas.svn.sourceforge.net/freenas/?rev=13312&view=rev
Author:   jpaetzel
Date:     2013-02-18 02:13:00 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
Move arc_summary.py and arcstat.py into $PATH

Added Paths:
-----------
    trunk/nanobsd/Files/usr/local/bin/arc_summary.py
    trunk/nanobsd/Files/usr/local/bin/arcstat.py

Removed Paths:
-------------
    trunk/gui/tools/arc_summary.py
    trunk/gui/tools/arcstat.py

Deleted: trunk/gui/tools/arc_summary.py
===================================================================
--- trunk/gui/tools/arc_summary.py	2013-02-18 02:11:17 UTC (rev 13311)
+++ trunk/gui/tools/arc_summary.py	2013-02-18 02:13:00 UTC (rev 13312)
@@ -1,736 +0,0 @@
-#!/usr/local/bin/python
-#
-# $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
-#
-# Copyright (c) 2008 Ben Rockwood <benr@...>,
-# Copyright (c) 2010 Martin Matuska <mm@...>,
-# Copyright (c) 2010-2011 Jason J. Hellenthal <jhell@...>,
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# If you are having troubles when using this script from cron(8) please try
-# adjusting your PATH before reporting problems.
-#
-# /usr/bin & /sbin
-#
-# Binaries used are:
-#
-# dc(1), kldstat(8), sed(1), sysctl(8) & vmstat(8)
-#
-# Binaries that I am working on phasing out are:
-#
-# dc(1) & sed(1)
-
-import sys
-import time
-import getopt
-import re
-
-from subprocess import Popen, PIPE
-from decimal import Decimal as D
-
-
-usetunable = True
-show_sysctl_descriptions = False
-alternate_sysctl_layout = False
-kstat_pobj = re.compile("^([^:]+):\s+(.+)\s*$", flags=re.M)
-
-
-def get_Kstat():
-    Kstats = [
-        "hw.pagesize",
-        "hw.physmem",
-        "kern.maxusers",
-        "vm.kmem_map_free",
-        "vm.kmem_map_size",
-        "vm.kmem_size",
-        "vm.kmem_size_max",
-        "vm.kmem_size_min",
-        "vm.kmem_size_scale",
-        "vm.stats",
-        "kstat.zfs",
-        "vfs.zfs"
-    ]
-
-    sysctls = " ".join(str(x) for x in Kstats)
-    p = Popen("/sbin/sysctl -q %s" % sysctls, stdin=PIPE,
-        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-    p.wait()
-
-    kstat_pull = p.communicate()[0].split('\n')
-    if p.returncode != 0:
-        sys.exit(1)
-
-    Kstat = {}
-    for kstat in kstat_pull:
-        kstat = kstat.strip()
-        mobj = kstat_pobj.match(kstat)
-        if mobj:
-            key = mobj.group(1).strip()
-            val = mobj.group(2).strip()
-            Kstat[key] = D(val)
-
-    return Kstat
-
-
-def div1():
-    sys.stdout.write("\n")
-    for i in xrange(18):
-        sys.stdout.write("%s" % "----")
-    sys.stdout.write("\n")
-
-
-def div2():
-    div1()
-    sys.stdout.write("\n")
-
-
-def fBytes(Bytes=0, Decimal=2):
-    kbytes = (2 ** 10)
-    mbytes = (2 ** 20)
-    gbytes = (2 ** 30)
-    tbytes = (2 ** 40)
-    pbytes = (2 ** 50)
-    ebytes = (2 ** 60)
-    zbytes = (2 ** 70)
-    ybytes = (2 ** 80)
-
-    if Bytes >= ybytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / ybytes) + "\tYiB"
-    elif Bytes >= zbytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / zbytes) + "\tZiB"
-    elif Bytes >= ebytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / ebytes) + "\tEiB"
-    elif Bytes >= pbytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / pbytes) + "\tPiB"
-    elif Bytes >= tbytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / tbytes) + "\tTiB"
-    elif Bytes >= gbytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / gbytes) + "\tGiB"
-    elif Bytes >= mbytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / mbytes) + "\tMiB"
-    elif Bytes >= kbytes:
-        return str("%0." + str(Decimal) + "f") % (Bytes / kbytes) + "\tKiB"
-    elif Bytes == 0:
-        return str("%d" % 0) + "\tBytes"
-    else:
-        return str("%d" % Bytes) + "\tBytes"
-
-
-def fHits(Hits=0, Decimal=2):
-    khits = (10 ** 3)
-    mhits = (10 ** 6)
-    bhits = (10 ** 9)
-    thits = (10 ** 12)
-    qhits = (10 ** 15)
-    Qhits = (10 ** 18)
-    shits = (10 ** 21)
-    Shits = (10 ** 24)
-
-    if Hits >= Shits:
-        return str("%0." + str(Decimal) + "f") % (Hits / Shits) + "S"
-    elif Hits >= shits:
-        return str("%0." + str(Decimal) + "f") % (Hits / shits) + "s"
-    elif Hits >= Qhits:
-        return str("%0." + str(Decimal) + "f") % (Hits / Qhits) + "Q"
-    elif Hits >= qhits:
-        return str("%0." + str(Decimal) + "f") % (Hits / qhits) + "q"
-    elif Hits >= thits:
-        return str("%0." + str(Decimal) + "f") % (Hits / thits) + "t"
-    elif Hits >= bhits:
-        return str("%0." + str(Decimal) + "f") % (Hits / bhits) + "b"
-    elif Hits >= mhits:
-        return str("%0." + str(Decimal) + "f") % (Hits / mhits) + "m"
-    elif Hits >= khits:
-        return str("%0." + str(Decimal) + "f") % (Hits / khits) + "k"
-    elif Hits == 0:
-        return str("%d" % 0)
-    else:
-        return str("%d" % Hits)
-
-
-def fPerc(lVal=0, rVal=0, Decimal=2):
-        if rVal > 0:
-            return str("%0." + str(Decimal) + "f") % (100 * (lVal / rVal)) + "%"
-        else:
-            return str("%0." + str(Decimal) + "f") % 100 + "%"
-
-
-def _system_memory():
-    def mem_rounded(mem_size):
-        chip_size = 1
-        chip_guess = (int(mem_size) / 8) - 1
-        while chip_guess != 0:
-            chip_guess >>= 1
-            chip_size <<= 1
-
-        mem_round = (int(mem_size / chip_size) + 1) * chip_size
-        return mem_round
-
-    Kstat = get_Kstat()
-    pagesize = Kstat["hw.pagesize"]
-    mem_hw = mem_rounded(Kstat["hw.physmem"])
-    mem_phys = Kstat["hw.physmem"]
-    mem_all = Kstat["vm.stats.vm.v_page_count"] * pagesize
-    mem_wire = Kstat["vm.stats.vm.v_wire_count"] * pagesize
-    mem_active = Kstat["vm.stats.vm.v_active_count"] * pagesize
-    mem_inactive = Kstat["vm.stats.vm.v_inactive_count"] * pagesize
-    mem_cache = Kstat["vm.stats.vm.v_cache_count"] * pagesize
-    mem_free = Kstat["vm.stats.vm.v_free_count"] * pagesize
-
-    mem_gap_vm = mem_all - (mem_wire + mem_active + mem_inactive + mem_cache + mem_free)
-
-    mem_total = mem_hw
-    mem_avail = mem_inactive + mem_cache + mem_free
-    mem_used = mem_total - mem_avail
-
-    sys.stdout.write("System Memory:\n")
-    sys.stdout.write("\n")
-    sys.stdout.write("\t%s\t%s Active,\t" % (fPerc(mem_active, mem_all), fBytes(mem_active)))
-    sys.stdout.write("%s\t%s Inact\n" % (fPerc(mem_inactive, mem_all), fBytes(mem_inactive)))
-    sys.stdout.write("\t%s\t%s Wired,\t" % (fPerc(mem_wire, mem_all), fBytes(mem_wire)))
-    sys.stdout.write("%s\t%s Cache\n" % (fPerc(mem_cache, mem_all), fBytes(mem_cache)))
-    sys.stdout.write("\t%s\t%s Free,\t" % (fPerc(mem_free, mem_all), fBytes(mem_free)))
-    sys.stdout.write("%s\t%s Gap\n" % (fPerc(mem_gap_vm, mem_all), fBytes(mem_gap_vm)))
-    sys.stdout.write("\n")
-    sys.stdout.write("\tReal Installed:\t\t\t\t%s\n" % fBytes(mem_hw))
-    sys.stdout.write("\tReal Available:\t\t\t%s\t%s\n" % (fPerc(mem_phys, mem_hw), fBytes(mem_phys)))
-    sys.stdout.write("\tReal Managed:\t\t\t%s\t%s\n" % (fPerc(mem_all, mem_phys), fBytes(mem_all)))
-    sys.stdout.write("\n")
-    sys.stdout.write("\tLogical Total:\t\t\t\t%s\n" % fBytes(mem_total))
-    sys.stdout.write("\tLogical Used:\t\t\t%s\t%s\n" % (fPerc(mem_used, mem_total), fBytes(mem_used)))
-    sys.stdout.write("\tLogical Free:\t\t\t%s\t%s\n" % (fPerc(mem_avail, mem_total), fBytes(mem_avail)))
-    sys.stdout.write("\n")
-
-    cmd1 = """
-        /sbin/kldstat | \
-        /usr/bin/awk '
-            BEGIN {
-                print "16i 0";
-            }
-            NR > 1 {
-                print toupper($4) "+";
-            }
-           END {
-                print "p";
-           }
-        ' | /usr/bin/dc
-    """
-
-    cmd2 = """
-        /usr/bin/vmstat -m | \
-        /usr/bin/sed -Ee '1s/.*/0/;s/.* ([0-9]+)K.*/\\1+/;$s/$/1024*p/' | \
-        /usr/bin/dc
-    """
-
-    p1 = Popen(cmd1, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-    p2 = Popen(cmd2, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-
-    ktext = D(p1.communicate()[0].strip())
-    kdata = D(p2.communicate()[0].strip())
-
-    if p1.returncode != 0 or p2.returncode != 0:
-        sys.exit(1)
-
-    kmem = ktext + kdata
-    kmem_map_size = Kstat["vm.kmem_map_size"]
-    kmem_map_free = Kstat["vm.kmem_map_free"]
-    kmem_map_total = kmem_map_size + kmem_map_free
-
-    sys.stdout.write("Kernel Memory:\t\t\t\t\t%s\n" % fBytes(kmem))
-    sys.stdout.write("\tData:\t\t\t\t%s\t%s\n" % (fPerc(kdata, kmem), fBytes(kdata)))
-    sys.stdout.write("\tText:\t\t\t\t%s\t%s\n\n" % (fPerc(ktext, kmem), fBytes(ktext)))
-
-    sys.stdout.write("Kernel Memory Map:\t\t\t\t%s\n" % fBytes(kmem_map_total))
-    sys.stdout.write("\tSize:\t\t\t\t%s\t%s\n" % (fPerc(kmem_map_size, kmem_map_total), fBytes(kmem_map_size)))
-    sys.stdout.write("\tFree:\t\t\t\t%s\t%s\n" % (fPerc(kmem_map_free, kmem_map_total), fBytes(kmem_map_free)))
-
-
-def _arc_summary():
-    Kstat = get_Kstat()
-    if not Kstat["vfs.zfs.version.spa"]:
-        return
-
-    spa = Kstat["vfs.zfs.version.spa"]
-    zpl = Kstat["vfs.zfs.version.zpl"]
-    memory_throttle_count = Kstat["kstat.zfs.misc.arcstats.memory_throttle_count"]
-
-    sys.stdout.write("ARC Summary: ")
-    if memory_throttle_count > 0:
-        sys.stdout.write("(THROTTLED)\n")
-    else:
-        sys.stdout.write("(HEALTHY)\n")
-
-    sys.stdout.write("\tStorage pool Version:\t\t\t%d\n" % spa)
-    sys.stdout.write("\tFilesystem Version:\t\t\t%d\n" % zpl)
-    sys.stdout.write("\tMemory Throttle Count:\t\t\t%s\n" % fHits(memory_throttle_count))
-    sys.stdout.write("\n")
-
-    ### ARC Misc. ###
-    deleted = Kstat["kstat.zfs.misc.arcstats.deleted"]
-    #evict_skip = Kstat["kstat.zfs.misc.arcstats.evict_skip"]
-    mutex_miss = Kstat["kstat.zfs.misc.arcstats.mutex_miss"]
-    recycle_miss = Kstat["kstat.zfs.misc.arcstats.recycle_miss"]
-
-    sys.stdout.write("ARC Misc:\n")
-    sys.stdout.write("\tDeleted:\t\t\t\t%s\n" % fHits(deleted))
-    sys.stdout.write("\tRecycle Misses:\t\t\t\t%s\n" % fHits(recycle_miss))
-    sys.stdout.write("\tMutex Misses:\t\t\t\t%s\n" % fHits(mutex_miss))
-    sys.stdout.write("\tEvict Skips:\t\t\t\t%s\n" % fHits(mutex_miss))
-    sys.stdout.write("\n")
-
-    ### ARC Sizing ###
-    arc_size = Kstat["kstat.zfs.misc.arcstats.size"]
-    mru_size = Kstat["kstat.zfs.misc.arcstats.p"]
-    target_max_size = Kstat["kstat.zfs.misc.arcstats.c_max"]
-    target_min_size = Kstat["kstat.zfs.misc.arcstats.c_min"]
-    target_size = Kstat["kstat.zfs.misc.arcstats.c"]
-
-    target_size_ratio = (target_max_size / target_min_size)
-
-    sys.stdout.write("ARC Size:\t\t\t\t%s\t%s\n" %
-        (fPerc(arc_size, target_max_size), fBytes(arc_size)))
-    sys.stdout.write("\tTarget Size: (Adaptive)\t\t%s\t%s\n" %
-        (fPerc(target_size, target_max_size), fBytes(target_size)))
-    sys.stdout.write("\tMin Size (Hard Limit):\t\t%s\t%s\n" %
-        (fPerc(target_min_size, target_max_size), fBytes(target_min_size)))
-    sys.stdout.write("\tMax Size (High Water):\t\t%d:1\t%s\n" %
-        (target_size_ratio, fBytes(target_max_size)))
-
-    sys.stdout.write("\nARC Size Breakdown:\n")
-    if arc_size > target_size:
-        mfu_size = (arc_size - mru_size)
-        sys.stdout.write("\tRecently Used Cache Size:\t%s\t%s\n" %
-            (fPerc(mru_size, arc_size), fBytes(mru_size)))
-        sys.stdout.write("\tFrequently Used Cache Size:\t%s\t%s\n" %
-            (fPerc(mfu_size, arc_size), fBytes(mfu_size)))
-
-    if arc_size < target_size:
-        mfu_size = (target_size - mru_size)
-        sys.stdout.write("\tRecently Used Cache Size:\t%s\t%s\n" %
-            (fPerc(mru_size, target_size), fBytes(mru_size)))
-        sys.stdout.write("\tFrequently Used Cache Size:\t%s\t%s\n" %
-            (fPerc(mfu_size, target_size), fBytes(mfu_size)))
-    sys.stdout.write("\n")
-
-    ### ARC Hash Breakdown ###
-    hash_chain_max = Kstat["kstat.zfs.misc.arcstats.hash_chain_max"]
-    hash_chains = Kstat["kstat.zfs.misc.arcstats.hash_chains"]
-    hash_collisions = Kstat["kstat.zfs.misc.arcstats.hash_collisions"]
-    hash_elements = Kstat["kstat.zfs.misc.arcstats.hash_elements"]
-    hash_elements_max = Kstat["kstat.zfs.misc.arcstats.hash_elements_max"]
-
-    sys.stdout.write("ARC Hash Breakdown:\n")
-    sys.stdout.write("\tElements Max:\t\t\t\t%s\n" % fHits(hash_elements_max))
-    sys.stdout.write("\tElements Current:\t\t%s\t%s\n" %
-        (fPerc(hash_elements, hash_elements_max), fHits(hash_elements)))
-    sys.stdout.write("\tCollisions:\t\t\t\t%s\n" % fHits(hash_collisions))
-    sys.stdout.write("\tChain Max:\t\t\t\t%s\n" % fHits(hash_chain_max))
-    sys.stdout.write("\tChains:\t\t\t\t\t%s\n" % fHits(hash_chains))
-
-
-def _arc_efficiency():
-    Kstat = get_Kstat()
-    if not Kstat["vfs.zfs.version.spa"]:
-        return
-
-    arc_hits = Kstat["kstat.zfs.misc.arcstats.hits"]
-    arc_misses = Kstat["kstat.zfs.misc.arcstats.misses"]
-    demand_data_hits = Kstat["kstat.zfs.misc.arcstats.demand_data_hits"]
-    demand_data_misses = Kstat["kstat.zfs.misc.arcstats.demand_data_misses"]
-    demand_metadata_hits = Kstat["kstat.zfs.misc.arcstats.demand_metadata_hits"]
-    demand_metadata_misses = Kstat["kstat.zfs.misc.arcstats.demand_metadata_misses"]
-    mfu_ghost_hits = Kstat["kstat.zfs.misc.arcstats.mfu_ghost_hits"]
-    mfu_hits = Kstat["kstat.zfs.misc.arcstats.mfu_hits"]
-    mru_ghost_hits = Kstat["kstat.zfs.misc.arcstats.mru_ghost_hits"]
-    mru_hits = Kstat["kstat.zfs.misc.arcstats.mru_hits"]
-    prefetch_data_hits = Kstat["kstat.zfs.misc.arcstats.prefetch_data_hits"]
-    prefetch_data_misses = Kstat["kstat.zfs.misc.arcstats.prefetch_data_misses"]
-    prefetch_metadata_hits = Kstat["kstat.zfs.misc.arcstats.prefetch_metadata_hits"]
-    prefetch_metadata_misses = Kstat["kstat.zfs.misc.arcstats.prefetch_metadata_misses"]
-
-    anon_hits = arc_hits - (mfu_hits + mru_hits + mfu_ghost_hits + mru_ghost_hits)
-    arc_accesses_total = (arc_hits + arc_misses)
-    demand_data_total = (demand_data_hits + demand_data_misses)
-    prefetch_data_total = (prefetch_data_hits + prefetch_data_misses)
-    real_hits = (mfu_hits + mru_hits)
-
-    sys.stdout.write("ARC Efficiency:\t\t\t\t\t%s\n" % fHits(arc_accesses_total))
-    sys.stdout.write("\tCache Hit Ratio:\t\t%s\t%s\n" %
-        (fPerc(arc_hits, arc_accesses_total), fHits(arc_hits)))
-    sys.stdout.write("\tCache Miss Ratio:\t\t%s\t%s\n" %
-        (fPerc(arc_misses, arc_accesses_total), fHits(arc_misses)))
-    sys.stdout.write("\tActual Hit Ratio:\t\t%s\t%s\n" %
-        (fPerc(real_hits, arc_accesses_total), fHits(real_hits)))
-    sys.stdout.write("\n")
-    sys.stdout.write("\tData Demand Efficiency:\t\t%s\t%s\n" %
-        (fPerc(demand_data_hits, demand_data_total), fHits(demand_data_total)))
-
-    if prefetch_data_total > 0:
-        sys.stdout.write("\tData Prefetch Efficiency:\t%s\t%s\n" %
-            (fPerc(prefetch_data_hits, prefetch_data_total), fHits(prefetch_data_total)))
-    sys.stdout.write("\n")
-
-    sys.stdout.write("\tCACHE HITS BY CACHE LIST:\n")
-    if anon_hits > 0:
-        sys.stdout.write("\t  Anonymously Used:\t\t%s\t%s\n" %
-            (fPerc(anon_hits, arc_hits), fHits(anon_hits)))
-
-    sys.stdout.write("\t  Most Recently Used:\t\t%s\t%s\n" %
-        (fPerc(mru_hits, arc_hits), fHits(mru_hits)))
-    sys.stdout.write("\t  Most Frequently Used:\t\t%s\t%s\n" %
-        (fPerc(mfu_hits, arc_hits), fHits(mfu_hits)))
-    sys.stdout.write("\t  Most Recently Used Ghost:\t%s\t%s\n" %
-        (fPerc(mru_ghost_hits, arc_hits), fHits(mru_ghost_hits)))
-    sys.stdout.write("\t  Most Frequently Used Ghost:\t%s\t%s\n" %
-        (fPerc(mfu_ghost_hits, arc_hits), fHits(mfu_ghost_hits)))
-
-    sys.stdout.write("\n\tCACHE HITS BY DATA TYPE:\n")
-    sys.stdout.write("\t  Demand Data:\t\t\t%s\t%s\n" %
-        (fPerc(demand_data_hits, arc_hits), fHits(demand_data_hits)))
-    sys.stdout.write("\t  Prefetch Data:\t\t%s\t%s\n" %
-        (fPerc(prefetch_data_hits, arc_hits), fHits(prefetch_data_hits)))
-    sys.stdout.write("\t  Demand Metadata:\t\t%s\t%s\n" %
-        (fPerc(demand_metadata_hits, arc_hits), fHits(demand_metadata_hits)))
-    sys.stdout.write("\t  Prefetch Metadata:\t\t%s\t%s\n" %
-        (fPerc(prefetch_metadata_hits, arc_hits), fHits(prefetch_metadata_hits)))
-
-    sys.stdout.write("\n\tCACHE MISSES BY DATA TYPE:\n")
-    sys.stdout.write("\t  Demand Data:\t\t\t%s\t%s\n" %
-        (fPerc(demand_data_misses, arc_misses), fHits(demand_data_misses)))
-    sys.stdout.write("\t  Prefetch Data:\t\t%s\t%s\n" %
-        (fPerc(prefetch_data_misses, arc_misses), fHits(prefetch_data_misses)))
-    sys.stdout.write("\t  Demand Metadata:\t\t%s\t%s\n" %
-        (fPerc(demand_metadata_misses, arc_misses), fHits(demand_metadata_misses)))
-    sys.stdout.write("\t  Prefetch Metadata:\t\t%s\t%s\n" %
-        (fPerc(prefetch_metadata_misses, arc_misses), fHits(prefetch_metadata_misses)))
-
-
-def _l2arc_summary():
-    Kstat = get_Kstat()
-    if not Kstat["vfs.zfs.version.spa"]:
-        return
-
-    l2_abort_lowmem = Kstat["kstat.zfs.misc.arcstats.l2_abort_lowmem"]
-    l2_cksum_bad = Kstat["kstat.zfs.misc.arcstats.l2_cksum_bad"]
-    l2_evict_lock_retry = Kstat["kstat.zfs.misc.arcstats.l2_evict_lock_retry"]
-    l2_evict_reading = Kstat["kstat.zfs.misc.arcstats.l2_evict_reading"]
-    l2_feeds = Kstat["kstat.zfs.misc.arcstats.l2_feeds"]
-    l2_free_on_write = Kstat["kstat.zfs.misc.arcstats.l2_free_on_write"]
-    l2_hdr_size = Kstat["kstat.zfs.misc.arcstats.l2_hdr_size"]
-    l2_hits = Kstat["kstat.zfs.misc.arcstats.l2_hits"]
-    l2_io_error = Kstat["kstat.zfs.misc.arcstats.l2_io_error"]
-    l2_misses = Kstat["kstat.zfs.misc.arcstats.l2_misses"]
-    l2_rw_clash = Kstat["kstat.zfs.misc.arcstats.l2_rw_clash"]
-    l2_size = Kstat["kstat.zfs.misc.arcstats.l2_size"]
-    l2_write_buffer_bytes_scanned = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_bytes_scanned"]
-    l2_write_buffer_iter = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_iter"]
-    l2_write_buffer_list_iter = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_list_iter"]
-    l2_write_buffer_list_null_iter = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_list_null_iter"]
-    #l2_write_bytes = Kstat["kstat.zfs.misc.arcstats.l2_write_bytes"]
-    l2_write_full = Kstat["kstat.zfs.misc.arcstats.l2_write_full"]
-    #l2_write_in_l2 = Kstat["kstat.zfs.misc.arcstats.l2_write_in_l2"]
-    l2_write_io_in_progress = Kstat["kstat.zfs.misc.arcstats.l2_write_io_in_progress"]
-    #l2_write_not_cacheable = Kstat["kstat.zfs.misc.arcstats.l2_write_not_cacheable"]
-    l2_write_passed_headroom = Kstat["kstat.zfs.misc.arcstats.l2_write_passed_headroom"]
-    #l2_write_pios = Kstat["kstat.zfs.misc.arcstats.l2_write_pios"]
-    l2_write_spa_mismatch = Kstat["kstat.zfs.misc.arcstats.l2_write_spa_mismatch"]
-    l2_write_trylock_fail = Kstat["kstat.zfs.misc.arcstats.l2_write_trylock_fail"]
-    l2_writes_done = Kstat["kstat.zfs.misc.arcstats.l2_writes_done"]
-    l2_writes_error = Kstat["kstat.zfs.misc.arcstats.l2_writes_error"]
-    #l2_writes_hdr_miss = Kstat["kstat.zfs.misc.arcstats.l2_writes_hdr_miss"]
-    l2_writes_sent = Kstat["kstat.zfs.misc.arcstats.l2_writes_sent"]
-
-    l2_access_total = (l2_hits + l2_misses)
-    l2_health_count = (l2_writes_error + l2_cksum_bad + l2_io_error)
-
-    if l2_size > 0 and l2_access_total > 0:
-        sys.stdout.write("L2 ARC Summary: ")
-        if l2_health_count > 0:
-            sys.stdout.write("(DEGRADED)\n")
-        else:
-            sys.stdout.write("(HEALTHY)\n")
-        sys.stdout.write("\tPassed Headroom:\t\t\t%s\n" % fHits(l2_write_passed_headroom))
-        sys.stdout.write("\tTried Lock Failures:\t\t\t%s\n" % fHits(l2_write_trylock_fail))
-        sys.stdout.write("\tIO In Progress:\t\t\t\t%s\n" % fHits(l2_write_io_in_progress))
-        sys.stdout.write("\tLow Memory Aborts:\t\t\t%s\n" % fHits(l2_abort_lowmem))
-        sys.stdout.write("\tFree on Write:\t\t\t\t%s\n" % fHits(l2_free_on_write))
-        sys.stdout.write("\tWrites While Full:\t\t\t%s\n" % fHits(l2_write_full))
-        sys.stdout.write("\tR/W Clashes:\t\t\t\t%s\n" % fHits(l2_rw_clash))
-        sys.stdout.write("\tBad Checksums:\t\t\t\t%s\n" % fHits(l2_cksum_bad))
-        sys.stdout.write("\tIO Errors:\t\t\t\t%s\n" % fHits(l2_io_error))
-        sys.stdout.write("\tSPA Mismatch:\t\t\t\t%s\n" % fHits(l2_write_spa_mismatch))
-        sys.stdout.write("\n")
-
-        sys.stdout.write("L2 ARC Size: (Adaptive)\t\t\t\t%s\n" % fBytes(l2_size))
-        sys.stdout.write("\tHeader Size:\t\t\t%s\t%s\n" %
-            (fPerc(l2_hdr_size, l2_size), fBytes(l2_hdr_size)))
-        sys.stdout.write("\n")
-
-        if (l2_evict_lock_retry + l2_evict_reading) > 0:
-            sys.stdout.write("L2 ARC Evicts:\n")
-            sys.stdout.write("\tLock Retries:\t\t\t\t%s\n" % fHits(l2_evict_lock_retry))
-            sys.stdout.write("\tUpon Reading:\t\t\t\t%s\n" % fHits(l2_evict_reading))
-            sys.stdout.write("\n")
-
-        sys.stdout.write("L2 ARC Breakdown:\t\t\t\t%s\n" % fHits(l2_access_total))
-        sys.stdout.write("\tHit Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(l2_hits, l2_access_total), fHits(l2_hits)))
-        sys.stdout.write("\tMiss Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(l2_misses, l2_access_total), fHits(l2_misses)))
-        sys.stdout.write("\tFeeds:\t\t\t\t\t%s\n" % fHits(l2_feeds))
-        sys.stdout.write("\n")
-
-        sys.stdout.write("L2 ARC Buffer:\n")
-        sys.stdout.write("\tBytes Scanned:\t\t\t\t%s\n" % fBytes(l2_write_buffer_bytes_scanned))
-        sys.stdout.write("\tBuffer Iterations:\t\t\t%s\n" % fHits(l2_write_buffer_iter))
-        sys.stdout.write("\tList Iterations:\t\t\t%s\n" % fHits(l2_write_buffer_list_iter))
-        sys.stdout.write("\tNULL List Iterations:\t\t\t%s\n" % fHits(l2_write_buffer_list_null_iter))
-        sys.stdout.write("\n")
-
-        sys.stdout.write("L2 ARC Writes:\n")
-        if l2_writes_done != l2_writes_sent:
-            sys.stdout.write("\tWrites Sent: (%s)\t\t\t\t%s\n" %
-                ("FAULTED", fHits(l2_writes_sent)))
-            sys.stdout.write("\t  Done Ratio:\t\t\t%s\t%s\n" %
-                (fPerc(l2_writes_done, l2_writes_sent), fHits(l2_writes_done)))
-            sys.stdout.write("\t  Error Ratio:\t\t\t%s\t%s\n" %
-                (fPerc(l2_writes_error, l2_writes_sent), fHits(l2_writes_error)))
-        else:
-            sys.stdout.write("\tWrites Sent:\t\t\t%s\t%s\n" % (fPerc(100), fHits(l2_writes_sent)))
-
-
-def _dmu_summary():
-    Kstat = get_Kstat()
-    if not Kstat["vfs.zfs.version.spa"]:
-        return
-
-    zfetch_bogus_streams = Kstat["kstat.zfs.misc.zfetchstats.bogus_streams"]
-    zfetch_colinear_hits = Kstat["kstat.zfs.misc.zfetchstats.colinear_hits"]
-    zfetch_colinear_misses = Kstat["kstat.zfs.misc.zfetchstats.colinear_misses"]
-    zfetch_hits = Kstat["kstat.zfs.misc.zfetchstats.hits"]
-    zfetch_misses = Kstat["kstat.zfs.misc.zfetchstats.misses"]
-    zfetch_reclaim_failures = Kstat["kstat.zfs.misc.zfetchstats.reclaim_failures"]
-    zfetch_reclaim_successes = Kstat["kstat.zfs.misc.zfetchstats.reclaim_successes"]
-    zfetch_streams_noresets = Kstat["kstat.zfs.misc.zfetchstats.streams_noresets"]
-    zfetch_streams_resets = Kstat["kstat.zfs.misc.zfetchstats.streams_resets"]
-    zfetch_stride_hits = Kstat["kstat.zfs.misc.zfetchstats.stride_hits"]
-    zfetch_stride_misses = Kstat["kstat.zfs.misc.zfetchstats.stride_misses"]
-
-    zfetch_access_total = (zfetch_hits + zfetch_misses)
-    zfetch_colinear_total = (zfetch_colinear_hits + zfetch_colinear_misses)
-    zfetch_health_count = (zfetch_bogus_streams)
-    zfetch_reclaim_total = (zfetch_reclaim_successes + zfetch_reclaim_failures)
-    zfetch_streams_total = (zfetch_streams_resets + zfetch_streams_noresets + zfetch_bogus_streams)
-    zfetch_stride_total = (zfetch_stride_hits + zfetch_stride_misses)
-
-    if zfetch_access_total > 0:
-        sys.stdout.write("File-Level Prefetch: ")
-        if zfetch_health_count > 0:
-            sys.stdout.write("(DEGRADED)\n\n")
-        else:
-            sys.stdout.write("(HEALTHY)\n\n")
-
-        sys.stdout.write("DMU Efficiency:\t\t\t\t\t%s\n" % fHits(zfetch_access_total))
-        sys.stdout.write("\tHit Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_hits, zfetch_access_total), fHits(zfetch_hits)))
-        sys.stdout.write("\tMiss Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_misses, zfetch_access_total), fHits(zfetch_misses)))
-        sys.stdout.write("\n")
-
-        sys.stdout.write("\tColinear:\t\t\t\t%s\n" % fHits(zfetch_colinear_total))
-        sys.stdout.write("\t  Hit Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_colinear_hits, zfetch_colinear_total), fHits(zfetch_colinear_hits)))
-        sys.stdout.write("\t  Miss Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_colinear_misses, zfetch_colinear_total), fHits(zfetch_colinear_misses)))
-        sys.stdout.write("\n")
-
-        sys.stdout.write("\tStride:\t\t\t\t\t%s\n" % fHits(zfetch_stride_total))
-        sys.stdout.write("\t  Hit Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_stride_hits, zfetch_stride_total), fHits(zfetch_stride_hits)))
-        sys.stdout.write("\t  Miss Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_stride_misses, zfetch_stride_total), fHits(zfetch_stride_misses)))
-        sys.stdout.write("\n")
-
-        if zfetch_health_count > 0:
-            sys.stdout.write("DMU Misc: (%s)\n" % "FAULTED")
-        else:
-            sys.stdout.write("DMU Misc:\n")
-
-        sys.stdout.write("\tReclaim:\t\t\t\t%s\n" % fHits(zfetch_reclaim_total))
-        sys.stdout.write("\t  Successes:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_reclaim_successes, zfetch_reclaim_total), fHits(zfetch_reclaim_successes)))
-        sys.stdout.write("\t  Failures:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_reclaim_failures, zfetch_reclaim_total), fHits(zfetch_reclaim_failures)))
-        sys.stdout.write("\n\tStreams:\t\t\t\t%s\n" % fHits(zfetch_streams_total))
-        sys.stdout.write("\t  +Resets:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_streams_resets, zfetch_streams_total), fHits(zfetch_streams_resets)))
-        sys.stdout.write("\t  -Resets:\t\t\t%s\t%s\n" %
-            (fPerc(zfetch_streams_noresets, zfetch_streams_total), fHits(zfetch_streams_noresets)))
-        sys.stdout.write("\t  Bogus:\t\t\t\t%s\n" % fHits(zfetch_bogus_streams))
-
-
-def _vdev_summary():
-    Kstat = get_Kstat()
-    if not Kstat["vfs.zfs.version.spa"]:
-        return
-
-    vdev_cache_delegations = Kstat["kstat.zfs.misc.vdev_cache_stats.delegations"]
-    vdev_cache_misses = Kstat["kstat.zfs.misc.vdev_cache_stats.misses"]
-    vdev_cache_hits = Kstat["kstat.zfs.misc.vdev_cache_stats.hits"]
-    vdev_cache_total = (vdev_cache_misses + vdev_cache_hits + vdev_cache_delegations)
-
-    if vdev_cache_total > 0:
-        sys.stdout.write("VDEV Cache Summary:\t\t\t\t%s\n" % fHits(vdev_cache_total))
-        sys.stdout.write("\tHit Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(vdev_cache_hits, vdev_cache_total), fHits(vdev_cache_hits)))
-        sys.stdout.write("\tMiss Ratio:\t\t\t%s\t%s\n" %
-            (fPerc(vdev_cache_misses, vdev_cache_total), fHits(vdev_cache_misses)))
-        sys.stdout.write("\tDelegations:\t\t\t%s\t%s\n" %
-            (fPerc(vdev_cache_delegations, vdev_cache_total), fHits(vdev_cache_delegations)))
-
-
-def _sysctl_summary():
-    global show_sysctl_descriptions
-    global alternate_sysctl_layout
-
-    Tunable = [
-        "kern.maxusers",
-        "vm.kmem_size",
-        "vm.kmem_size_scale",
-        "vm.kmem_size_min",
-        "vm.kmem_size_max",
-        "vfs.zfs"
-    ]
-
-    if not usetunable:
-        return
-
-    sysctl_descriptions = {}
-    if show_sysctl_descriptions:
-        tunables = " ".join(str(x) for x in Tunable)
-        p = Popen("/sbin/sysctl -qde %s" % tunables, stdin=PIPE,
-            stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-        p.wait()
-
-        descriptions = p.communicate()[0].split('\n')
-        if p.returncode != 0:
-            sys.exit(1)
-
-        for tunable in descriptions:
-            if not tunable:
-                continue
-            tunable = tunable.strip()
-            name, description = tunable.split('=')[:2]
-            name = name.strip()
-            description = description.strip()
-            if not description:
-                description = "Description unavailable"
-            sysctl_descriptions[name] = description
-
-    tunables = " ".join(str(x) for x in Tunable)
-    p = Popen("/sbin/sysctl -qe %s" % tunables, stdin=PIPE,
-        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-    p.wait()
-
-    zfs_tunables = p.communicate()[0].split('\n')
-    if p.returncode != 0:
-        sys.exit(1)
-
-    sys.stdout.write("ZFS Tunable (sysctl):\n")
-    for tunable in zfs_tunables:
-        if not tunable:
-            continue
-        tunable = tunable.strip()
-        name, value = tunable.split("=")[0:2]
-        name = name.strip()
-        value = D(value.strip())
-        format = "\t%s=%d\n" if alternate_sysctl_layout else "\t%-40s%d\n"
-        if show_sysctl_descriptions:
-            sys.stdout.write("\t\# %s\n" % sysctl_descriptions[name])
-        sys.stdout.write(format % (name, value))
-
-
-unSub = [
-    _system_memory,
-    _arc_summary,
-    _arc_efficiency,
-    _l2arc_summary,
-    _dmu_summary,
-    _vdev_summary,
-    _sysctl_summary
-]
-
-
-def _call_all():
-    page = 1
-    for unsub in unSub:
-        unsub()
-        sys.stdout.write("\t\t\t\t\t\t\t\tPage: %2d" % page)
-        div2()
-        page += 1
-
-
-def zfs_header():
-    daydate = time.strftime("%a %b %d %H:%M:%S %Y")
-
-    div1()
-    sys.stdout.write("ZFS Subsystem Report\t\t\t\t%s" % daydate)
-    div2()
-
-
-def main():
-    global show_sysctl_descriptions
-    global alternate_sysctl_layout
-
-    opts, args = getopt.getopt(
-        sys.argv[1:], "adp:"
-    )
-
-    args = {}
-    for opt, arg in opts:
-        if opt == '-a':
-            args['a'] = True
-        if opt == '-d':
-            args['d'] = True
-        if opt == '-p':
-            args['p'] = arg
-
-    if args:
-        alternate_sysctl_layout = True if 'a' in args else False
-        show_sysctl_descriptions = True if 'd' in args else False
-        try:
-            zfs_header()
-            unSub[int(args['p']) - 1]()
-            div2()
-
-        except:
-            _call_all()
-
-    else:
-        _call_all()
-
-
-if __name__ == '__main__':
-    main()

Deleted: trunk/gui/tools/arcstat.py
===================================================================
--- trunk/gui/tools/arcstat.py	2013-02-18 02:11:17 UTC (rev 13311)
+++ trunk/gui/tools/arcstat.py	2013-02-18 02:13:00 UTC (rev 13312)
@@ -1,454 +0,0 @@
-#!/usr/local/bin/python
-#
-# Print out ZFS ARC Statistics exported via kstat(1)
-# For a definition of fields, or usage, use arctstat.pl -v
-#
-# This script is a fork of the original arcstat.pl (0.1) by
-# Neelakanth Nadgir, originally published on his Sun blog on
-# 09/18/2007
-#     http://blogs.sun.com/realneel/entry/zfs_arc_statistics
-#
-# This version aims to improve upon the original by adding features
-# and fixing bugs as needed.  This version is maintained by
-# Mike Harsch and is hosted in a public open source repository:
-#    http://github.com/mharsch/arcstat
-#
-# Comments, Questions, or Suggestions are always welcome.
-# Contact the maintainer at ( mike at harschsystems dot com )
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Fields have a fixed width. Every interval, we fill the "v"
-# hash with its corresponding value (v[field]=value) using calculate().
-# @hdr is the array of fields that needs to be printed, so we
-# just iterate over this array and print the values using our pretty printer.
-#
-
-
-import sys
-import time
-import getopt
-import re
-import copy
-
-from decimal import Decimal
-from subprocess import Popen, PIPE
-from signal import signal, SIGINT
-
-cols = {
-    # HDR:        [Size, Scale, Description]
-    "time":       [8, -1, "Time"],
-    "hits":       [4, 1000, "ARC reads per second"],
-    "miss":       [4, 1000, "ARC misses per second"],
-    "read":       [4, 1000, "Total ARC accesses per second"],
-    "hit%":       [4, 100, "ARC Hit percentage"],
-    "miss%":      [5, 100, "ARC miss percentage"],
-    "dhit":       [4, 1000, "Demand Data hits per second"],
-    "dmis":       [4, 1000, "Demand Data misses per second"],
-    "dh%":        [3, 100, "Demand Data hit percentage"],
-    "dm%":        [3, 100, "Demand Data miss percentage"],
-    "phit":       [4, 1000, "Prefetch hits per second"],
-    "pmis":       [4, 1000, "Prefetch misses per second"],
-    "ph%":        [3, 100, "Prefetch hits percentage"],
-    "pm%":        [3, 100, "Prefetch miss percentage"],
-    "mhit":       [4, 1000, "Metadata hits per second"],
-    "mmis":       [4, 1000, "Metadata misses per second"],
-    "mread":      [4, 1000, "Metadata accesses per second"],
-    "mh%":        [3, 100, "Metadata hit percentage"],
-    "mm%":        [3, 100, "Metadata miss percentage"],
-    "arcsz":      [5, 1024, "ARC Size"],
-    "c":          [4, 1024, "ARC Target Size"],
-    "mfu":        [4, 1000, "MFU List hits per second"],
-    "mru":        [4, 1000, "MRU List hits per second"],
-    "mfug":       [4, 1000, "MFU Ghost List hits per second"],
-    "mrug":       [4, 1000, "MRU Ghost List hits per second"],
-    "eskip":      [5, 1000, "evict_skip per second"],
-    "mtxmis":     [6, 1000, "mutex_miss per second"],
-    "rmis":       [4, 1000, "recycle_miss per second"],
-    "dread":      [5, 1000, "Demand data accesses per second"],
-    "pread":      [5, 1000, "Prefetch accesses per second"],
-    "l2hits":     [6, 1000, "L2ARC hits per second"],
-    "l2miss":     [6, 1000, "L2ARC misses per second"],
-    "l2read":     [6, 1000, "Total L2ARC accesses per second"],
-    "l2hit%":     [6, 100, "L2ARC access hit percentage"],
-    "l2miss%":    [7, 100, "L2ARC access miss percentage"],
-    "l2size":     [6, 1024, "Size of the L2ARC"],
-    "l2bytes":    [7, 1024, "bytes read per second from the L2ARC"],
-}
-
-v = {}
-hdr = ["time", "read", "miss", "miss%", "dmis", "dm%", "pmis", "pm%", "mmis",
-    "mm%", "arcsz", "c"]
-xhdr = ["time", "mfu", "mru", "mfug", "mrug", "eskip", "mtxmis", "rmis",
-    "dread", "pread", "read"]
-sint = 1               # Default interval is 1 second
-count = 1              # Default count is 1
-hdr_intr = 20          # Print header every 20 lines of output
-opfile = None
-sep = "  "              # Default separator is 2 spaces
-version = "0.4"
-l2exist = False
-cmd = ("Usage: arcstat [-hvx] [-f fields] [-o file] [-s string] [interval "
-    "[count]]\n")
-cur = {}
-d = {}
-out = None
-kstat = None
-float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$")
-
-
-def detailed_usage():
-    sys.stderr.write("%s\n" % cmd)
-    sys.stderr.write("Field definitions are as follows:\n")
-    for key in cols:
-        sys.stderr.write("%11s : %s\n" % (key, cols[key][2]))
-    sys.stderr.write("\n")
-
-    sys.exit(1)
-
-
-def usage():
-    sys.stderr.write("%s\n" % cmd)
-    sys.stderr.write("\t -h : Print this help message\n")
-    sys.stderr.write("\t -v : List all possible field headers and definitions"
-        "\n")
-    sys.stderr.write("\t -x : Print extended stats\n")
-    sys.stderr.write("\t -f : Specify specific fields to print (see -v)\n")
-    sys.stderr.write("\t -o : Redirect output to the specified file\n")
-    sys.stderr.write("\t -s : Override default field separator with custom "
-        "character or string\n")
-    sys.stderr.write("\nExamples:\n")
-    sys.stderr.write("\tarcstat -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tarcstat -s \",\" -o /tmp/a.log 2 10\n")
-    sys.stderr.write("\tarcstat -v\n")
-    sys.stderr.write("\tarcstat -f time,hit%,dh%,ph%,mh% 1\n")
-    sys.stderr.write("\n")
-
-    sys.exit(1)
-
-
-def kstat_update():
-    global kstat
-
-    p = Popen("/sbin/sysctl -q 'kstat.zfs.misc.arcstats'", stdin=PIPE,
-        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
-    p.wait()
-
-    k = p.communicate()[0].split('\n')
-    if p.returncode != 0:
-        sys.exit(1)
-
-    if not k:
-        sys.exit(1)
-
-    kstat = {}
-
-    for s in k:
-        if not s:
-            continue
-
-        s = s.strip()
-
-        name, value = s.split(':')
-        name = name.strip()
-        value = value.strip()
-
-        parts = name.split('.')
-        n = parts.pop()
-
-        kstat[n] = Decimal(value)
-
-
-def snap_stats():
-    global cur
-    global kstat
-
-    prev = copy.deepcopy(cur)
-    kstat_update()
-
-    cur = kstat
-    for key in cur:
-        if re.match(key, "class"):
-            continue
-        if key in prev:
-            d[key] = cur[key] - prev[key]
-        else:
-            d[key] = cur[key]
-
-
-def prettynum(sz, scale, num=0):
-    suffix = [' ', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']
-    index = 0
-    save = 0
-
-    # Special case for date field
-    if scale == -1:
-        return "%s" % num
-
-    # Rounding error, return 0
-    elif num > 0 and num < 1:
-        num = 0
-
-    while num > scale and index < 5:
-        save = num
-        num = num / scale
-        index += 1
-
-    if index == 0:
-        return "%*d" % (sz, num)
-
-    if (save / scale) < 10:
-        return "%*.1f%s" % (sz - 1, num, suffix[index])
-    else:
-        return "%*d%s" % (sz - 1, num, suffix[index])
-
-
-def print_values():
-    global hdr
-    global sep
-    global v
-
-    for col in hdr:
-        sys.stdout.write("%s%s" % (
-            prettynum(cols[col][0], cols[col][1], v[col]),
-            sep
-            ))
-    sys.stdout.write("\n")
-
-
-def print_header():
-    global hdr
-    global sep
-
-    for col in hdr:
-        sys.stdout.write("%*s%s" % (cols[col][0], col, sep))
-    sys.stdout.write("\n")
-
-
-def init():
-    global sint
-    global count
-    global hdr
-    global xhdr
-    global opfile
-    global sep
-    global out
-    global l2exist
-
-    desired_cols = None
-    xflag = False
-    hflag = False
-    vflag = False
-    i = 1
-
-    try:
-        opts, args = getopt.getopt(
-            sys.argv[1:],
-            "xo:hvs:f:",
-            [
-                "extended",
-                "outfile",
-                "help",
-                "verbose",
-                "seperator",
-                "columns"
-            ]
-        )
-
-    except getopt.error, msg:
-        sys.stderr.write(msg)
-        usage()
-
-    for opt, arg in opts:
-        if opt in ('-x', '--extended'):
-            xflag = True
-        if opt in ('-o', '--outfile'):
-            opfile = arg
-            i += 1
-        if opt in ('-h', '--help'):
-            hflag = True
-        if opt in ('-v', '--verbose'):
-            vflag = True
-        if opt in ('-s', '--seperator'):
-            sep = arg
-            i += 1
-        if opt in ('-f', '--columns'):
-            desired_cols = arg
-            i += 1
-        i += 1
-
-    argv = sys.argv[i:]
-    sint = int(argv[0]) if argv else sint
-    count = int(argv[1]) if len(argv) > 1 else count
-
-    if len(argv) > 1:
-        sint = int(argv[0])
-        count = int(argv[1])
-
-    elif len(argv) > 0:
-        sint = int(argv[0])
-        count = 0
-
-    if hflag or (xflag and desired_cols):
-        usage()
-
-    if vflag:
-        detailed_usage()
-
-    if xflag:
-        hdr = xhdr
-
-    # check if L2ARC exists
-    snap_stats()
-    l2_size = cur.get("l2_size")
-    if l2_size:
-        l2exist = True
-
-    if desired_cols:
-        hdr = desired_cols.split(",")
-
-        invalid = []
-        incompat = []
-        for ele in hdr:
-            if ele not in cols:
-                invalid.append(ele)
-            elif not l2exist and ele.startswith("l2"):
-                sys.stdout.write("No L2ARC Here\n%s\n" % ele)
-                incompat.append(ele)
-
-        if len(invalid) > 0:
-            sys.stderr.write("Invalid column definition! -- %s\n" % invalid)
-            usage()
-
-        if len(incompat) > 0:
-            sys.stderr.write("Incompatible field specified! -- %s\n" % (
-                incompat,
-                ))
-            usage()
-
-    if opfile:
-        try:
-            out = open(opfile, "w")
-            sys.stdout = out
-
-        except:
-            sys.stderr.write("Cannot open %s for writing\n" % opfile)
-            sys.exit(1)
-
-
-def calculate():
-    global d
-    global v
-    global l2exist
-
-    v = {}
-    v["time"] = time.strftime("%H:%M:%S", time.localtime())
-    v["hits"] = d["hits"] / sint
-    v["miss"] = d["misses"] / sint
-    v["read"] = v["hits"] + v["miss"]
-    v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
-    v["miss%"] = 100 - v["hit%"] if v["read"] > 0 else 0
-
-    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
-    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
-
-    v["dread"] = v["dhit"] + v["dmis"]
-    v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
-    v["dm%"] = 100 - v["dh%"] if v["dread"] > 0 else 0
-
-    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
-    v["pmis"] = (d["prefetch_data_misses"] +
-        d["prefetch_metadata_misses"]) / sint
-
-    v["pread"] = v["phit"] + v["pmis"]
-    v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
-    v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0
-
-    v["mhit"] = (d["prefetch_metadata_hits"] +
-        d["demand_metadata_hits"]) / sint
-    v["mmis"] = (d["prefetch_metadata_misses"] +
-        d["demand_metadata_misses"]) / sint
-
-    v["mread"] = v["mhit"] + v["mmis"]
-    v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
-    v["mm%"] = 100 - v["mh%"] if v["mread"] > 0 else 0
-
-    v["arcsz"] = cur["size"]
-    v["c"] = cur["c"]
-    v["mfu"] = d["mfu_hits"] / sint
-    v["mru"] = d["mru_hits"] / sint
-    v["mrug"] = d["mru_ghost_hits"] / sint
-    v["mfug"] = d["mfu_ghost_hits"] / sint
-    v["eskip"] = d["evict_skip"] / sint
-    v["rmis"] = d["recycle_miss"] / sint
-    v["mtxmis"] = d["mutex_miss"] / sint
-
-    if l2exist:
-        v["l2hits"] = d["l2_hits"] / sint
-        v["l2miss"] = d["l2_misses"] / sint
-        v["l2read"] = v["l2hits"] + v["l2miss"]
-        v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
-
-        v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
-        v["l2size"] = cur["l2_size"]
-        v["l2bytes"] = d["l2_read_bytes"] / sint
-
-
-def sighandler(*args):
-    sys.exit(0)
-
-
-def main():
-    global sint
-    global count
-    global hdr_intr
-
-    i = 0
-    count_flag = 0
-
-    init()
-    if count > 0:
-        count_flag = 1
-
-    signal(SIGINT, sighandler)
-    while True:
-        if i == 0:
-            print_header()
-
-        snap_stats()
-        calculate()
-        print_values()
-
-        if count_flag == 1:
-            if count <= 1:
-                break
-            count -= 1
-
-        i = 0 if i == hdr_intr else i + 1
-        time.sleep(sint)
-
-    if out:
-        out.close()
-
-
-if __name__ == '__main__':
-    main()

Copied: trunk/nanobsd/Files/usr/local/bin/arc_summary.py (from rev 13308, trunk/gui/tools/arc_summary.py)
===================================================================
--- trunk/nanobsd/Files/usr/local/bin/arc_summary.py	                        (rev 0)
+++ trunk/nanobsd/Files/usr/local/bin/arc_summary.py	2013-02-18 02:13:00 UTC (rev 13312)
@@ -0,0 +1,736 @@
+#!/usr/local/bin/python
+#
+# $Id: arc_summary.pl,v 388:e27800740aa2 2011-07-08 02:53:29Z jhell $
+#
+# Copyright (c) 2008 Ben Rockwood <benr@...>,
+# Copyright (c) 2010 Martin Matuska <mm@...>,
+# Copyright (c) 2010-2011 Jason J. Hellenthal <jhell@...>,
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# If you are having troubles when using this script from cron(8) please try
+# adjusting your PATH before reporting problems.
+#
+# /usr/bin & /sbin
+#
+# Binaries used are:
+#
+# dc(1), kldstat(8), sed(1), sysctl(8) & vmstat(8)
+#
+# Binaries that I am working on phasing out are:
+#
+# dc(1) & sed(1)
+
+import sys
+import time
+import getopt
+import re
+
+from subprocess import Popen, PIPE
+from decimal import Decimal as D
+
+
+usetunable = True
+show_sysctl_descriptions = False
+alternate_sysctl_layout = False
+kstat_pobj = re.compile("^([^:]+):\s+(.+)\s*$", flags=re.M)
+
+
+def get_Kstat():
+    Kstats = [
+        "hw.pagesize",
+        "hw.physmem",
+        "kern.maxusers",
+        "vm.kmem_map_free",
+        "vm.kmem_map_size",
+        "vm.kmem_size",
+        "vm.kmem_size_max",
+        "vm.kmem_size_min",
+        "vm.kmem_size_scale",
+        "vm.stats",
+        "kstat.zfs",
+        "vfs.zfs"
+    ]
+
+    sysctls = " ".join(str(x) for x in Kstats)
+    p = Popen("/sbin/sysctl -q %s" % sysctls, stdin=PIPE,
+        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
+    p.wait()
+
+    kstat_pull = p.communicate()[0].split('\n')
+    if p.returncode != 0:
+        sys.exit(1)
+
+    Kstat = {}
+    for kstat in kstat_pull:
+        kstat = kstat.strip()
+        mobj = kstat_pobj.match(kstat)
+        if mobj:
+            key = mobj.group(1).strip()
+            val = mobj.group(2).strip()
+            Kstat[key] = D(val)
+
+    return Kstat
+
+
+def div1():
+    sys.stdout.write("\n")
+    for i in xrange(18):
+        sys.stdout.write("%s" % "----")
+    sys.stdout.write("\n")
+
+
+def div2():
+    div1()
+    sys.stdout.write("\n")
+
+
+def fBytes(Bytes=0, Decimal=2):
+    kbytes = (2 ** 10)
+    mbytes = (2 ** 20)
+    gbytes = (2 ** 30)
+    tbytes = (2 ** 40)
+    pbytes = (2 ** 50)
+    ebytes = (2 ** 60)
+    zbytes = (2 ** 70)
+    ybytes = (2 ** 80)
+
+    if Bytes >= ybytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / ybytes) + "\tYiB"
+    elif Bytes >= zbytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / zbytes) + "\tZiB"
+    elif Bytes >= ebytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / ebytes) + "\tEiB"
+    elif Bytes >= pbytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / pbytes) + "\tPiB"
+    elif Bytes >= tbytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / tbytes) + "\tTiB"
+    elif Bytes >= gbytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / gbytes) + "\tGiB"
+    elif Bytes >= mbytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / mbytes) + "\tMiB"
+    elif Bytes >= kbytes:
+        return str("%0." + str(Decimal) + "f") % (Bytes / kbytes) + "\tKiB"
+    elif Bytes == 0:
+        return str("%d" % 0) + "\tBytes"
+    else:
+        return str("%d" % Bytes) + "\tBytes"
+
+
+def fHits(Hits=0, Decimal=2):
+    khits = (10 ** 3)
+    mhits = (10 ** 6)
+    bhits = (10 ** 9)
+    thits = (10 ** 12)
+    qhits = (10 ** 15)
+    Qhits = (10 ** 18)
+    shits = (10 ** 21)
+    Shits = (10 ** 24)
+
+    if Hits >= Shits:
+        return str("%0." + str(Decimal) + "f") % (Hits / Shits) + "S"
+    elif Hits >= shits:
+        return str("%0." + str(Decimal) + "f") % (Hits / shits) + "s"
+    elif Hits >= Qhits:
+        return str("%0." + str(Decimal) + "f") % (Hits / Qhits) + "Q"
+    elif Hits >= qhits:
+        return str("%0." + str(Decimal) + "f") % (Hits / qhits) + "q"
+    elif Hits >= thits:
+        return str("%0." + str(Decimal) + "f") % (Hits / thits) + "t"
+    elif Hits >= bhits:
+        return str("%0." + str(Decimal) + "f") % (Hits / bhits) + "b"
+    elif Hits >= mhits:
+        return str("%0." + str(Decimal) + "f") % (Hits / mhits) + "m"
+    elif Hits >= khits:
+        return str("%0." + str(Decimal) + "f") % (Hits / khits) + "k"
+    elif Hits == 0:
+        return str("%d" % 0)
+    else:
+        return str("%d" % Hits)
+
+
+def fPerc(lVal=0, rVal=0, Decimal=2):
+        if rVal > 0:
+            return str("%0." + str(Decimal) + "f") % (100 * (lVal / rVal)) + "%"
+        else:
+            return str("%0." + str(Decimal) + "f") % 100 + "%"
+
+
+def _system_memory():
+    def mem_rounded(mem_size):
+        chip_size = 1
+        chip_guess = (int(mem_size) / 8) - 1
+        while chip_guess != 0:
+            chip_guess >>= 1
+            chip_size <<= 1
+
+        mem_round = (int(mem_size / chip_size) + 1) * chip_size
+        return mem_round
+
+    Kstat = get_Kstat()
+    pagesize = Kstat["hw.pagesize"]
+    mem_hw = mem_rounded(Kstat["hw.physmem"])
+    mem_phys = Kstat["hw.physmem"]
+    mem_all = Kstat["vm.stats.vm.v_page_count"] * pagesize
+    mem_wire = Kstat["vm.stats.vm.v_wire_count"] * pagesize
+    mem_active = Kstat["vm.stats.vm.v_active_count"] * pagesize
+    mem_inactive = Kstat["vm.stats.vm.v_inactive_count"] * pagesize
+    mem_cache = Kstat["vm.stats.vm.v_cache_count"] * pagesize
+    mem_free = Kstat["vm.stats.vm.v_free_count"] * pagesize
+
+    mem_gap_vm = mem_all - (mem_wire + mem_active + mem_inactive + mem_cache + mem_free)
+
+    mem_total = mem_hw
+    mem_avail = mem_inactive + mem_cache + mem_free
+    mem_used = mem_total - mem_avail
+
+    sys.stdout.write("System Memory:\n")
+    sys.stdout.write("\n")
+    sys.stdout.write("\t%s\t%s Active,\t" % (fPerc(mem_active, mem_all), fBytes(mem_active)))
+    sys.stdout.write("%s\t%s Inact\n" % (fPerc(mem_inactive, mem_all), fBytes(mem_inactive)))
+    sys.stdout.write("\t%s\t%s Wired,\t" % (fPerc(mem_wire, mem_all), fBytes(mem_wire)))
+    sys.stdout.write("%s\t%s Cache\n" % (fPerc(mem_cache, mem_all), fBytes(mem_cache)))
+    sys.stdout.write("\t%s\t%s Free,\t" % (fPerc(mem_free, mem_all), fBytes(mem_free)))
+    sys.stdout.write("%s\t%s Gap\n" % (fPerc(mem_gap_vm, mem_all), fBytes(mem_gap_vm)))
+    sys.stdout.write("\n")
+    sys.stdout.write("\tReal Installed:\t\t\t\t%s\n" % fBytes(mem_hw))
+    sys.stdout.write("\tReal Available:\t\t\t%s\t%s\n" % (fPerc(mem_phys, mem_hw), fBytes(mem_phys)))
+    sys.stdout.write("\tReal Managed:\t\t\t%s\t%s\n" % (fPerc(mem_all, mem_phys), fBytes(mem_all)))
+    sys.stdout.write("\n")
+    sys.stdout.write("\tLogical Total:\t\t\t\t%s\n" % fBytes(mem_total))
+    sys.stdout.write("\tLogical Used:\t\t\t%s\t%s\n" % (fPerc(mem_used, mem_total), fBytes(mem_used)))
+    sys.stdout.write("\tLogical Free:\t\t\t%s\t%s\n" % (fPerc(mem_avail, mem_total), fBytes(mem_avail)))
+    sys.stdout.write("\n")
+
+    cmd1 = """
+        /sbin/kldstat | \
+        /usr/bin/awk '
+            BEGIN {
+                print "16i 0";
+            }
+            NR > 1 {
+                print toupper($4) "+";
+            }
+           END {
+                print "p";
+           }
+        ' | /usr/bin/dc
+    """
+
+    cmd2 = """
+        /usr/bin/vmstat -m | \
+        /usr/bin/sed -Ee '1s/.*/0/;s/.* ([0-9]+)K.*/\\1+/;$s/$/1024*p/' | \
+        /usr/bin/dc
+    """
+
+    p1 = Popen(cmd1, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
+    p2 = Popen(cmd2, stdin=PIPE, stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
+
+    ktext = D(p1.communicate()[0].strip())
+    kdata = D(p2.communicate()[0].strip())
+
+    if p1.returncode != 0 or p2.returncode != 0:
+        sys.exit(1)
+
+    kmem = ktext + kdata
+    kmem_map_size = Kstat["vm.kmem_map_size"]
+    kmem_map_free = Kstat["vm.kmem_map_free"]
+    kmem_map_total = kmem_map_size + kmem_map_free
+
+    sys.stdout.write("Kernel Memory:\t\t\t\t\t%s\n" % fBytes(kmem))
+    sys.stdout.write("\tData:\t\t\t\t%s\t%s\n" % (fPerc(kdata, kmem), fBytes(kdata)))
+    sys.stdout.write("\tText:\t\t\t\t%s\t%s\n\n" % (fPerc(ktext, kmem), fBytes(ktext)))
+
+    sys.stdout.write("Kernel Memory Map:\t\t\t\t%s\n" % fBytes(kmem_map_total))
+    sys.stdout.write("\tSize:\t\t\t\t%s\t%s\n" % (fPerc(kmem_map_size, kmem_map_total), fBytes(kmem_map_size)))
+    sys.stdout.write("\tFree:\t\t\t\t%s\t%s\n" % (fPerc(kmem_map_free, kmem_map_total), fBytes(kmem_map_free)))
+
+
+def _arc_summary():
+    Kstat = get_Kstat()
+    if not Kstat["vfs.zfs.version.spa"]:
+        return
+
+    spa = Kstat["vfs.zfs.version.spa"]
+    zpl = Kstat["vfs.zfs.version.zpl"]
+    memory_throttle_count = Kstat["kstat.zfs.misc.arcstats.memory_throttle_count"]
+
+    sys.stdout.write("ARC Summary: ")
+    if memory_throttle_count > 0:
+        sys.stdout.write("(THROTTLED)\n")
+    else:
+        sys.stdout.write("(HEALTHY)\n")
+
+    sys.stdout.write("\tStorage pool Version:\t\t\t%d\n" % spa)
+    sys.stdout.write("\tFilesystem Version:\t\t\t%d\n" % zpl)
+    sys.stdout.write("\tMemory Throttle Count:\t\t\t%s\n" % fHits(memory_throttle_count))
+    sys.stdout.write("\n")
+
+    ### ARC Misc. ###
+    deleted = Kstat["kstat.zfs.misc.arcstats.deleted"]
+    #evict_skip = Kstat["kstat.zfs.misc.arcstats.evict_skip"]
+    mutex_miss = Kstat["kstat.zfs.misc.arcstats.mutex_miss"]
+    recycle_miss = Kstat["kstat.zfs.misc.arcstats.recycle_miss"]
+
+    sys.stdout.write("ARC Misc:\n")
+    sys.stdout.write("\tDeleted:\t\t\t\t%s\n" % fHits(deleted))
+    sys.stdout.write("\tRecycle Misses:\t\t\t\t%s\n" % fHits(recycle_miss))
+    sys.stdout.write("\tMutex Misses:\t\t\t\t%s\n" % fHits(mutex_miss))
+    sys.stdout.write("\tEvict Skips:\t\t\t\t%s\n" % fHits(mutex_miss))
+    sys.stdout.write("\n")
+
+    ### ARC Sizing ###
+    arc_size = Kstat["kstat.zfs.misc.arcstats.size"]
+    mru_size = Kstat["kstat.zfs.misc.arcstats.p"]
+    target_max_size = Kstat["kstat.zfs.misc.arcstats.c_max"]
+    target_min_size = Kstat["kstat.zfs.misc.arcstats.c_min"]
+    target_size = Kstat["kstat.zfs.misc.arcstats.c"]
+
+    target_size_ratio = (target_max_size / target_min_size)
+
+    sys.stdout.write("ARC Size:\t\t\t\t%s\t%s\n" %
+        (fPerc(arc_size, target_max_size), fBytes(arc_size)))
+    sys.stdout.write("\tTarget Size: (Adaptive)\t\t%s\t%s\n" %
+        (fPerc(target_size, target_max_size), fBytes(target_size)))
+    sys.stdout.write("\tMin Size (Hard Limit):\t\t%s\t%s\n" %
+        (fPerc(target_min_size, target_max_size), fBytes(target_min_size)))
+    sys.stdout.write("\tMax Size (High Water):\t\t%d:1\t%s\n" %
+        (target_size_ratio, fBytes(target_max_size)))
+
+    sys.stdout.write("\nARC Size Breakdown:\n")
+    if arc_size > target_size:
+        mfu_size = (arc_size - mru_size)
+        sys.stdout.write("\tRecently Used Cache Size:\t%s\t%s\n" %
+            (fPerc(mru_size, arc_size), fBytes(mru_size)))
+        sys.stdout.write("\tFrequently Used Cache Size:\t%s\t%s\n" %
+            (fPerc(mfu_size, arc_size), fBytes(mfu_size)))
+
+    if arc_size < target_size:
+        mfu_size = (target_size - mru_size)
+        sys.stdout.write("\tRecently Used Cache Size:\t%s\t%s\n" %
+            (fPerc(mru_size, target_size), fBytes(mru_size)))
+        sys.stdout.write("\tFrequently Used Cache Size:\t%s\t%s\n" %
+            (fPerc(mfu_size, target_size), fBytes(mfu_size)))
+    sys.stdout.write("\n")
+
+    ### ARC Hash Breakdown ###
+    hash_chain_max = Kstat["kstat.zfs.misc.arcstats.hash_chain_max"]
+    hash_chains = Kstat["kstat.zfs.misc.arcstats.hash_chains"]
+    hash_collisions = Kstat["kstat.zfs.misc.arcstats.hash_collisions"]
+    hash_elements = Kstat["kstat.zfs.misc.arcstats.hash_elements"]
+    hash_elements_max = Kstat["kstat.zfs.misc.arcstats.hash_elements_max"]
+
+    sys.stdout.write("ARC Hash Breakdown:\n")
+    sys.stdout.write("\tElements Max:\t\t\t\t%s\n" % fHits(hash_elements_max))
+    sys.stdout.write("\tElements Current:\t\t%s\t%s\n" %
+        (fPerc(hash_elements, hash_elements_max), fHits(hash_elements)))
+    sys.stdout.write("\tCollisions:\t\t\t\t%s\n" % fHits(hash_collisions))
+    sys.stdout.write("\tChain Max:\t\t\t\t%s\n" % fHits(hash_chain_max))
+    sys.stdout.write("\tChains:\t\t\t\t\t%s\n" % fHits(hash_chains))
+
+
+def _arc_efficiency():
+    Kstat = get_Kstat()
+    if not Kstat["vfs.zfs.version.spa"]:
+        return
+
+    arc_hits = Kstat["kstat.zfs.misc.arcstats.hits"]
+    arc_misses = Kstat["kstat.zfs.misc.arcstats.misses"]
+    demand_data_hits = Kstat["kstat.zfs.misc.arcstats.demand_data_hits"]
+    demand_data_misses = Kstat["kstat.zfs.misc.arcstats.demand_data_misses"]
+    demand_metadata_hits = Kstat["kstat.zfs.misc.arcstats.demand_metadata_hits"]
+    demand_metadata_misses = Kstat["kstat.zfs.misc.arcstats.demand_metadata_misses"]
+    mfu_ghost_hits = Kstat["kstat.zfs.misc.arcstats.mfu_ghost_hits"]
+    mfu_hits = Kstat["kstat.zfs.misc.arcstats.mfu_hits"]
+    mru_ghost_hits = Kstat["kstat.zfs.misc.arcstats.mru_ghost_hits"]
+    mru_hits = Kstat["kstat.zfs.misc.arcstats.mru_hits"]
+    prefetch_data_hits = Kstat["kstat.zfs.misc.arcstats.prefetch_data_hits"]
+    prefetch_data_misses = Kstat["kstat.zfs.misc.arcstats.prefetch_data_misses"]
+    prefetch_metadata_hits = Kstat["kstat.zfs.misc.arcstats.prefetch_metadata_hits"]
+    prefetch_metadata_misses = Kstat["kstat.zfs.misc.arcstats.prefetch_metadata_misses"]
+
+    anon_hits = arc_hits - (mfu_hits + mru_hits + mfu_ghost_hits + mru_ghost_hits)
+    arc_accesses_total = (arc_hits + arc_misses)
+    demand_data_total = (demand_data_hits + demand_data_misses)
+    prefetch_data_total = (prefetch_data_hits + prefetch_data_misses)
+    real_hits = (mfu_hits + mru_hits)
+
+    sys.stdout.write("ARC Efficiency:\t\t\t\t\t%s\n" % fHits(arc_accesses_total))
+    sys.stdout.write("\tCache Hit Ratio:\t\t%s\t%s\n" %
+        (fPerc(arc_hits, arc_accesses_total), fHits(arc_hits)))
+    sys.stdout.write("\tCache Miss Ratio:\t\t%s\t%s\n" %
+        (fPerc(arc_misses, arc_accesses_total), fHits(arc_misses)))
+    sys.stdout.write("\tActual Hit Ratio:\t\t%s\t%s\n" %
+        (fPerc(real_hits, arc_accesses_total), fHits(real_hits)))
+    sys.stdout.write("\n")
+    sys.stdout.write("\tData Demand Efficiency:\t\t%s\t%s\n" %
+        (fPerc(demand_data_hits, demand_data_total), fHits(demand_data_total)))
+
+    if prefetch_data_total > 0:
+        sys.stdout.write("\tData Prefetch Efficiency:\t%s\t%s\n" %
+            (fPerc(prefetch_data_hits, prefetch_data_total), fHits(prefetch_data_total)))
+    sys.stdout.write("\n")
+
+    sys.stdout.write("\tCACHE HITS BY CACHE LIST:\n")
+    if anon_hits > 0:
+        sys.stdout.write("\t  Anonymously Used:\t\t%s\t%s\n" %
+            (fPerc(anon_hits, arc_hits), fHits(anon_hits)))
+
+    sys.stdout.write("\t  Most Recently Used:\t\t%s\t%s\n" %
+        (fPerc(mru_hits, arc_hits), fHits(mru_hits)))
+    sys.stdout.write("\t  Most Frequently Used:\t\t%s\t%s\n" %
+        (fPerc(mfu_hits, arc_hits), fHits(mfu_hits)))
+    sys.stdout.write("\t  Most Recently Used Ghost:\t%s\t%s\n" %
+        (fPerc(mru_ghost_hits, arc_hits), fHits(mru_ghost_hits)))
+    sys.stdout.write("\t  Most Frequently Used Ghost:\t%s\t%s\n" %
+        (fPerc(mfu_ghost_hits, arc_hits), fHits(mfu_ghost_hits)))
+
+    sys.stdout.write("\n\tCACHE HITS BY DATA TYPE:\n")
+    sys.stdout.write("\t  Demand Data:\t\t\t%s\t%s\n" %
+        (fPerc(demand_data_hits, arc_hits), fHits(demand_data_hits)))
+    sys.stdout.write("\t  Prefetch Data:\t\t%s\t%s\n" %
+        (fPerc(prefetch_data_hits, arc_hits), fHits(prefetch_data_hits)))
+    sys.stdout.write("\t  Demand Metadata:\t\t%s\t%s\n" %
+        (fPerc(demand_metadata_hits, arc_hits), fHits(demand_metadata_hits)))
+    sys.stdout.write("\t  Prefetch Metadata:\t\t%s\t%s\n" %
+        (fPerc(prefetch_metadata_hits, arc_hits), fHits(prefetch_metadata_hits)))
+
+    sys.stdout.write("\n\tCACHE MISSES BY DATA TYPE:\n")
+    sys.stdout.write("\t  Demand Data:\t\t\t%s\t%s\n" %
+        (fPerc(demand_data_misses, arc_misses), fHits(demand_data_misses)))
+    sys.stdout.write("\t  Prefetch Data:\t\t%s\t%s\n" %
+        (fPerc(prefetch_data_misses, arc_misses), fHits(prefetch_data_misses)))
+    sys.stdout.write("\t  Demand Metadata:\t\t%s\t%s\n" %
+        (fPerc(demand_metadata_misses, arc_misses), fHits(demand_metadata_misses)))
+    sys.stdout.write("\t  Prefetch Metadata:\t\t%s\t%s\n" %
+        (fPerc(prefetch_metadata_misses, arc_misses), fHits(prefetch_metadata_misses)))
+
+
+def _l2arc_summary():
+    Kstat = get_Kstat()
+    if not Kstat["vfs.zfs.version.spa"]:
+        return
+
+    l2_abort_lowmem = Kstat["kstat.zfs.misc.arcstats.l2_abort_lowmem"]
+    l2_cksum_bad = Kstat["kstat.zfs.misc.arcstats.l2_cksum_bad"]
+    l2_evict_lock_retry = Kstat["kstat.zfs.misc.arcstats.l2_evict_lock_retry"]
+    l2_evict_reading = Kstat["kstat.zfs.misc.arcstats.l2_evict_reading"]
+    l2_feeds = Kstat["kstat.zfs.misc.arcstats.l2_feeds"]
+    l2_free_on_write = Kstat["kstat.zfs.misc.arcstats.l2_free_on_write"]
+    l2_hdr_size = Kstat["kstat.zfs.misc.arcstats.l2_hdr_size"]
+    l2_hits = Kstat["kstat.zfs.misc.arcstats.l2_hits"]
+    l2_io_error = Kstat["kstat.zfs.misc.arcstats.l2_io_error"]
+    l2_misses = Kstat["kstat.zfs.misc.arcstats.l2_misses"]
+    l2_rw_clash = Kstat["kstat.zfs.misc.arcstats.l2_rw_clash"]
+    l2_size = Kstat["kstat.zfs.misc.arcstats.l2_size"]
+    l2_write_buffer_bytes_scanned = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_bytes_scanned"]
+    l2_write_buffer_iter = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_iter"]
+    l2_write_buffer_list_iter = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_list_iter"]
+    l2_write_buffer_list_null_iter = Kstat["kstat.zfs.misc.arcstats.l2_write_buffer_list_null_iter"]
+    #l2_write_bytes = Kstat["kstat.zfs.misc.arcstats.l2_write_bytes"]
+    l2_write_full = Kstat["kstat.zfs.misc.arcstats.l2_write_full"]
+    #l2_write_in_l2 = Kstat["kstat.zfs.misc.arcstats.l2_write_in_l2"]
+    l2_write_io_in_progress = Kstat["kstat.zfs.misc.arcstats.l2_write_io_in_progress"]
+    #l2_write_not_cacheable = Kstat["kstat.zfs.misc.arcstats.l2_write_not_cacheable"]
+    l2_write_passed_headroom = Kstat["kstat.zfs.misc.arcstats.l2_write_passed_headroom"]
+    #l2_write_pios = Kstat["kstat.zfs.misc.arcstats.l2_write_pios"]
+    l2_write_spa_mismatch = Kstat["kstat.zfs.misc.arcstats.l2_write_spa_mismatch"]
+    l2_write_trylock_fail = Kstat["kstat.zfs.misc.arcstats.l2_write_trylock_fail"]
+    l2_writes_done = Kstat["kstat.zfs.misc.arcstats.l2_writes_done"]
+    l2_writes_error = Kstat["kstat.zfs.misc.arcstats.l2_writes_error"]
+    #l2_writes_hdr_miss = Kstat["kstat.zfs.misc.arcstats.l2_writes_hdr_miss"]
+    l2_writes_sent = Kstat["kstat.zfs.misc.arcstats.l2_writes_sent"]
+
+    l2_access_total = (l2_hits + l2_misses)
+    l2_health_count = (l2_writes_error + l2_cksum_bad + l2_io_error)
+
+    if l2_size > 0 and l2_access_total > 0:
+        sys.stdout.write("L2 ARC Summary: ")
+        if l2_health_count > 0:
+            sys.stdout.write("(DEGRADED)\n")
+        else:
+            sys.stdout.write("(HEALTHY)\n")
+        sys.stdout.write("\tPassed Headroom:\t\t\t%s\n" % fHits(l2_write_passed_headroom))
+        sys.stdout.write("\tTried Lock Failures:\t\t\t%s\n" % fHits(l2_write_trylock_fail))
+        sys.stdout.write("\tIO In Progress:\t\t\t\t%s\n" % fHits(l2_write_io_in_progress))
+        sys.stdout.write("\tLow Memory Aborts:\t\t\t%s\n" % fHits(l2_abort_lowmem))
+        sys.stdout.write("\tFree on Write:\t\t\t\t%s\n" % fHits(l2_free_on_write))
+        sys.stdout.write("\tWrites While Full:\t\t\t%s\n" % fHits(l2_write_full))
+        sys.stdout.write("\tR/W Clashes:\t\t\t\t%s\n" % fHits(l2_rw_clash))
+        sys.stdout.write("\tBad Checksums:\t\t\t\t%s\n" % fHits(l2_cksum_bad))
+        sys.stdout.write("\tIO Errors:\t\t\t\t%s\n" % fHits(l2_io_error))
+        sys.stdout.write("\tSPA Mismatch:\t\t\t\t%s\n" % fHits(l2_write_spa_mismatch))
+        sys.stdout.write("\n")
+
+        sys.stdout.write("L2 ARC Size: (Adaptive)\t\t\t\t%s\n" % fBytes(l2_size))
+        sys.stdout.write("\tHeader Size:\t\t\t%s\t%s\n" %
+            (fPerc(l2_hdr_size, l2_size), fBytes(l2_hdr_size)))
+        sys.stdout.write("\n")
+
+        if (l2_evict_lock_retry + l2_evict_reading) > 0:
+            sys.stdout.write("L2 ARC Evicts:\n")
+            sys.stdout.write("\tLock Retries:\t\t\t\t%s\n" % fHits(l2_evict_lock_retry))
+            sys.stdout.write("\tUpon Reading:\t\t\t\t%s\n" % fHits(l2_evict_reading))
+            sys.stdout.write("\n")
+
+        sys.stdout.write("L2 ARC Breakdown:\t\t\t\t%s\n" % fHits(l2_access_total))
+        sys.stdout.write("\tHit Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(l2_hits, l2_access_total), fHits(l2_hits)))
+        sys.stdout.write("\tMiss Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(l2_misses, l2_access_total), fHits(l2_misses)))
+        sys.stdout.write("\tFeeds:\t\t\t\t\t%s\n" % fHits(l2_feeds))
+        sys.stdout.write("\n")
+
+        sys.stdout.write("L2 ARC Buffer:\n")
+        sys.stdout.write("\tBytes Scanned:\t\t\t\t%s\n" % fBytes(l2_write_buffer_bytes_scanned))
+        sys.stdout.write("\tBuffer Iterations:\t\t\t%s\n" % fHits(l2_write_buffer_iter))
+        sys.stdout.write("\tList Iterations:\t\t\t%s\n" % fHits(l2_write_buffer_list_iter))
+        sys.stdout.write("\tNULL List Iterations:\t\t\t%s\n" % fHits(l2_write_buffer_list_null_iter))
+        sys.stdout.write("\n")
+
+        sys.stdout.write("L2 ARC Writes:\n")
+        if l2_writes_done != l2_writes_sent:
+            sys.stdout.write("\tWrites Sent: (%s)\t\t\t\t%s\n" %
+                ("FAULTED", fHits(l2_writes_sent)))
+            sys.stdout.write("\t  Done Ratio:\t\t\t%s\t%s\n" %
+                (fPerc(l2_writes_done, l2_writes_sent), fHits(l2_writes_done)))
+            sys.stdout.write("\t  Error Ratio:\t\t\t%s\t%s\n" %
+                (fPerc(l2_writes_error, l2_writes_sent), fHits(l2_writes_error)))
+        else:
+            sys.stdout.write("\tWrites Sent:\t\t\t%s\t%s\n" % (fPerc(100), fHits(l2_writes_sent)))
+
+
+def _dmu_summary():
+    Kstat = get_Kstat()
+    if not Kstat["vfs.zfs.version.spa"]:
+        return
+
+    zfetch_bogus_streams = Kstat["kstat.zfs.misc.zfetchstats.bogus_streams"]
+    zfetch_colinear_hits = Kstat["kstat.zfs.misc.zfetchstats.colinear_hits"]
+    zfetch_colinear_misses = Kstat["kstat.zfs.misc.zfetchstats.colinear_misses"]
+    zfetch_hits = Kstat["kstat.zfs.misc.zfetchstats.hits"]
+    zfetch_misses = Kstat["kstat.zfs.misc.zfetchstats.misses"]
+    zfetch_reclaim_failures = Kstat["kstat.zfs.misc.zfetchstats.reclaim_failures"]
+    zfetch_reclaim_successes = Kstat["kstat.zfs.misc.zfetchstats.reclaim_successes"]
+    zfetch_streams_noresets = Kstat["kstat.zfs.misc.zfetchstats.streams_noresets"]
+    zfetch_streams_resets = Kstat["kstat.zfs.misc.zfetchstats.streams_resets"]
+    zfetch_stride_hits = Kstat["kstat.zfs.misc.zfetchstats.stride_hits"]
+    zfetch_stride_misses = Kstat["kstat.zfs.misc.zfetchstats.stride_misses"]
+
+    zfetch_access_total = (zfetch_hits + zfetch_misses)
+    zfetch_colinear_total = (zfetch_colinear_hits + zfetch_colinear_misses)
+    zfetch_health_count = (zfetch_bogus_streams)
+    zfetch_reclaim_total = (zfetch_reclaim_successes + zfetch_reclaim_failures)
+    zfetch_streams_total = (zfetch_streams_resets + zfetch_streams_noresets + zfetch_bogus_streams)
+    zfetch_stride_total = (zfetch_stride_hits + zfetch_stride_misses)
+
+    if zfetch_access_total > 0:
+        sys.stdout.write("File-Level Prefetch: ")
+        if zfetch_health_count > 0:
+            sys.stdout.write("(DEGRADED)\n\n")
+        else:
+            sys.stdout.write("(HEALTHY)\n\n")
+
+        sys.stdout.write("DMU Efficiency:\t\t\t\t\t%s\n" % fHits(zfetch_access_total))
+        sys.stdout.write("\tHit Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_hits, zfetch_access_total), fHits(zfetch_hits)))
+        sys.stdout.write("\tMiss Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_misses, zfetch_access_total), fHits(zfetch_misses)))
+        sys.stdout.write("\n")
+
+        sys.stdout.write("\tColinear:\t\t\t\t%s\n" % fHits(zfetch_colinear_total))
+        sys.stdout.write("\t  Hit Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_colinear_hits, zfetch_colinear_total), fHits(zfetch_colinear_hits)))
+        sys.stdout.write("\t  Miss Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_colinear_misses, zfetch_colinear_total), fHits(zfetch_colinear_misses)))
+        sys.stdout.write("\n")
+
+        sys.stdout.write("\tStride:\t\t\t\t\t%s\n" % fHits(zfetch_stride_total))
+        sys.stdout.write("\t  Hit Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_stride_hits, zfetch_stride_total), fHits(zfetch_stride_hits)))
+        sys.stdout.write("\t  Miss Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_stride_misses, zfetch_stride_total), fHits(zfetch_stride_misses)))
+        sys.stdout.write("\n")
+
+        if zfetch_health_count > 0:
+            sys.stdout.write("DMU Misc: (%s)\n" % "FAULTED")
+        else:
+            sys.stdout.write("DMU Misc:\n")
+
+        sys.stdout.write("\tReclaim:\t\t\t\t%s\n" % fHits(zfetch_reclaim_total))
+        sys.stdout.write("\t  Successes:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_reclaim_successes, zfetch_reclaim_total), fHits(zfetch_reclaim_successes)))
+        sys.stdout.write("\t  Failures:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_reclaim_failures, zfetch_reclaim_total), fHits(zfetch_reclaim_failures)))
+        sys.stdout.write("\n\tStreams:\t\t\t\t%s\n" % fHits(zfetch_streams_total))
+        sys.stdout.write("\t  +Resets:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_streams_resets, zfetch_streams_total), fHits(zfetch_streams_resets)))
+        sys.stdout.write("\t  -Resets:\t\t\t%s\t%s\n" %
+            (fPerc(zfetch_streams_noresets, zfetch_streams_total), fHits(zfetch_streams_noresets)))
+        sys.stdout.write("\t  Bogus:\t\t\t\t%s\n" % fHits(zfetch_bogus_streams))
+
+
+def _vdev_summary():
+    Kstat = get_Kstat()
+    if not Kstat["vfs.zfs.version.spa"]:
+        return
+
+    vdev_cache_delegations = Kstat["kstat.zfs.misc.vdev_cache_stats.delegations"]
+    vdev_cache_misses = Kstat["kstat.zfs.misc.vdev_cache_stats.misses"]
+    vdev_cache_hits = Kstat["kstat.zfs.misc.vdev_cache_stats.hits"]
+    vdev_cache_total = (vdev_cache_misses + vdev_cache_hits + vdev_cache_delegations)
+
+    if vdev_cache_total > 0:
+        sys.stdout.write("VDEV Cache Summary:\t\t\t\t%s\n" % fHits(vdev_cache_total))
+        sys.stdout.write("\tHit Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(vdev_cache_hits, vdev_cache_total), fHits(vdev_cache_hits)))
+        sys.stdout.write("\tMiss Ratio:\t\t\t%s\t%s\n" %
+            (fPerc(vdev_cache_misses, vdev_cache_total), fHits(vdev_cache_misses)))
+        sys.stdout.write("\tDelegations:\t\t\t%s\t%s\n" %
+            (fPerc(vdev_cache_delegations, vdev_cache_total), fHits(vdev_cache_delegations)))
+
+
+def _sysctl_summary():
+    global show_sysctl_descriptions
+    global alternate_sysctl_layout
+
+    Tunable = [
+        "kern.maxusers",
+        "vm.kmem_size",
+        "vm.kmem_size_scale",
+        "vm.kmem_size_min",
+        "vm.kmem_size_max",
+        "vfs.zfs"
+    ]
+
+    if not usetunable:
+        return
+
+    sysctl_descriptions = {}
+    if show_sysctl_descriptions:
+        tunables = " ".join(str(x) for x in Tunable)
+        p = Popen("/sbin/sysctl -qde %s" % tunables, stdin=PIPE,
+            stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
+        p.wait()
+
+        descriptions = p.communicate()[0].split('\n')
+        if p.returncode != 0:
+            sys.exit(1)
+
+        for tunable in descriptions:
+            if not tunable:
+                continue
+            tunable = tunable.strip()
+            name, description = tunable.split('=')[:2]
+            name = name.strip()
+            description = description.strip()
+            if not description:
+                description = "Description unavailable"
+            sysctl_descriptions[name] = description
+
+    tunables = " ".join(str(x) for x in Tunable)
+    p = Popen("/sbin/sysctl -qe %s" % tunables, stdin=PIPE,
+        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
+    p.wait()
+
+    zfs_tunables = p.communicate()[0].split('\n')
+    if p.returncode != 0:
+        sys.exit(1)
+
+    sys.stdout.write("ZFS Tunable (sysctl):\n")
+    for tunable in zfs_tunables:
+        if not tunable:
+            continue
+        tunable = tunable.strip()
+        name, value = tunable.split("=")[0:2]
+        name = name.strip()
+        value = D(value.strip())
+        format = "\t%s=%d\n" if alternate_sysctl_layout else "\t%-40s%d\n"
+        if show_sysctl_descriptions:
+            sys.stdout.write("\t\# %s\n" % sysctl_descriptions[name])
+        sys.stdout.write(format % (name, value))
+
+
+unSub = [
+    _system_memory,
+    _arc_summary,
+    _arc_efficiency,
+    _l2arc_summary,
+    _dmu_summary,
+    _vdev_summary,
+    _sysctl_summary
+]
+
+
+def _call_all():
+    page = 1
+    for unsub in unSub:
+        unsub()
+        sys.stdout.write("\t\t\t\t\t\t\t\tPage: %2d" % page)
+        div2()
+        page += 1
+
+
+def zfs_header():
+    daydate = time.strftime("%a %b %d %H:%M:%S %Y")
+
+    div1()
+    sys.stdout.write("ZFS Subsystem Report\t\t\t\t%s" % daydate)
+    div2()
+
+
+def main():
+    global show_sysctl_descriptions
+    global alternate_sysctl_layout
+
+    opts, args = getopt.getopt(
+        sys.argv[1:], "adp:"
+    )
+
+    args = {}
+    for opt, arg in opts:
+        if opt == '-a':
+            args['a'] = True
+        if opt == '-d':
+            args['d'] = True
+        if opt == '-p':
+            args['p'] = arg
+
+    if args:
+        alternate_sysctl_layout = True if 'a' in args else False
+        show_sysctl_descriptions = True if 'd' in args else False
+        try:
+            zfs_header()
+            unSub[int(args['p']) - 1]()
+            div2()
+
+        except:
+            _call_all()
+
+    else:
+        _call_all()
+
+
+if __name__ == '__main__':
+    main()

Copied: trunk/nanobsd/Files/usr/local/bin/arcstat.py (from rev 13308, trunk/gui/tools/arcstat.py)
===================================================================
--- trunk/nanobsd/Files/usr/local/bin/arcstat.py	                        (rev 0)
+++ trunk/nanobsd/Files/usr/local/bin/arcstat.py	2013-02-18 02:13:00 UTC (rev 13312)
@@ -0,0 +1,454 @@
+#!/usr/local/bin/python
+#
+# Print out ZFS ARC Statistics exported via kstat(1)
+# For a definition of fields, or usage, use arctstat.pl -v
+#
+# This script is a fork of the original arcstat.pl (0.1) by
+# Neelakanth Nadgir, originally published on his Sun blog on
+# 09/18/2007
+#     http://blogs.sun.com/realneel/entry/zfs_arc_statistics
+#
+# This version aims to improve upon the original by adding features
+# and fixing bugs as needed.  This version is maintained by
+# Mike Harsch and is hosted in a public open source repository:
+#    http://github.com/mharsch/arcstat
+#
+# Comments, Questions, or Suggestions are always welcome.
+# Contact the maintainer at ( mike at harschsystems dot com )
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Fields have a fixed width. Every interval, we fill the "v"
+# hash with its corresponding value (v[field]=value) using calculate().
+# @hdr is the array of fields that needs to be printed, so we
+# just iterate over this array and print the values using our pretty printer.
+#
+
+
+import sys
+import time
+import getopt
+import re
+import copy
+
+from decimal import Decimal
+from subprocess import Popen, PIPE
+from signal import signal, SIGINT
+
+cols = {
+    # HDR:        [Size, Scale, Description]
+    "time":       [8, -1, "Time"],
+    "hits":       [4, 1000, "ARC reads per second"],
+    "miss":       [4, 1000, "ARC misses per second"],
+    "read":       [4, 1000, "Total ARC accesses per second"],
+    "hit%":       [4, 100, "ARC Hit percentage"],
+    "miss%":      [5, 100, "ARC miss percentage"],
+    "dhit":       [4, 1000, "Demand Data hits per second"],
+    "dmis":       [4, 1000, "Demand Data misses per second"],
+    "dh%":        [3, 100, "Demand Data hit percentage"],
+    "dm%":        [3, 100, "Demand Data miss percentage"],
+    "phit":       [4, 1000, "Prefetch hits per second"],
+    "pmis":       [4, 1000, "Prefetch misses per second"],
+    "ph%":        [3, 100, "Prefetch hits percentage"],
+    "pm%":        [3, 100, "Prefetch miss percentage"],
+    "mhit":       [4, 1000, "Metadata hits per second"],
+    "mmis":       [4, 1000, "Metadata misses per second"],
+    "mread":      [4, 1000, "Metadata accesses per second"],
+    "mh%":        [3, 100, "Metadata hit percentage"],
+    "mm%":        [3, 100, "Metadata miss percentage"],
+    "arcsz":      [5, 1024, "ARC Size"],
+    "c":          [4, 1024, "ARC Target Size"],
+    "mfu":        [4, 1000, "MFU List hits per second"],
+    "mru":        [4, 1000, "MRU List hits per second"],
+    "mfug":       [4, 1000, "MFU Ghost List hits per second"],
+    "mrug":       [4, 1000, "MRU Ghost List hits per second"],
+    "eskip":      [5, 1000, "evict_skip per second"],
+    "mtxmis":     [6, 1000, "mutex_miss per second"],
+    "rmis":       [4, 1000, "recycle_miss per second"],
+    "dread":      [5, 1000, "Demand data accesses per second"],
+    "pread":      [5, 1000, "Prefetch accesses per second"],
+    "l2hits":     [6, 1000, "L2ARC hits per second"],
+    "l2miss":     [6, 1000, "L2ARC misses per second"],
+    "l2read":     [6, 1000, "Total L2ARC accesses per second"],
+    "l2hit%":     [6, 100, "L2ARC access hit percentage"],
+    "l2miss%":    [7, 100, "L2ARC access miss percentage"],
+    "l2size":     [6, 1024, "Size of the L2ARC"],
+    "l2bytes":    [7, 1024, "bytes read per second from the L2ARC"],
+}
+
+v = {}
+hdr = ["time", "read", "miss", "miss%", "dmis", "dm%", "pmis", "pm%", "mmis",
+    "mm%", "arcsz", "c"]
+xhdr = ["time", "mfu", "mru", "mfug", "mrug", "eskip", "mtxmis", "rmis",
+    "dread", "pread", "read"]
+sint = 1               # Default interval is 1 second
+count = 1              # Default count is 1
+hdr_intr = 20          # Print header every 20 lines of output
+opfile = None
+sep = "  "              # Default separator is 2 spaces
+version = "0.4"
+l2exist = False
+cmd = ("Usage: arcstat [-hvx] [-f fields] [-o file] [-s string] [interval "
+    "[count]]\n")
+cur = {}
+d = {}
+out = None
+kstat = None
+float_pobj = re.compile("^[0-9]+(\.[0-9]+)?$")
+
+
+def detailed_usage():
+    sys.stderr.write("%s\n" % cmd)
+    sys.stderr.write("Field definitions are as follows:\n")
+    for key in cols:
+        sys.stderr.write("%11s : %s\n" % (key, cols[key][2]))
+    sys.stderr.write("\n")
+
+    sys.exit(1)
+
+
+def usage():
+    sys.stderr.write("%s\n" % cmd)
+    sys.stderr.write("\t -h : Print this help message\n")
+    sys.stderr.write("\t -v : List all possible field headers and definitions"
+        "\n")
+    sys.stderr.write("\t -x : Print extended stats\n")
+    sys.stderr.write("\t -f : Specify specific fields to print (see -v)\n")
+    sys.stderr.write("\t -o : Redirect output to the specified file\n")
+    sys.stderr.write("\t -s : Override default field separator with custom "
+        "character or string\n")
+    sys.stderr.write("\nExamples:\n")
+    sys.stderr.write("\tarcstat -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -s \",\" -o /tmp/a.log 2 10\n")
+    sys.stderr.write("\tarcstat -v\n")
+    sys.stderr.write("\tarcstat -f time,hit%,dh%,ph%,mh% 1\n")
+    sys.stderr.write("\n")
+
+    sys.exit(1)
+
+
+def kstat_update():
+    global kstat
+
+    p = Popen("/sbin/sysctl -q 'kstat.zfs.misc.arcstats'", stdin=PIPE,
+        stdout=PIPE, stderr=PIPE, shell=True, close_fds=True)
+    p.wait()
+
+    k = p.communicate()[0].split('\n')
+    if p.returncode != 0:
+        sys.exit(1)
+
+    if not k:
+        sys.exit(1)
+
+    kstat = {}
+
+    for s in k:
+        if not s:
+            continue
+
+        s = s.strip()
+
+        name, value = s.split(':')
+        name = name.strip()
+        value = value.strip()
+
+        parts = name.split('.')
+        n = parts.pop()
+
+        kstat[n] = Decimal(value)
+
+
+def snap_stats():
+    global cur
+    global kstat
+
+    prev = copy.deepcopy(cur)
+    kstat_update()
+
+    cur = kstat
+    for key in cur:
+        if re.match(key, "class"):
+            continue
+        if key in prev:
+            d[key] = cur[key] - prev[key]
+        else:
+            d[key] = cur[key]
+
+
+def prettynum(sz, scale, num=0):
+    suffix = [' ', 'K', 'M', 'G', 'T', 'P', 'E', 'Z']
+    index = 0
+    save = 0
+
+    # Special case for date field
+    if scale == -1:
+        return "%s" % num
+
+    # Rounding error, return 0
+    elif num > 0 and num < 1:
+        num = 0
+
+    while num > scale and index < 5:
+        save = num
+        num = num / scale
+        index += 1
+
+    if index == 0:
+        return "%*d" % (sz, num)
+
+    if (save / scale) < 10:
+        return "%*.1f%s" % (sz - 1, num, suffix[index])
+    else:
+        return "%*d%s" % (sz - 1, num, suffix[index])
+
+
+def print_values():
+    global hdr
+    global sep
+    global v
+
+    for col in hdr:
+        sys.stdout.write("%s%s" % (
+            prettynum(cols[col][0], cols[col][1], v[col]),
+            sep
+            ))
+    sys.stdout.write("\n")
+
+
+def print_header():
+    global hdr
+    global sep
+
+    for col in hdr:
+        sys.stdout.write("%*s%s" % (cols[col][0], col, sep))
+    sys.stdout.write("\n")
+
+
+def init():
+    global sint
+    global count
+    global hdr
+    global xhdr
+    global opfile
+    global sep
+    global out
+    global l2exist
+
+    desired_cols = None
+    xflag = False
+    hflag = False
+    vflag = False
+    i = 1
+
+    try:
+        opts, args = getopt.getopt(
+            sys.argv[1:],
+            "xo:hvs:f:",
+            [
+                "extended",
+                "outfile",
+                "help",
+                "verbose",
+                "seperator",
+                "columns"
+            ]
+        )
+
+    except getopt.error, msg:
+        sys.stderr.write(msg)
+        usage()
+
+    for opt, arg in opts:
+        if opt in ('-x', '--extended'):
+            xflag = True
+        if opt in ('-o', '--outfile'):
+            opfile = arg
+            i += 1
+        if opt in ('-h', '--help'):
+            hflag = True
+        if opt in ('-v', '--verbose'):
+            vflag = True
+        if opt in ('-s', '--seperator'):
+            sep = arg
+            i += 1
+        if opt in ('-f', '--columns'):
+            desired_cols = arg
+            i += 1
+        i += 1
+
+    argv = sys.argv[i:]
+    sint = int(argv[0]) if argv else sint
+    count = int(argv[1]) if len(argv) > 1 else count
+
+    if len(argv) > 1:
+        sint = int(argv[0])
+        count = int(argv[1])
+
+    elif len(argv) > 0:
+        sint = int(argv[0])
+        count = 0
+
+    if hflag or (xflag and desired_cols):
+        usage()
+
+    if vflag:
+        detailed_usage()
+
+    if xflag:
+        hdr = xhdr
+
+    # check if L2ARC exists
+    snap_stats()
+    l2_size = cur.get("l2_size")
+    if l2_size:
+        l2exist = True
+
+    if desired_cols:
+        hdr = desired_cols.split(",")
+
+        invalid = []
+        incompat = []
+        for ele in hdr:
+            if ele not in cols:
+                invalid.append(ele)
+            elif not l2exist and ele.startswith("l2"):
+                sys.stdout.write("No L2ARC Here\n%s\n" % ele)
+                incompat.append(ele)
+
+        if len(invalid) > 0:
+            sys.stderr.write("Invalid column definition! -- %s\n" % invalid)
+            usage()
+
+        if len(incompat) > 0:
+            sys.stderr.write("Incompatible field specified! -- %s\n" % (
+                incompat,
+                ))
+            usage()
+
+    if opfile:
+        try:
+            out = open(opfile, "w")
+            sys.stdout = out
+
+        except:
+            sys.stderr.write("Cannot open %s for writing\n" % opfile)
+            sys.exit(1)
+
+
+def calculate():
+    global d
+    global v
+    global l2exist
+
+    v = {}
+    v["time"] = time.strftime("%H:%M:%S", time.localtime())
+    v["hits"] = d["hits"] / sint
+    v["miss"] = d["misses"] / sint
+    v["read"] = v["hits"] + v["miss"]
+    v["hit%"] = 100 * v["hits"] / v["read"] if v["read"] > 0 else 0
+    v["miss%"] = 100 - v["hit%"] if v["read"] > 0 else 0
+
+    v["dhit"] = (d["demand_data_hits"] + d["demand_metadata_hits"]) / sint
+    v["dmis"] = (d["demand_data_misses"] + d["demand_metadata_misses"]) / sint
+
+    v["dread"] = v["dhit"] + v["dmis"]
+    v["dh%"] = 100 * v["dhit"] / v["dread"] if v["dread"] > 0 else 0
+    v["dm%"] = 100 - v["dh%"] if v["dread"] > 0 else 0
+
+    v["phit"] = (d["prefetch_data_hits"] + d["prefetch_metadata_hits"]) / sint
+    v["pmis"] = (d["prefetch_data_misses"] +
+        d["prefetch_metadata_misses"]) / sint
+
+    v["pread"] = v["phit"] + v["pmis"]
+    v["ph%"] = 100 * v["phit"] / v["pread"] if v["pread"] > 0 else 0
+    v["pm%"] = 100 - v["ph%"] if v["pread"] > 0 else 0
+
+    v["mhit"] = (d["prefetch_metadata_hits"] +
+        d["demand_metadata_hits"]) / sint
+    v["mmis"] = (d["prefetch_metadata_misses"] +
+        d["demand_metadata_misses"]) / sint
+
+    v["mread"] = v["mhit"] + v["mmis"]
+    v["mh%"] = 100 * v["mhit"] / v["mread"] if v["mread"] > 0 else 0
+    v["mm%"] = 100 - v["mh%"] if v["mread"] > 0 else 0
+
+    v["arcsz"] = cur["size"]
+    v["c"] = cur["c"]
+    v["mfu"] = d["mfu_hits"] / sint
+    v["mru"] = d["mru_hits"] / sint
+    v["mrug"] = d["mru_ghost_hits"] / sint
+    v["mfug"] = d["mfu_ghost_hits"] / sint
+    v["eskip"] = d["evict_skip"] / sint
+    v["rmis"] = d["recycle_miss"] / sint
+    v["mtxmis"] = d["mutex_miss"] / sint
+
+    if l2exist:
+        v["l2hits"] = d["l2_hits"] / sint
+        v["l2miss"] = d["l2_misses"] / sint
+        v["l2read"] = v["l2hits"] + v["l2miss"]
+        v["l2hit%"] = 100 * v["l2hits"] / v["l2read"] if v["l2read"] > 0 else 0
+
+        v["l2miss%"] = 100 - v["l2hit%"] if v["l2read"] > 0 else 0
+        v["l2size"] = cur["l2_size"]
+        v["l2bytes"] = d["l2_read_bytes"] / sint
+
+
+def sighandler(*args):
+    sys.exit(0)
+
+
+def main():
+    global sint
+    global count
+    global hdr_intr
+
+    i = 0
+    count_flag = 0
+
+    init()
+    if count > 0:
+        count_flag = 1
+
+    signal(SIGINT, sighandler)
+    while True:
+        if i == 0:
+            print_header()
+
+        snap_stats()
+        calculate()
+        print_values()
+
+        if count_flag == 1:
+            if count <= 1:
+                break
+            count -= 1
+
+        i = 0 if i == hdr_intr else i + 1
+        time.sleep(sint)
+
+    if out:
+        out.close()
+
+
+if __name__ == '__main__':
+    main()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13314
          http://freenas.svn.sourceforge.net/freenas/?rev=13314&view=rev
Author:   zippybr
Date:     2013-02-18 10:42:09 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
Remember what UPS name was chosen

Submitted by: paleoN
ticket: #1544

Modified Paths:
--------------
    trunk/gui/choices.py
    trunk/nanobsd/Files/etc/rc.d/ix-ups

Modified: trunk/gui/choices.py
===================================================================
--- trunk/gui/choices.py	2013-02-18 02:15:06 UTC (rev 13313)
+++ trunk/gui/choices.py	2013-02-18 10:42:09 UTC (rev 13314)
@@ -601,7 +601,7 @@
                     continue
                 if row[-1].find(' (experimental)') != -1:
                     row[-1] = row[-1].replace(' (experimental)', '').strip()
-                yield (row[-1], "%s (%s)" % (" ".join(row[0:-1]), row[-1]))
+                yield ("$".join([row[-1], row[3]]), "%s (%s)" % (" ".join(row[0:-1]), row[-1]))
 
 
 LDAP_SSL_CHOICES = (

Modified: trunk/nanobsd/Files/etc/rc.d/ix-ups
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-ups	2013-02-18 02:15:06 UTC (rev 13313)
+++ trunk/nanobsd/Files/etc/rc.d/ix-ups	2013-02-18 10:42:09 UTC (rev 13314)
@@ -29,7 +29,7 @@
 	while eval read $f; do
 	    cat <<EOF
 [${ups_identifier}]
-    driver = $(echo "${ups_driver}"|tr -s " " "\n")
+    driver = $(echo "${ups_driver}"|cut -d"$" -f 1|tr -s " " "\n")
     port = ${ups_port}
     desc = "${ups_description}"
 EOF

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13365
          http://freenas.svn.sourceforge.net/freenas/?rev=13365&view=rev
Author:   delphij
Date:     2013-02-28 22:29:18 +0000 (Thu, 28 Feb 2013)
Log Message:
-----------
It makes no sense to disable large read-write for CIFS service,
remove the option.

Modified Paths:
--------------
    trunk/gui/services/models.py
    trunk/nanobsd/Files/etc/rc.d/ix-samba

Added Paths:
-----------
    trunk/gui/services/migrations/0087_auto__del_field_cifs_cifs_srv_largerw.py

Added: trunk/gui/services/migrations/0087_auto__del_field_cifs_cifs_srv_largerw.py
===================================================================
--- trunk/gui/services/migrations/0087_auto__del_field_cifs_cifs_srv_largerw.py	                        (rev 0)
+++ trunk/gui/services/migrations/0087_auto__del_field_cifs_cifs_srv_largerw.py	2013-02-28 22:29:18 UTC (rev 13365)
@@ -0,0 +1,361 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'CIFS.cifs_srv_largerw'
+        db.delete_column('services_cifs', 'cifs_srv_largerw')
+
+
+    def backwards(self, orm):
+        # Adding field 'CIFS.cifs_srv_largerw'
+        db.add_column('services_cifs', 'cifs_srv_largerw',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+
+    models = {
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_dns_timeout': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_gcname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_kpwdname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_krbname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_timeout': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'ad_unix_extensions': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_use_default_domain': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'ad_verbose_logging': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_hostlookup': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls_certfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'ordering': "['iscsi_target_extent_name']", 'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.0/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_allow_nonroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_async': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nfs_srv_bindip': ('django.db.models.fields.CharField', [], {'max_length': '250', 'blank': 'True'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.nis': {
+            'Meta': {'object_name': 'NIS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nis_domain': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nis_manycast': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nis_secure_mode': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'nis_servers': ('django.db.models.fields.CharField', [], {'max_length': '8192', 'blank': 'True'})
+        },
+        'services.nt4': {
+            'Meta': {'object_name': 'NT4'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nt4_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'nt4_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.pluginsjail': {
+            'Meta': {'object_name': 'PluginsJail'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {}),
+            'jail_ipv4netmask': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'jail_mac': ('freenasUI.freeadmin.models.MACField', [], {'default': "''", 'max_length': '17', 'blank': 'True'}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rpctoken': {
+            'Meta': {'object_name': 'RPCToken'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freenasUI.freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_sftp_log_facility': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'ssh_sftp_log_level': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freenasUI.freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freenasUI.freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']
\ No newline at end of file

Modified: trunk/gui/services/models.py
===================================================================
--- trunk/gui/services/models.py	2013-02-28 21:18:17 UTC (rev 13364)
+++ trunk/gui/services/models.py	2013-02-28 22:29:18 UTC (rev 13365)
@@ -136,8 +136,6 @@
             help_text=_("Use this option to override the directory creation "
                 "mask (0777 by default).")
             )
-    cifs_srv_largerw = models.BooleanField(
-            verbose_name=_("Large RW support"))
     cifs_srv_sendfile = models.BooleanField(
             verbose_name=_("Send files with sendfile(2)"))
     cifs_srv_easupport = models.BooleanField(

Modified: trunk/nanobsd/Files/etc/rc.d/ix-samba
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-samba	2013-02-28 21:18:17 UTC (rev 13364)
+++ trunk/nanobsd/Files/etc/rc.d/ix-samba	2013-02-28 22:29:18 UTC (rev 13365)
@@ -234,7 +234,6 @@
 		cifs_srv_guest,
 		cifs_srv_filemask,
 		cifs_srv_dirmask,
-		cifs_srv_largerw,
 		cifs_srv_sendfile,
 		cifs_srv_easupport,
 		cifs_srv_dosattr,
@@ -259,7 +258,7 @@
 	while read -r authmodel netbiosname workgroup cifs_description doscharset \
 		unixcharset loglevel localmaster timeserver guest \
 		cifs_filemask cifs_dirmask \
-		largerw sendfile easupport dosattr nullpw unixext \
+		sendfile easupport dosattr nullpw unixext \
 		cifs_aio_enable cifs_aio_rs cifs_aio_ws cifs_hostlookup cifs_homedir \
 		cifs_homedir_browseable cifs_homedir_mp ;
 	do
@@ -334,10 +333,6 @@
 			echo "    use sendfile = yes"
 		fi
 
-		if [ "${largerw}" = "0" ]; then
-			echo "    large readwrite = no"
-		fi
-
 		if [ "${easupport}" = "1" ]; then
 			echo "    ea support = yes"
 		fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13405
          http://freenas.svn.sourceforge.net/freenas/?rev=13405&view=rev
Author:   zippybr
Date:     2013-03-08 16:14:18 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Merge branch 'gitbuild'

Modified Paths:
--------------
    trunk/build/create_iso.sh
    trunk/build/do_build.sh
    trunk/build/nano_env
    trunk/nanobsd/FREENAS.amd64
    trunk/nanobsd/FREENAS.i386
    trunk/nanobsd/Files/usr/local/etc/rc.d/django
    trunk/nanobsd/os-base

Modified: trunk/build/create_iso.sh
===================================================================
--- trunk/build/create_iso.sh	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/build/create_iso.sh	2013-03-08 16:14:18 UTC (rev 13405)
@@ -94,6 +94,13 @@
 	# installer code.
 	rm -f "$INSTALLUFSDIR/etc/rc.conf.local"
 
+	# NOTE: only glabel and gpart work statically when hardlinked as
+	# geom(8).
+	#
+	# Look for "nvalid class name" in sbin/geom/core/geom.c for more
+	# details.
+	tar -cf - -C${NANO_OBJ}/_.w/sbin gmirror graid | tar -xpf - -C ${INSTALLUFSDIR}/rescue/
+
 	# Compress what's left of the image after mangling it
 	makefs -b 10%  ${TEMP_IMGFILE} ${INSTALLUFSDIR}
 	mkuzip -o ${ISODIR}/data/base.ufs.uzip ${TEMP_IMGFILE}
@@ -209,7 +216,7 @@
 # Boot loader file for $NANO_LABEL.  This relies on a hacked beastie.4th.
 #
 autoboot_delay="2"
-loader_logo="freenas"
+#loader_logo="freenas"
 
 mfsroot_load="YES"
 mfsroot_type="md_image"
@@ -219,16 +226,6 @@
 init_shell="/rescue/sh"
 init_script="/baseroot.rc"
 init_chroot="/baseroot"
-opensolaris_load="YES"
-zfs_load="YES"
-# GEOM support
-geom_mirror_load="YES"
-geom_stripe_load="YES"
-geom_raid3_load="YES"
-geom_raid5_load="YES"
-geom_gate_load="YES"
-ntfs_load="YES"
-smbfs_load="YES"
 EOF
 	eval ${MKISOFS_CMD}
 	echo "Created ${OUTPUT}"

Modified: trunk/build/do_build.sh
===================================================================
--- trunk/build/do_build.sh	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/build/do_build.sh	2013-03-08 16:14:18 UTC (rev 13405)
@@ -10,6 +10,9 @@
 . build/functions.sh
 . build/pbi_env
 
+: ${SKIP_SOURCE_PATCHES="yes"}
+: ${USE_GIT="yes"}
+
 # Should we build?
 BUILD=true
 
@@ -288,6 +291,53 @@
 	done
 }
 
+freebsd_checkout_svn()
+{
+	: ${FREEBSD_SRC_REPOSITORY_ROOT=http://svn.freebsd.org/base}
+	FREEBSD_SRC_URL_REL="releng/9.1"
+
+	FREEBSD_SRC_URL_FULL="$FREEBSD_SRC_REPOSITORY_ROOT/$FREEBSD_SRC_URL_REL"
+
+	(
+	 cd "$AVATAR_ROOT/FreeBSD"
+	 if [ -d src/.svn ]; then
+		svn switch $FREEBSD_SRC_URL_FULL src
+		svn upgrade src >/dev/null 2>&1 || :
+	 	svn resolved src
+	 else
+		svn co $FREEBSD_SRC_URL_FULL src
+	 fi
+	 # Always do this so the csup pulled files are paved over.
+ 	 svn revert -R src
+	 svn up src
+	)
+}
+
+freebsd_checkout_git()
+{
+	(
+	cd "$AVATAR_ROOT/FreeBSD"
+	if [ -d src/.git ] ; then
+		cd src
+		git pull
+		cd ..
+	else
+		: ${GIT_BRANCH=freenas-9-stable}
+		: ${GIT_REPO=https://github.com/trueos/trueos.git}
+		spl="$-";set -x
+		git clone -b ${GIT_BRANCH} ${GIT_REPO} src
+		echo $spl | grep -q x || set +x
+		if [ "x${GIT_TAG}" != "x" ] ; then
+			(
+			spl="$-";set -x
+			cd src && git checkout "tags/${GIT_TAG}"
+			echo $spl | grep -q x || set +x
+			)
+		fi
+	fi
+	)
+}
+
 checkout_freebsd_source()
 {
 	if ${UPDATE}
@@ -298,29 +348,17 @@
 		fi
 		mkdir -p ${AVATAR_ROOT}/FreeBSD
 
-		: ${FREEBSD_SRC_REPOSITORY_ROOT=http://svn.freebsd.org/base}
-		FREEBSD_SRC_URL_REL="releng/8.3"
-		FREEBSD_SRC_URL_FULL="${FREEBSD_SRC_REPOSITORY_ROOT}/${FREEBSD_SRC_URL_REL}"
 
-		(
-	 		cd "${AVATAR_ROOT}/FreeBSD"
-	 		if [ -d src/.svn ]; then
-				svn switch ${FREEBSD_SRC_URL_FULL} src
-				svn upgrade src >/dev/null 2>&1 || :
-	 			svn resolved src
-	 		else
-				svn co ${FREEBSD_SRC_URL_FULL} src
-	 		fi
+		if [ "x$USE_GIT" = "xyes" ] ; then
+			echo "Use git set!"
+			freebsd_checkout_git
+		else
+			echo "Use git unset!"
+			freebsd_checkout_svn
+		fi
 
-			#
-	 		# Always do this so the csup pulled files are paved over.
-			#
- 	 		svn revert -R src
-	 		svn up src
-		)
-
-		SUPFILE=${AVATAR_ROOT}/FreeBSD/supfile
-		cat <<EOF > ${SUPFILE}
+		SUPFILE=$AVATAR_ROOT/FreeBSD/supfile
+		cat <<EOF > $SUPFILE
 *default host=${FREEBSD_CVSUP_HOST}
 *default base=${AVATAR_ROOT}/FreeBSD/sup
 *default prefix=${AVATAR_ROOT}/FreeBSD
@@ -330,18 +368,25 @@
 
 ports-all date=2012.07.12.00.00.00
 EOF
-		#
 		# Nuke newly created files to avoid build errors.
-		#
-		svn_status_ok="${AVATAR_ROOT}/FreeBSD/.svn_status_ok"
-		rm -f "${svn_status_ok}"
-		(
-	 		svn status ${AVATAR_ROOT}/FreeBSD/src
-	 		: > "${svn_status_ok}"
-		) | \
+		if [ "x$USE_GIT" != "yes" ] ; then
+		    git_status_ok="$AVATAR_ROOT/FreeBSD/.git_status_ok"
+		    rm -rf "$git_status_ok"
+		    (
+		      cd $AVATAR_ROOT/FreeBSD/src && git status --porcelain
+		    ) | tee "$git_status_ok"
+		    awk '$1 == "??" { print $2 }' < "$git_status_ok" |  xargs rm -Rf
+		else
+		    svn_status_ok="$AVATAR_ROOT/FreeBSD/.svn_status_ok"
+		    rm -f "$svn_status_ok"
+		    (
+		     svn status $AVATAR_ROOT/FreeBSD/src
+		     : > "$svn_status_ok"
+		    ) | \
 			awk '$1 == "?" { print $2 }' | \
 			xargs rm -Rf
-		[ -f "${svn_status_ok}" ]
+		    [ -f "$svn_status_ok" ]
+		fi
 
 		for file in $(find ${AVATAR_ROOT}/FreeBSD/ports -name '*.orig' -size 0)
 		do
@@ -360,47 +405,50 @@
 	fi
 }
 
-apply_patches()
+_lp=last-patch.$$.log
+
+patch_filter()
 {
-	local _lp=last-patch.$$.log
+    if [ "x$USE_GIT" = "xyes" ] ; then
+        sed 's/$FreeBSD[^$]*[$]/$FreeBSD$/g'
+    else
+        cat
+    fi
 
-	#
-	# Appply patches to FreeBSD source code
-	#
-	for _patch in $(cd ${AVATAR_ROOT}/patches && ls freebsd-*.patch)
-	do
-		if ! grep -q ${_patch} ${AVATAR_ROOT}/FreeBSD/src-patches
-		then
-			echo "Applying patch ${_patch}..."
-			(
-				cd FreeBSD/src &&
-		 		patch -C -f -p0 < ${AVATAR_ROOT}/patches/${_patch} >${_lp} 2>&1 ||
-		 		{ echo "Failed to apply patch: ${_patch} (check $(pwd)/${_lp})"; exit 1; } &&
-		 		patch -E -p0 -s < ${AVATAR_ROOT}/patches/${_patch}
-			)
-			echo ${_patch} >> ${AVATAR_ROOT}/FreeBSD/src-patches
-		fi
-	done
+}
 
-	#
-	# Apply patches to FreeBSD ports
-	#
-	for _patch in $(cd ${AVATAR_ROOT}/patches && ls ports-*.patch)
-	do
-		if ! grep -q ${_patch} ${AVATAR_ROOT}/FreeBSD/ports-patches
-		then
-			echo "Applying patch ${_patch}..."
-			(
-				cd FreeBSD/ports &&
-		 		patch -C -f -p0 < ${AVATAR_ROOT}/patches/${_patch} >${_lp} 2>&1 ||
-				{ echo "Failed to apply patch: ${_patch} (check $(pwd)/${_lp})"; exit 1; } &&
-		 		patch -E -p0 -s < ${AVATAR_ROOT}/patches/${_patch}
-			)
-			echo ${_patch} >> ${AVATAR_ROOT}/FreeBSD/ports-patches
-		fi
-	done
+do_source_patches()
+{
+for patch in $(cd $AVATAR_ROOT/patches && ls freebsd-*.patch); do
+	if ! grep -q $patch $AVATAR_ROOT/FreeBSD/src-patches; then
+		echo "Applying patch $patch..."
+        mkdir -p filtered-patches
+		(cd FreeBSD/src &&
+        patch_filter < $AVATAR_ROOT/patches/$patch > $AVATAR_ROOT/filtered-patches/$patch &&
+		 patch -C -f -p0 < $AVATAR_ROOT/filtered-patches/$patch >$_lp 2>&1 ||
+		 { echo "Failed to apply patch: $patch (check $(pwd)/$_lp)";
+		   exit 1; } &&
+		 patch -E -p0 -s < $AVATAR_ROOT/filtered-patches/$patch)
+		echo $patch >> $AVATAR_ROOT/FreeBSD/src-patches
+	fi
+done
 }
 
+do_ports_patches()
+{
+for patch in $(cd $AVATAR_ROOT/patches && ls ports-*.patch); do
+	if ! grep -q $patch $AVATAR_ROOT/FreeBSD/ports-patches; then
+		echo "Applying patch $patch..."
+		(cd FreeBSD/ports &&
+		 patch -C -f -p0 < $AVATAR_ROOT/patches/$patch >$_lp 2>&1 ||
+		{ echo "Failed to apply patch: $patch (check $(pwd)/$_lp)";
+		  exit 1; } &&
+		 patch -E -p0 -s < $AVATAR_ROOT/patches/$patch)
+		echo $patch >> $AVATAR_ROOT/FreeBSD/ports-patches
+	fi
+done
+}
+
 do_pbi_wrapper_hack()
 {
 	local _src="${AVATAR_ROOT}/src/pcbsd/pbi-wrapper"
@@ -455,7 +503,10 @@
 	#
 	# Apply source and port patches to FreeBSD source code
 	#
-	apply_patches
+	if [ "x${SKIP_SOURCE_PATCHES}" != "xyes" ] ; then
+	    do_source_patches
+	fi
+	do_ports_patches
 
 	#
 	# HACK: chmod +x the script because:

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/build/nano_env	2013-03-08 16:14:18 UTC (rev 13405)
@@ -123,7 +123,7 @@
 
 # Version of the software to use. This should be 8.2-BETA1, 9.0-PRERELEASE,
 # etc.
-VERSION="8.3.2-ALPHA"
+VERSION="9.1.0-ALPHA"
 
 # Image name, e.g. FreeNAS-8.1-r7609-amd64 or FreeNAS-8.0.1-RC1-i386, see
 # nanobsd/freenas-common:last_orders().
@@ -141,8 +141,9 @@
 # one's environment. Please replace these lines with valid values.
 
 # See bsd.port.mk
-unset MASTER_SITE_BACKUP
-unset MASTER_SITE_OVERRIDE
+# We need this to hit our local package cache.
+#unset MASTER_SITE_BACKUP
+#unset MASTER_SITE_OVERRIDE
 
 # See pkg_add(1).
 unset PACKAGEROOT

Modified: trunk/nanobsd/FREENAS.amd64
===================================================================
--- trunk/nanobsd/FREENAS.amd64	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/nanobsd/FREENAS.amd64	2013-03-08 16:14:18 UTC (rev 13405)
@@ -356,3 +356,11 @@
 
 # Needed for ipmi(4)
 device		smbus
+
+# VirtIO
+device		virtio
+device		virtio_pci
+device		virtio_blk
+device		virtio_balloon
+device		vtnet
+device		virtio_scsi

Modified: trunk/nanobsd/FREENAS.i386
===================================================================
--- trunk/nanobsd/FREENAS.i386	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/nanobsd/FREENAS.i386	2013-03-08 16:14:18 UTC (rev 13405)
@@ -368,3 +368,11 @@
 
 # Needed for ipmi(4)
 device		smbus
+
+# VirtIO
+device		virtio
+device		virtio_pci
+device		virtio_blk
+device		virtio_balloon
+device		vtnet
+device		virtio_scsi

Modified: trunk/nanobsd/Files/usr/local/etc/rc.d/django
===================================================================
--- trunk/nanobsd/Files/usr/local/etc/rc.d/django	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/nanobsd/Files/usr/local/etc/rc.d/django	2013-03-08 16:14:18 UTC (rev 13405)
@@ -51,7 +51,7 @@
 path=${django_path}
 host=${django_host}
 port=${django_port}
-start_precmd="start_command"
+start_cmd="start_command"
 stop_cmd="stop_command"
 
 

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-08 13:42:58 UTC (rev 13404)
+++ trunk/nanobsd/os-base	2013-03-08 16:14:18 UTC (rev 13405)
@@ -83,6 +83,7 @@
 WITHOUT_BIND_NAMED=true
 WITHOUT_BLUETOOTH=true
 WITHOUT_CALENDAR=true
+WITHOUT_CLANG=true
 WITHOUT_CTM=true
 WITHOUT_CVS=true
 WITHOUT_DICT=true
@@ -153,7 +154,6 @@
 # Pull in common definitions.
 . ${NANO_CFG_BASE}/common
 
-add_port emulators/virtio-kmod
 add_port archivers/lzo2
 add_port security/openvpn
 add_port converters/libiconv
@@ -316,7 +316,8 @@
 add_port devel/py-greenlet
 add_port net/py-eventlet
 add_port graphics/jpeg
-add_port sysutils/testdisk WITH_NTFS3G=y
+#FIXME: failing to fetch
+#add_port sysutils/testdisk WITH_NTFS3G=y
 
 # NOTE: in reality these aren't DEBUG apps, but this ensures that they aren't
 # counted against the release image's size because they aren't used in
@@ -558,6 +559,20 @@
 }
 customize_cmd select_httpd
 
+# Ths is required to be added in rescue image as it is no longer
+# in the freebsd patch
+static_dialog()
+{
+	make \
+		-C ${NANO_SRC}/gnu/usr.bin/dialog \
+		BINDIR=/rescue \
+		DESTDIR=${NANO_WORLDDIR} \
+		NO_SHARED= \
+		__MAKE_CONF=${NANO_MAKE_CONF_BUILD} \
+		clean all install
+}
+customize_cmd static_dialog
+
 remove_patch_divots ( )
 {
 	find ${NANO_WORLDDIR} -name \*.orig -or -name \*.rej -delete

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13436
          http://freenas.svn.sourceforge.net/freenas/?rev=13436&view=rev
Author:   zippybr
Date:     2013-03-13 13:57:50 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Rename XZ_BIN to NANO_XZ to conform with the standard

Modified Paths:
--------------
    trunk/build/nano_env
    trunk/nanobsd/os-base

Modified: trunk/build/nano_env
===================================================================
--- trunk/build/nano_env	2013-03-13 13:39:50 UTC (rev 13435)
+++ trunk/build/nano_env	2013-03-13 13:57:50 UTC (rev 13436)
@@ -21,8 +21,8 @@
 # explicitly in the script.
 : ${FREENAS_ARCH=$(uname -p)}
 if ! [ "${FREENAS_ARCH}" == "amd64" -o "${FREENAS_ARCH}" == "i386" ] ; then
-    echo "Possible values for FREENAS_ARCH are amd64 or i386"
-    exit
+	echo "Possible values for FREENAS_ARCH are amd64 or i386"
+	exit
 fi
 NANO_ARCH=$FREENAS_ARCH
 
@@ -153,18 +153,18 @@
 # if it's installed.
 # Since the only valid values are pxz and xz setting env XZ=whatever
 # will cause the build to fall back to using xz.
-# TODO: If XZ_BIN is set to something other than pxz or xz and pxz is installed
+# TODO: If NANO_XZ is set to something other than pxz or xz and pxz is installed
 # we may as well use pxz here.
 
-if [ $(which pxz) ]; then 
-    if [ x"${XZ_BIN}" == "xpxz" -o -z ${XZ} ]; then 
-        XZ_BIN=pxz 
-    else 
-        XZ_BIN=xz 
-    fi 
+if [ $(which pxz) ]; then
+	if [ x"${NANO_XZ}" == "xpxz" -o -z ${XZ} ]; then
+		NANO_XZ=pxz
+	else
+		NANO_XZ=xz
+	fi
 else
-    XZ_BIN=xz
+	NANO_XZ=xz
 fi
-export XZ_BIN
+export NANO_XZ
 
 # vim: syntax=sh

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-13 13:39:50 UTC (rev 13435)
+++ trunk/nanobsd/os-base	2013-03-13 13:57:50 UTC (rev 13436)
@@ -792,7 +792,7 @@
 		# NOTE: keep in synch with create_*_diskimage.
 		mv "$NANO_DISKIMGDIR/_.disk.image" "$firmware_img"
 
-		${XZ_BIN} --keep --verbose -9 < "$firmware_img" > \
+		${NANO_XZ} --keep --verbose -9 < "$firmware_img" > \
 		    "$gui_upgrade_bname.xz"
 
 		tar -cpvf - \
@@ -804,7 +804,7 @@
 				. \
 			-C "$NANO_DISKIMGDIR" \
 				${firmware_img##*/} \
-		    | ${XZ_BIN} -9 -cz > "$gui_upgrade_bname.txz"
+		    | ${NANO_XZ} -9 -cz > "$gui_upgrade_bname.txz"
 
 		) > "${gui_image_log}" 2>&1
 
@@ -821,7 +821,7 @@
 	# added because pc-sysinstall doesn't support raw images
 	# (-.-).
 	mv "$NANO_DISKIMGDIR/$NANO_IMGNAME" "$full_image"
-	time ${XZ_BIN} --verbose -9 -f "$full_image"
+	time ${NANO_XZ} --verbose -9 -f "$full_image"
 
 	) > "${full_image_log}" 2>&1
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13447
          http://freenas.svn.sourceforge.net/freenas/?rev=13447&view=rev
Author:   zippybr
Date:     2013-03-15 13:37:32 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
Remove the nfs async option, it doesn't do anything on FreeBSD 9.

Modified Paths:
--------------
    trunk/gui/services/models.py
    trunk/nanobsd/Files/etc/rc.d/ix-nfsd

Added Paths:
-----------
    trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py

Added: trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py
===================================================================
--- trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py	                        (rev 0)
+++ trunk/gui/services/migrations/0068_auto__del_field_nfs_nfs_srv_async.py	2013-03-15 13:37:32 UTC (rev 13447)
@@ -0,0 +1,328 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Deleting field 'NFS.nfs_srv_async'
+        db.delete_column('services_nfs', 'nfs_srv_async')
+
+
+    def backwards(self, orm):
+        
+        # Adding field 'NFS.nfs_srv_async'
+        db.add_column('services_nfs', 'nfs_srv_async', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    models = {
+        'services.activedirectory': {
+            'Meta': {'object_name': 'ActiveDirectory'},
+            'ad_adminname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_adminpw': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_allow_trusted_doms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ad_dcname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_domainname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ad_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.afp': {
+            'Meta': {'object_name': 'AFP'},
+            'afp_srv_connections_limit': ('django.db.models.fields.IntegerField', [], {'default': '50', 'max_length': '120'}),
+            'afp_srv_guest': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'afp_srv_guest_user': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'afp_srv_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.cifs': {
+            'Meta': {'object_name': 'CIFS'},
+            'cifs_srv_aio_enable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_aio_rs': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_aio_ws': ('django.db.models.fields.IntegerField', [], {'default': '4096', 'max_length': '120'}),
+            'cifs_srv_authmodel': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'cifs_srv_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dirmask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_dosattr': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_doscharset': ('django.db.models.fields.CharField', [], {'default': "'CP437'", 'max_length': '120'}),
+            'cifs_srv_easupport': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_filemask': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'cifs_srv_guest': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'}),
+            'cifs_srv_homedir': ('freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'cifs_srv_homedir_aux': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_homedir_browseable_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_homedir_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_largerw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_localmaster': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_loglevel': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '120'}),
+            'cifs_srv_netbiosname': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_nullpw': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_sendfile': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_smb_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'cifs_srv_timeserver': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'cifs_srv_unixcharset': ('django.db.models.fields.CharField', [], {'default': "'UTF-8'", 'max_length': '120'}),
+            'cifs_srv_unixext': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cifs_srv_workgroup': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'cifs_srv_zeroconf': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.dynamicdns': {
+            'Meta': {'object_name': 'DynamicDNS'},
+            'ddns_domain': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_fupdateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ddns_password': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ddns_provider': ('django.db.models.fields.CharField', [], {'default': "'dyndns'", 'max_length': '120', 'blank': 'True'}),
+            'ddns_updateperiod': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ddns_username': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.ftp': {
+            'Meta': {'object_name': 'FTP'},
+            'ftp_anonpath': ('freeadmin.models.PathField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'ftp_anonuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_anonuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_banner': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_clients': ('django.db.models.fields.PositiveIntegerField', [], {'default': '32'}),
+            'ftp_defaultroot': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_dirmask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_filemask': ('django.db.models.fields.CharField', [], {'default': "'077'", 'max_length': '3'}),
+            'ftp_fxp': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ident': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ipconnections': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_localuserdlbw': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_loginattempt': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3'}),
+            'ftp_masqaddress': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_onlyanonymous': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_onlylocal': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ftp_passiveportsmax': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_passiveportsmin': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
+            'ftp_port': ('django.db.models.fields.PositiveIntegerField', [], {'default': '21'}),
+            'ftp_resume': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_reversedns': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_ssltls': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ftp_timeout': ('django.db.models.fields.PositiveIntegerField', [], {'default': '120'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'services.iscsitarget': {
+            'Meta': {'object_name': 'iSCSITarget'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_alias': ('django.db.models.fields.CharField', [], {'max_length': '120', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_target_authtype': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_flags': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'iscsi_target_initialdigest': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_target_initiatorgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetAuthorizedInitiator']"}),
+            'iscsi_target_logical_blocksize': ('django.db.models.fields.IntegerField', [], {'default': '512', 'max_length': '3'}),
+            'iscsi_target_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_portalgroup': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"}),
+            'iscsi_target_queue_depth': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '3'}),
+            'iscsi_target_serial': ('django.db.models.fields.CharField', [], {'default': "'10000001'", 'max_length': '16'}),
+            'iscsi_target_type': ('django.db.models.fields.CharField', [], {'default': "'Disk'", 'max_length': '120'})
+        },
+        'services.iscsitargetauthcredential': {
+            'Meta': {'object_name': 'iSCSITargetAuthCredential'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_auth_peersecret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_peeruser': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_auth_secret': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_auth_tag': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'iscsi_target_auth_user': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetauthorizedinitiator': {
+            'Meta': {'object_name': 'iSCSITargetAuthorizedInitiator'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_initiator_auth_network': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_initiator_initiators': ('django.db.models.fields.TextField', [], {'default': "'ALL'", 'max_length': '2048'}),
+            'iscsi_target_initiator_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'unique': 'True'})
+        },
+        'services.iscsitargetextent': {
+            'Meta': {'object_name': 'iSCSITargetExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_extent_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_extent_filesize': ('django.db.models.fields.CharField', [], {'default': '0', 'max_length': '120'}),
+            'iscsi_target_extent_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '120'}),
+            'iscsi_target_extent_path': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_target_extent_type': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.iscsitargetglobalconfiguration': {
+            'Meta': {'object_name': 'iSCSITargetGlobalConfiguration'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_basename': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'iscsi_defaultt2r': ('django.db.models.fields.IntegerField', [], {'default': '60', 'max_length': '120'}),
+            'iscsi_defaultt2w': ('django.db.models.fields.IntegerField', [], {'default': '2', 'max_length': '120'}),
+            'iscsi_discoveryauthgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_discoveryauthmethod': ('django.db.models.fields.CharField', [], {'default': "'Auto'", 'max_length': '120'}),
+            'iscsi_firstburst': ('django.db.models.fields.IntegerField', [], {'default': '65536', 'max_length': '120'}),
+            'iscsi_iotimeout': ('django.db.models.fields.IntegerField', [], {'default': '30', 'max_length': '120'}),
+            'iscsi_luc_authgroup': ('django.db.models.fields.IntegerField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+            'iscsi_luc_authmethod': ('django.db.models.fields.CharField', [], {'default': "'chap'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_luc_authnetwork': ('django.db.models.fields.CharField', [], {'default': "'127.0.0.0/8'", 'max_length': '120', 'blank': 'True'}),
+            'iscsi_lucip': ('django.db.models.fields.IPAddressField', [], {'default': "'127.0.0.1'", 'max_length': '15', 'blank': 'True'}),
+            'iscsi_lucport': ('django.db.models.fields.IntegerField', [], {'default': '3261', 'null': 'True', 'blank': 'True'}),
+            'iscsi_maxburst': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxconnect': ('django.db.models.fields.IntegerField', [], {'default': '8', 'max_length': '120'}),
+            'iscsi_maxoutstandingr2t': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_maxrecdata': ('django.db.models.fields.IntegerField', [], {'default': '262144', 'max_length': '120'}),
+            'iscsi_maxsesh': ('django.db.models.fields.IntegerField', [], {'default': '16', 'max_length': '120'}),
+            'iscsi_nopinint': ('django.db.models.fields.IntegerField', [], {'default': '20', 'max_length': '120'}),
+            'iscsi_r2t': ('django.db.models.fields.IntegerField', [], {'default': '32', 'max_length': '120'}),
+            'iscsi_toggleluc': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.iscsitargetportal': {
+            'Meta': {'object_name': 'iSCSITargetPortal'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portal_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'iscsi_target_portal_tag': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '120'})
+        },
+        'services.iscsitargetportalip': {
+            'Meta': {'unique_together': "(('iscsi_target_portalip_ip', 'iscsi_target_portalip_port'),)", 'object_name': 'iSCSITargetPortalIP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_target_portalip_ip': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'iscsi_target_portalip_port': ('django.db.models.fields.SmallIntegerField', [], {'default': '3260'}),
+            'iscsi_target_portalip_portal': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetPortal']"})
+        },
+        'services.iscsitargettoextent': {
+            'Meta': {'object_name': 'iSCSITargetToExtent'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'iscsi_extent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITargetExtent']", 'unique': 'True'}),
+            'iscsi_target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['services.iSCSITarget']"})
+        },
+        'services.ldap': {
+            'Meta': {'object_name': 'LDAP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ldap_anonbind': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ldap_basedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_groupsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_hostname': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_machinesuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_passwordsuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_pwencryption': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_rootbasedn': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_rootbindpw': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ldap_ssl': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ldap_tls_cacertfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ldap_usersuffix': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        },
+        'services.nfs': {
+            'Meta': {'object_name': 'NFS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nfs_srv_servers': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4'})
+        },
+        'services.pluginsjail': {
+            'Meta': {'object_name': 'PluginsJail'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'jail_ipv4address': ('freenasUI.contrib.IPAddressField.IPAddressField', [], {}),
+            'jail_ipv4netmask': ('django.db.models.fields.CharField', [], {'max_length': '3'}),
+            'jail_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '120'}),
+            'jail_path': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+            'plugins_path': ('freeadmin.models.PathField', [], {'max_length': '255'})
+        },
+        'services.rpctoken': {
+            'Meta': {'object_name': 'RPCToken'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+            'secret': ('django.db.models.fields.CharField', [], {'max_length': '1024'})
+        },
+        'services.rsyncd': {
+            'Meta': {'object_name': 'Rsyncd'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncd_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncd_port': ('django.db.models.fields.IntegerField', [], {'default': '873'})
+        },
+        'services.rsyncmod': {
+            'Meta': {'ordering': "['rsyncmod_name']", 'object_name': 'RsyncMod'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'rsyncmod_auxiliary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_comment': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_group': ('freeadmin.models.GroupField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'}),
+            'rsyncmod_hostsallow': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_hostsdeny': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rsyncmod_maxconn': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'rsyncmod_mode': ('django.db.models.fields.CharField', [], {'default': "'rw'", 'max_length': '120'}),
+            'rsyncmod_name': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'rsyncmod_path': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+            'rsyncmod_user': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120', 'blank': 'True'})
+        },
+        'services.services': {
+            'Meta': {'object_name': 'services'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'srv_enable': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'srv_service': ('django.db.models.fields.CharField', [], {'max_length': '120'})
+        },
+        'services.smart': {
+            'Meta': {'object_name': 'SMART'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'smart_critical': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_difference': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_email': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'smart_informal': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'smart_interval': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+            'smart_powermode': ('django.db.models.fields.CharField', [], {'default': "'never'", 'max_length': '60'})
+        },
+        'services.snmp': {
+            'Meta': {'object_name': 'SNMP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'snmp_community': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'snmp_contact': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'snmp_location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'snmp_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'snmp_traps': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        },
+        'services.ssh': {
+            'Meta': {'object_name': 'SSH'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ssh_compression': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_host_dsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_dsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_ecdsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_host_rsa_key_pub': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+            'ssh_options': ('django.db.models.fields.TextField', [], {'max_length': '120', 'blank': 'True'}),
+            'ssh_passwordauth': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_privatekey': ('django.db.models.fields.TextField', [], {'max_length': '1024', 'blank': 'True'}),
+            'ssh_rootlogin': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpfwd': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ssh_tcpport': ('django.db.models.fields.PositiveIntegerField', [], {})
+        },
+        'services.tftp': {
+            'Meta': {'object_name': 'TFTP'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'tftp_directory': ('freeadmin.models.PathField', [], {'max_length': '255'}),
+            'tftp_newfiles': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'tftp_options': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'tftp_port': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'tftp_umask': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'tftp_username': ('freeadmin.models.UserField', [], {'default': "'nobody'", 'max_length': '120'})
+        },
+        'services.ups': {
+            'Meta': {'object_name': 'UPS'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ups_description': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_driver': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_emailnotify': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_extrausers': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_identifier': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_masterpwd': ('django.db.models.fields.CharField', [], {'default': "'fixmepass'", 'max_length': '30'}),
+            'ups_options': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'ups_port': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
+            'ups_rmonitor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'ups_shutdown': ('django.db.models.fields.CharField', [], {'default': "'batt'", 'max_length': '120'}),
+            'ups_shutdowntimer': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_subject': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
+            'ups_toemail': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['services']

Modified: trunk/gui/services/models.py
===================================================================
--- trunk/gui/services/models.py	2013-03-14 11:31:07 UTC (rev 13446)
+++ trunk/gui/services/models.py	2013-03-15 13:37:32 UTC (rev 13447)
@@ -276,12 +276,6 @@
                 " enough to handle the maximum level of concurrency from its "
                 "clients, typically four to six.")
             )
-    nfs_srv_async = models.BooleanField(
-            default=False,
-            verbose_name=_("Asynchronous mode"),
-            help_text=_("Enable asynchronous mode, which will help "
-                          "performance beyond gigabit network speed.")
-            )
     nfs_srv_allow_nonroot = models.BooleanField(
             default=False,
             verbose_name=_("Allow non-root mount"),

Modified: trunk/nanobsd/Files/etc/rc.d/ix-nfsd
===================================================================
--- trunk/nanobsd/Files/etc/rc.d/ix-nfsd	2013-03-14 11:31:07 UTC (rev 13446)
+++ trunk/nanobsd/Files/etc/rc.d/ix-nfsd	2013-03-15 13:37:32 UTC (rev 13447)
@@ -38,18 +38,6 @@
 	echo "${group}"
 }
 
-set_sysctl()
-{
-	local IFS="|"
-	local f="nfs_srv_async"
-	eval local $f
-	local sf=$(var_to_sf $f)
-	${FREENAS_SQLITE_CMD} ${FREENAS_CONFIG} "SELECT $sf FROM services_nfs ORDER BY id DESC LIMIT 1" | \
-	while eval read $f; do
-		/sbin/sysctl vfs.nfsrv.async=${nfs_srv_async} > /dev/null
-	done
-}
-
 #
 # TODO: For now we overwrite /etc/exports, it's desirable to teach mountd about another
 # place so user can write their own entry.
@@ -108,9 +96,6 @@
 		fi
 	done > /etc/exports
 
-	set_sysctl
-
-
 	if ! /etc/rc.d/mountd forcestatus 1>/dev/null 2>&1
 	then
 		force_depend mountd || return 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13453
          http://freenas.svn.sourceforge.net/freenas/?rev=13453&view=rev
Author:   zippybr
Date:     2013-03-18 22:21:25 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Update build_bug.sh

Modified Paths:
--------------
    trunk/README
    trunk/build/build_bug.sh

Modified: trunk/README
===================================================================
--- trunk/README	2013-03-16 23:17:12 UTC (rev 13452)
+++ trunk/README	2013-03-18 22:21:25 UTC (rev 13453)
@@ -11,7 +11,7 @@
 - amd64 or i386 for i386 builds; an amd64 for amd64 builds.
 - You will need the following ports/packages when compiling anything
   FreeNAS-related:
-  - devel/git or devel/subversion
+  - devel/git
   - lang/python26 or lang/python27
 
 - You need the following additional ports/packages to build the FreeNAS base

Modified: trunk/build/build_bug.sh
===================================================================
--- trunk/build/build_bug.sh	2013-03-16 23:17:12 UTC (rev 13452)
+++ trunk/build/build_bug.sh	2013-03-18 22:21:25 UTC (rev 13453)
@@ -18,22 +18,16 @@
 	for cmd in \
 		"uname -a" \
 		"set" \
-		"cat obj.*/_.env" \
-		"svn status ." \
-		"svnversion FreeBSD/src" \
-		"svn info FreeBSD/src" \
-		"svn status FreeBSD/src" \
-		"svn diff FreeBSD/src" \
-		"cat patches/ports*.patch" \
+		"cat os-base/*/_.env" \
+		"git status ." \
+		"git diff" \
+		"cd FreeBSD/src && git rev-parse HEAD" \
+		"cd FreeBSD/src && git remote -v" \
+		"cd FreeBSD/src && git status" \
+		"cd FreeBSD/src && git diff HEAD" \
 		; \
 	do
 		do_cmd "$cmd"
 	done
-	# See: build/nano_env .
-	if [ -z "$git" ]; then
-		do_cmd "svn diff ."
-	else
-		do_cmd "git diff ."
-	fi
 ) | bzip2 -c > $log 2>&1
 info "Done! Please create a support ticket [at $AVATAR_SUPPORT_SITE], attach $log (in addition to any other failed build logs as noted by nanobsd, etc), and note that the issue is a build system issue."

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.