New package: cherokee-1.2.101 web server.

common/shlibs

@@ -929,3 +929,6 @@ libopcodes-2.22.so		binutils		binutils-devel
 libv8.so			libv8			v8-devel
 libGeoIP.so.1		libgeoip		geoip-devel
 libGeoIPUpdate.so.0	libgeoip		geoip-devel
+libcherokee-base.so.0	libcherokee		cherokee-devel
+libcherokee-client.so.0	libcherokee		cherokee-devel
+libcherokee-server.so.0	libcherokee		cherokee-devel

srcpkgs/cherokee-devel

@@ -0,0 +1 @@
+cherokee

srcpkgs/cherokee/REMOVE

@@ -0,0 +1,6 @@
+case ${ACTION} in
+purge)
+	[ -d var/log/cherokee ] && rm -rf var/log/cherokee
+	[ -d var/lib/cherokee ] && rm -rf var/lib/cherokee
+	;;
+esac

srcpkgs/cherokee/cherokee-devel.template

@@ -0,0 +1,15 @@
+# Template file for 'cherokee-devel'.
+#
+short_desc="${short_desc} (Development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run libcherokee
+
+do_install()
+{
+        vmove usr/include usr
+        vmove usr/lib/pkgconfig usr/lib
+		vmove usr/share/aclocal usr/share
+}

srcpkgs/cherokee/cherokee.rshlibs

@@ -0,0 +1,5 @@
+libpthread.so.0
+libc.so.6
+libcherokee-base.so.0
+libcherokee-client.so.0
+libcherokee-server.so.0

srcpkgs/cherokee/files/cherokee.logrotate

@@ -0,0 +1,9 @@
+/var/log/cherokee/*.error /var/log/cherokee/*.access {
+   daily
+   rotate 14
+   compress
+   sharedscripts
+   postrotate
+      /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true
+   endscript
+}

srcpkgs/cherokee/files/cherokee.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Cherokee web server
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
+
+[Install]
+WantedBy=multi-user.target

srcpkgs/cherokee/libcherokee.rshlibs

@@ -0,0 +1,17 @@
+libpthread.so.0
+libcrypto.so.1
+libdl.so.2
+libc.so.6
+libGeoIP.so.1
+libavformat.so.53
+libavcodec.so.53
+libavutil.so.51
+libbz2.so.1
+libm.so.6
+libmysqlclient.so.16
+libz.so.1
+libcrypt.so.1
+libnsl.so.1
+libssl.so.1
+libpam.so.0
+libldap-2.4.so.2

srcpkgs/cherokee/libcherokee.template

@@ -0,0 +1,14 @@
+# Template file for 'libcherokee'.
+#
+short_desc="${short_desc} (Runtime library)"
+long_desc="${long_desc}
+
+ This package contains the cherokee runtime lib(s)."
+
+do_install()
+{
+	vmove "usr/lib/*.so*" usr/lib
+	vmove usr/lib/cherokee usr/lib
+}
+
+

srcpkgs/cherokee/patches/fix-ctk-path-handler-match_from_arch.patch

@@ -0,0 +1,16 @@
+diff -upr cherokee-1.2.99.orig/admin/CTK/CTK/Server.py cherokee-1.2.99/admin/CTK/CTK/Server.py
+--- admin/CTK/CTK/Server.py	2011-06-06 14:17:35.000000000 +0300
++++ admin/CTK/CTK/Server.py	2011-09-16 03:31:06.000000000 +0300
+@@ -121,8 +121,11 @@ class ServerHandler (pyscgi.SCGIHandler)
+         my_thread.scgi_conn   = self
+         my_thread.request_url = url
+
++        # Drop the query string before matching against the handlers
++        path = url.split('?', 1)[0]
++
+         for published in server._web_paths:
+-            if re.match (published._regex, url):
++            if re.match (published._regex, path):
+                 # POST
+                 if published._method == 'POST':
+                     post = self._process_post()

srcpkgs/cherokee/template

@@ -0,0 +1,65 @@
+# Template file for 'cherokee'
+pkgname=cherokee
+version=1.2.101
+distfiles="http://www.${pkgname}-project.com/download/1.2/${version}/${pkgname}-${version}.tar.gz"
+build_style=gnu-configure
+configure_args="--prefix=/usr --sysconfdir=/etc --localstatedir=/var
+--disable-static --with-wwwroot=/srv/httpd --with-wwwuser=httpd
+--with-wwwgroup=httpd --with-python=python
+--enable-os-string=Linux"
+short_desc="An innovative, feature rich, and yet easy to configure open source Web Server."
+maintainer="davehome <davehome@redthumb.info.tm>"
+homepage="http://www.cherokee-project.com/"
+license="GPL-2"
+checksum=ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8
+long_desc="
+ Cherokee is an open-source Cross-platform Web server that runs on Linux, BSD
+ variants, Solaris, Mac OS X, and Microsoft Windows. It is a lightweight,
+ high-performance Web Server/reverse proxy licensed under the GNU General
+ Public License. Its goal is to be fast and fully functional yet still light.
+ 
+ Major features of Cherokee include a graphical administration interface named
+ cherokee-admin, and a modular light-weight design. Cherokee is maintained and
+ developed by an Open Source Community."
+
+subpackages="${pkgname}-devel lib${pkgname}"
+
+conf_files="
+/etc/cherokee/cherokee.conf"
+
+systemd_services="cherokee.service on"
+
+make_dirs="
+/etc/cherokee/ssl 0755 httpd httpd
+/var/log/cherokee 0755 httpd httpd
+/var/lib/cherokee/graphs/images 0755 httpd httpd"
+
+system_accounts="httpd"
+httpd_descr="Cherokee HTTP server"
+httpd_homedir="/srv/httpd"
+
+Add_dependency build coreutils
+Add_dependency build gettext
+Add_dependency build libldap-devel
+Add_dependency build pam-devel
+Add_dependency build libmysqlclient-devel
+Add_dependency build ffmpeg-devel
+Add_dependency build geoip-devel
+
+Add_dependency full python
+
+pre_configure()
+{
+	# use /var/log/cherokee instead of /var/log
+	sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
+	
+}
+
+post_install()
+{
+	# Setup logrotate thing
+	vinstall ${FILESDIR}/${pkgname}.logrotate 644 etc/logrotate.d/${pkgname}
+	
+	# Install systemd service
+	vinstall ${FILESDIR}/${pkgname}.service 644 lib/systemd/system
+}

srcpkgs/libcherokee

@@ -0,0 +1 @@
+cherokee