[aur-dev] cherokee AUR PKGBUILD Patch

[Pierre B.]

Hi --all,

I have seen that Cherokee Web server was dropped from Community.
I try to setup from AUR and :
yaourt -S cherokee => don't compile

There is this error :
make[3]: *** [libplugin_streaming_la-handler_streaming.lo] Error 1
make[3]: Leaving directory
`/tmp/yaourt-tmp-root/aur-cherokee/src/cherokee-1.2.101/cherokee'
make[2]: *** [all] Error 2
make[2]: Leaving directory
`/tmp/yaourt-tmp-root/aur-cherokee/src/cherokee-1.2.101/cherokee'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory
`/tmp/yaourt-tmp-root/aur-cherokee/src/cherokee-1.2.101'
make: *** [all] Error 2


This bug can be corrected by applying this patch from the SVN of cherokee.
Here the http link :
https://bugs.mageia.org/show_bug.cgi?id=6145

I have made a PKGBUILD patch who correct the problem.
In attachement, the two files to add in the cherokee.tar.gz archive.

Bye --all.

-- 
Pierre B.
http://www.pi3rrot.net



--- PKGBUILD2	2012-09-04 17:11:23.390340409 +0200
+++ PKGBUILD	2012-09-04 17:10:29.943963283 +0200
@@ -2,6 +2,7 @@
 # Maintainer:
 # Contributor: Evangelos Foutras <evange...@foutrelis.com>
 # Contributor: Link Dupont <l...@subpop.net>
+# Contributor: Pierre Bourdin <pie...@pi3rrot.net>
 
 pkgname=cherokee
 pkgver=1.2.101
@@ -27,17 +28,22 @@
 source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz
         cherokee.rc
         cherokee.logrotate
-        fix-ctk-path-handler-match.patch)
+        fix-ctk-path-handler-match.patch
+	cherokee-1.2.101-ffmpeg0.11.patch)
+
 sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8'
             '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
             '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
-            '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630')
+            '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630'
+	    'a273b21352b4d50f83c7ac8ad4796d13d83678e25b2dc75ced6450c41aa26c31')
 
 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"
+  # Fix this bug : https://bugs.mageia.org/show_bug.cgi?id=6145
+  patch -Np1 -i "$srcdir/cherokee-1.2.101-ffmpeg0.11.patch"
 
   # Use subdirectory for logs
   sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
@@ -89,4 +95,3 @@
 }
 
 # vim:set ts=2 sw=2 et:
-


--- cherokee-1.2.101/cherokee/handler_streaming.c.ffmpeg	2012-06-04 12:56:16.000000000 +0800
+++ cherokee-1.2.101/cherokee/handler_streaming.c	2012-06-04 12:56:40.000000000 +0800
@@ -380,7 +380,7 @@
 	if (likely (secs > 0)) {
 		long tmp;
 
-		tmp = (hdl->avformat->file_size / secs);
+		tmp = (avio_size(hdl->avformat) / secs);
 		if (tmp > rate) {
 			rate = tmp;
 			TRACE(ENTRIES, "New rate: %d bytes/s\n", rate);

signature.asc
Description: OpenPGP digital signature