From a05f48d0d19db4b03be11debc183322c527137da Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 19 Dec 2011 22:00:18 +0000 Subject: [PATCH] Version bump to 1.4.30 bug fix release Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64 --- www-servers/lighttpd/ChangeLog | 7 +- www-servers/lighttpd/Manifest | 24 ++- www-servers/lighttpd/lighttpd-1.4.30.ebuild | 217 ++++++++++++++++++++ 3 files changed, 241 insertions(+), 7 deletions(-) create mode 100644 www-servers/lighttpd/lighttpd-1.4.30.ebuild diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 6f03f451498a..2a60804935d3 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/lighttpd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.263 2011/10/23 16:41:34 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.264 2011/12/19 22:00:18 hwoarang Exp $ + +*lighttpd-1.4.30 (19 Dec 2011) + + 19 Dec 2011; Markos Chandras +lighttpd-1.4.30.ebuild: + Version bump to 1.4.30 bug fix release 23 Oct 2011; Raúl Porcel lighttpd-1.4.29-r3.ebuild: alpha/ia64/sh/sparc stable wrt #383791 diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 74227b27e6a1..bd341f0fdf99 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 AUX 1.4.25-fix-CVE-2010-0295.patch 6237 RMD160 cd9ce4410ed805d28899b0207bbc670e04491315 SHA1 2ba33d94f5628d97cb606ad97ef9630eef5191c4 SHA256 d4d269d993396cfd9146de621e0a3d5e9203ac7f6b2b6f351f9013dbbe956a4e AUX 1.4.25-fix-unknown-AM_SILENT_RULES.patch 744 RMD160 5da8bdca1728f2de730e90de4fb7e93a274406e8 SHA1 8ae6849a88aaaca76c1b8c13a62cc266dbebc2a7 SHA256 a1cf7c77b7ee1cbe9bf3efbb7704b8582c480ae69fd70934597d24ff3fddf663 @@ -23,6 +23,7 @@ DIST lighttpd-1.4.25.tar.bz2 628267 RMD160 f0f7dd0ff3c92a6185be2e6017fd5ea74734c DIST lighttpd-1.4.26.tar.bz2 627971 RMD160 2d294083fbcd4040dc8efec06090cf1c1bf66bbf SHA1 f9710da0152792d83c223a1248345a2d145d6f32 SHA256 d7c25a5bb08c8dbc3e8d86f9e564c90ebf0c365d7fcf5ee801e912fb3c2357fd DIST lighttpd-1.4.28.tar.bz2 641702 RMD160 5af6c848dd251c9d15f5185f54411744ae41c67b SHA1 42915dffe2af4f870cc1cdc0218edb60a0a315c2 SHA256 7e55747a4feb74545d80a1f2d85b5866b8600705eac946e4402e3364b0666ed2 DIST lighttpd-1.4.29.tar.bz2 659974 RMD160 d4369e8970001d2ebe4e49767053c341c4bd2f27 SHA1 fe8ee6dc5f5302bffef905fcdf0b35f255e59b32 SHA256 afd8af213e65afb48b397d004696c6620a7ae7f3d4f162ec46a04b9b9dbfd599 +DIST lighttpd-1.4.30.tar.bz2 664697 RMD160 3d54d76c8530c556e13bf189ba85ecf6a0e8e38d SHA1 70f88e6059da6e04514cc211dd5064a2413b5406 SHA256 0d795597e4666dbf6ffe44b4a42f388ddb44736ddfab0b1ac091e5bb35212c2d EBUILD lighttpd-1.4.23.ebuild 5785 RMD160 9329db0ea573b13e5764c6a173b5af3f53bb5d0b SHA1 674020a06fa14101d24faf13ebe034ef7a852358 SHA256 5ab87c04a35cb8a00460150402ddd82586e7f0e3eea8381dd0738ee69d73f459 EBUILD lighttpd-1.4.25-r1.ebuild 5876 RMD160 5634e49a7eef011d5ae68a9c804df24e36b3f442 SHA1 e1fec940f7ad0d6dab262a91fdb82d726eb2ce5d SHA256 ec001e91cd40d3793d34d8d6aabc411d0f6bddbd34b8335efdde09258d4b33c1 EBUILD lighttpd-1.4.25.ebuild 5829 RMD160 365b1ea4415d2667fcef3a7af08fec29edcf596f SHA1 002a05ab99b4f3c15c8da95fa764fbfb8d84757c SHA256 cc5b0e4170cf4ef91b8043504c4b28e677c5d0d92039cbbe897c00d1a61bcce5 @@ -32,12 +33,23 @@ EBUILD lighttpd-1.4.28-r1.ebuild 5739 RMD160 39f13a4f941e4f54f2ce1e15972c7df3327 EBUILD lighttpd-1.4.28-r2.ebuild 5724 RMD160 010553db292467d43cfbbd06549f0e13004cc6c6 SHA1 537d4b521740bcface141649dbce3df0048af7cb SHA256 0e19a6c294ea24f88a99a8f1f5425eda89596d60176c7920a3ab0d90efc3c73f EBUILD lighttpd-1.4.28.ebuild 5676 RMD160 551c7b19158096b60f350f8db80ac6e61312af42 SHA1 005e0a5ed111b6cda8eb22c9cff9280e4542d3eb SHA256 8fb37b0afc97e260ffda15acc288f8e75418b84cfab9de0a9d62fc1a91f83bac EBUILD lighttpd-1.4.29-r3.ebuild 6526 RMD160 eb5af7eadf35ce0fd46e242cc8b930c16fe2a509 SHA1 a5cde2fd4f158c3be0ad34fdf62d3ee486bc03f6 SHA256 c59a91cea6fcb4c36759a26730354f2fd81ee936ffe9949fef39ad6381b9578a -MISC ChangeLog 56005 RMD160 c80db7f1264b477fb6d772016367f1c8e75a189a SHA1 577bb841fd23d79fc540de61a8b700c667fe2b64 SHA256 a7a14160437d4dfd2572a20cbb0829cd1c74daafb801f7c151318fa6afecdb68 +EBUILD lighttpd-1.4.30.ebuild 6495 RMD160 e1eb68ff268cde364b97f2c3b98eaaf57e17cf4f SHA1 ed37a2551c01d265c0dce7f1fc93113cb1017afc SHA256 c397bc463b05da7732bedeb7d0df430559907c836479020cd1dc5a884ca4ce8c +MISC ChangeLog 56158 RMD160 468f6efed10817dee60e71aa9a1026ea0642f4c9 SHA1 f24fd6a294fea6d122f1732bf7d7e75bf8d46eff SHA256 db30b97f9183fa79d00a44a240494b2cc3b06573ef585498bdc614efde93b218 MISC metadata.xml 1193 RMD160 1fdffaaf6f865686842c2328277899a20c3ff4f1 SHA1 4c92866074579331b95b656e3eed56a5fd698c37 SHA256 bd3dbe66a93023547bd9cc688b51c050a1184d4a18d40f82171c5ca76757424e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk6kQ8cACgkQuQc30/atMkAk+wCff2cfJn6CNTYhGvNkGtPnylUy -pkgAnA/EtzMazSpFszHHizsLyfNAUef5 -=YJ5e +iQIcBAEBCgAGBQJO77PxAAoJEPqDWhW0r/LCWPoP/R6tvCo/5dlswAazAEQM2fmE +o8nV4FERNEaNpafOTpjlCnWIETetr6xiOXtWfXEho0wT7SJ8k58iHHYy0FoQVjFf +7vSF3t+9oeXEXbPpRWycV5qKeW20dKCWJ8VK4sC/3K13MU0O2O/zkb+Br2/w3h6D +11lEnFZhymu7uchiDgBOlojNBx1rwFQmEOpIjd4ZOFENNBcU8Qnttvmsyilh6Vkx +p+IgecyK+/wpDOHCMOVybYfiBAZFBzhfNhlCOBfd6FqmlUR9ep0XTogneh46F82g +lxR0EBv4dtWPQuKy+Cpt38YvU1FC5m+HODOnLCCeogBxMRtFnZwFirFmvlnoMo2h +HcVWayEf4CSo5t3QRZFZzPxlnLzo2vvbw3VSgROjXsgyIh/GXtvpgyHvfVSD1IgD +tJymkVIRBB4eJ5l5JlPYSAEfw+wZEluTG1tMlhBKfh6vYrtXhkaEYH+6RV9bps38 +Ao2zsLRhxb0lY6bFH4bYdo8QSaNasT4k1zeom1aokB2Swh7kbLbN9h+moWbXOov5 +Wj9H2EB99yABXbZZr/JfYW16ftdxc/AVmoEz2q4x05cX59YtFca4wF3fRuZM68XP +sFgEM4P5WuNhQdf5VEMb6ruWcnmUjlVSgvHI7TTcU3m4T88fMqrk4/P+Glwr9c9G +/2e0F4IxRgeOzm+F5IhI +=NNGj -----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/lighttpd-1.4.30.ebuild b/www-servers/lighttpd/lighttpd-1.4.30.ebuild new file mode 100644 index 000000000000..6db4f2dec495 --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.30.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.30.ebuild,v 1.1 2011/12/19 22:00:18 hwoarang Exp $ + +EAPI="4" + +inherit base autotools eutils depend.php + +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" +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 memcache mysql pcre php rrdtool 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 ) + 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} + dev-util/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 + + 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_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 || die "emake failed" + + if use doc ; then + einfo "Building HTML documentation" + cd doc + emake html || die "failed to build HTML documentation" + 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() { + 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 doc/scripts/*.sh + newdoc doc/config//lighttpd.conf lighttpd.conf.distrib + + use doc && dohtml -r doc/* + + docinto txt + dodoc doc/outdated/*.txt || die + + # 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 () { + 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 +} -- 2.26.2