Version bump.
authorAaron Walker <ka0ttic@gentoo.org>
Thu, 3 Nov 2005 16:10:44 +0000 (16:10 +0000)
committerAaron Walker <ka0ttic@gentoo.org>
Thu, 3 Nov 2005 16:10:44 +0000 (16:10 +0000)
Package-Manager: portage-2.0.53_rc7

www-servers/lighttpd/ChangeLog
www-servers/lighttpd/Manifest
www-servers/lighttpd/files/digest-lighttpd-1.4.7 [new file with mode: 0644]
www-servers/lighttpd/lighttpd-1.4.7.ebuild [new file with mode: 0644]

index 0107a712f823e72b3c8343b339c79be8872e03d7..f24f7ddfd5471179714a5ab2e269385c1d40ca1f 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.51 2005/10/12 12:51:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.52 2005/11/03 16:10:44 ka0ttic Exp $
+
+*lighttpd-1.4.7 (03 Nov 2005)
+
+  03 Nov 2005; Aaron Walker <ka0ttic@gentoo.org> +lighttpd-1.4.7.ebuild:
+  Version bump.
 
   12 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> files/lighttpd.initd:
   'use slapd' in init script so that slapd gets started before lighttpd if
index 33942052b78fd33ee5a448f458f4c00027590db3..4076f0a1368028cee3ce2858cebbf658f5915ceb 100644 (file)
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 558869ca77f07907af6ee4539410ae79 ChangeLog 16762
+MD5 41d225f2fb9934a204761cc2f4e49493 ChangeLog 16883
 MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182
 MD5 fef397e7bcf1b741dea211a555e1803c files/conf/mime-types.conf 3291
 MD5 9c1407e95f62ed22da66c4ef5f69c3b5 files/conf/mod_cgi.conf 869
@@ -9,6 +9,7 @@ MD5 b4c80dba9c626d5f89d3c3797ac6670c files/conf/mod_fastcgi.conf 661
 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67
 MD5 c54a6d92e91493bbb27e8f346f6ac342 files/digest-lighttpd-1.3.16 67
 MD5 c087586319160eacb4cb2ff4f098e4e7 files/digest-lighttpd-1.4.6 66
+MD5 422bbab47d465847a64bdb2c2ebcc02d files/digest-lighttpd-1.4.7 66
 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666
 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784
 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863
@@ -24,11 +25,12 @@ MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383
 MD5 49ded22216ffc6092d1a1e04a6e420c1 lighttpd-1.3.13-r3.ebuild 2607
 MD5 5aaaf3e31839a20fb69fc5526e69d849 lighttpd-1.3.16.ebuild 2547
 MD5 72645136402557fac96496c117e89459 lighttpd-1.4.6.ebuild 5142
+MD5 ef9fd9f6f59cf99c4460d547f2676bdd lighttpd-1.4.7.ebuild 5142
 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDTQb5EZCkKN40op4RAnZeAJwMg9DYWXEe4oZffIVty2oyTx1c9QCguKdc
-VHvQWdpEB3o0x9qOd18dXSQ=
-=oL2l
+iD8DBQFDajaUEZCkKN40op4RAu0VAKCJP5VSAzRh3F6BjtUNh4LRLjR7FQCgpRTH
+1iyMSJALBym5pkx6vOFMa4U=
+=LTEh
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.7 b/www-servers/lighttpd/files/digest-lighttpd-1.4.7
new file mode 100644 (file)
index 0000000..5423b8a
--- /dev/null
@@ -0,0 +1 @@
+MD5 4d1b02e2008e5f35e4df7defee186fdd lighttpd-1.4.7.tar.gz 778982
diff --git a/www-servers/lighttpd/lighttpd-1.4.7.ebuild b/www-servers/lighttpd/lighttpd-1.4.7.ebuild
new file mode 100644 (file)
index 0000000..2b6cdf1
--- /dev/null
@@ -0,0 +1,196 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.7.ebuild,v 1.1 2005/11/03 16:10:44 ka0ttic Exp $
+
+inherit eutils depend.php
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+
+RDEPEND=">=sys-libs/zlib-1.1
+       bzip2?    ( app-arch/bzip2 )
+       fam?      ( virtual/fam )
+       gdbm?     ( sys-libs/gdbm )
+       ldap?     ( >=net-nds/openldap-2.1.26 )
+       lua?      ( dev-lang/lua )
+       memcache? ( dev-libs/libmemcache )
+       mysql?    ( >=dev-db/mysql-4.0.0 )
+       pcre?     ( >=dev-libs/libpcre-3.1 )
+       php?      (
+               virtual/httpd-php
+               !net-www/spawn-fcgi
+       )
+       rrdtool? ( net-analyzer/rrdtool )
+       ssl?    ( >=dev-libs/openssl-0.9.7 )
+       webdav? (
+               dev-libs/libxml2
+               >=dev-db/sqlite-3
+       )
+       xattr?  ( sys-apps/attr )"
+
+DEPEND="${RDEPEND}
+       doc?  ( dev-python/docutils )
+       test? (
+               perl-core/Test-Harness
+               dev-libs/fcgi
+       )"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+       local config="/etc/lighttpd/lighttpd.conf"
+
+       # enable php/mod_fastcgi settings
+       use php && \
+               dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
+
+       # enable stat() caching
+       use fam && \
+               dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+       local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+       # text docs
+       use doc || rm -fr ${D}/usr/share/doc/${PF}/txt
+
+       # non-essential modules
+       rm -f \
+               ${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
+
+       # allow users to keep some based on USE flags
+       use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+       use webdav  || rm -f ${libdir}/mod_webdav.*
+       use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+       use lua     || rm -f ${libdir}/mod_cml.*
+       use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+
+       if ! use fastcgi ; then
+               rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
+                       ${D}/usr/share/man/man1/spawn-fcgi.*
+       fi
+}
+
+pkg_setup() {
+       if ! use pcre ; then
+               ewarn "It is highly recommended that you build ${PN}"
+               ewarn "with perl regular expressions support via USE=pcre."
+               ewarn "Otherwise you lose support for some core options such"
+               ewarn "as conditionals and modules such as mod_re{write,direct}"
+               ewarn "and mod_ssi."
+               ebeep 5
+       fi
+
+       use php && require_php_with_use cgi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+#    EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV}
+
+#    einfo "Regenerating autoconf/automake files"
+#    libtoolize --copy --force || die "libtoolize failed"
+#    aclocal || die "aclocal failed"
+#    autoheader || die "autoheader failed"
+#    automake --add-missing --copy || die "automake failed"
+#    autoconf || die "autoconf failed"
+
+       # dev-python/docutils installs rst2html.py not rst2html
+       sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
+               die "sed doc/Makefile.in failed"
+}
+
+src_compile() {
+       econf --libdir=/usr/$(get_libdir)/${PN} \
+               --enable-lfs \
+               $(use_enable ipv6) \
+               $(use_with bzip2) \
+               $(use_with fam) \
+               $(use_with gdbm) \
+               $(use_with lua) \
+               $(use_with ldap) \
+               $(use_with memcache) \
+               $(use_with mysql) \
+               $(use_with pcre) \
+               $(use_with ssl openssl) \
+               $(use_with webdav webdav-props) \
+               $(use_with xattr attr) \
+               || die "econf failed"
+
+       emake || die "emake failed"
+
+       if use doc ; then
+               einfo "Building HTML documentation"
+               cd doc
+               emake html || die "failed to build HTML documentation"
+       fi
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+
+       # init script stuff
+       newinitd ${FILESDIR}/lighttpd.initd lighttpd || die
+
+       if use php || use fastcgi ; then
+               newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
+               newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
+       fi
+
+       # configs
+       insinto /etc/lighttpd
+       doins ${FILESDIR}/conf/*.conf
+
+       # update lighttpd.conf directives based on conditionals
+       update_config
+
+       # docs
+       dodoc AUTHORS README COPYING INSTALL NEWS ChangeLog doc/*.sh
+       newdoc doc/lighttpd.conf lighttpd.conf.distrib
+
+       use doc && dohtml -r doc/*
+
+       docinto txt
+       dodoc doc/*.txt
+
+       # logrotate
+       insinto /etc/logrotate.d
+       newins ${FILESDIR}/lighttpd.logrotate lighttpd || die
+
+       keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+
+       use minimal && remove_non_essential
+}
+
+pkg_preinst() {
+       enewgroup lighttpd
+       enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+       fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+}
+
+pkg_postinst () {
+       echo
+       if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+               einfo "spawn-fcgi is now included with lighttpd"
+               einfo "spawn-fcgi's init script configuration is now located"
+               einfo "at /etc/conf.d/spawn-fcgi."
+               echo
+       fi
+
+       if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+               ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
+               ewarn "which is now located in /etc/lighttpd.  Please migrate your"
+               ewarn "existing configuration."
+               ebeep 5
+       fi
+       echo
+}