Version bumped. Added cherokee.logrotate. Fixed graceful and reload in init.d, bug #348929. Clean up.

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

6 files changed, 324 insertions, 7 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index afcc562b2d76..4121729c6e46 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -19,13 +19,13 @@ EBUILD apache-2.2.16-r1.ebuild 2680 RMD160 619727d2b7f48b8357dbb4112b001f67593ad
 EBUILD apache-2.2.16.ebuild 2326 RMD160 ea97a265f787b20329c592a6a4aaed5a97884a42 SHA1 dcea03fbf229d138f6f42d15813a59875c7bf965 SHA256 2f8ab433d60d88650df0602894606d0c4b4b730dda216b7398eb9c0849f39edb
 EBUILD apache-2.2.17.ebuild 2662 RMD160 504b6e5e1fca0e16802dc07a1244517e7c868b66 SHA1 881c6fa19547502b3d8e33a927d27c707569c8d9 SHA256 5f18d3f92d278467e839898adeb130c13b30be9a4eb9094c6b18a12700ff4332
 EBUILD apache-2.2.20.ebuild 2663 RMD160 45ffdb6ac45a8d2227128c3008aa66dfa84ab797 SHA1 c3d254c5239772964241527083a9d703848c8024 SHA256 abf0ff5141cb2335c9e826dfb59101079c559b945b2042da7266741004df4ce7
-EBUILD apache-2.2.21.ebuild 2675 RMD160 13ba7ff63394192efe069192b0625c80ae894976 SHA1 eac4b63adf2f0cfc5cda01d4852df367b88138cf SHA256 f451dfb87365c8a88e47e71a20909167788b20496b0e4b90f1584d2c99c02572
-MISC ChangeLog 114444 RMD160 a361917dc331f316b201c12717ed4c4efa9cbc1f SHA1 50b013b3a0f98854a2b90cf6fa3bee82d7f20d2e SHA256 2cdb565ee7f72c5adca428ac1b4a5b5f0fce7fed01955ae014d11b6213e8da86
+EBUILD apache-2.2.21.ebuild 2673 RMD160 357688f0f4906ae1439a5feb6a4253b7e81528be SHA1 90c6952c54f5df126b2692fce44ae84b3fcea6e1 SHA256 7bcd60fc8746b44668e35604459bf42bdcc227ebecd06cec46522a8730d1e6ab
+MISC ChangeLog 114689 RMD160 97a499e40bfcfabbc7f7d550b90b51589534abd6 SHA1 845053d50bc739d5d8414e3e8d4d0ee0f318a5c5 SHA256 f9c8ecf2dc4a2fb3d0492af1342369b75d76064348bad27326eaf9536d393afd
 MISC metadata.xml 767 RMD160 3b4215160698916a68964b0bcbd63907fef5b124 SHA1 a27777ba897768cfbcebf7779a6cf8be2029ed9b SHA256 8378ce2aa8e0adbe9d7b2f093f115a11d0ec170c74232111b7f46bd692e5aa5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5zqPIACgkQB6aLYPQCwODsJgCg1m5VLlF13CKyf/QplO9EJAME
-eqMAn3bYkSqbjbEN86QLwh/eSExSBMOo
-=/XTC
+iEYEARECAAYFAk5zOiQACgkQp5vW4rUFj5oJmwCaA5d62Q6HNij6TM4oQo7Kaii8
+80MAn0LCAnfsyOAyA4p2+VLFjT4F79vr
+=dTdN
 -----END PGP SIGNATURE-----
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog
index 1bb6bffa82d6..e525a2bf2f23 100644
--- a/www-servers/cherokee/ChangeLog
+++ b/www-servers/cherokee/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-servers/cherokee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.85 2011/08/26 11:58:08 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.86 2011/09/16 11:57:03 matsuu Exp $
+
+*cherokee-1.2.99 (16 Sep 2011)
+
+  16 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> +files/cherokee-initd-1.2.99,
+  +cherokee-1.2.99.ebuild, +files/cherokee-1.2.99-gentoo.patch,
+  +files/cherokee.logrotate:
+  Version bumped. Added cherokee.logrotate. Fixed graceful and reload in
+  init.d, bug #348929. Clean up.
 
 *cherokee-1.2.98 (26 Aug 2011)
 
diff --git a/www-servers/cherokee/cherokee-1.2.99.ebuild b/www-servers/cherokee/cherokee-1.2.99.ebuild
new file mode 100644
index 000000000000..83d012e4aee0
--- /dev/null
+++ b/www-servers/cherokee/cherokee-1.2.99.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/cherokee-1.2.99.ebuild,v 1.1 2011/09/16 11:57:03 matsuu Exp $
+
+EAPI="3"
+PYTHON_DEPEND="admin? 2"
+PYTHON_USE_WITH="threads"
+
+inherit eutils multilib pam python versionator
+
+DESCRIPTION="An extremely fast and tiny web server."
+SRC_URI="http://www.cherokee-project.com/download/$(get_version_component_range 1-2)/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.cherokee-project.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="admin coverpage ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
+
+COMMON_DEPEND="dev-libs/libpcre
+	>=sys-libs/zlib-1.1.4-r1
+	ffmpeg? ( virtual/ffmpeg )
+	geoip? ( dev-libs/geoip )
+	ldap? ( net-nds/openldap )
+	mysql? ( >=virtual/mysql-5 )
+	nls? ( virtual/libintl )
+	pam? ( virtual/pam )
+	php? ( || (
+		dev-lang/php[fpm]
+		dev-lang/php[cgi]
+	) )
+	ssl? ( dev-libs/openssl )"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${COMMON_DEPEND}
+	rrdtool? ( net-analyzer/rrdtool )"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_pkg_setup
+
+	python_set_active_version 2
+
+	enewgroup cherokee
+	enewuser cherokee -1 -1 /var/www cherokee
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-gentoo.patch" \
+		"${FILESDIR}/${PN}-1.2.98-linux3.patch"
+
+	python_convert_shebangs -r 2 .
+}
+
+src_configure() {
+	local myconf
+
+	if use admin ; then
+		myconf="${myconf} --enable-admin --with-python=$(PYTHON -2)"
+	else
+		myconf="${myconf} --disable-admin --without-python"
+	fi
+
+	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.
+	if ! use php ; then
+		myconf="${myconf} --without-php"
+	fi
+
+	if use static ; then
+		myconf="${myconf} --enable-static-module=all"
+	fi
+
+	local os="Unknown"
+	case "${CHOST}" in
+		*-freebsd*)
+			os="FreeBSD" ;;
+		*-netbsd*)
+			os="NetBSD" ;;
+		*-openbsd*)
+			os="OpenBSD" ;;
+		*)
+			os="Linux" ;;
+	esac
+
+	# This make cherokee 1.2 sad
+	#	$(use_enable threads pthread) \
+	econf \
+		$(use_enable debug trace) \
+		$(use_enable debug backtraces) \
+		$(use_enable ipv6) \
+		$(use_enable kernel_linux epoll) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable static-libs static) \
+		$(use_with ffmpeg) \
+		$(use_with geoip) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with ssl libssl) \
+		--disable-dependency-tracking \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--enable-os-string="Gentoo ${os}" \
+		--enable-tmpdir="${EPREFIX}/var/tmp" \
+		--localstatedir="${EPREFIX}/var" \
+		--with-wwwroot="${EPREFIX}/var/www/localhost/htdocs" \
+		--with-cgiroot="${EPREFIX}/var/www/localhost/cgi-bin" \
+		--with-wwwuser=cherokee \
+		--with-wwwgroup=cherokee \
+		${myconf} || die "configure failed"
+}
+
+src_test() {
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete || die
+	elif ! use static ; then
+		find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
+	fi
+
+	dodoc AUTHORS ChangeLog README || die
+
+	if use pam ; then
+		pamd_mimic system-auth cherokee auth account session || die
+	fi
+
+	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN} || die "newinitd ${PN} failed"
+	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN} || die "newconfd ${PN} failed"
+
+	if ! use admin ; then
+		rm -r \
+			"${ED}"/usr/bin/cherokee-admin-launcher \
+			"${ED}"/usr/bin/CTK-run \
+			"${ED}"/usr/sbin/cherokee-admin \
+			"${ED}"/usr/share/cherokee/admin || die
+	fi
+
+	exeinto /usr/share/doc/${PF}/contrib
+	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py} || die
+
+	keepdir \
+		/var/www/localhost/htdocs \
+		/var/log/cherokee \
+		/var/lib/cherokee/graphs/images || die
+	fowners cherokee:cherokee \
+		/var/log/cherokee \
+		/var/lib/cherokee/graphs \
+		/var/lib/cherokee/graphs/images || die
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
+
+	if ! use coverpage ; then
+		rm -r "${ED}"/var/www/localhost/htdocs/* || die
+	fi
+}
+
+pkg_postinst() {
+	elog
+	if use admin ; then
+		python_mod_optimize "${EPREFIX}/usr/share/cherokee/admin/"
+		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
+		elog
+		elog "Cherokee currently supports configuration versioning, so from now on,"
+		elog "whenever a change is made to the configuration file format,"
+		elog "Cherokee-Admin will be able to automatically convert yours to the new"
+		elog "release. You simply have to load Cherokee-Admin and it will be converted"
+		elog "once you proceed to saving it."
+		elog
+		elog "There is also a command line utility that you can use to do the exact"
+		elog "same thing. Config format can change in different versions. It is"
+		elog "provided under:"
+		elog "	${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
+	else
+		elog "Try USE=admin if you want an easy way to configure cherokee."
+	fi
+	elog
+	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
+	elog
+}
+
+pkg_postrm() {
+	if use admin ; then
+		python_mod_cleanup "${EPREFIX}/usr/share/cherokee/admin/"
+	fi
+}
diff --git a/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch b/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch
new file mode 100644
index 000000000000..d55a5a2a82cf
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch
@@ -0,0 +1,38 @@
+diff -Naur cherokee-1.2.99.orig/admin/configured.py.pre cherokee-1.2.99/admin/configured.py.pre
+--- cherokee-1.2.99.orig/admin/configured.py.pre	2011-03-31 17:30:04.000000000 +0900
++++ cherokee-1.2.99/admin/configured.py.pre	2011-09-16 19:37:15.893487362 +0900
+@@ -22,7 +22,7 @@
+ CHEROKEE_DATADIR      = join (DATADIR, "cherokee")
+ CHEROKEE_DEPSDIR      = join (DATADIR, "cherokee/deps")
+ CHEROKEE_CONFDIR      = join (SYSCONFDIR, "cherokee")
+-CHEROKEE_VAR_LOG      = join (LOCALSTATE, "log")
++CHEROKEE_VAR_LOG      = join (LOCALSTATE, "log/cherokee")
+ CHEROKEE_VAR_RUN      = join (LOCALSTATE, "run")
+ CHEROKEE_VAR_LIB      = join (LOCALSTATE, "lib/cherokee")
+ CHEROKEE_RRD_DIR      = join (LOCALSTATE, "lib/cherokee/graphs")
+diff -Naur cherokee-1.2.99.orig/cherokee.conf.sample.pre cherokee-1.2.99/cherokee.conf.sample.pre
+--- cherokee-1.2.99.orig/cherokee.conf.sample.pre	2011-05-03 18:01:42.000000000 +0900
++++ cherokee-1.2.99/cherokee.conf.sample.pre	2011-09-16 19:37:15.894487368 +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
diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.99 b/www-servers/cherokee/files/cherokee-initd-1.2.99
new file mode 100644
index 000000000000..ad4fb7f2d865
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee-initd-1.2.99
@@ -0,0 +1,67 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/cherokee"
+extra_commands="configtest"
+extra_started_commands="graceful reload"
+
+
+depend() {
+	need net
+	use dns ldap logger mysql netmount
+}
+
+checkconfig() {
+	${command} -t 1>/dev/null 2>&1
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		eerror "${SVCNAME} has detected an error in your config:"
+		${command} -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 ${command} -- -d ${CHEROKEE_OPTS}
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --quiet \
+		--exec ${command}
+	eend $?
+}
+
+graceful() {
+	checkconfig || return 1
+
+	ebegin "Restarting ${SVCNAME} and closing all the opened connections"
+	start-stop-daemon \
+		--exec ${command} \
+		--signal USR1
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading ${SVCNAME} configuration"
+	start-stop-daemon \
+		--exec ${command} \
+		--signal HUP
+	eend $?
+}
diff --git a/www-servers/cherokee/files/cherokee.logrotate b/www-servers/cherokee/files/cherokee.logrotate
new file mode 100644
index 000000000000..ca37a9033933
--- /dev/null
+++ b/www-servers/cherokee/files/cherokee.logrotate
@@ -0,0 +1,11 @@
+# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee.logrotate,v 1.1 2011/09/16 11:57:03 matsuu Exp $
+# lighttpd logrotate script for Gentoo
+
+/var/log/cherokee/cherokee.* {
+  missingok
+  notifempty
+  sharedscripts
+  postrotate
+  [ -f /var/run/cherokee/cherokee.pid ] && /bin/kill -USR2 `cat /var/run/cherokee.pid`
+  endscript
+}