From 0669684720f97826696e11d1053f82108cd03a74 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 16 Sep 2011 23:14:49 +0000
Subject: Fri Sep 16 23:14:49 UTC 2011

---
 community/cherokee/PKGBUILD                         | 13 +++++++++----
 community/cherokee/fix-ctk-path-handler-match.patch | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 community/cherokee/fix-ctk-path-handler-match.patch

(limited to 'community/cherokee')

diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD
index 93fe2247a..5e2b61234 100644
--- a/community/cherokee/PKGBUILD
+++ b/community/cherokee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55378 2011-09-10 20:22:39Z foutrelis $
+# $Id: PKGBUILD 55615 2011-09-16 00:44:29Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=cherokee
 pkgver=1.2.99
-pkgrel=2
+pkgrel=3
 pkgdesc="A very fast, flexible and easy to configure Web Server"
 arch=('i686' 'x86_64')
 url="http://www.cherokee-project.com/"
@@ -24,14 +24,19 @@ backup=('etc/cherokee/cherokee.conf'
 options=('!libtool')
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
-        cherokee.logrotate)
+        cherokee.logrotate
+        fix-ctk-path-handler-match.patch)
 md5sums=('c83115c3eebb29e6f2b4cc6fe699affe'
          'a2d2b69c6220fab57cda4f531b680f9f'
-         '8d69341bd4002bffd69c6e82ff6c905f')
+         '8d69341bd4002bffd69c6e82ff6c905f'
+         'e9475edd26ee24d035783e5999244857')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Fix path matching bug in CTK apps (e.g. market)
+  patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch"
+
   # Use subdirectory for logs
   sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
 
diff --git a/community/cherokee/fix-ctk-path-handler-match.patch b/community/cherokee/fix-ctk-path-handler-match.patch
new file mode 100644
index 000000000..abd20c5ef
--- /dev/null
+++ b/community/cherokee/fix-ctk-path-handler-match.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
+--- cherokee-1.2.99.orig/admin/CTK/CTK/Server.py	2011-06-06 14:17:35.000000000 +0300
++++ cherokee-1.2.99/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()
-- 
cgit v1.2.3-54-g00ecf