[arch-commits] Commit in lighttpd/trunk (PKGBUILD changeset_r2399.diff)

[Pierre Schmitz]

    Date: Wednesday, February 18, 2009 @ 08:30:11
  Author: pierre
Revision: 27285

upgpkg: lighttpd 1.4.21-2

Added:
  lighttpd/trunk/changeset_r2399.diff
Modified:
  lighttpd/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   11 ++++++++---
 changeset_r2399.diff |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-18 12:59:08 UTC (rev 27284)
+++ PKGBUILD	2009-02-18 13:30:11 UTC (rev 27285)
@@ -3,7 +3,7 @@
 
 pkgname=lighttpd
 pkgver=1.4.21
-pkgrel=1
+pkgrel=2
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -20,14 +20,19 @@
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 source=("http://www.lighttpd.net/download/lighttpd-${pkgver}.tar.bz2" \
-        'lighttpd.rc.d' 'lighttpd.logrotate.d')
+        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'changeset_r2399.diff')
 
 md5sums=('49eeba63c931fa82120711adc7182731'
          'bd690eee0d9e51857448770a151023b0'
-         '857e174643fd7761a2f0d8431a679f6c')
+         '857e174643fd7761a2f0d8431a679f6c'
+         'aa18d869af9de0cd57b3dc174c463b84')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
+
+	# see http://bugs.archlinux.org/task/13354
+	patch -p0 -i $srcdir/changeset_r2399.diff || return 1
+
 	./configure --prefix=/usr \
 		--libexecdir=/usr/lib/lighttpd/modules \
 		--sysconfdir=/etc/lighttpd \

Added: changeset_r2399.diff
===================================================================
--- changeset_r2399.diff	                        (rev 0)
+++ changeset_r2399.diff	2009-02-18 13:30:11 UTC (rev 27285)
@@ -0,0 +1,13 @@
+Index: mod_simple_vhost.c
+===================================================================
+--- src/mod_simple_vhost.c	(revision 2398)
++++ src/mod_simple_vhost.c	(revision 2399)
+@@ -249,6 +249,8 @@
+ 				return HANDLER_GO_ON;
+ 			} else {
+ 				buffer_copy_string_buffer(con->server_name, p->conf.default_host);
++				buffer_copy_string_buffer(con->physical.doc_root, p->doc_root);
++
+ 				/* do not cache default host */
+ 				return HANDLER_GO_ON;
+ 			}