diff options
| -rw-r--r-- | www-servers/lighttpd/ChangeLog | 10 | ||||
| -rw-r--r-- | www-servers/lighttpd/Manifest | 17 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1 | 1 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/digest-lighttpd-1.3.14-r1 | 1 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/digest-lighttpd-1.3.16 | 1 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff | 123 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild | 94 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild | 4 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.3.16.ebuild (renamed from www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild) | 5 |
9 files changed, 145 insertions, 111 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index a02f2fd1103f..c9e359a962ff 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for www-servers/lighttpd # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.23 2005/07/17 11:57:52 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.24 2005/08/02 13:17:59 ka0ttic Exp $ + +*lighttpd-1.3.16 (02 Aug 2005) + + 02 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> + +files/lighttpd-1.3.16-zope-deserves-lovins-too.diff, + -lighttpd-1.3.13-r1.ebuild, lighttpd-1.3.13-r3.ebuild, + -lighttpd-1.3.14-r1.ebuild, +lighttpd-1.3.16.ebuild: + Version bump; 1.3.13-r3 stable on x86; tidy old ebuilds. *lighttpd-1.3.15 (17 Jul 2005) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 72e2e9cdf252..2ff46484756f 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -2,11 +2,10 @@ Hash: SHA1 MD5 bf33a45d7149d7b9d4e719ff3174a65c lighttpd-1.3.15.ebuild 2480 -MD5 b726a3c1f9efa04f543d8ad576e5287d lighttpd-1.3.14-r1.ebuild 2483 MD5 4f68ff1ad2dd0b01e11474dede6e62f0 lighttpd-1.3.10-r1.ebuild 2181 -MD5 8b4348a856b6d060a9897167b5e72302 lighttpd-1.3.13-r1.ebuild 2360 -MD5 449488d5d6fbf6345e69735f6083304d lighttpd-1.3.13-r3.ebuild 2482 -MD5 d994b0d75e4d4f2fa0cd82103f67be50 ChangeLog 6914 +MD5 f4a8529a3655873acba6c5d690bb471f lighttpd-1.3.16.ebuild 2423 +MD5 b8935dbb5e02292fdf75347124e29c38 lighttpd-1.3.13-r3.ebuild 2481 +MD5 328a5e5808107c21cef5de178bdab5c9 ChangeLog 7223 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076 MD5 f984dc26b2bc491272d302ab453f6e6b files/lighttpd-1.3.13-ldap-binddn.diff 3863 @@ -15,11 +14,11 @@ MD5 9cc5ffbffdd7554797c338c5972ed813 files/lighttpd-1.3.13-valid-user.diff 762 MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784 MD5 7fdb430fc7240e6e6a9078e4e57f6322 files/lighttpd-1.3.10.initd 666 MD5 f111e60bb593bffbdb01b9aece46ab20 files/lighttpd-1.3.13-php.diff 1399 +MD5 dd1691d04eda1cb0ff916c08f8907db8 files/lighttpd-1.3.16-zope-deserves-lovins-too.diff 4669 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67 -MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r1 67 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r3 67 -MD5 c18826cf0d687fd3c9fb6456e60c28d6 files/digest-lighttpd-1.3.14-r1 67 MD5 2299a6229d7b298b7b0f66d611c041d9 files/digest-lighttpd-1.3.15 67 +MD5 c54a6d92e91493bbb27e8f346f6ac342 files/digest-lighttpd-1.3.16 67 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970 @@ -29,7 +28,7 @@ MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFC2kgKEZCkKN40op4RAhFbAJ9v9l9eaXsJMm0nDOU26b241KsQlwCeMNJH -76mA2p6pCE1lclptvh2ePp4= -=yZi6 +iD8DBQFC73LNEZCkKN40op4RApTlAKCtR1YvJg/rJsLv39Y9ztxFAz73CQCgqxRU +zdCQDkA9v3ghHx//Yl6zY6k= +=buKc -----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1 deleted file mode 100644 index d17be2479447..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz 680068 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.14-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.3.14-r1 deleted file mode 100644 index 98c3c2aa243f..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.14-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 16d9f8c40bcb5638ee452fa23b21e346 lighttpd-1.3.14.tar.gz 691059 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.16 b/www-servers/lighttpd/files/digest-lighttpd-1.3.16 new file mode 100644 index 000000000000..42a48002fd67 --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.16 @@ -0,0 +1 @@ +MD5 b73f7a7ace4901b6417b0e450aaa5df5 lighttpd-1.3.16.tar.gz 706362 diff --git a/www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff b/www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff new file mode 100644 index 000000000000..cd9c5e0ae241 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.3.16-zope-deserves-lovins-too.diff @@ -0,0 +1,123 @@ +diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.16.orig/src/mod_fastcgi.c lighttpd-1.3.16/src/mod_fastcgi.c +--- lighttpd-1.3.16.orig/src/mod_fastcgi.c 2005-08-01 23:15:30.000000000 -0400 ++++ lighttpd-1.3.16/src/mod_fastcgi.c 2005-08-01 23:30:01.000000000 -0400 +@@ -331,6 +331,8 @@ + + pid_t pid; + int got_proc; ++ ++ buffer *extension; /* used extension, used for SCRIPT_NAME/PATH_INFO of check-local=0 */ + + plugin_config conf; + +@@ -357,6 +359,7 @@ + hctx->response = buffer_init(); + hctx->response_header = buffer_init(); + hctx->write_buffer = buffer_init(); ++ hctx->extension = buffer_init(); + + hctx->request_id = 0; + hctx->state = FCGI_STATE_INIT; +@@ -377,6 +380,7 @@ + buffer_free(hctx->response); + buffer_free(hctx->response_header); + buffer_free(hctx->write_buffer); ++ buffer_free(hctx->extension); + + if (hctx->rb) { + if (hctx->rb->ptr) free(hctx->rb->ptr); +@@ -1654,22 +1658,74 @@ + * For AUTHORIZER mode these headers should be omitted. + */ + +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path)); ++ if (host->check_local == 0 && ++ !buffer_is_empty(hctx->extension) && ++ hctx->extension->ptr[0] == '/') { ++ char *sl; ++ /* no local check and path-prefix /fcgi_pattern ++ * ++ * zope needs this ++ * ++ * SCRIPT_NAME => /fcgi_pattern ++ * PATH_INFO => uri.path - /fcgi_pattern ++ * ++ */ ++ ++ /* search for / in uri.path after /fcgi_pattern ++ * ++ * uri.path = /zope/abc ++ * ++ * pattern SCRIPT_NAME PATH_INFO ++ * /zop /zope /abc ++ * /zope/ /zope /abc ++ * /zope/abc /zope/abc (empty) ++ * / /zope/abc (empty) ++ * ++ */ ++ if (hctx->extension->used == 2) { ++ /* ext is / only */ ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_STR_LEN("")); ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->uri.path)); ++ ++ } else if (hctx->extension->ptr[hctx->extension->used - 2] == '/') { ++ /* last character is a / */ ++ ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), con->uri.path->ptr, hctx->extension->used - 2); ++ if (con->uri.path->used > hctx->extension->used) { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), ++ con->uri.path->ptr + hctx->extension->used - 2, ++ con->uri.path->used - hctx->extension->used + 1); ++ } else { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN("")); ++ } ++ ++ } else if (NULL != (sl = strchr(con->uri.path->ptr + hctx->extension->used - 1, '/'))) { ++ /* a trailing slash was found */ ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), con->uri.path->ptr, sl - con->uri.path->ptr - 1); ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), sl, strlen(sl)); ++ } else { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path)); ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN("")); ++ } ++ ++ } else { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path)); + +- if (!buffer_is_empty(con->request.pathinfo)) { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo)); +- +- /* PATH_TRANSLATED is only defined if PATH_INFO is set */ ++ if (!buffer_is_empty(con->request.pathinfo)) { ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_BUF_LEN(con->request.pathinfo)); ++ ++ /* PATH_TRANSLATED is only defined if PATH_INFO is set */ + +- if (!buffer_is_empty(host->docroot)) { +- buffer_copy_string_buffer(p->path, host->docroot); ++ if (!buffer_is_empty(host->docroot)) { ++ buffer_copy_string_buffer(p->path, host->docroot); ++ } else { ++ buffer_copy_string_buffer(p->path, con->physical.doc_root); ++ } ++ buffer_append_string_buffer(p->path, con->request.pathinfo); ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path)); + } else { +- buffer_copy_string_buffer(p->path, con->physical.doc_root); ++ fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN("")); + } +- buffer_append_string_buffer(p->path, con->request.pathinfo); +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_TRANSLATED"), CONST_BUF_LEN(p->path)); +- } else { +- fcgi_env_add(p->fcgi_env, CONST_STR_LEN("PATH_INFO"), CONST_STR_LEN("")); + } + } + +@@ -3044,6 +3100,7 @@ + + hctx = handler_ctx_init(); + ++ buffer_copy_string_buffer(hctx->extension, extension->key); + hctx->remote_conn = con; + hctx->plugin_data = p; + hctx->host = host; diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild deleted file mode 100644 index 3f77163e03d6..000000000000 --- a/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r1.ebuild,v 1.4 2005/07/17 11:57:52 ka0ttic Exp $ - -inherit eutils - -RESTRICT="test" - -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="~amd64 ~ppc ~x86" -IUSE="mysql ssl php xattr ldap" - -RDEPEND="virtual/libc - app-arch/bzip2 - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - ldap? ( >=net-nds/openldap-2.1.26 ) - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - php? ( - >=dev-php/php-cgi-4.3.0 - !net-www/spawn-fcgi - )" - -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -pkg_setup() { - enewgroup lighttpd - enewuser lighttpd -1 /bin/false "${LIGHTTPD_DIR}" lighttpd -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff - epatch ${FILESDIR}/${P}-no-mysql-means-no-mysql.diff - epatch ${FILESDIR}/${P}-zope-deserves-lovins-too.diff - use php && epatch ${FILESDIR}/${P}-php.diff -} - -src_compile() { - local my_conf="--libdir=/usr/$(get_libdir)/${PN}" - - einfo "Regenerating automake/autoconf files" - autoreconf -f -i || die "autoreconf failed" - - econf ${my_conf} \ - $(use_with mysql) \ - $(use_with ldap) \ - $(use_with xattr attr) \ - $(use_with ssl openssl) || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - insinto /etc - doins doc/lighttpd.conf || die "doins failed" - - newinitd ${FILESDIR}/${PN}-1.3.10.initd ${PN} - - if use php ; then - newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi - newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi - fi - - keepdir ${LIGHTTPD_DIR} ${LOG_DIR} || die "keepdir failed" - fowners lighttpd:lighttpd ${LOG_DIR} || die "fowners failed" - - dodoc README COPYING - cd doc - dodoc *.txt *.sh *.ps.gz - newdoc lighttpd.conf lighttpd.conf.example || die "newdoc failed" -} - -pkg_postinst () { - echo - einfo "lighttpd.conf has moved from /etc/conf.d to /etc" - if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then - einfo - 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." - fi - echo -} diff --git a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild index 88508f16ce80..52312b841f1a 100644 --- a/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild +++ b/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.4 2005/07/17 11:57:52 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.13-r3.ebuild,v 1.5 2005/08/02 13:17:59 ka0ttic Exp $ inherit eutils @@ -12,7 +12,7 @@ SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="mysql ssl php xattr ldap" RDEPEND="virtual/libc diff --git a/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild b/www-servers/lighttpd/lighttpd-1.3.16.ebuild index ea71bae24393..5448974dba61 100644 --- a/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.3.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.14-r1.ebuild,v 1.2 2005/07/17 11:57:52 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.16.ebuild,v 1.1 2005/08/02 13:17:59 ka0ttic Exp $ inherit eutils @@ -40,10 +40,9 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff - epatch ${FILESDIR}/${PN}-1.3.13-zope-deserves-lovins-too.diff - epatch ${FILESDIR}/${PN}-1.3.13-valid-user.diff epatch ${FILESDIR}/${PN}-1.3.13-ldap-binddn.diff use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff + epatch ${FILESDIR}/${P}-zope-deserves-lovins-too.diff } src_compile() { |