* [gentoo-commits] gentoo-x86 commit in www-servers/cherokee/files: cherokee-1.2.98-gentoo.patch cherokee-1.2.98-linux3.patch cherokee-confd-1.2.98 cherokee-initd-1.2.98
@ 2011-08-26 11:58 Matsuu Takuto (matsuu)
0 siblings, 0 replies; only message in thread
From: Matsuu Takuto (matsuu) @ 2011-08-26 11:58 UTC (permalink / raw
To: gentoo-commits
matsuu 11/08/26 11:58:08
Added: cherokee-1.2.98-gentoo.patch
cherokee-1.2.98-linux3.patch cherokee-confd-1.2.98
cherokee-initd-1.2.98
Log:
Version bumped. Added php and static-libs USE flags. Removed fastcgi USE flag. Added PYTHON_USE_WITH="theads", bug #364533. Added many fixes.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Revision Changes Path
1.1 www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-1.2.98-gentoo.patch?rev=1.1&content-type=text/plain
Index: cherokee-1.2.98-gentoo.patch
===================================================================
diff -Naur cherokee-1.2.98.orig/cherokee.conf.sample.pre cherokee-1.2.98/cherokee.conf.sample.pre
--- cherokee-1.2.98.orig/cherokee.conf.sample.pre 2011-05-03 18:01:42.000000000 +0900
+++ cherokee-1.2.98/cherokee.conf.sample.pre 2011-08-25 17:51:33.615130274 +0900
@@ -18,6 +18,8 @@
server!server_tokens = full
server!panic_action = %prefix%/bin/cherokee-panic
server!pid_file = %localstatedir%/run/cherokee.pid
+server!user = cherokee
+server!group = cherokee
# Default virtual server
#
@@ -27,11 +29,11 @@
vserver!1!logger = combined
vserver!1!logger!access!type = file
-vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access
+vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access
vserver!1!logger!access!buffsize = 16384
vserver!1!error_writer!type = file
-vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error
+vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error
vserver!1!rule!1!match = default
vserver!1!rule!1!handler = common
1.1 www-servers/cherokee/files/cherokee-1.2.98-linux3.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-1.2.98-linux3.patch?rev=1.1&content-type=text/plain
Index: cherokee-1.2.98-linux3.patch
===================================================================
diff -Naur cherokee-1.2.98.orig/admin/SystemStats.py cherokee-1.2.98/admin/SystemStats.py
--- cherokee-1.2.98.orig/admin/SystemStats.py 2011-05-03 18:01:41.000000000 +0900
+++ cherokee-1.2.98/admin/SystemStats.py 2011-08-26 13:05:08.128851462 +0900
@@ -39,7 +39,7 @@
global _stats
if not _stats:
- if sys.platform == 'linux2':
+ if sys.platform == 'linux2' or sys.platform == 'linux3':
_stats = System_stats__Linux()
elif sys.platform == 'darwin':
_stats = System_stats__Darwin()
diff -Naur cherokee-1.2.98.orig/admin/market/InstallUtil.py cherokee-1.2.98/admin/market/InstallUtil.py
--- cherokee-1.2.98.orig/admin/market/InstallUtil.py 2011-05-03 18:01:41.000000000 +0900
+++ cherokee-1.2.98/admin/market/InstallUtil.py 2011-08-26 13:05:06.596844132 +0900
@@ -56,7 +56,7 @@
first_group = str(root_group)
# Systems
- if sys.platform == 'linux2':
+ if sys.platform == 'linux2' or sys.platform == 'linux3':
if os.getuid() == 0:
return root_group
return first_group
@@ -72,7 +72,7 @@
def current_UID_is_admin():
- if sys.platform == 'linux2':
+ if sys.platform == 'linux2' or sys.platform == 'linux3':
return os.getuid() == 0
elif sys.platform == 'darwin':
return os.getuid() == 0
diff -Naur cherokee-1.2.98.orig/admin/util.py cherokee-1.2.98/admin/util.py
--- cherokee-1.2.98.orig/admin/util.py 2011-03-31 17:30:04.000000000 +0900
+++ cherokee-1.2.98/admin/util.py 2011-08-26 13:05:04.622834682 +0900
@@ -341,7 +341,7 @@
def os_get_document_root():
if sys.platform == 'darwin':
return "/Library/WebServer/Documents"
- elif sys.platform == 'linux2':
+ elif sys.platform == 'linux2' or sys.platform == 'linux3':
if os.path.exists ("/etc/redhat-release"):
return '/var/www'
elif os.path.exists ("/etc/fedora-release"):
1.1 www-servers/cherokee/files/cherokee-confd-1.2.98
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-confd-1.2.98?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-confd-1.2.98?rev=1.1&content-type=text/plain
Index: cherokee-confd-1.2.98
===================================================================
# /etc/conf.d/cherokee: config file for /etc/init.d/cherokee
#CHEROKEE_OPTS="--config=/etc/cherokee/cherokee.conf --valgrind"
CHEROKEE_OPTS=""
1.1 www-servers/cherokee/files/cherokee-initd-1.2.98
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-initd-1.2.98?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/cherokee/files/cherokee-initd-1.2.98?rev=1.1&content-type=text/plain
Index: cherokee-initd-1.2.98
===================================================================
#!/sbin/runscript
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
opts="${ops} configtest graceful reload"
CHEROKEE="/usr/sbin/cherokee"
depend() {
need net
use dns ldap logger mysql netmount
}
checkconfig() {
${CHEROKEE} -t 1>/dev/null 2>&1
ret=$?
if [ $ret -ne 0 ]; then
eerror "${SVCNAME} has detected an error in your config:"
${CHEROKEE} -t ${CHEROKEE_OPTS}
fi
return $?
}
configtest() {
ebegin "Checking ${SVCNAME} configuration"
checkconfig
eend $?
}
start() {
checkconfig || return 1
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start --quiet \
--exec ${CHEROKEE} -- -d ${CHEROKEE_OPTS}
eend $?
}
stop() {
checkconfig || return 1
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --quiet \
--exec ${CHEROKEE}
eend $?
}
graceful() {
checkconfig || return 1
ebegin "Gracefully restarting ${SVCNAME}"
start-stop-daemon \
--exec ${CHEROKEE} \
--signal HUP
eend $?
}
reload() {
checkconfig || return 1
ebegin "Restarting ${SVCNAME} and closing all open connections"
start-stop-daemon \
--exec ${CHEROKEE} \
--signal USR1
eend $?
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-26 11:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-26 11:58 [gentoo-commits] gentoo-x86 commit in www-servers/cherokee/files: cherokee-1.2.98-gentoo.patch cherokee-1.2.98-linux3.patch cherokee-confd-1.2.98 cherokee-initd-1.2.98 Matsuu Takuto (matsuu)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox