summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Hanson <hansonorders@verison.net>2010-03-14 05:32:01 (GMT)
committerMichael Hanson <hansonorders@verison.net>2010-03-14 05:32:01 (GMT)
commit5a8b4a54246cb05ee5b6661a5597a02a3c21687b (patch)
tree086a058dde716c67e9fdd5aa61a4d4cc41ef3b8d
parent031d96551bb50e4cf0b0f5eeaa30aa759b9ceeb4 (diff)
downloadlinhes_pkgbuild-5a8b4a54246cb05ee5b6661a5597a02a3c21687b.zip
linhes_pkgbuild-5a8b4a54246cb05ee5b6661a5597a02a3c21687b.tar.gz
linhes_pkgbuild-5a8b4a54246cb05ee5b6661a5597a02a3c21687b.tar.bz2
lighttpd: Work around mythweb producing url's with //
Thanks for the help jams.
-rw-r--r--abs/core-testing/lighttpd/PKGBUILD5
-rw-r--r--abs/core-testing/lighttpd/_changelog2
-rw-r--r--abs/core-testing/lighttpd/lighttpd.conf2
3 files changed, 5 insertions, 4 deletions
diff --git a/abs/core-testing/lighttpd/PKGBUILD b/abs/core-testing/lighttpd/PKGBUILD
index 09ca0ed..3695f0f 100644
--- a/abs/core-testing/lighttpd/PKGBUILD
+++ b/abs/core-testing/lighttpd/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=lighttpd
pkgver=1.4.26
-pkgrel=2
+pkgrel=3
pkgdesc='a secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -64,6 +64,7 @@ build() {
-e 's|#server.groupname = "wwwrun"|server.groupname = "http"|' \
-e 's|#server.pid-file = "/var/run/lighttpd.pid"|server.pid-file = "/var/run/lighttpd/lighttpd.pid"|' \
-e 's|/usr/local/bin/php-cgi|/usr/bin/php-cgi|' \
+ -e 's|"^/mythweb|"^/{1,2}mythweb|' \
-i ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1
install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
@@ -71,6 +72,6 @@ build() {
md5sums=('a682c8efce47a2f4263a247ba0813c9b'
'bd690eee0d9e51857448770a151023b0'
'857e174643fd7761a2f0d8431a679f6c'
- 'f12f37fb6a239b027c2bccf2ff51512b'
+ 'fe078f9b8ee701ed21278789cad90acf'
'c6e361131000ceec085f40b310ef4a2c'
'84c884b8dadd724afe2bc6529e9d4485')
diff --git a/abs/core-testing/lighttpd/_changelog b/abs/core-testing/lighttpd/_changelog
index b838943..a96d942 100644
--- a/abs/core-testing/lighttpd/_changelog
+++ b/abs/core-testing/lighttpd/_changelog
@@ -3,4 +3,4 @@ modified auth to require valid user (include auth-inc.conf)
# by mihanson:
upgraded to 1.4.26 to address http://linhes.org/flyspray/index.php?do=details&task_id=624
-
+Added -e 's|"^/mythweb|"^/{1,2}mythweb|' \ to the sed command to work around lighttpd no longer honoring // in a url and/or to work around mythweb producing url's with a // for streaming and downloading.
diff --git a/abs/core-testing/lighttpd/lighttpd.conf b/abs/core-testing/lighttpd/lighttpd.conf
index 7305133..0c55f52 100644
--- a/abs/core-testing/lighttpd/lighttpd.conf
+++ b/abs/core-testing/lighttpd/lighttpd.conf
@@ -238,7 +238,7 @@ cgi.assign = ( ".pl" => "/usr/bin/perl",
".cgi" => "/bin/bash" )
url.rewrite-once = (
- "^/mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0",
+ "^/mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0",
"^/mythweb/(pl(/.*)?)$" => "/mythweb/mythweb.pl/$1",
"^/mythweb/(.+)$" => "/mythweb/mythweb.php/$1",
"^/mythweb/(.*)$" => "/mythweb/mythweb.php"