From 562cec1085c3cad0fc9efc7a1ca8c5cbefca38cb Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 7 Jan 2007 10:36:40 +0000 Subject: [PATCH] New 1.4.13 version, pmasked for testing. Package-Manager: portage-2.1.2_rc4-r6 --- www-servers/lighttpd/ChangeLog | 10 +- www-servers/lighttpd/Manifest | 24 ++- .../1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff | 11 + .../02_lighttpd-1.4.13-fcgi-auth-type.diff | 41 ++++ .../lighttpd/files/digest-lighttpd-1.4.13 | 3 + www-servers/lighttpd/lighttpd-1.4.13.ebuild | 204 ++++++++++++++++++ 6 files changed, 288 insertions(+), 5 deletions(-) create mode 100644 www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff create mode 100644 www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff create mode 100644 www-servers/lighttpd/files/digest-lighttpd-1.4.13 create mode 100644 www-servers/lighttpd/lighttpd-1.4.13.ebuild diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 42a7c0898a0f..a3732aa82e5c 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-servers/lighttpd # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.91 2007/01/05 01:28:26 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.92 2007/01/07 10:36:39 robbat2 Exp $ + +*lighttpd-1.4.13 (07 Jan 2007) + + 07 Jan 2007; Robin H. Johnson + +files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff, + +files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff, + +lighttpd-1.4.13.ebuild: + New 1.4.13 version, pmasked for testing. 05 Jan 2007; Elfyn McBratney lighttpd-1.4.11.ebuild: Set WANT_AUTO{CONF,MAKE} variables; fixes bug #160133. diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 69f99f72085a..dc4a6ede721c 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -22,6 +22,14 @@ AUX 1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353 RMD160 d6beacffdba06fba MD5 0ce285405a1c07a6f7cf2905a056f299 files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353 RMD160 d6beacffdba06fbaeabc0310765c39d8a23047ad files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353 SHA256 67ce14b3f41f37c22e75fe897f2bfa427cfc1bacd4df72d1e7f73929b0ebce70 files/1.4.11/23_all_mod_ssi_gcc-4.1.1_compile_fix.diff 353 +AUX 1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263 RMD160 ea424d080a74a2cdc871838593982576795c52e1 SHA1 69587463e4f056b61cc871d8f060cc6494f1c9e1 SHA256 3a51f64094827e4536fa68e18c7428346c9965b8975a8cc11c7f9e7e895bf023 +MD5 5d187fb7f7a6e016319418fd38b1fda0 files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263 +RMD160 ea424d080a74a2cdc871838593982576795c52e1 files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263 +SHA256 3a51f64094827e4536fa68e18c7428346c9965b8975a8cc11c7f9e7e895bf023 files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff 263 +AUX 1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087 RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f SHA1 877d864fbc6abf39f48a7bb29de809437298f158 SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848 +MD5 b2e5994810ffd6ad28fa31cc386674c0 files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087 +RMD160 fcd67f8f5b06b7605210d97ae12ec5c22e7f4b4f files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087 +SHA256 adb11e29f1a76c57aced62fc30aaa5dcbca85d30967fff637a4f782d7ab4b848 files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087 AUX conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 SHA1 16922786a79807fa3233d1af105a99582d3486a5 SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 files/conf/lighttpd.conf 8182 @@ -80,6 +88,7 @@ RMD160 4f604c9c54aca1bc58b171121e8ce823561e6694 files/spawn-fcgi.initd 1383 SHA256 ad2582f8b05523a13c147d57b948e58ba31758cd8af0a45cbf39964ac094a2f6 files/spawn-fcgi.initd 1383 DIST lighttpd-1.3.16.tar.gz 706362 RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 SHA1 47449370b58f488350a54d54b416747228e4120f SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369 DIST lighttpd-1.4.11.tar.gz 781656 RMD160 0434e6c09383f1ad443d985fd168a29f6f132d1f SHA1 ca904d3d4d9dde76f85156f2c709a394f30e28c8 SHA256 7782ac82af8ea8d14df5d35b6668c0d45c00f3ba43a6203c29c7fe7dfe98999c +DIST lighttpd-1.4.13.tar.gz 797813 RMD160 4e67e42dc3692d50c044561cc903de7b906f260c SHA1 b17553e66609f85baec50263712a4a5aeca50ca5 SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 EBUILD lighttpd-1.3.16.ebuild 2586 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 SHA1 0984b9d7fb378b6b7bb08fd8155ff30b480adac0 SHA256 12818ec066898a0e019dcbb50fb4d190fe60363052d03213e8b5e4f4da5bbfe1 MD5 21b1cf627412a4e10256724537880485 lighttpd-1.3.16.ebuild 2586 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 lighttpd-1.3.16.ebuild 2586 @@ -88,10 +97,14 @@ EBUILD lighttpd-1.4.11.ebuild 5433 RMD160 15516a26053769cfd979bbc170688bcc231b7d MD5 29011edc4969d9601390836b3cab781b lighttpd-1.4.11.ebuild 5433 RMD160 15516a26053769cfd979bbc170688bcc231b7d5e lighttpd-1.4.11.ebuild 5433 SHA256 ed8d1062e31147f5d4f8813c0d9e8c684db1c6597916565aebf0f32d3220c6f5 lighttpd-1.4.11.ebuild 5433 -MISC ChangeLog 25398 RMD160 42526b566782a86e611b2de3693f329c2331a8e0 SHA1 04565ea49301b5c8e4aec6d7eef876f597b77251 SHA256 eee384f630fa7d6ad9ae280d7f85c8aee92006c2f2aa317d10d7190592fca117 -MD5 54d90b04914a1e2acbe1fb7ead8b3bb5 ChangeLog 25398 -RMD160 42526b566782a86e611b2de3693f329c2331a8e0 ChangeLog 25398 -SHA256 eee384f630fa7d6ad9ae280d7f85c8aee92006c2f2aa317d10d7190592fca117 ChangeLog 25398 +EBUILD lighttpd-1.4.13.ebuild 5444 RMD160 c60ad5420706fc0656e2c99a69c580dff65d183c SHA1 23e0c7d2766c7fe76f356114560f626d342c3c7c SHA256 e13f4ea82a471603f823e6695f49775c37c597d64990b60e46e155a1630f3ab5 +MD5 b4b30928194f2f54f4d3fd0d44fab2d8 lighttpd-1.4.13.ebuild 5444 +RMD160 c60ad5420706fc0656e2c99a69c580dff65d183c lighttpd-1.4.13.ebuild 5444 +SHA256 e13f4ea82a471603f823e6695f49775c37c597d64990b60e46e155a1630f3ab5 lighttpd-1.4.13.ebuild 5444 +MISC ChangeLog 25665 RMD160 bdc74f64ab260a1ba8972601d05ddc632d86b910 SHA1 a627707eff6d3435e317a49394a73b75b77eb79c SHA256 965d06a3dbc842669c4f9e35955ab6a5883bb7e4c0838f93e85adc8e5cc46987 +MD5 540d68cec70a1e1426c8bfa48faa38ba ChangeLog 25665 +RMD160 bdc74f64ab260a1ba8972601d05ddc632d86b910 ChangeLog 25665 +SHA256 965d06a3dbc842669c4f9e35955ab6a5883bb7e4c0838f93e85adc8e5cc46987 ChangeLog 25665 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725 @@ -102,3 +115,6 @@ SHA256 ab1ef738bc2850a97e6a69183d8a8e19e07dd08103b3e7bca611f1b545851b81 files/di MD5 c8db26191b779d4a3d84919e681ddffd files/digest-lighttpd-1.4.11 247 RMD160 b24bbce0321852d8953330bd31b51a0c1b9959ab files/digest-lighttpd-1.4.11 247 SHA256 134236010b24b21a1a403a663ca1fc927bee6247a0f9b3ba8b2d525905381d82 files/digest-lighttpd-1.4.11 247 +MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13 247 +RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13 247 +SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13 247 diff --git a/www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff b/www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff new file mode 100644 index 000000000000..56f4243218e0 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.13/01_lighttpd-1.4.13-99cpu-fix.diff @@ -0,0 +1,11 @@ +--- src/connections.c.orig 2007-01-05 10:56:08.000000000 -0800 ++++ src/connections.c 2007-01-05 10:56:23.000000000 -0800 +@@ -970,7 +970,7 @@ + } + } else { + /* a splited \r \n */ +- return -1; ++ break; + } + } + } diff --git a/www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff b/www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff new file mode 100644 index 000000000000..aa051c7e1b36 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff @@ -0,0 +1,41 @@ +--- lighttpd-1.4.13/src/mod_fastcgi.c 2006-10-05 03:22:32.000000000 -0700 ++++ lighttpd-1.4.13.patch/src/mod_fastcgi.c 2006-10-18 00:57:19.000000000 -0700 +@@ -1875,8 +1875,36 @@ + fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_ADDR"), s, strlen(s)); + + if (!buffer_is_empty(con->authed_user)) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"), +- CONST_BUF_LEN(con->authed_user)); ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("REMOTE_USER"), CONST_BUF_LEN(con->authed_user)); ++ ++ /* AUTH_TYPE fix by Troy Kruthoff (tkruthoff@gmail.com) ++ * section 4.1.1 of RFC 3875 (cgi spec) requires the server to set a AUTH_TYPE env ++ * declaring the type of authentication used. (see http://tools.ietf.org/html/rfc3875#page-11) ++ * ++ * I copied this code from mod_auth.c where it extracts auth info from the "Authorization" ++ * header to authenticate the user before allowing the request to proceed. I'm guessing it makes ++ * sense to re-parse the header here, as mod_auth is unaware if the request is headed for cgi/fcgi. ++ * Someone more familiar with the lighty internals should be able to quickly determine if we are ++ * better storing AUTH_TYPE on the initial parse in mod_auth. ++ */ ++ char *http_authorization = NULL; ++ data_string *ds; ++ ++ if (NULL != (ds = (data_string *)array_get_element(con->request.headers, "Authorization"))) { ++ http_authorization = ds->value->ptr; ++ } ++ ++ if (ds && ds->value && ds->value->used) { ++ char *auth_realm; ++ if (NULL != (auth_realm = strchr(http_authorization, ' '))) { ++ int auth_type_len = auth_realm - http_authorization; ++ if ((auth_type_len == 5) && (0 == strncmp(http_authorization, "Basic", auth_type_len))) { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("AUTH_TYPE"), CONST_STR_LEN("Basic")); ++ } else if ((auth_type_len == 6) && (0 == strncmp(http_authorization, "Digest", auth_type_len))) { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("AUTH_TYPE"), CONST_STR_LEN("Digest")); ++ } ++ } ++ } + } + + if (con->request.content_length > 0 && host->mode != FCGI_AUTHORIZER) { diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13 new file mode 100644 index 000000000000..7a885e91935a --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.13 @@ -0,0 +1,3 @@ +MD5 d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz 797813 +RMD160 4e67e42dc3692d50c044561cc903de7b906f260c lighttpd-1.4.13.tar.gz 797813 +SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 lighttpd-1.4.13.tar.gz 797813 diff --git a/www-servers/lighttpd/lighttpd-1.4.13.ebuild b/www-servers/lighttpd/lighttpd-1.4.13.ebuild new file mode 100644 index 000000000000..8f8abbc12f4b --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.13.ebuild @@ -0,0 +1,204 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13.ebuild,v 1.1 2007/01/07 10:36:39 robbat2 Exp $ + +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest +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.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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 ) + memcache? ( dev-libs/libmemcache ) + mysql? ( >=virtual/mysql-4.0 ) + pcre? ( >=dev-libs/libpcre-3.1 ) + php? ( + virtual/httpd-php + !net-www/spawn-fcgi + ) + rrdtool? ( net-analyzer/rrdtool ) + ssl? ( >=dev-libs/openssl-0.9.7 ) + webdav? ( + dev-libs/libxml2 + >=dev-db/sqlite-3 + ) + 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.* + use rrdtool || rm -f ${libdir}/mod_rrdtool.* + + if ! use fastcgi ; then + rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \ + ${D}/usr/share/man/man1/spawn-fcgi.* + 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_unpack() { + unpack ${A} + cd ${S} + + EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV} || die "Patching failed!" + + eautoreconf || die + + # 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" + + # fix typo + sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \ + die "sed doc/cml.txt failed" +} + +src_compile() { + 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 xattr attr) \ + || die "econf failed" + + 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 + + if use php || use fastcgi ; then + newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die + newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die + fi + + # configs + insinto /etc/lighttpd + doins ${FILESDIR}/conf/*.conf + + # 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 + + use minimal && remove_non_essential +} + +pkg_postinst () { + echo + if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then + einfo "spawn-fcgi is now included with lighttpd" + 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 "As of lighttpd-1.4.1, Gentoo has a customized configuration," + ewarn "which is now located in /etc/lighttpd. Please migrate your" + ewarn "existing configuration." + ebeep 5 + fi + + if use fam ; then + einfo "Remember to re-emerge lighttpd should you switch from" + einfo "app-admin/famd to app-admin/gamin or vice versa." + fi + echo +} -- 2.26.2