Attachment #112744 for bug #154211

View | Details | Raw Unified | Return to bug 154211
Collapse All | Expand All

Lines 2-12 Link Here

(-)cherokee-new/Makefile (-2 / +10 lines)
2	# Date created: 01 Jun 2002	2	# Date created: 01 Jun 2002
3	# Whom: silence <oksala@videotron.ca>	3	# Whom: silence <oksala@videotron.ca>
4	#	4	#
5	# $FreeBSD: ports/www/cherokee/Makefile,v 1.92 2011/01/06 00:54:06 wen Exp $	5	# $FreeBSD: ports/www/cherokee/Makefile,v 1.91 2010/12/09 06:24:40 wen Exp $
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 1.0.15	9	PORTVERSION= 1.0.18
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \	11	MASTER_SITES= http://www.cherokee-project.com/download/1.0/${PORTVERSION}/ \
12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \	12	http://cherokee.osuosl.org/1.0/${PORTVERSION}/ \
Lines 73-78 Link Here
73	CHEROKEE_LOGFILE_USER= root	73	CHEROKEE_LOGFILE_USER= root
74	CHEROKEE_LOGFILE_GROUP= wheel	74	CHEROKEE_LOGFILE_GROUP= wheel
75		75
		76	# Directory where to put RRD files, by default
		77	CHEROKEE_RRDDIR=/var/lib/cherokee/graphs
		78
76	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \	79	CONFIGURE_ARGS= --with-wwwroot=${PREFIX}/www/cherokee \
77	--localstatedir=${CHEROKEE_VARDIR} \	80	--localstatedir=${CHEROKEE_VARDIR} \
78	--disable-static	81	--disable-static
Lines 237-244 Link Here
237	CHEROKEE_LOGFILE_GROUP=${CHEROKEE_LOGFILE_GROUP} \	240	CHEROKEE_LOGFILE_GROUP=${CHEROKEE_LOGFILE_GROUP} \
238	CHEROKEE_ERRORLOG=${CHEROKEE_ERRORLOG} \	241	CHEROKEE_ERRORLOG=${CHEROKEE_ERRORLOG} \
239	CHEROKEE_ACCESSLOG=${CHEROKEE_ACCESSLOG} \	242	CHEROKEE_ACCESSLOG=${CHEROKEE_ACCESSLOG} \
		243	CHEROKEE_WITH_RRDTOOL=${WITH_RRDTOOL} \
		244	CHEROKEE_RRDDIR=${CHEROKEE_RRDDIR} \
		245	CHEROKEE_RRDDIR_USER=${CHEROKEE_USER} \
		246	CHEROKEE_RRDDIR_GROUP=${CHEROKEE_GROUP} \
240	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	247	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
241		248
		249
242	@${ECHO_MSG} "==============================================================="	250	@${ECHO_MSG} "==============================================================="
243	@${CAT} ${PKGMESSAGE}	251	@${CAT} ${PKGMESSAGE}
244	@${ECHO_MSG} "==============================================================="	252	@${ECHO_MSG} "==============================================================="

Lines 1-2 Link Here

(-)cherokee-new/distinfo (-2 / +2 lines)
1	SHA256 (cherokee-1.0.15.tar.gz) = 014ff6ddf5491c2289cab135c28a8c69955ef2c0cd8a60531cd6bc4f4918c3eb	1	SHA256 (cherokee-1.0.18.tar.gz) = 8bedf485ffbfa0a915a5714532186d8bd2b7b4a7cc5a2197bc9f026c68fd1a2c
2	SIZE (cherokee-1.0.15.tar.gz) = 5827351	2	SIZE (cherokee-1.0.18.tar.gz) = 5841896




--- admin/SystemStats.py	2011-01-14 12:07:33.000000000 -0300
+++ admin/SystemStats.py-new	2011-01-21 16:44:01.000000000 -0300
@@ -5,7 +5,7 @@
 # Authors:
 #      Alvaro Lopez Ortega <alvaro@alobbs.com>
 #
-# Copyright (C) 2001-2011 Alvaro Lopez Ortega
+# Copyright (C) 2001-2010 Alvaro Lopez Ortega
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of version 2 of the GNU General Public
@@ -331,7 +331,7 @@
 
     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")
+        ret = popen.popen_sync ("/sbin/sysctl -i hw.ncpu hw.clockrate kern.smp.cpus hw.pagesize vm.stats.vm.v_page_count")
         lines = filter (lambda x: x, ret['stdout'].split('\n'))
 
         # Parse output
@@ -349,10 +349,11 @@
 	    parts = line.split()
 	    if parts[0] == 'hw.ncpu:':
 		ncpus = int(parts[1])
+		vcpus = int(parts[1])
             elif parts[0] == 'hw.clockrate:':
 		clock = parts[1]
-            elif parts[0] == 'kern.threads.virtual_cpu:':
-		vcpus = parts[1]
+            elif parts[0] == 'kern.smp.cpus:':
+	  	vcpus = parts[1]
             elif parts[0] == 'vm.stats.vm.v_page_count:':
 		pcount = int(parts[1])
             elif parts[0] == 'hw.pagesize:':




PATH=/bin:/usr/bin:/usr/sbin


ACCESSLOG=${CHEROKEE_ACCESSLOG:-/var/log/cherokee.access}
ERRORLOG=${CHEROKEE_ERRORLOG:-/var/log/cherokee.error}
LOGS_USER=${CHEROKEE_LOGFILE_USER:-root}
LOGS_GROUP=${CHEROKEE_LOGFILE_GROUP:-wheel}
LOGS_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE:-0640}

WITH_RRDTOOL=${CHEROKEE_WITH_RRDTOOL:-n}
RRDDIR=${CHEROKEE_RRDDIR:-/var/lib/cherokee/graphs}
RRDDIR_USER=${CHEROKEE_RRDDIR_USER:-www}
RRDDIR_GROUP=${CHEROKEE_RRDDIR_GROUP:-www}


case $2 in

POST-INSTALL)
        
	echo "$2 for $1" 
	echo "Adjusting ownership (${LOGS_USER}:${LOGS_GROUP}) and permissions (${LOGS_FILEMODE}) on log files:"
        echo "${ACCESSLOG}"
        echo "${ERRORLOG}"

	if [ ! -f  ${ACCESSLOG} ]; then
		touch ${ACCESSLOG}
        fi

	if [ ! -f  ${ERRORLOG} ]; then
		touch ${ERRORLOG}
        fi

	chown -v ${LOGS_USER}:${LOGS_GROUP} ${ACCESSLOG} ${ERRORLOG}
	chmod -v ${LOGS_FILEMODE} ${ACCESSLOG} ${ERRORLOG}

        if [ "$WITH_RRDTOOL" = "true" ]; then	
	        if [ -d ${RRDDIR} ]; then
	            echo "RRD directory already exists."
		else
	            echo "Creating directory for RRD databases..."
		    mkdir -v -p ${RRDDIR} 
		fi

	        echo "Adjusting ownership..."
	        chown -v ${RRDDIR_USER}:${RRDDIR_GROUP} ${RRDDIR} 
	fi

	echo "$2 done."
	;;



Lines 910-915 Link Here

(-)cherokee-new/pkg-plist (+1 lines)
910	%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/wordpress.png	910	%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/wordpress.png
911	%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/zend.png	911	%%ADMIN%%%%DATADIR%%/admin/static/images/wizards/zend.png
912	%%ADMIN%%%%DATADIR%%/admin/static/js/SelectionPanel.js	912	%%ADMIN%%%%DATADIR%%/admin/static/js/SelectionPanel.js
		913	%%ADMIN%%%%DATADIR%%/admin/static/help_404.html
913	%%ADMIN%%%%DATADIR%%/admin/theme.html	914	%%ADMIN%%%%DATADIR%%/admin/theme.html
914	%%ADMIN%%%%DATADIR%%/admin/upgrade_config.py	915	%%ADMIN%%%%DATADIR%%/admin/upgrade_config.py
915	%%ADMIN%%%%DATADIR%%/admin/upgrade_config.pyc	916	%%ADMIN%%%%DATADIR%%/admin/upgrade_config.pyc

Return to bug 154211

Line 0 Link Here

(-)cherokee-new/files/patch-admin-systemstats.py.diff (+34 lines)
	1	--- admin/SystemStats.py 2011-01-14 12:07:33.000000000 -0300
	2	+++ admin/SystemStats.py-new 2011-01-21 16:44:01.000000000 -0300
	3	@@ -5,7 +5,7 @@
	4	# Authors:
	5	# Alvaro Lopez Ortega <alvaro@alobbs.com>
	6	#
	7	-# Copyright (C) 2001-2011 Alvaro Lopez Ortega
	8	+# Copyright (C) 2001-2010 Alvaro Lopez Ortega
	9	#
	10	# This program is free software; you can redistribute it and/or
	11	# modify it under the terms of version 2 of the GNU General Public
	12	@@ -331,7 +331,7 @@
	13
	14	def _read_cpu_and_mem_info (self):
	15	# Execute sysctl
	16	- ret = popen.popen_sync ("/sbin/sysctl hw.ncpu hw.clockrate kern.threads.virtual_cpu hw.pagesize vm.stats.vm.v_page_count")
	17	+ ret = popen.popen_sync ("/sbin/sysctl -i hw.ncpu hw.clockrate kern.smp.cpus hw.pagesize vm.stats.vm.v_page_count")
	18	lines = filter (lambda x: x, ret['stdout'].split('\n'))
	19
	20	# Parse output
	21	@@ -349,10 +349,11 @@
	22	parts = line.split()
	23	if parts[0] == 'hw.ncpu:':
	24	ncpus = int(parts[1])
	25	+ vcpus = int(parts[1])
	26	elif parts[0] == 'hw.clockrate:':
	27	clock = parts[1]
	28	- elif parts[0] == 'kern.threads.virtual_cpu:':
	29	- vcpus = parts[1]
	30	+ elif parts[0] == 'kern.smp.cpus:':
	31	+ vcpus = parts[1]
	32	elif parts[0] == 'vm.stats.vm.v_page_count:':
	33	pcount = int(parts[1])
	34	elif parts[0] == 'hw.pagesize:':

Lines 3-33 Link Here

(-)cherokee-new/files/pkg-install.in (-16 / +36 lines)
3	PATH=/bin:/usr/bin:/usr/sbin	3	PATH=/bin:/usr/bin:/usr/sbin
4		4
5		5
6	C_ACCESSLOG=${CHEROKEE_ACCESSLOG:-/var/log/cherokee.access}	6	ACCESSLOG=${CHEROKEE_ACCESSLOG:-/var/log/cherokee.access}
7	C_ERRORLOG=${CHEROKEE_ERRORLOG:-/var/log/cherokee.error}	7	ERRORLOG=${CHEROKEE_ERRORLOG:-/var/log/cherokee.error}
8	C_USER=${CHEROKEE_LOGFILE_USER:-root}	8	LOGS_USER=${CHEROKEE_LOGFILE_USER:-root}
9	C_GROUP=${CHEROKEE_LOGFILE_GROUP:-wheel}	9	LOGS_GROUP=${CHEROKEE_LOGFILE_GROUP:-wheel}
10	C_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE:-0640}	10	LOGS_FILEMODE=${CHEROKEE_LOGFILE_FILEMODE:-0640}
		11
		12	WITH_RRDTOOL=${CHEROKEE_WITH_RRDTOOL:-n}
		13	RRDDIR=${CHEROKEE_RRDDIR:-/var/lib/cherokee/graphs}
		14	RRDDIR_USER=${CHEROKEE_RRDDIR_USER:-www}
		15	RRDDIR_GROUP=${CHEROKEE_RRDDIR_GROUP:-www}
		16
11		17
12	case $2 in	18	case $2 in
13		19
14	POST-INSTALL)	20	POST-INSTALL)
15	echo "$2 for $1"	21
16	echo "Adjusting ownership (${C_USER}:${C_GROUP}) and permissions (${C_FILEMODE}) on log files:"	22	echo "$2 for $1"
17	echo "${C_ACCESSLOG}"	23	echo "Adjusting ownership (${LOGS_USER}:${LOGS_GROUP}) and permissions (${LOGS_FILEMODE}) on log files:"
18	echo "${C_ERRORLOG}"	24	echo "${ACCESSLOG}"
		25	echo "${ERRORLOG}"
19		26
20	if [ ! -f ${C_ACCESSLOG} ]; then	27	if [ ! -f ${ACCESSLOG} ]; then
21	touch ${C_ACCESSLOG}	28	touch ${ACCESSLOG}
22	fi	29	fi
23		30
24	if [ ! -f ${C_ERRORLOG} ]; then	31	if [ ! -f ${ERRORLOG} ]; then
25	touch ${C_ERRORLOG}	32	touch ${ERRORLOG}
26	fi	33	fi
27		34
28	chown ${C_USER}:${C_GROUP} ${C_ACCESSLOG} ${C_ERRORLOG}	35	chown -v ${LOGS_USER}:${LOGS_GROUP} ${ACCESSLOG} ${ERRORLOG}
29	chmod ${C_FILEMODE} ${C_ACCESSLOG} ${C_ERRORLOG}	36	chmod -v ${LOGS_FILEMODE} ${ACCESSLOG} ${ERRORLOG}
30		37
		38	if [ "$WITH_RRDTOOL" = "true" ]; then
		39	if [ -d ${RRDDIR} ]; then
		40	echo "RRD directory already exists."
		41	else
		42	echo "Creating directory for RRD databases..."
		43	mkdir -v -p ${RRDDIR}
		44	fi
		45
		46	echo "Adjusting ownership..."
		47	chown -v ${RRDDIR_USER}:${RRDDIR_GROUP} ${RRDDIR}
		48	fi
		49
		50	echo "$2 done."
31	;;	51	;;
32		52
33		53