diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2012-11-21 18:57:24 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2012-11-21 18:57:24 +0000 |
commit | 684899a4d7a6e53a99f58167c89b824d1173cfa7 (patch) | |
tree | 2a55280b31aea9c38d600233d1655fa2e4916d07 /www-servers/lighttpd | |
parent | Stable on amd64 and x86, I need this to test my vdpau stuff on stable. (diff) | |
download | historical-684899a4d7a6e53a99f58167c89b824d1173cfa7.tar.gz historical-684899a4d7a6e53a99f58167c89b824d1173cfa7.tar.bz2 historical-684899a4d7a6e53a99f58167c89b824d1173cfa7.zip |
Version bump
Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2
Diffstat (limited to 'www-servers/lighttpd')
-rw-r--r-- | www-servers/lighttpd/ChangeLog | 7 | ||||
-rw-r--r-- | www-servers/lighttpd/Manifest | 30 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.32.ebuild | 223 |
3 files changed, 245 insertions, 15 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index a5935edc6a5e..6e08f64213a5 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/lighttpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.288 2012/11/20 19:07:35 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.289 2012/11/21 18:57:22 hwoarang Exp $ + +*lighttpd-1.4.32 (21 Nov 2012) + + 21 Nov 2012; Markos Chandras <hwoarang@gentoo.org> +lighttpd-1.4.32.ebuild: + Version bump 20 Nov 2012; Alex Alexander <wired@gentoo.org> lighttpd-1.4.30-r1.ebuild, lighttpd-1.4.31.ebuild: diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index f98918912993..611226c055da 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -13,24 +13,26 @@ AUX lighttpd.initd 1682 SHA256 7886dab8764fca471ae0152af823accfe8ffea45049f49236 AUX lighttpd.logrotate 487 SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c SHA512 e1284fe9ab4b9a53c21b40a5ac3e77e66343e187321b8a2f7464db64747f3a99f7e17a9e7c0e298db84a24fa1286cfe344dbff182eddd9de5c0605f5397a6972 WHIRLPOOL 96538a7fb86d6cb19dbc8eb6034e305fbc574edeb29e45d7fd8e58234fb8f1812daf7c1d845f9dfa052ebf9bfdc84b801a8aa68dfbad08aa88f32b0838a5bf5c DIST lighttpd-1.4.30.tar.bz2 664697 SHA256 0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d SHA512 a5bf730d7699aa4c825dfd1333eea0dbdedfa29a0c43854c23c8b0eb13a12c75b3944c862fd094dee521f7bad78e50b5aa07607002ef590e14ba68fb1cac05a2 WHIRLPOOL ec199dafa8389cf9f03b23022dd34cd4b64fc4a181352b027fd552e3d9d98703e21ad6ed549511615add9951d2649c6b731cedb82ac5e595d8383ac112c293fd DIST lighttpd-1.4.31.tar.bz2 675275 SHA256 5209e7a25d3044cb21b34d6a2bb3a6f6c216ba903ea486a803d070582e5e26ac SHA512 1d5853adb8a8f923b3413c3841f9a17b307e6a81206a9509c1fac3e301ca1bb1e26bdb2f45ebd6dcc540935e6168c9bc1ee2046199907841331aaa64e54a92c7 WHIRLPOOL c9d783e47cd571b5f7d88b03dadfb9f6ea5e41465f29f00f4a46c094c5ad4124e7c3e709d8742bdeb10175f64d9b1559f16c2ecefa45329fd5969dea965730e8 +DIST lighttpd-1.4.32.tar.bz2 681065 SHA256 60691b2dcf3ad2472c06b23d75eb0c164bf48a08a630ed3f308f61319104701f SHA512 ffd5488a2ed57daa26b6d16223f422a94e88f2488cdc50bbb354c45daa535fbf9231fbbe73c23327a0adb708cc2b67fbdc60c34195a2a46a171dcc0f30bb3efb WHIRLPOOL 0f537296ae2a321962a4e4bc9a45631d334cf180a5aee1a182e6d95ebdcabfec6df4d229e888ce9170f526ab716c323cc66947413747ee91e6f73e2a4a0d4526 EBUILD lighttpd-1.4.30-r1.ebuild 6440 SHA256 e4b0805ab8a01643bf1ff45bd5bf0e122f2f4e02163feef38bb501b55060d4f8 SHA512 a7a57a6fb1aecc151e95fd952ad46ce664c84a690b465ad48a31cd8df5e7989ea270f430d4f042f8c9fa14271a2acbde389c0c64cb78e7684195cfdeae57886f WHIRLPOOL 0cd3ceb2f19af26bdc0678b02a2b2b786f5029bed818ce465cdc11908be82d586852fa9ba10a8790798ca0c07e8516803d0ef1088208838a40efc3203f009e18 EBUILD lighttpd-1.4.31.ebuild 6693 SHA256 7783b003e9193315796be66d288d21a4ec06a6a02207b30dd84939d263d31e64 SHA512 e62ae6b75ad51967df7090892ba5e8f73ff401fe1cf0cd1fd6e8929e67a95c4491ce3517efa808c0f3e0fadcd585d9ad62a44728201a8b34077e79ff2ef0a75f WHIRLPOOL 6fc9af90077ec8d47e36db7399206e416e17e61dfa548407bcc0bf22ec3dc2fc16f84cfd9c05146ae72419b43a2585ae64acaebdfabe19f981465f064ae8717b -MISC ChangeLog 60860 SHA256 f7b5224880237667006d68a49253b636f743cf63d2cca7a98c521baef950bdff SHA512 12fe31299ca3d6836e09cb06411929719e325a6f376e0ede330dccebe335d4edbe5d4808f5cd72164dd8fd1cc688ce8a238ee3805d2f8d2e9b6600aee04cc834 WHIRLPOOL b9678c0f2793387930b0cedae44186193a1098430ea57a4829f3a3f5605fa12fddb46390013bc893cafdd4efc93de9b67a132a8841b8b8cdc61dfbbf33b9a449 +EBUILD lighttpd-1.4.32.ebuild 6658 SHA256 f37b14bcd1e68ca2bbb95c6eef97404dfbf6f31261fc9462df2903df48491021 SHA512 85725e45feebacb1d81e2d18fc24ea2a885958296859c4418a4a2b55b33dc23d6b3408882ed18dc32206ee36ead5a1c2472391f3f873058ca45b314dc815681b WHIRLPOOL 31b1ce2957ac63e0684ffa6e124530cc543e9ca7d492026471758a82730a41da35631ea85bf12f62643f6288febc4ef7c449880811164a7feff0bfc2623ef1e6 +MISC ChangeLog 60989 SHA256 acc5c144810c9c2c33abb4b817e6563a931abba11c40607cd3a20b14c73d1092 SHA512 3f9152240d3a6e83f2bccd05d91aca62126740cb84d08c5311cb2143d35e0b19ca55e9c274ff8713e41c8eb3ccd3e15ab5b4a9deb494a6da16f1acf2b23c3def WHIRLPOOL ff3ea328a877ce27d1734bdab0e52a6de14fe267a3555832c43f7441b3a04079298a6a8a0dfc0c35316df16fa4dcd1784dfeba176296aae2f079a56d57e50116 MISC metadata.xml 1315 SHA256 4a5b911cadfb5f48332d4c252cabdae052af96232321f0171e5ed1fa7194abce SHA512 4ff65b32d294a5ff288eafb81561e4160db69bbea3fab90dc7e80135901ce7c6aded4743b88d3e52e936c73d71b2ddef7d65523e6f737fd76994776bb9a6ea77 WHIRLPOOL 83a654aa9c34b778cded6acad83aaa891d57b3effc220a4a006123beef73d69e075eeb580d9b5c3021535da8a8ec64a933d0d62bd1e8ab639ccff4f3592b92f1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQq9T9AAoJEDZF8K7rm0r6LlUQALCMVHd9IAr3pwS/IYX3lwFr -wI5aMZz7CKRx1g4FstnDfsxMPMtoY41vuFnIOTs8lo3QZ9areikxY4+7p+YSMZKW -DJl5SpFV5p4wbe003IsI06ZyW3J8TLQZkpL/sU9ibgNL2z2pg9q/HTjNYhzoxY81 -A37nyCU7aWP7FZKcH0wvE2H0fXb1U+y+AeXfpZxpCsXFtxeYaxxMnRfc2gaoRV68 -vkV8hs8P1ZXb8E6GVNESSUniWJ2HjafQZq43HhPLbrGXelDiIoGMWCG17nk1Bsg+ -0hixgJVBQxw06UayNCSdzAjajmG9o2UaTXdHd+XqeBbLGSLEMk5TpPFw2Jk+Hfth -T3AEFpyrf7V+sHd7bjBhHNRaALOL++FayGZuHQXg6avGGFWWcsxXGjUiNcA4scQj -etZtmEJ9ZNAtMRu6eF1jeBBnumM3r2Tjad8Pja+9KSG2mmCrKUcCJMVeaCgBfYf7 -UrQvAcrynvH8+JeifVxgBksO2r/QmBjuOR8GABJn4Ym7y974YyNdLv+SVEXy7R2e -H4wOnYNWFpirYEJcp4Isaui5t1MNlfCdev4eScBZtxP9AmEBnipnIWpKIdEKHoPl -Z1cvfR/imE9X5cWreSyo8Zn/2gyXYz4JphWaHLFQyM2yAK2f0PjMIa4hVfKU3lBB -UOxB5+pQaHYP1mB55LjR -=wDPz +iQIcBAEBCAAGBQJQrSQPAAoJEPqDWhW0r/LCun8P/3eStTHUKfSQ2JjWJISEQ4s4 +Xm/QusHb6nqG4ue5CbWv5SnfkBvIusfEEl527ypIxyyUf74pFzRBfYxGcZjco01Q +m71Rm8VciEoufsH0te5K+CdWEn+iQWPh5UGnPGbIszboeMEnuj1FG/Rx7syPfxe+ +KmqpmZOtitIFg65JoR8AfcEx1KmnxIhXhKzKwSc2BOuVUXA2vBsi6F2QuMNKAwyT +eLWjbAqjFSyFHbxgXgsUKKh92yba0wJPr2dsGoQNHpZEsBi0Gd+zEwnkFtN2BUow +8Do1cgmfDd7HCtEXh0rbmZVpq87zv+84k2UTJU3NOxz1DYoCe5rYgR8nB2X9YD79 +HNH4upndkMKnShdfNuVaFIhyyIRGyiUW1L3zax3eCHoCQvz2vvBWiA6uIDGBUw6a +hijn1d4s/LK3GWZK20cn/UFZDIjuNOvuTt/Eoop6uizlNmhROG2vHyNdo2GPR9KN +GQd8mMUBRyj7DNRlngi5fWs/S/eVGbn3LNFWRkda6uZ6jyvAUbL3cALKf5X7fGFQ +/8zISuFpxQyT4H5wgjfse+i4fyd+povHSe9JCHUC0kzkchxzaioyjMwsfD2M9KRG +V57/3Z9Kf2verxstLWWWNmsPpoBoi4fLwbH4LQPrDSzxCrb3/Gi1MmpKuxy3z5bx +JbKO5RA22o+FkETx3oYH +=d5om -----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/lighttpd-1.4.32.ebuild b/www-servers/lighttpd/lighttpd-1.4.32.ebuild new file mode 100644 index 000000000000..62c1f684153d --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.32.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.32.ebuild,v 1.1 2012/11/21 18:57:22 hwoarang Exp $ + +EAPI="4" + +inherit base autotools eutils depend.php user + +DESCRIPTION="Lightweight high-performance web server" +HOMEPAGE="http://www.lighttpd.net/" +SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal mmap memcache mysql pcre php rrdtool selinux ssl test uploadprogress webdav xattr zlib" + +REQUIRED_USE="kerberos? ( ssl )" + +RDEPEND=" + bzip2? ( app-arch/bzip2 ) + fam? ( virtual/fam ) + gdbm? ( sys-libs/gdbm ) + ldap? ( >=net-nds/openldap-2.1.26 ) + libev? ( >=dev-libs/libev-4.01 ) + lua? ( >=dev-lang/lua-5.1 ) + memcache? ( dev-libs/libmemcache ) + mysql? ( >=virtual/mysql-4.0 ) + pcre? ( >=dev-libs/libpcre-3.1 ) + php? ( dev-lang/php[cgi] ) + rrdtool? ( net-analyzer/rrdtool ) + selinux? ( sec-policy/selinux-apache ) + ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) + webdav? ( + dev-libs/libxml2 + >=dev-db/sqlite-3 + sys-fs/e2fsprogs + ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + zlib? ( >=sys-libs/zlib-1.1 )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + 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="${D}/etc/lighttpd/lighttpd.conf" + + # enable php/mod_fastcgi settings + use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } + + # enable stat() caching + use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } + + # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 + use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } +} + +# 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.* + use zlib || rm -f ${libdir}/mod_compress.* +} + +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." + fi + if use mmap; then + ewarn "You have enabled the mmap option. This option may allow" + ewarn "local users to trigger SIGBUG crashes. Use this option" + ewarn "with EXTRA care." + fi + enewgroup lighttpd + enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd +} + +src_prepare() { + base_src_prepare + #dev-python/docutils installs rst2html.py not rst2html + sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ + die "sed doc/Makefile.am failed" + # Experimental patch for progress bar. Bug #380093 + if use uploadprogress; then + epatch "${FILESDIR}"/${PN}-1.4.29-mod_uploadprogress.patch + fi + eautoreconf +} +src_configure() { + econf --libdir=/usr/$(get_libdir)/${PN} \ + --enable-lfs \ + $(use_enable ipv6) \ + $(use_enable mmap) \ + $(use_with bzip2) \ + $(use_with fam) \ + $(use_with gdbm) \ + $(use_with kerberos kerberos5) \ + $(use_with ldap) \ + $(use_with libev) \ + $(use_with lua) \ + $(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) \ + $(use_with zlib) +} + +src_compile() { + emake + + if use doc ; then + einfo "Building HTML documentation" + cd doc || die + emake html + fi +} + +src_test() { + if [[ ${EUID} -eq 0 ]]; then + default_src_test + else + ewarn "test skipped, please re-run as root if you wish to test ${PN}" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + # init script stuff + newinitd "${FILESDIR}"/lighttpd.initd lighttpd + newconfd "${FILESDIR}"/lighttpd.confd lighttpd + use fam && has_version app-admin/fam && \ + { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } + + # 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 doc/scripts/*.sh + newdoc doc/config//lighttpd.conf lighttpd.conf.distrib + + use doc && dohtml -r doc/* + + docinto txt + dodoc doc/outdated/*.txt + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/lighttpd.logrotate lighttpd + + 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 () { + if use ipv6; then + elog "IPv6 migration guide:" + elog "http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" + fi + 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." + fi + + if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then + elog "Gentoo has a customized configuration," + elog "which is now located in /etc/lighttpd. Please migrate your" + elog "existing configuration." + fi + + if use uploadprogress; then + elog "WARNING! mod_uploadprogress is a backported module from the" + elog "1.5x-branch, which is not considered stable yet. Please go to" + elog "http://redmine.lighttpd.net/wiki/1/Docs:ModUploadProgress" + elog "for more information. This configuration also is NOT supported" + elog "by upstream, so please refrain from reporting bugs. You have" + elog "been warned!" + fi +} |