diff -ruN cherokee/Makefile cherokee-new/Makefile --- cherokee/Makefile 2010-12-09 08:44:44.000000000 -0300 +++ cherokee-new/Makefile 2011-01-05 03:22:11.000000000 -0300 @@ -6,7 +6,7 @@ # PORTNAME= cherokee -PORTVERSION= 1.0.10 +PORTVERSION= 1.0.15 CATEGORIES= www MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \ http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \ @@ -182,6 +182,10 @@ $$i > $${i%.pre};done @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ + ${WRKSRC}/admin/CTK/CTK-run.pre + @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ + ${WRKSRC}/cherokee/cherokee-admin-launcher + @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/admin/server.py @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/admin/upgrade_config.py @@ -198,8 +202,6 @@ @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/po/po_stats.py @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ - ${WRKSRC}/packages/osx/build.py - @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/qa/fcgi.py @${REINPLACE_CMD} -e 's|/usr/bin/env python|/usr/local/bin/python|' \ ${WRKSRC}/qa/run-tests.py diff -ruN cherokee/distinfo cherokee-new/distinfo --- cherokee/distinfo 2010-12-09 08:44:44.000000000 -0300 +++ cherokee-new/distinfo 2011-01-03 16:15:03.000000000 -0300 @@ -1,2 +1,2 @@ -SHA256 (cherokee-1.0.10.tar.gz) = 688b8112506c2692cd0547dc9f4dc0837aa1a4b38d077ec3dacef3acacbe474d -SIZE (cherokee-1.0.10.tar.gz) = 5689814 +SHA256 (cherokee-1.0.15.tar.gz) = 014ff6ddf5491c2289cab135c28a8c69955ef2c0cd8a60531cd6bc4f4918c3eb +SIZE (cherokee-1.0.15.tar.gz) = 5827351 diff -ruN cherokee/files/patch-cherokee-admin-systemstats.py cherokee-new/files/patch-cherokee-admin-systemstats.py --- cherokee/files/patch-cherokee-admin-systemstats.py 2010-12-09 08:44:44.000000000 -0300 +++ cherokee-new/files/patch-cherokee-admin-systemstats.py 1969-12-31 20:00:00.000000000 -0400 @@ -1,150 +0,0 @@ ---- admin/SystemStats.py-orig 2010-11-18 07:53:18.000000000 -0300 -+++ admin/SystemStats.py 2010-11-25 20:38:23.000000000 -0300 -@@ -23,6 +23,7 @@ - # - - import os -+import popen - import re - import sys - import time -@@ -42,6 +43,8 @@ - _stats = System_stats__Linux() - elif sys.platform == 'darwin': - _stats = System_stats__Darwin() -+ elif sys.platform.startswith ('freebsd'): -+ _stats = System_stats__FreeBSD() - - assert _stats, "Not implemented" - return _stats -@@ -286,6 +289,130 @@ - time.sleep (self.CHECK_INTERVAL) - - -+ -+# FreeBSD implementation -+class System_stats__FreeBSD (Thread, System_stats): -+ CHECK_INTERVAL = 2 -+ -+ def __init__ (self): -+ Thread.__init__ (self) -+ System_stats.__init__ (self) -+ -+ self.vmstat_fd = subprocess.Popen ("/usr/bin/vmstat -H -w%d" %(self.CHECK_INTERVAL), -+ shell=True, stdout = subprocess.PIPE, close_fds=True ) -+ -+ #first,second = self.vmstat_fd.stdout.readline(),self.vmstat_fd.stdout.readline() -+ -+ -+ # Read valid values -+ self._read_hostname() -+ self._read_cpu() -+ self._read_memory() -+ self._read_cpu_and_mem_info() -+ -+ self.start() -+ -+ def _read_hostname (self): -+ # First try: uname() -+ self.hostname = os.uname()[1] -+ if self.hostname: -+ return -+ -+ # Second try: sysctl() -+ ret = popen.popen_sync ("/sbin/sysctl -n kern.hostname") -+ self.hostname = ret['stdout'].rstrip() -+ if self.hostname: -+ return -+ -+ # Could not figure it out -+ self.hostname = "Unknown" -+ -+ def _read_cpu_and_mem_info (self): -+ # Execute sysctl -+ ret = popen.popen_sync ("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu hw.pagesize vm.stats.vm.v_page_count") -+ lines = filter (lambda x: x, ret['stdout'].split('\n')) -+ -+ # Parse output -+ -+ # cpu related -+ ncpus = 0 -+ vcpus = 0 -+ clock = '' -+ -+ # mem related -+ psize = 0 -+ pcount = 0 -+ -+ for line in lines: -+ parts = line.split() -+ if parts[0] == 'hw.ncpu:': -+ ncpus = int(parts[1]) -+ elif parts[0] == 'hw.clockrate:': -+ clock = parts[1] -+ elif parts[0] == 'kern.threads.virtual_cpu:': -+ vcpus = parts[1] -+ elif parts[0] == 'vm.stats.vm.v_page_count:': -+ pcount = int(parts[1]) -+ elif parts[0] == 'hw.pagesize:': -+ psize = int(parts[1]) -+ -+ # Deal with cores -+ if vcpus: -+ self.cpu.num = str (int(vcpus) / int(ncpus)) -+ self.cpu.cores = vcpus -+ else: -+ self.cpu.num = int (ncpus) -+ self.cpu.cores = int (ncpus) -+ -+ # Global speed -+ self.cpu.speed = '%s MHz' %(clock) -+ -+ -+ # Physical mem -+ self.mem.total = (psize * pcount) / 1024 -+ -+ def _read_cpu (self): -+ -+ # Read a new line -+ line = self.vmstat_fd.stdout.readline().rstrip('\n') -+ -+ # Skip headers -+ if len(filter (lambda x: x not in " .0123456789", line)): -+ return -+ -+ # Parse -+ parts = filter (lambda x: x, line.split(' ')) -+ -+ if not len(parts) == 18: -+ return -+ -+ self.cpu.idle = int(parts[17]) -+ self.cpu.usage = 100 - self.cpu.idle -+ -+ def _read_memory (self): -+ -+ line = self.vmstat_fd.stdout.readline().rstrip('\n') -+ -+ # Skip headers -+ if len(filter (lambda x: x not in " .0123456789", line)): -+ return -+ -+ # Parse -+ values = filter (lambda x: x, line.split(' ')) -+ -+ if not len(values)==18: -+ return -+ -+ self.mem.free = int(values[4]) -+ self.mem.used = self.mem.total - self.mem.free -+ -+ def run (self): -+ while True: -+ self._read_cpu() -+ self._read_memory() -+ time.sleep (self.CHECK_INTERVAL) -+ -+ - if __name__ == '__main__': - sys_stats = get_system_stats() - diff -ruN cherokee/pkg-plist cherokee-new/pkg-plist --- cherokee/pkg-plist 2010-12-09 08:44:44.000000000 -0300 +++ cherokee-new/pkg-plist 2011-01-05 02:51:17.000000000 -0300 @@ -3,6 +3,8 @@ bin/cherokee-config bin/cherokee-panic bin/cherokee-tweak +bin/cherokee-macos-askpass +bin/cherokee-admin-launcher @unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done @unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done etc/cherokee/cherokee.conf.default @@ -89,6 +91,8 @@ lib/cherokee/libplugin_exists.so lib/cherokee/libplugin_extensions.la lib/cherokee/libplugin_extensions.so +lib/cherokee/libplugin_failover.la +lib/cherokee/libplugin_failover.so lib/cherokee/libplugin_fcgi.la lib/cherokee/libplugin_fcgi.so lib/cherokee/libplugin_file.la @@ -175,6 +179,7 @@ lib/libcherokee-server.so lib/libcherokee-server.so.0 libdata/pkgconfig/cherokee.pc +man/man1/cherokee-admin-launcher.1 sbin/cherokee sbin/cherokee-admin sbin/cherokee-worker @@ -389,6 +394,7 @@ %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/ui-icons_cd0a0a_256x240.png %%ADMIN%%%%DATADIR%%/admin/CTK/static/images/uploadify.cancel.png %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/ajaxupload.3.6.js +%%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Carousel.js %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Help.js %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/Submitter.js %%ADMIN%%%%DATADIR%%/admin/CTK/static/js/common.js @@ -447,6 +453,8 @@ %%ADMIN%%%%DATADIR%%/admin/Rule.pyc %%ADMIN%%%%DATADIR%%/admin/RuleSimple.py %%ADMIN%%%%DATADIR%%/admin/RuleSimple.pyc +%%ADMIN%%%%DATADIR%%/admin/SavingChecks.py +%%ADMIN%%%%DATADIR%%/admin/SavingChecks.pyc %%ADMIN%%%%DATADIR%%/admin/SelectionPanel.py %%ADMIN%%%%DATADIR%%/admin/SelectionPanel.pyc %%ADMIN%%%%DATADIR%%/admin/Wizard.py @@ -461,6 +469,14 @@ %%ADMIN%%%%DATADIR%%/admin/consts.pyc %%ADMIN%%%%DATADIR%%/admin/exception.html %%ADMIN%%%%DATADIR%%/admin/help.html +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-16.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-32.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-48.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-96.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-128.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-256.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher-512.png +%%ADMIN%%%%DATADIR%%/admin/icons/cherokee-admin-launcher.svg %%ADMIN%%%%DATADIR%%/admin/plugins/admin.py %%ADMIN%%%%DATADIR%%/admin/plugins/admin.pyc %%ADMIN%%%%DATADIR%%/admin/plugins/authlist.py @@ -555,6 +571,12 @@ %%ADMIN%%%%DATADIR%%/admin/plugins/uwsgi.pyc %%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.py %%ADMIN%%%%DATADIR%%/admin/plugins/wildcard.pyc +%%ADMIN%%%%DATADIR%%/admin/plugins/failover.py +%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.py +%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.py +%%ADMIN%%%%DATADIR%%/admin/plugins/failover.pyc +%%ADMIN%%%%DATADIR%%/admin/plugins/gzip.pyc +%%ADMIN%%%%DATADIR%%/admin/plugins/deflate.pyc %%ADMIN%%%%DATADIR%%/admin/server.py %%ADMIN%%%%DATADIR%%/admin/server.pyc %%ADMIN%%%%DATADIR%%/admin/static/css/cherokee-admin.css @@ -925,6 +947,8 @@ %%ADMIN%%%%DATADIR%%/admin/wizards/moinmoin.pyc %%ADMIN%%%%DATADIR%%/admin/wizards/mono.py %%ADMIN%%%%DATADIR%%/admin/wizards/mono.pyc +%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.py +%%ADMIN%%%%DATADIR%%/admin/wizards/moodle.pyc %%ADMIN%%%%DATADIR%%/admin/wizards/php.py %%ADMIN%%%%DATADIR%%/admin/wizards/php.pyc %%ADMIN%%%%DATADIR%%/admin/wizards/phpbb.py @@ -1035,6 +1059,7 @@ %%ADMIN%%@dirrm %%DATADIR%%/admin/static %%ADMIN%%@dirrm %%DATADIR%%/admin/plugins %%ADMIN%%@dirrm %%DATADIR%%/admin/market +%%ADMIN%%@dirrm %%DATADIR%%/admin/icons %%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/js %%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/images %%ADMIN%%@dirrm %%DATADIR%%/admin/CTK/static/css