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

[Pierre Schmitz]

    Date: Monday, October 26, 2009 @ 16:46:18
  Author: pierre
Revision: 56746

Merged revisions 56701,56745 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/lighttpd/trunk

........
  r56701 | pierre | 2009-10-25 22:55:56 +0100 (So, 25 Okt 2009) | 1 line
  
   
........
  r56745 | pierre | 2009-10-26 21:45:28 +0100 (Mo, 26 Okt 2009) | 1 line
  
  disable meaningless warning
........

Added:
  lighttpd/repos/extra-x86_64/disable_warning.patch
    (from rev 56745, lighttpd/trunk/disable_warning.patch)
Modified:
  lighttpd/repos/extra-x86_64/	(properties)
  lighttpd/repos/extra-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |   30 +++++++++++++++---------------
 disable_warning.patch |   15 +++++++++++++++
 2 files changed, 30 insertions(+), 15 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-26 20:45:28 UTC (rev 56745)
+++ extra-x86_64/PKGBUILD	2009-10-26 20:46:18 UTC (rev 56746)
@@ -2,33 +2,33 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.23
-pkgrel=2
+pkgver=1.4.24
+pkgrel=1
 pkgdesc='a secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
 url="http://www.lighttpd.net/"
-depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap')
+depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap' 'util-linux-ng')
 makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
-optdepends=('libxml2: mod_webdav' \
-            'e2fsprogs: mod_webdav' \
-            'lua: mod_cml/mod_magnet' \
-            'libmysqlclient: mod_mysql_vhost' \
-            'sqlite3: mod_webdav' \
-            'gdbm: mod_trigger_b4_dl' \
-            )
+optdepends=('libxml2: mod_webdav'
+            'lua: mod_cml/mod_magnet'
+            'libmysqlclient: mod_mysql_vhost'
+            'sqlite3: mod_webdav')
 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')
-
-md5sums=('0ab6bb7b17bf0f515ce7dce68e5e215a'
+source=("http://www.lighttpd.net/download/lighttpd-${pkgver}.tar.bz2"
+        'lighttpd.rc.d' 'lighttpd.logrotate.d'
+        'disable_warning.patch')
+md5sums=('e2324a24e4a5bce74663c21c58ddd200'
          '789ed1b4521e72e591e09d5dfb99235a'
-         '857e174643fd7761a2f0d8431a679f6c')
+         '857e174643fd7761a2f0d8431a679f6c'
+         '399c18c37c0f2c6750ac103b2bf2f886')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
+	patch -p0 -i $srcdir/disable_warning.patch || return 1
+
 	./configure --prefix=/usr \
 		--libexecdir=/usr/lib/lighttpd/modules \
 		--sysconfdir=/etc/lighttpd \

Copied: lighttpd/repos/extra-x86_64/disable_warning.patch (from rev 56745, lighttpd/trunk/disable_warning.patch)
===================================================================
--- extra-x86_64/disable_warning.patch	                        (rev 0)
+++ extra-x86_64/disable_warning.patch	2009-10-26 20:46:18 UTC (rev 56746)
@@ -0,0 +1,15 @@
+Index: src/connections.c
+===================================================================
+--- src/connections.c	(revision 2683)
++++ src/connections.c	(revision 2684)
+@@ -1250,8 +1250,10 @@
+ 
+ 		if (b > 0) {
+ 			char buf[1024];
++#if 0
+ 			log_error_write(srv, __FILE__, __LINE__, "sdd",
+ 					"CLOSE-read()", con->fd, b);
++#endif
+ 
+ 			/* */
+ 			read(con->fd, buf, sizeof(buf));