[arch-commits] Commit in lighttpd/trunk (PKGBUILD lighttpd.conf openssl-0.9.8m.patch)

[Pierre Schmitz]

    Date: Wednesday, August 18, 2010 @ 18:08:32
  Author: pierre
Revision: 88004

upgpkg: lighttpd 1.4.27-1
upstream update; cleanup; add simple default config

Added:
  lighttpd/trunk/lighttpd.conf
Modified:
  lighttpd/trunk/PKGBUILD
Deleted:
  lighttpd/trunk/openssl-0.9.8m.patch

----------------------+
 PKGBUILD             |   38 ++++++++++++++------------------------
 lighttpd.conf        |   13 +++++++++++++
 openssl-0.9.8m.patch |   11 -----------
 3 files changed, 27 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-18 21:56:25 UTC (rev 88003)
+++ PKGBUILD	2010-08-18 22:08:32 UTC (rev 88004)
@@ -2,13 +2,13 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=lighttpd
-pkgver=1.4.26
-pkgrel=3
+pkgver=1.4.27
+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' 'util-linux-ng')
+depends=('pcre' 'bzip2' 'libldap' 'util-linux-ng')
 makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig')
 optdepends=('libxml2: mod_webdav'
             'lua: mod_cml/mod_magnet'
@@ -17,25 +17,18 @@
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'openssl-0.9.8m.patch')
-md5sums=('a682c8efce47a2f4263a247ba0813c9b'
+        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf')
+md5sums=('afece7dc547d71cb94ea2e34ee5b3f9b'
          '789ed1b4521e72e591e09d5dfb99235a'
          '857e174643fd7761a2f0d8431a679f6c'
-         '37b7ca9883d5accaae84dcd7329576ae')
+         'da7b4ee2d2547d719015e54e8f2ff3d7')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
 
-	# fixed in 1.4.27
-	patch -p0 -i ${srcdir}/openssl-0.9.8m.patch || return 1
-
 	./configure --prefix=/usr \
 		--libexecdir=/usr/lib/lighttpd/modules \
 		--sysconfdir=/etc/lighttpd \
-		--sharedstatedir=/usr/var \
-		--localstatedir=/var \
-		--libdir=/usr/lib/lighttpd \
-		--includedir=/usr/include/lighttpd \
 		--with-mysql \
 		--with-ldap \
 		--with-attr \
@@ -56,19 +49,16 @@
 
 	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
-	install -d -m755 -o http -g http $pkgdir/var/run/lighttpd/
-	install -d -m755 -o http -g http $pkgdir/var/log/lighttpd/
+	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
+	install -d -m755 -o http -g http $pkgdir/var/{run,log,cache}/lighttpd/
 
-	install -D -m644 doc/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
+	pushd doc/config >/dev/null
+	find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \;
+	popd >/dev/null
 
-	# set sane defaults
-	sed -e 's|/srv/www/htdocs/|/srv/http/|' \
-	    -e 's|/srv/www/|/srv/http/|' \
-	    -e 's|#server.username            = "wwwrun"|server.username            = "http"|' \
-	    -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|' \
-	    -i ${pkgdir}/etc/lighttpd/lighttpd.conf
+	pushd doc >/dev/null
+	find . -maxdepth 1 -type f -name '*.txt' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/{} \;
+	popd >/dev/null
 
 	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 }

Added: lighttpd.conf
===================================================================
--- lighttpd.conf	                        (rev 0)
+++ lighttpd.conf	2010-08-18 22:08:32 UTC (rev 88004)
@@ -0,0 +1,13 @@
+# This is a minimal example config
+# See /usr/share/doc/lighttpd
+# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions
+
+server.port		= 80
+server.username		= "http"
+server.groupname	= "http"
+server.document-root	= "/srv/http"
+server.pid-file		= "/var/run/lighttpd.pid"
+server.errorlog		= "/var/log/lighttpd/error.log"
+dir-listing.activate	= "enable"
+index-file.names	= ( "index.html" )
+mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" )

Deleted: openssl-0.9.8m.patch
===================================================================
--- openssl-0.9.8m.patch	2010-08-18 21:56:25 UTC (rev 88003)
+++ openssl-0.9.8m.patch	2010-08-18 22:08:32 UTC (rev 88004)
@@ -1,11 +0,0 @@
---- src/network.c	(revision 2715)
-+++ src/network.c	(revision 2716)
-@@ -525,7 +525,7 @@
- 
- 		if (!s->ssl_use_sslv2) {
- 			/* disable SSLv2 */
--			if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) {
-+			if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) {
- 				log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
- 						ERR_error_string(ERR_get_error(), NULL));
- 				return -1;