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

[Pierre Schmitz]

    Date: Friday, July 11, 2008 @ 10:46:15
  Author: pierre
Revision: 4867

Merged revisions 4852-4866 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/lighttpd/trunk

........
  r4866 | pierre | 2008-07-11 14:45:41 +0000 (Fr, 11 Jul 2008) | 1 line
  
  upgpkg: lighttpd 1.4.19-3
........

Modified:
  lighttpd/repos/testing-x86_64/	(properties)
  lighttpd/repos/testing-x86_64/PKGBUILD
  lighttpd/repos/testing-x86_64/lighttpd.install
  lighttpd/repos/testing-x86_64/lighttpd.rc.d

------------------+
 PKGBUILD         |   29 +++++++++++++++++------------
 lighttpd.install |   18 ++++++++++++++++--
 lighttpd.rc.d    |    1 +
 3 files changed, 34 insertions(+), 14 deletions(-)


Property changes on: lighttpd/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /lighttpd/trunk:1-4851
   + /lighttpd/trunk:1-4866

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-07-11 14:45:41 UTC (rev 4866)
+++ testing-x86_64/PKGBUILD	2008-07-11 14:46:15 UTC (rev 4867)
@@ -3,21 +3,27 @@
 
 pkgname=lighttpd
 pkgver=1.4.19
-pkgrel=2
+pkgrel=3
 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' 'libmysqlclient' \
-         'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm')
-makedepends=('fcgi' 'libmemcache' 'pkgconfig')
+depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr' 'libldap')
+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' \
+            )
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 install='lighttpd.install'
 source=("http://www.lighttpd.net/download/lighttpd-${pkgver}.tar.bz2" \
         'lighttpd.rc.d' 'lighttpd.logrotate.d')
 md5sums=('d787374e4e4aaa09d5cfa9ab9d23ad40'
-         '4e6483a1f13d9062aa294fb46b0e9971'
+         '245930c049d2088af099b364964534bb'
          '857e174643fd7761a2f0d8431a679f6c')
 
 build() {
@@ -45,18 +51,17 @@
 
 	install -D -m755 ../lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
 	install -D -m644 ../lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
-	install -d -m755 -o http -g http $pkgdir/var/{run,log}/lighttpd/
+	install -d -m755 $pkgdir/var/run/lighttpd/
+	install -d -m755 -o http -g http $pkgdir/var/log/lighttpd/
 
 	install -D -m644 doc/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
 
 	# set sane defaults
-	sed -e 's|#                               "mod_userdir",|                                "mod_userdir",|' \
-	    -e 's|/srv/www/htdocs/|/srv/http/|' \
+	sed -e 's|/srv/www/htdocs/|/srv/http/|' \
 	    -e 's|/srv/www/|/srv/http/|' \
-	    -e 's|#dir-listing.activate       = "enable"| dir-listing.activate       = "enable"|' \
-	    -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|#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 || return 1
 

Modified: testing-x86_64/lighttpd.install
===================================================================
--- testing-x86_64/lighttpd.install	2008-07-11 14:45:41 UTC (rev 4866)
+++ testing-x86_64/lighttpd.install	2008-07-11 14:46:15 UTC (rev 4867)
@@ -1,9 +1,24 @@
+post_install() {
+	echo '
+	==> Optional modules and their requirements
+
+	* mod_webdav		: libxml2, sqlite3, e2fsprogs
+	* mod_cml		: lua
+	* mod_magnet		: lua
+	* mod_trigger_b4_dl	: gdbm
+	* mod_mysql_vhost	: libmysqlclient
+
+	'
+}
+
 post_upgrade() {
+	post_install
+
 	if [ $(vercmp '1.4.19-1' $2) -ge 0 ]; then
 	echo '
 	==> New default DocumentRoot
 
-	Apache lighttpd uses /srv/http as default DocumentRoot.
+	lighttpd uses /srv/http as default DocumentRoot.
 	You can still use your current DocumentRoot
 
 	==> New default user and group
@@ -13,4 +28,4 @@
 	run lighttpd as nobody.
 	'
 	fi
-}
\ No newline at end of file
+}

Modified: testing-x86_64/lighttpd.rc.d
===================================================================
--- testing-x86_64/lighttpd.rc.d	2008-07-11 14:45:41 UTC (rev 4866)
+++ testing-x86_64/lighttpd.rc.d	2008-07-11 14:46:15 UTC (rev 4867)
@@ -30,6 +30,7 @@
     ;;
   restart)
     $0 stop
+    sleep 1
     $0 start
     ;;
   *)