diff options
author | Aaron Walker <ka0ttic@gentoo.org> | 2005-10-10 17:20:15 +0000 |
---|---|---|
committer | Aaron Walker <ka0ttic@gentoo.org> | 2005-10-10 17:20:15 +0000 |
commit | 25668d590821c903a3e83c1dd8e365483995ccaf (patch) | |
tree | a0d679e167a8c769832cc9e0f0e75771c37bf9e4 /www-servers | |
parent | Add xen flag screen (diff) | |
download | gentoo-2-25668d590821c903a3e83c1dd8e365483995ccaf.tar.gz gentoo-2-25668d590821c903a3e83c1dd8e365483995ccaf.tar.bz2 gentoo-2-25668d590821c903a3e83c1dd8e365483995ccaf.zip |
Version bump; tidy previous 1.4.x ebuilds.
(Portage version: 2.0.53_rc4)
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/lighttpd/ChangeLog | 8 | ||||
-rw-r--r-- | www-servers/lighttpd/Manifest | 18 | ||||
-rw-r--r-- | www-servers/lighttpd/files/digest-lighttpd-1.4.3 | 1 | ||||
-rw-r--r-- | www-servers/lighttpd/files/digest-lighttpd-1.4.5 | 1 | ||||
-rw-r--r-- | www-servers/lighttpd/files/digest-lighttpd-1.4.6 | 1 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.3.ebuild | 196 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.6.ebuild (renamed from www-servers/lighttpd/lighttpd-1.4.5.ebuild) | 2 |
7 files changed, 12 insertions, 215 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index d96baefab392..94b6e1617299 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,12 @@ # 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.49 2005/10/03 12:11:24 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.50 2005/10/10 17:20:15 ka0ttic Exp $ + +*lighttpd-1.4.6 (10 Oct 2005) + + 10 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> -lighttpd-1.4.3.ebuild, + -lighttpd-1.4.5.ebuild, +lighttpd-1.4.6.ebuild: + Version bump; tidy previous 1.4.x ebuilds. *lighttpd-1.4.5 (03 Oct 2005) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 86c4fa505f01..f4fd1da0e9c5 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,15 +1,11 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 e2276f3abba81dedb5b77238c4b76190 ChangeLog 16396 +MD5 dd7c39177c788ef63012983e2ac557da ChangeLog 16596 MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182 MD5 fef397e7bcf1b741dea211a555e1803c files/conf/mime-types.conf 3291 MD5 9c1407e95f62ed22da66c4ef5f69c3b5 files/conf/mod_cgi.conf 869 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 8f9c2d7a51a85b60ef1a6da355083fd0 files/digest-lighttpd-1.4.3 66 -MD5 080f2b1be14e4f457e06d9b99c351a15 files/digest-lighttpd-1.4.5 66 +MD5 c087586319160eacb4cb2ff4f098e4e7 files/digest-lighttpd-1.4.6 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,13 +20,5 @@ MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076 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 15468c1601f8061e5ad2d5f62b39b964 lighttpd-1.4.3.ebuild 5143 -MD5 e039b934ff13f7d36cf1f6a494c90bfa lighttpd-1.4.5.ebuild 5142 +MD5 19ffc2fba824f210823810ce7a8a221b lighttpd-1.4.6.ebuild 5142 MD5 6a9d4814404d8d51327e5b8306ee3d7e metadata.xml 726 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDQSAaEZCkKN40op4RAvWwAKCPSak0IgfCi1GQ5LSVtSqg11hVqQCfSbpI -KVgt2JxspsVND3zEYX3/6Cg= -=7PPa ------END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.3 b/www-servers/lighttpd/files/digest-lighttpd-1.4.3 deleted file mode 100644 index 05906ad1440b..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.4.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 5a08721c2ea7fbfc6790a1cf0063c8ef lighttpd-1.4.3.tar.gz 765903 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.5 b/www-servers/lighttpd/files/digest-lighttpd-1.4.5 deleted file mode 100644 index 819970c1ac1f..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.4.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 f2e16caf782b9fc8df634b1ea65b7645 lighttpd-1.4.5.tar.gz 773963 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.6 b/www-servers/lighttpd/files/digest-lighttpd-1.4.6 new file mode 100644 index 000000000000..afa04400e2dc --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.6 @@ -0,0 +1 @@ +MD5 dec3ff6ff004868303407165d218bcdf lighttpd-1.4.6.tar.gz 774879 diff --git a/www-servers/lighttpd/lighttpd-1.4.3.ebuild b/www-servers/lighttpd/lighttpd-1.4.3.ebuild deleted file mode 100644 index 56e9c6f124ed..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.3.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# 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.3.ebuild,v 1.3 2005/09/21 14:01:05 gustavoz 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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.5.ebuild b/www-servers/lighttpd/lighttpd-1.4.6.ebuild index e081f7bed500..4981a8edd580 100644 --- a/www-servers/lighttpd/lighttpd-1.4.5.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.6.ebuild @@ -1,6 +1,6 @@ # 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.5.ebuild,v 1.1 2005/10/03 12:11:24 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.6.ebuild,v 1.1 2005/10/10 17:20:15 ka0ttic Exp $ inherit eutils depend.php |