[arch-commits] Commit in lighttpd/repos (3 files)

[Pierre Schmitz]

    Date: Monday, March 9, 2009 @ 07:52:27
  Author: pierre
Revision: 29503

Merged revisions 29502 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/lighttpd/trunk

........
  r29502 | pierre | 2009-03-09 12:51:56 +0100 (Mo, 09 M?\195?\164r 2009) | 1 line
  
  upgpkg: lighttpd 1.4.22-1
........

Modified:
  lighttpd/repos/extra-x86_64/	(properties)
  lighttpd/repos/extra-x86_64/PKGBUILD
Deleted:
  lighttpd/repos/extra-x86_64/changeset_r2399.diff

----------------------+
 PKGBUILD             |   14 +++++---------
 changeset_r2399.diff |   13 -------------
 2 files changed, 5 insertions(+), 22 deletions(-)


Property changes on: lighttpd/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /lighttpd/trunk:1-27286
   + /lighttpd/trunk:1-29502

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-03-09 11:51:56 UTC (rev 29502)
+++ extra-x86_64/PKGBUILD	2009-03-09 11:52:27 UTC (rev 29503)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.21
-pkgrel=2
+pkgver=1.4.22
+pkgrel=1
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
@@ -20,19 +20,15 @@
 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' 'changeset_r2399.diff')
+        'lighttpd.rc.d' 'lighttpd.logrotate.d')
 
-md5sums=('49eeba63c931fa82120711adc7182731'
+md5sums=('ed4ca3897eadf419c893b03fee53c982'
          'bd690eee0d9e51857448770a151023b0'
-         '857e174643fd7761a2f0d8431a679f6c'
-         'aa18d869af9de0cd57b3dc174c463b84')
+         '857e174643fd7761a2f0d8431a679f6c')
 
 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 \

Deleted: extra-x86_64/changeset_r2399.diff
===================================================================
--- extra-x86_64/changeset_r2399.diff	2009-03-09 11:51:56 UTC (rev 29502)
+++ extra-x86_64/changeset_r2399.diff	2009-03-09 11:52:27 UTC (rev 29503)
@@ -1,13 +0,0 @@
-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;
- 			}