diff options
author | Thilo Bangert <bangert@gentoo.org> | 2009-05-14 08:42:29 +0000 |
---|---|---|
committer | Thilo Bangert <bangert@gentoo.org> | 2009-05-14 08:42:29 +0000 |
commit | 01beeab0400f36b0c50cb8015922a2a4c75fa49b (patch) | |
tree | a1d4fcb889f097f04cfb54847fd521148037907c /www-servers/lighttpd | |
parent | stable x86, bug 268769 (diff) | |
download | historical-01beeab0400f36b0c50cb8015922a2a4c75fa49b.tar.gz historical-01beeab0400f36b0c50cb8015922a2a4c75fa49b.tar.bz2 historical-01beeab0400f36b0c50cb8015922a2a4c75fa49b.zip |
version bump - bug #260174 - spawn-fcgi now lives in www-servers/spawn-fcgi - EAPI=2
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'www-servers/lighttpd')
-rw-r--r-- | www-servers/lighttpd/ChangeLog | 10 | ||||
-rw-r--r-- | www-servers/lighttpd/Manifest | 5 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.22-r1.ebuild | 205 |
3 files changed, 218 insertions, 2 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 15e26577ff16..5700d90982b6 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-servers/lighttpd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.198 2009/05/12 09:54:13 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.199 2009/05/14 08:42:29 bangert Exp $ + +*lighttpd-1.4.22-r1 (14 May 2009) + + 14 May 2009; Thilo Bangert <bangert@gentoo.org> + +files/1.4.22-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff, + +lighttpd-1.4.22-r1.ebuild: + version bump - bug #260174 - spawn-fcgi now lives in + www-servers/spawn-fcgi - EAPI=2 12 May 2009; Thilo Bangert <bangert@gentoo.org> files/conf/lighttpd.conf: make user screwup less likely - bug #259007 diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index e60c36b80b6c..0a9b7c3258fa 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -3,6 +3,7 @@ AUX 1.4.19-r2/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a AUX 1.4.19-r2/05_all_lighttpd-1.4.19-force_lowercase_filenames_in_mod_userdir.diff 465 RMD160 570e27715c359c75459d7c967b67ca8c7c15972d SHA1 65558d8eb54e1a722c9e1983e1ab126a8466497a SHA256 81051f76e57f54ab6158300799be0351b68c4fa86d632b423268f35f41bbd0c1 AUX 1.4.19-r2/07_all_lighttpd-1.4.19-closing_foreign_ssl_connections-dos-taketwo.diff 2948 RMD160 7cc3d41c227d7eb12204d353eec208fb9456a2b8 SHA1 0475987b269c229400b7e4527fdb98827114ae04 SHA256 3f2edba70fd5fd06e19657c14dc7b314cdec7c54bef96587ee5b50662c26c025 AUX 1.4.20/03_all_lighttpd-1.4.11-errorlog-pipe.diff 4931 RMD160 7653167b0cd3fde6cb7d3d6fe4ae30a8d2e56ebe SHA1 bd0ff91b5caf447f78bcad66a444fbe3719897fb SHA256 2b1a253dda1dbc688ac072608656121f8c2d346a64be1080c65f2ca1d81f8e2d +AUX 1.4.22-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff 4563 RMD160 a37ad759d8b430779b740047aeabfa541479ce66 SHA1 468e08b4bf32b677a0bb1e3ec36edd52e4bc024e SHA256 a26d8e23113a3ffc35a351be4192b3e183ff0237edba3633af8886af08e241c1 AUX conf/lighttpd.conf 8243 RMD160 0b99dbb49be34521ddda14abd9b06cef141bbfc9 SHA1 8fd27dd9b5aea94ca0d1611c8fb1d9e3cb720d0b SHA256 3c016c663d14bf1cb8bf1c7d87dc0ecc1fb4f189ebd4fb05e90ed23f20439ed5 AUX conf/mime-types.conf 3350 RMD160 ca82154e69af26b1d9de9757d5bcbe69eb428dcb SHA1 f7b7c19a90629b6598a1c4769592628fa582dd34 SHA256 8bbab2136c71878fbca5ad8d45838a99fd278037406049a3cca5f47d81309100 AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf @@ -16,7 +17,9 @@ AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 8 AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1 DIST lighttpd-1.4.19.tar.bz2 610347 RMD160 8731ba3efc95659a16dbb11b7298e3b539ab3c75 SHA1 fd4450e7faae55ebe0905114722995b0c57397cc SHA256 a239323239c3735a04290f7c063a14ed2c4560a88c15181c253fcd68c6c2f1d7 DIST lighttpd-1.4.20.tar.bz2 618018 RMD160 0fcc71d6063574da86b610c9bdc16b7e44f9d2e7 SHA1 e5944a40579e0f37c6a0eeb0ad751344b2d6006c SHA256 3cda2ce779f24948062f765f2630b5865e483f5fab7149681a2a25422fd61176 +DIST lighttpd-1.4.22.tar.bz2 657939 RMD160 04dcf5565ee6deb3e91449cf54309645f88a43fb SHA1 33390d4cc72b61405c0803358f8d9112821c194b SHA256 6d217dd47fbbf431ee37aa6f12604411204be1fb37bc2a70e14d15dab507c451 EBUILD lighttpd-1.4.19-r2.ebuild 5839 RMD160 0947b4c115cc5ecbc0ec67aa4b077b70c1714d09 SHA1 9ccbbb41364d162b09e52134cbc47c72f731ffdc SHA256 373f9b64c41abce5d09af55a16218ab34ac44bedc4cc6019d034d20865db4ac4 EBUILD lighttpd-1.4.20.ebuild 5960 RMD160 19f74751b53e92f9876c0015b0fc850733c20021 SHA1 4de12f3cba5ef21bf55a16e4b5a9ca2ab64d1816 SHA256 45c275d895a00370c905b0aa37ebdba46872930034843bb0375fdfa1c0f78f72 -MISC ChangeLog 45898 RMD160 139d1fec19955ab3fecfc7c2641a860aa312a625 SHA1 6d02ab86099de0a6869fc07ca57123fd16b74d9f SHA256 2a6bf00c63c6d61422922402be432ad408770778f461e7daf7184f8be77aacfb +EBUILD lighttpd-1.4.22-r1.ebuild 5728 RMD160 f40d8519ccb6fb900ad35f29e70b357c6f11ac3c SHA1 260cfa9228b438bce6287a604f9fbfda5f4300dc SHA256 a06174ae3939f7d68368db2dfcf655cd45890a28d4270eb147688c7c25b08c73 +MISC ChangeLog 46166 RMD160 069f95f889c400ecee005e8bdd99816c401d5c71 SHA1 b6d7cb367c5568528e813d0f0f8045abcc2ccd4f SHA256 9b298222c18a07d9b0c6ebae8eb1af12d7b4988098ff9029b8cc9554e2893838 MISC metadata.xml 927 RMD160 3d969f099d1bb8df70ec5f8ed78a83ad27d2b10d SHA1 1e564c4fc4edb8a4b2dc41f731071ec38e917027 SHA256 479db26201c5c934fd5fb5deccd8712a637114d5cde6e75da8ce9ad4872ec070 diff --git a/www-servers/lighttpd/lighttpd-1.4.22-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.22-r1.ebuild new file mode 100644 index 000000000000..86707ac4c1ff --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.22-r1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.22-r1.ebuild,v 1.1 2009/05/14 08:42:29 bangert Exp $ + +EAPI="2" + +inherit eutils autotools depend.php + +DESCRIPTION="Lightweight high-performance web server" +HOMEPAGE="http://www.lighttpd.net/" +SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +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-5.1 ) + memcache? ( dev-libs/libmemcache ) + mysql? ( >=virtual/mysql-4.0 ) + pcre? ( >=dev-libs/libpcre-3.1 ) + php? ( virtual/httpd-php ) + rrdtool? ( net-analyzer/rrdtool ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + webdav? ( + dev-libs/libxml2 + >=dev-db/sqlite-3 + sys-fs/e2fsprogs + ) + xattr? ( kernel_linux? ( sys-apps/attr ) )" + +DEPEND="${RDEPEND} + doc? ( dev-python/docutils ) + test? ( + virtual/perl-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,magnet}.* + use rrdtool || rm -f ${libdir}/mod_rrdtool.* + + if ! use fastcgi ; then + rm -f ${libdir}/mod_fastcgi.* + 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 + + enewgroup lighttpd + enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd +} + +src_prepare() { + EPATCH_SUFFIX="diff" EPATCH_OPTS="-l" epatch "${FILESDIR}/${PVR}" || \ + die "Patching 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" + + eautoreconf || die +} + +src_configure() { + 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 webdav webdav-locks) \ + $(use_with xattr attr) \ + || die "econf failed" +} + +src_compile() { + 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 + newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die + use fam && has_version app-admin/fam && \ + sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd + + # configs + insinto /etc/lighttpd + doins "${FILESDIR}"/conf/lighttpd.conf + doins "${FILESDIR}"/conf/mime-types.conf + doins "${FILESDIR}"/conf/mod_cgi.conf + doins "${FILESDIR}"/conf/mod_fastcgi.conf + # Secure directory for fastcgi sockets + keepdir /var/run/lighttpd/ + fperms 0750 /var/run/lighttpd/ + fowners lighttpd:lighttpd /var/run/lighttpd/ + + # update lighttpd.conf directives based on conditionals + update_config + + # docs + dodoc AUTHORS README 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 + fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd + fperms 0750 /var/l{ib,og}/lighttpd + + #spawn-fcgi may optionally be installed via www-servers/spawn-fcgi + rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* + + use minimal && remove_non_essential +} + +pkg_postinst () { + echo + if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then + einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi." + 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 "Gentoo has a customized configuration," + ewarn "which is now located in /etc/lighttpd. Please migrate your" + ewarn "existing configuration." + ebeep 5 + fi + + if use fastcgi; then + ewarn "As of lighttpd-1.4.22, spawn-fcgi is provided by the separate" + ewarn "www-servers/spawn-fcgi package. Please install it manually, if" + ewarn "you use spawn-fcgi." + ewarn "It features a new, more featurefull init script - please migrate" + ewarn "your configuration!" + fi +} |