diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2012-06-01 21:12:21 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2012-06-01 21:12:21 +0000 |
commit | d024e096d1a430462a09e9671e108189edd39f35 (patch) | |
tree | 1aa8c9cae29c6e07b8bfeff6a525745162ffe2ce /www-servers | |
parent | removed old ebuilds and files (diff) | |
download | historical-d024e096d1a430462a09e9671e108189edd39f35.tar.gz historical-d024e096d1a430462a09e9671e108189edd39f35.tar.bz2 historical-d024e096d1a430462a09e9671e108189edd39f35.zip |
Version bump
Package-Manager: portage-2.1.10.63/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/lighttpd/ChangeLog | 10 | ||||
-rw-r--r-- | www-servers/lighttpd/Manifest | 35 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild | 211 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild | 212 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild | 213 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild | 212 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild | 203 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.31.ebuild (renamed from www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild) | 75 | ||||
-rw-r--r-- | www-servers/lighttpd/metadata.xml | 1 |
9 files changed, 81 insertions, 1091 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 2d1f65bce1c7..58e76b282e38 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,14 @@ # 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.276 2012/05/02 21:49:38 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.277 2012/06/01 21:12:21 hwoarang Exp $ + +*lighttpd-1.4.31 (01 Jun 2012) + + 01 Jun 2012; Markos Chandras <hwoarang@gentoo.org> +lighttpd-1.4.31.ebuild, + -lighttpd-1.4.23-r1.ebuild, -lighttpd-1.4.25-r2.ebuild, + -lighttpd-1.4.25-r3.ebuild, -lighttpd-1.4.26-r2.ebuild, + -lighttpd-1.4.28-r3.ebuild, -lighttpd-1.4.28-r4.ebuild, metadata.xml: + Version bump 02 May 2012; Jeff Horelick <jdhore@gentoo.org> lighttpd-1.4.23-r1.ebuild, lighttpd-1.4.25-r2.ebuild, lighttpd-1.4.25-r3.ebuild, diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 78d87f11f811..919a69a5fc04 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +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 AUX 1.4.26-fix-ssl-return-check-r2716.patch 562 RMD160 81b5fc8f13e3fbca8a48fd1f954ae7e165b261b1 SHA1 60c3665d0a4f46df1da80338970c7ce6efab64fe SHA256 28391235c48d4dc686d060bbafd711e028a07b68065f40346dc40ca242f4285c @@ -15,20 +18,30 @@ AUX lighttpd.initd-1.4.13-r3 1438 RMD160 f62f42e11b1fcc72e99d5bd48ca50d3c671cc4b AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768 AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1 -DIST lighttpd-1.4.23.tar.bz2 641621 RMD160 3034f56156ee56dbfe5d632f92d9a7e420284caf SHA1 a07b7bfdbf882ebe645cc140f4a658c46725224e SHA256 72896e6677b12aee2371c12e6d3f8299cfbdb2f89ad4b519a96b3ba80852a5fa -DIST lighttpd-1.4.25.tar.bz2 628267 RMD160 f0f7dd0ff3c92a6185be2e6017fd5ea74734c769 SHA1 bc4592930292ae8d0990a94a584f49fe8f52445b SHA256 7e803089f18b179097cb33b64b37d8a3b537ce9c196c88e3fb09881b471c88ce -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-r1.ebuild 5753 RMD160 665b10d9998760297fc1ca2cdd52152ba38c9686 SHA1 adc75b0b33610e81492e2450fb93929a13f42bc2 SHA256 c93c4f8279105d6c1da8cbab729a5d1ec5e2cd0138d33af2439c3f91e38519e9 -EBUILD lighttpd-1.4.25-r2.ebuild 5831 RMD160 29e231bddb32f06e24bbf40beaa87ee8b4a9d577 SHA1 1b67852288ff0855318b7f29a62a465d197ba56e SHA256 b34e3c5d969a7ca40a0292b417a9466ff8cb5a4e93004aeb2e22b160c620780e -EBUILD lighttpd-1.4.25-r3.ebuild 5878 RMD160 87835d6ecf6a7856755a66be7bbe9effa94d5855 SHA1 f97a28dbabd658778192ac688b6c546b46235f65 SHA256 8af219f5460023940fe0e7e0254f7bb16cc15ad45500cea908f3d1a1d1959330 -EBUILD lighttpd-1.4.26-r2.ebuild 5824 RMD160 0c99e4a71e1208721519d26931d172ce00961e8a SHA1 7d0376d5992dbc7973640de9007bea71e29e2b12 SHA256 a95dcde80399800e326e4ca3dc30f8d258d28e889783f579b89fc591fe3fd540 -EBUILD lighttpd-1.4.28-r3.ebuild 5673 RMD160 870449556e3d6f1eee76e1409ca469cf5d3be0a5 SHA1 06056af784ea7a0444c950660eb4e95f73ba45c8 SHA256 a6bb5fee07e689289165f601f9ba79d38b4bbbf88372e593837625336918c3bc -EBUILD lighttpd-1.4.28-r4.ebuild 5736 RMD160 36aa65571d76f51b8dfadec9f88065d73290a529 SHA1 2446364bcaec4458447a601f815211fd6bc601e2 SHA256 5873ccd1942a26487b21a50df5dfa9c830ea9c6915c22f7acba58d50a06b960b +DIST lighttpd-1.4.31.tar.bz2 675275 RMD160 4d1669269c787928388daf3dd4e99f2760db1d43 SHA1 fadfd4bd25d794536ea646fa376caee6a105368e SHA256 5209e7a25d3044cb21b34d6a2bb3a6f6c216ba903ea486a803d070582e5e26ac EBUILD lighttpd-1.4.28-r5.ebuild 5726 RMD160 3605390da5b10783b43c4ffec9186555abc740c4 SHA1 4f3f371e057f774e424ac94b108f9584162ae409 SHA256 1527370e87535d7bfe22fd4df5841676275d881f955934fb8efd2468c606544d EBUILD lighttpd-1.4.29-r4.ebuild 6524 RMD160 e7bf142e1f208fccb7c53979ca1bb18f12bdd0e2 SHA1 d82a5baffaa2267e0bc50b04829eb92dd47fe2fd SHA256 00432c313966ec16ac8b2567cb14ce037f4e25233df57408ff19da50b397ba34 EBUILD lighttpd-1.4.30-r1.ebuild 6430 RMD160 5e18eaf8f6dc6e511fc2301e2e09230e53f27326 SHA1 e97c8998ef1ae97799f365e63f51d14e0a32120f SHA256 b369aa116966b86be89aa5f467bdb6453c28b3833acb5a102684f00d9c25e0df -MISC ChangeLog 58722 RMD160 b72d69822710932f8d45d2be650588d575dbf71b SHA1 cedd56d8cc5333c3d6f2a9a5986ff65f8553288d SHA256 55681c82f25574e375802b08628093649fb83d8fdb46ea0b643054b3106ec026 -MISC metadata.xml 1167 RMD160 92390e2bf8eff4a979e776e39614716211c6db98 SHA1 703d74a83af2f85ad8a9314b2afce1f6c89cff25 SHA256 9a2db850c3993dd830b6e2df528a638444284b61e6502cb24d865e9fce9d4fee +EBUILD lighttpd-1.4.31.ebuild 6645 RMD160 034aefdbb05fcea9dfe38e5de6a4d1949b51ecf8 SHA1 6863ee02a66457d8d4a352a5038e359eac756fcb SHA256 8efeb208398de8d20bdf506d8e233a26f0987cfeaabefa0401d64887d82bdb61 +MISC ChangeLog 59038 RMD160 d861985b08f9546fb2279b8ac9a031af8273b46b SHA1 210943719885a300db17e95a553aa8d1e474a467 SHA256 24615ebf502952169d3f0f99e32e3799493384f69c7160f0b0fa77ead22afe3d +MISC metadata.xml 1315 RMD160 243d9ccb89a1f5c4a2f2b990ec81a567daae7b80 SHA1 cbb1518f4daf3af0172b1e71797570619f7401ce SHA256 4a5b911cadfb5f48332d4c252cabdae052af96232321f0171e5ed1fa7194abce +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQIcBAEBCgAGBQJPyTA5AAoJEPqDWhW0r/LCtqIP+wSJtDXtIhNEwYMOG04e7MtK +NL34f8Wtq/QXr4zyZ+NoLz4SGkKfD/9DTpDeVNWXl+gpFkrSVonqU4Hws6Wufc80 +H1VIw5KuxtP+RwpXHVaHhBJbTuWQWoEZfwilk65chjWxCUZt5905LBuO2r1fZjsw +Oz8AOl6ax/XpnwqdYaXfKbfhCGCrE8OzJ2X4MB/erW4BpCO7M6coP8ITQTMY531n +Cp9GwuIlFGO1DmZDVIkqvdHeXvuHG9e+ZXHQia0qm63SeEfr1CFZVrIlFwyrpiev +0j7PM9d4s3K8bfubq3+Jj+6xPb/ckIcZ9fdJMG9VlEnpwtm4+qzO1SZUEkU23E0U +N1KN+O7773zBZ8t4rjrkPGacbOwcr2yWuFOZFszHeKNQgLoAHSCDDadHEn5U/MYY +YtnG4lSMUvOBz0MvzoSylVhQk4790AP9P7sB1s0X9mdpdNaJ68mwuHX/uhxITnBc +BK1HksNDX5rqS8qo6sY+8VLc2EbJwMlpPOuYMTYZVEeGMXF8nwhqGCEXD/cH5F/y +G+4H7MN+pQMhWKF93ttyFoVayZodaRNDVdeGJdH3mbErtzlJouuP7/9Y7P2hA3ts +z5WZKmfxE9r6A5xCOaRZQjNTlwLT4Y6JBz9l7ieW/o1OnpNl62YzA9Eza6uVfcQ9 +ai0mmOn4pfpeAgqKL1nb +=QCt6 +-----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild deleted file mode 100644 index 326e08626fcf..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.23-r1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# 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.23-r1.ebuild,v 1.3 2012/05/02 21:49:38 jdhore 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 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} - 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="/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() { - # 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 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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild deleted file mode 100644 index 697180c8dc2f..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.25-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# 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.25-r2.ebuild,v 1.2 2012/05/02 21:49:38 jdhore 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} - 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="/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 - # 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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild deleted file mode 100644 index b9a10c8e1e48..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.25-r3.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# 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.25-r3.ebuild,v 1.2 2012/05/02 21:49:38 jdhore 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} - 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="/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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild deleted file mode 100644 index b0fafbbbbfb6..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.26-r2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# 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.26-r2.ebuild,v 1.2 2012/05/02 21:49:38 jdhore 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} - 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="/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() { - # 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" - - epatch "${FILESDIR}/1.4.26-fix-ssl-return-check-r2716.patch" - 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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild deleted file mode 100644 index 34fe36b81bef..000000000000 --- a/www-servers/lighttpd/lighttpd-1.4.28-r3.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# 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.28-r3.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $ - -EAPI="2" - -inherit base 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 gdbm ipv6 ldap libev 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 ) - libev? ( dev-libs/libev ) - 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 ) - webdav? ( - dev-libs/libxml2 - >=dev-db/sqlite-3 - sys-fs/e2fsprogs - ) - xattr? ( kernel_linux? ( sys-apps/attr ) )" - -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="/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} - - # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 - use ipv6 && \ - dosed 's|# server.use-ipv6|server.use-ipv6|' ${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.* -} - -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/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 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) -} - -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/*.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 () { - 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 -} diff --git a/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild b/www-servers/lighttpd/lighttpd-1.4.31.ebuild index a14450f53738..60b100418c0e 100644 --- a/www-servers/lighttpd/lighttpd-1.4.28-r4.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.31.ebuild @@ -1,10 +1,10 @@ # 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.28-r4.ebuild,v 1.2 2012/05/02 21:49:38 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.31.ebuild,v 1.1 2012/06/01 21:12:21 hwoarang Exp $ -EAPI="2" +EAPI="4" -inherit base eutils autotools depend.php +inherit base autotools eutils depend.php DESCRIPTION="Lightweight high-performance web server" HOMEPAGE="http://www.lighttpd.net/" @@ -13,10 +13,11 @@ 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 ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr" +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=" - >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) @@ -28,13 +29,15 @@ RDEPEND=" pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) - ssl? ( >=dev-libs/openssl-0.9.7 ) + 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 ) )" + xattr? ( kernel_linux? ( sys-apps/attr ) ) + zlib? ( >=sys-libs/zlib-1.1 )" DEPEND="${RDEPEND} virtual/pkgconfig @@ -46,19 +49,16 @@ DEPEND="${RDEPEND} # update certain parts of lighttpd.conf based on conditionals update_config() { - local config="/etc/lighttpd/lighttpd.conf" + local config="${D}/etc/lighttpd/lighttpd.conf" # enable php/mod_fastcgi settings - use php && \ - dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} + use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; } # enable stat() caching - use fam && \ - dosed 's|#\(.*stat-cache.*$\)|\1|' ${config} + use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; } # automatically listen on IPv6 if built with USE=ipv6. Bug #234987 - use ipv6 && \ - dosed 's|# server.use-ipv6|server.use-ipv6|' ${config} + use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; } } # remove non-essential stuff (for USE=minimal) @@ -78,6 +78,7 @@ remove_non_essential() { 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() { @@ -88,7 +89,11 @@ pkg_setup() { 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 } @@ -96,12 +101,14 @@ pkg_setup() { src_prepare() { base_src_prepare #dev-python/docutils installs rst2html.py not rst2html - sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \ + sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \ die "sed doc/Makefile.am failed" - epatch "${FILESDIR}"/${P}-detect-libev.patch + # 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 \ @@ -109,25 +116,28 @@ src_configure() { $(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 mmap) \ $(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 xattr attr) \ + $(use_with zlib) } src_compile() { - emake || die "emake failed" + emake if use doc ; then einfo "Building HTML documentation" - cd doc - emake html || die "failed to build HTML documentation" + cd doc || die + emake html fi } @@ -140,13 +150,13 @@ src_test() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install # init script stuff - newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die - newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die + 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 + { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } # configs insinto /etc/lighttpd @@ -169,11 +179,11 @@ src_install() { use doc && dohtml -r doc/* docinto txt - dodoc doc/*.txt + dodoc doc/outdated/*.txt # logrotate insinto /etc/logrotate.d - newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die + newins "${FILESDIR}"/lighttpd.logrotate lighttpd keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd @@ -201,4 +211,13 @@ pkg_postinst () { 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 } diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml index 63cf2a4ed85e..c2f3a89122a6 100644 --- a/www-servers/lighttpd/metadata.xml +++ b/www-servers/lighttpd/metadata.xml @@ -21,6 +21,7 @@ <flag name='libev'>Enable fdevent handler</flag> <flag name='memcache'>Enable memcache support for mod_cml and mod_trigger_b4_dl</flag> + <flag name='mmap'>Use mmap with files owned by lighttpd. This is a dangerous option as it may allow local users to trigger SIGBUS crashes.</flag> <flag name='rrdtool'>Enable rrdtool support via mod_rrdtool</flag> <flag name='uploadprogress'>Apply experimental patch for upload progress module</flag> <flag name='webdav'>Enable webdav properties</flag> |