jhixson | 29 Mar 2013 02:07
Picon

SF.net SVN: freenas:[13467] projects/pluginjail/nanobsd/os-base

Revision: 13467
          http://freenas.svn.sourceforge.net/freenas/?rev=13467&view=rev
Author:   jhixson
Date:     2013-03-29 01:07:55 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
Remove testdisk from this branch since it can't build

Modified Paths:
--------------
    projects/pluginjail/nanobsd/os-base

Modified: projects/pluginjail/nanobsd/os-base
===================================================================
--- projects/pluginjail/nanobsd/os-base	2013-03-27 23:59:35 UTC (rev 13466)
+++ projects/pluginjail/nanobsd/os-base	2013-03-29 01:07:55 UTC (rev 13467)
 <at>  <at>  -308,7 +308,7  <at>  <at> 
 add_port devel/py-greenlet
 add_port net/py-eventlet
 add_port graphics/jpeg
-add_port sysutils/testdisk OPTIONS_FILE_SET+=NTFS OPTIONS_FILE_SET+=NTFS3G OPTIONS_FILE_SET+=ICONV
+#add_port sysutils/testdisk OPTIONS_FILE_SET+=NTFS OPTIONS_FILE_SET+=NTFS3G OPTIONS_FILE_SET+=ICONV

 if [ "${DEBUG}" = 1 ]; then

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

------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
(Continue reading)

jhixson | 28 Mar 2013 00:59
Picon

SF.net SVN: freenas:[13466] projects/pluginjail

Revision: 13466
          http://freenas.svn.sourceforge.net/freenas/?rev=13466&view=rev
Author:   jhixson
Date:     2013-03-27 23:59:35 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
Bring all changes to trunk into pluginjail branch.

Modified Paths:
--------------
    projects/pluginjail/.gitignore
    projects/pluginjail/README
    projects/pluginjail/build/create_iso.sh
    projects/pluginjail/gui/account/urls.py
    projects/pluginjail/gui/freeadmin/api/utils.py
    projects/pluginjail/gui/freeadmin/static/lib/js/freeadmin.js
    projects/pluginjail/gui/freeadmin/utils.py
    projects/pluginjail/gui/freeadmin/views.py
    projects/pluginjail/gui/jails/urls.py
    projects/pluginjail/gui/middleware/notifier.py
    projects/pluginjail/gui/network/urls.py
    projects/pluginjail/gui/plugins/urls.py
    projects/pluginjail/gui/reporting/urls.py
    projects/pluginjail/gui/services/forms.py
    projects/pluginjail/gui/services/models.py
    projects/pluginjail/gui/services/urls.py
    projects/pluginjail/gui/sharing/forms.py
    projects/pluginjail/gui/sharing/urls.py
    projects/pluginjail/gui/storage/forms.py
    projects/pluginjail/gui/storage/urls.py
(Continue reading)

jhixson | 27 Mar 2013 06:41
Picon

SF.net SVN: freenas:[13465] projects/pluginjail

Revision: 13465
          http://freenas.svn.sourceforge.net/freenas/?rev=13465&view=rev
Author:   jhixson
Date:     2013-03-27 05:41:04 +0000 (Wed, 27 Mar 2013)
Log Message:
-----------
manual merge of trunk stuff to get build to work.

Modified Paths:
--------------
    projects/pluginjail/build/nano_env
    projects/pluginjail/gui/settings.py

Modified: projects/pluginjail/build/nano_env
===================================================================
--- projects/pluginjail/build/nano_env	2013-03-26 22:22:03 UTC (rev 13464)
+++ projects/pluginjail/build/nano_env	2013-03-27 05:41:04 UTC (rev 13465)
 <at>  <at>  -21,8 +21,8  <at>  <at> 
 # 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

 <at>  <at>  -86,7 +86,7  <at>  <at> 
 			else
(Continue reading)

jhixson | 26 Mar 2013 23:22
Picon

SF.net SVN: freenas:[13464] projects/pluginjail

Revision: 13464
          http://freenas.svn.sourceforge.net/freenas/?rev=13464&view=rev
Author:   jhixson
Date:     2013-03-26 22:22:03 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
Bring trunk changes into pluginjail branch (including updating to FreeBSD
9.x)

Modified Paths:
--------------
    projects/pluginjail/README
    projects/pluginjail/build/build_bug.sh
    projects/pluginjail/build/do_build.sh
    projects/pluginjail/gui/reporting/rrd.py
    projects/pluginjail/gui/services/models.py
    projects/pluginjail/gui/sharing/forms.py
    projects/pluginjail/gui/templates/freeadmin/generic_model_add.html
    projects/pluginjail/gui/templates/freeadmin/generic_model_edit.html
    projects/pluginjail/nanobsd/Files/etc/rc.d/ix-nfsd
    projects/pluginjail/nanobsd/common
    projects/pluginjail/nanobsd/os-base

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

Property Changed:
----------------
    projects/pluginjail/
(Continue reading)

zippybr | 22 Mar 2013 14:55
Picon

SF.net SVN: freenas:[13463] trunk/nanobsd/os-base

Revision: 13463
          http://freenas.svn.sourceforge.net/freenas/?rev=13463&view=rev
Author:   zippybr
Date:     2013-03-22 13:55:52 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
Add back sysutils/testdisk with options ng

While I'm here remove x11/libICE and x11/libSM which I believe
are no longer needed since cairo new options

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

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-21 23:45:11 UTC (rev 13462)
+++ trunk/nanobsd/os-base	2013-03-22 13:55:52 UTC (rev 13463)
 <at>  <at>  -284,9 +284,7  <at>  <at> 
 add_port sysutils/graid5
 add_port devel/libevent
 add_port sysutils/tmux
-add_port x11/libICE
-add_port x11/libSM
-add_port net/netatalk WITH_PAM=y WITHOUT_APPLETALK=y WITHOUT_X11=y
+add_port net/netatalk WITH_PAM=y WITHOUT_APPLETALK=y
 add_port dns/libidn
 add_port ftp/wget
 add_port benchmarks/iozone
(Continue reading)

zippybr | 22 Mar 2013 00:45
Picon

SF.net SVN: freenas:[13462] trunk/gui/reporting/rrd.py

Revision: 13462
          http://freenas.svn.sourceforge.net/freenas/?rev=13462&view=rev
Author:   zippybr
Date:     2013-03-21 23:45:11 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Fix interfaces graphs

Reported by: Richard Kojedzinszky (via email)

Modified Paths:
--------------
    trunk/gui/reporting/rrd.py

Modified: trunk/gui/reporting/rrd.py
===================================================================
--- trunk/gui/reporting/rrd.py	2013-03-21 21:43:11 UTC (rev 13461)
+++ trunk/gui/reporting/rrd.py	2013-03-21 23:45:11 UTC (rev 13462)
 <at>  <at>  -24,6 +24,7  <at>  <at> 
 # POSSIBILITY OF SUCH DAMAGE.
 #
 #####################################################################
+import glob
 import logging
 import os
 import re
 <at>  <at>  -70,6 +71,7  <at>  <at> 
             self.unit = str(unit)
         if step is not None:
             self.step = int(step)
(Continue reading)

zippybr | 21 Mar 2013 22:43
Picon

SF.net SVN: freenas:[13461] trunk/nanobsd/os-base

Revision: 13461
          http://freenas.svn.sourceforge.net/freenas/?rev=13461&view=rev
Author:   zippybr
Date:     2013-03-21 21:43:11 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Remove ZMQ support for ipython

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

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-21 19:35:24 UTC (rev 13460)
+++ trunk/nanobsd/os-base	2013-03-21 21:43:11 UTC (rev 13461)
 <at>  <at>  -322,7 +322,7  <at>  <at> 
 	add_port devel/subversion
 	add_port editors/vim-lite
 	add_port misc/py-pexpect
-	add_port devel/ipython OPTIONS_FILE_UNSET+=X11
+	add_port devel/ipython OPTIONS_FILE_UNSET+=X11 OPTIONS_FILE_UNSET+=ZMQ
 	add_port devel/p5-Term-ReadKey
 	add_port devel/p5-subversion
 	add_port mail/p5-Net-SMTP-SSL

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

------------------------------------------------------------------------------
(Continue reading)

zippybr | 21 Mar 2013 20:35
Picon

SF.net SVN: freenas:[13460] trunk/build/do_build.sh

Revision: 13460
          http://freenas.svn.sourceforge.net/freenas/?rev=13460&view=rev
Author:   zippybr
Date:     2013-03-21 19:35:24 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Use --depth 1 in git pull as well

Modified Paths:
--------------
    trunk/build/do_build.sh

Modified: trunk/build/do_build.sh
===================================================================
--- trunk/build/do_build.sh	2013-03-21 19:29:57 UTC (rev 13459)
+++ trunk/build/do_build.sh	2013-03-21 19:35:24 UTC (rev 13460)
 <at>  <at>  -326,7 +326,7  <at>  <at> 

 			git checkout ${GIT_BRANCH}
 		fi
-		git pull
+		git pull --depth 1
 		cd ..
 	else
 		spl="$-";set -x
 <at>  <at>  -399,7 +399,7  <at>  <at> 
 	cd "$AVATAR_ROOT/FreeBSD"
 	if [ -d ports/.git ] ; then
 		cd ports
-		git pull
(Continue reading)

zippybr | 21 Mar 2013 20:29
Picon

SF.net SVN: freenas:[13459] trunk/nanobsd/os-base

Revision: 13459
          http://freenas.svn.sourceforge.net/freenas/?rev=13459&view=rev
Author:   zippybr
Date:     2013-03-21 19:29:57 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Lets try removing those packages by removing some options from cairo

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

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-21 18:08:06 UTC (rev 13458)
+++ trunk/nanobsd/os-base	2013-03-21 19:29:57 UTC (rev 13459)
 <at>  <at>  -239,12 +239,7  <at>  <at> 
 	add_port devel/libstatgrab
 	add_port devel/libltdl
 	add_port print/freetype2
-	add_port x11/kbproto
 	add_port x11/xproto
-	add_port x11/libXdmcp
-	add_port x11/libXau
-	add_port x11/libxcb
-	add_port x11/libX11
 	add_port x11-fonts/fontconfig
 	add_port x11-fonts/libfontenc
 	add_port x11-fonts/mkfontscale
 <at>  <at>  -256,13 +251,8  <at>  <at> 
(Continue reading)

zippybr | 21 Mar 2013 19:08
Picon

SF.net SVN: freenas:[13458] trunk/nanobsd/os-base

Revision: 13458
          http://freenas.svn.sourceforge.net/freenas/?rev=13458&view=rev
Author:   zippybr
Date:     2013-03-21 18:08:06 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
databases/rrdtool has been recently converted as well

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

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-21 17:03:00 UTC (rev 13457)
+++ trunk/nanobsd/os-base	2013-03-21 18:08:06 UTC (rev 13458)
 <at>  <at>  -264,8 +264,9  <at>  <at> 
 	add_port x11/pixman
 	add_port graphics/cairo OPTIONS_FILE_UNSET+=X11
 	add_port x11-toolkits/pango OPTIONS_FILE_UNSET+=X11
-	add_port databases/rrdtool	WITHOUT_X11=y WITHOUT_PERL_MODULE=y \
-					WITH_PYTHON_MODULE=y
+	add_port databases/rrdtool OPTIONS_FILE_SET+=PERL_MODULE \
+				OPTIONS_FILE_SET+=PYTHON_MODULE \
+				OPTIONS_FILE_SET+=JSON
 	add_port net/liboping
 	add_port net-mgmt/collectd5 OPTIONS_FILE_UNSET+=BIND OPTIONS_FILE_UNSET+=SNMP \
 				   OPTIONS_FILE_SET+=DISK OPTIONS_FILE_SET+=PYTHON

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
(Continue reading)

zippybr | 21 Mar 2013 18:03
Picon

SF.net SVN: freenas:[13457] trunk/nanobsd/os-base

Revision: 13457
          http://freenas.svn.sourceforge.net/freenas/?rev=13457&view=rev
Author:   zippybr
Date:     2013-03-21 17:03:00 +0000 (Thu, 21 Mar 2013)
Log Message:
-----------
Use Options NG for a few more ports

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

Modified: trunk/nanobsd/os-base
===================================================================
--- trunk/nanobsd/os-base	2013-03-20 16:10:19 UTC (rev 13456)
+++ trunk/nanobsd/os-base	2013-03-21 17:03:00 UTC (rev 13457)
 <at>  <at>  -162,7 +162,7  <at>  <at> 
 add_port converters/iconv
 add_port devel/gettext
 add_port devel/pkgconf
-add_port devel/libpthread-stubs WITHOUT_X11=y
+add_port devel/libpthread-stubs
 add_port devel/cdialog
 add_port dns/inadyn
 add_port devel/pcre
 <at>  <at>  -262,14 +262,13  <at>  <at> 
 	add_port x11/xcb-proto
 	add_port x11/xcb-util-renderutil
 	add_port x11/pixman
-	add_port graphics/cairo WITHOUT_X11=y
(Continue reading)


Gmane