From 0669684720f97826696e11d1053f82108cd03a74 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 16 Sep 2011 23:14:49 +0000 Subject: Fri Sep 16 23:14:49 UTC 2011 --- community/busybox/PKGBUILD | 4 ++-- community/cherokee/PKGBUILD | 13 +++++++++---- community/cherokee/fix-ctk-path-handler-match.patch | 16 ++++++++++++++++ community/cppcheck/PKGBUILD | 6 +++--- community/fotoxx/PKGBUILD | 4 ++-- community/roxterm/PKGBUILD | 8 ++++---- 6 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 community/cherokee/fix-ctk-path-handler-match.patch (limited to 'community') diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 0aa86474b..664e1682f 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55598 2011-09-14 21:43:19Z spupykin $ +# $Id: PKGBUILD 55611 2011-09-15 22:10:36Z ebelanger $ # Maintainer: Sergej Pupykin # Contributor: Jens Pranaitis @@ -7,7 +7,7 @@ pkgver=1.19.2 pkgrel=2 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") -url="http://busybox.net" +url="http://www.busybox.net" license=('GPL') makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 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 # Contributor: Link Dupont 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() diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index e1598e189..ddab85731 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 50806 2011-07-01 15:04:30Z stephane $ +# $Id: PKGBUILD 55608 2011-09-15 21:38:48Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=cppcheck -pkgver=1.49 +pkgver=1.50 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d04c1b207aca59f845aac57de3b08f44168d5aa9') +sha1sums=('39ad14cb4cb9caa45fd3365203c5f54981ee2870') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index 817aa32b2..0bf347cb8 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Stefan Husmann pkgname=fotoxx pkgver=11.09 -pkgrel=1 +pkgrel=2 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ license=('GPL3') depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('dd851af4ce6e9d900fbf0afd65270ae8') +md5sums=('7001aec08a6291abf1c7c480b79cc38f') install=fotoxx.install build() { diff --git a/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD index ad189f6e9..b09cd3c3d 100644 --- a/community/roxterm/PKGBUILD +++ b/community/roxterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55595 2011-09-14 14:55:41Z ttopper $ +# $Id: PKGBUILD 55606 2011-09-15 14:20:05Z ttopper $ # Maintainer: Thorsten Töpper # Contributor: Alexander Fehr pkgname=roxterm -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="Tabbed, VTE-based terminal emulator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('dbus-glib' 'vte3' 'hicolor-icon-theme' 'dbus' 'dbus-core' 'glib2') makedepends=('docbook-xsl' 'xmlto' 'po4a') install=roxterm.install source=(http://downloads.sourceforge.net/roxterm/roxterm-$pkgver.tar.gz) -md5sums=('ad94bb37de28fcc3997a5529277708a1') -sha1sums=('463c334596744f60f9592752d85eb4af4feeef1d') +sha1sums=('7ebfefd1196ded78185a549fb7cc4662aa661dec') +md5sums=('73b394916f798f1829dcae316f2b5ba3') build() { -- cgit v1.2.3-54-g00ecf