From: "Christian Hoffmann (hoffie)" <hoffie@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/lighttpd: ChangeLog lighttpd-1.4.25-r1.ebuild
Date: Mon, 01 Feb 2010 23:47:55 +0000 [thread overview]
Message-ID: <E1Nc5zn-00054b-80@stork.gentoo.org> (raw)
hoffie 10/02/01 23:47:55
Modified: ChangeLog
Added: lighttpd-1.4.25-r1.ebuild
Log:
revision bump with fix for CVE-2010-0295, straight to stable on amd64
(Portage version: 2.1.7.16/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.218 www-servers/lighttpd/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.218&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?rev=1.218&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/ChangeLog?r1=1.217&r2=1.218
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- ChangeLog 1 Feb 2010 19:53:41 -0000 1.217
+++ ChangeLog 1 Feb 2010 23:47:54 -0000 1.218
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/lighttpd
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.217 2010/02/01 19:53:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.218 2010/02/01 23:47:54 hoffie Exp $
+
+*lighttpd-1.4.25-r1 (01 Feb 2010)
+
+ 01 Feb 2010; Christian Hoffmann <hoffie@gentoo.org>
+ +lighttpd-1.4.25-r1.ebuild, +files/1.4.25-fix-CVE-2010-0295.patch:
+ revision bump with fix for CVE-2010-0295, straight to stable on amd64
01 Feb 2010; Markus Meier <maekke@gentoo.org> lighttpd-1.4.23.ebuild:
arm stable, bug #286134
1.1 www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild?rev=1.1&content-type=text/plain
Index: lighttpd-1.4.25-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.25-r1.ebuild,v 1.1 2010/02/01 23:47:54 hoffie Exp $
EAPI="2"
inherit eutils autotools 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 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}
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="/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 "${FILESDIR}"/1.4.25-fix-unknown-AM_SILENT_RULES.patch
epatch "${FILESDIR}"/1.4.25-fix-CVE-2010-0295.patch
# dev-python/docutils installs rst2html.py not rst2html
sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \
die "sed doc/Makefile.am failed"
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 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)
}
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/*.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
}
next reply other threads:[~2010-02-01 23:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 23:47 Christian Hoffmann (hoffie) [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-02-02 19:11 [gentoo-commits] gentoo-x86 commit in www-servers/lighttpd: ChangeLog lighttpd-1.4.25-r1.ebuild Brent Baude (ranger)
2010-02-03 9:39 Christian Faulhammer (fauli)
2010-02-03 20:39 Raul Porcel (armin76)
2010-02-03 23:39 Jeroen Roovers (jer)
2010-02-04 0:06 Jeroen Roovers (jer)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Nc5zn-00054b-80@stork.gentoo.org \
--to=hoffie@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox