From 00cd747070b182eb1704a1b267c47a8413f9d575 Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Sun, 5 Jun 2005 17:59:47 +0000 Subject: Revision bump; added pam name patch from tigger^. Package-Manager: portage-2.0.51.22-r1 --- www-servers/lighttpd/ChangeLog | 10 ++- www-servers/lighttpd/Manifest | 16 ++-- www-servers/lighttpd/files/digest-lighttpd-1.3.11 | 1 - www-servers/lighttpd/files/digest-lighttpd-1.3.13 | 1 - .../lighttpd/files/digest-lighttpd-1.3.13-r2 | 1 + .../lighttpd/files/lighttpd-1.3.11-upstream.diff | 24 ------ .../lighttpd/files/lighttpd-1.3.13-pam-name.diff | 12 +++ www-servers/lighttpd/lighttpd-1.3.11.ebuild | 86 -------------------- www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild | 91 ++++++++++++++++++++++ www-servers/lighttpd/lighttpd-1.3.13.ebuild | 85 -------------------- 10 files changed, 120 insertions(+), 207 deletions(-) delete mode 100644 www-servers/lighttpd/files/digest-lighttpd-1.3.11 delete mode 100644 www-servers/lighttpd/files/digest-lighttpd-1.3.13 create mode 100644 www-servers/lighttpd/files/digest-lighttpd-1.3.13-r2 delete mode 100644 www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff create mode 100644 www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff delete mode 100644 www-servers/lighttpd/lighttpd-1.3.11.ebuild create mode 100644 www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild delete mode 100644 www-servers/lighttpd/lighttpd-1.3.13.ebuild (limited to 'www-servers/lighttpd') diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 3bf2f59f6a71..0c75f90e3570 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.16 2005/05/13 13:49:34 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.17 2005/06/05 17:59:47 ka0ttic Exp $ + +*lighttpd-1.3.13-r2 (05 Jun 2005) + + 05 Jun 2005; Aaron Walker + -files/lighttpd-1.3.11-upstream.diff, + +files/lighttpd-1.3.13-pam-name.diff, -lighttpd-1.3.11.ebuild, + -lighttpd-1.3.13.ebuild, +lighttpd-1.3.13-r2.ebuild: + Revision bump; added pam name patch from tigger^. *lighttpd-1.3.13-r1 (13 May 2005) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 2d4f34d15f24..1fc965604997 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,11 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 cd23797541ff4bbc3da62538ae699dd1 lighttpd-1.3.13.ebuild 2138 +MD5 378ffce2346d85a3d3c04e769e725480 lighttpd-1.3.13-r2.ebuild 2381 MD5 2ee7defa9578776786620b0864ca3bbc lighttpd-1.3.10-r1.ebuild 2160 MD5 3e5bb5d47d1b107f11b702af81b85451 lighttpd-1.3.13-r1.ebuild 2342 -MD5 1012bda0e37285755f02211ea2ebff71 lighttpd-1.3.11.ebuild 2161 -MD5 1189f53e97f5c2b21901675c30d8f087 ChangeLog 5206 +MD5 435dec9851d4efe403e2461a47548c19 ChangeLog 5503 MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383 @@ -13,19 +12,18 @@ MD5 8648177a5f9a79cd4ba0eaaa4e769fdc files/lighttpd-1.3.11-gentoo.diff 1784 MD5 7a09197e7483749e8963e177138c7622 files/lighttpd-1.3.10.initd 661 MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67 MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r1 67 -MD5 19489693ecfbff88c20b9ef33fef1df6 files/digest-lighttpd-1.3.11 67 -MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13 67 +MD5 77ba3937d1e8762f8d8b6b2ea9ee1aaa files/digest-lighttpd-1.3.13-r2 67 MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974 MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971 -MD5 353d4b620cc5f277554ac570d5e45b3c files/lighttpd-1.3.11-upstream.diff 786 MD5 5eb378dcd8905a09175df3e48953100c files/lighttpd-1.3.13-zope-deserves-lovins-too.diff 5970 MD5 da762512b4ae8682e353873c4f9d31bd files/lighttpd-1.3.11-php.diff 1332 MD5 0c57eeef1963af5add8b9608e0bc0d0f files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456 MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777 +MD5 44374d14af9b69b8f60f8d73f14c848d files/lighttpd-1.3.13-pam-name.diff 564 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFChLCHEZCkKN40op4RAhtXAJsGNIg7BjZXOkZR7R4kSWeC2FUVBQCfXGwz -972SJPHMk/DM6Pc9Q7tGttI= -=YmSi +iD8DBQFCoz2uEZCkKN40op4RAuYKAKC66Xe45wvHYd4LNkYt178+ZNMsKgCgu7qS +suHxobO7n5z6PN/3/49vrCA= +=ghoF -----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.11 b/www-servers/lighttpd/files/digest-lighttpd-1.3.11 deleted file mode 100644 index 177f1b482eb0..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 730c9b9d743360d23e523968ab4fe7c5 lighttpd-1.3.11.tar.gz 670438 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.13 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13 deleted file mode 100644 index d17be2479447..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.13 +++ /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.13-r2 b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r2 new file mode 100644 index 000000000000..d17be2479447 --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.13-r2 @@ -0,0 +1 @@ +MD5 2f017b936be376ad6f6c2ee26db93467 lighttpd-1.3.13.tar.gz 680068 diff --git a/www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff b/www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff deleted file mode 100644 index 35d4f1408f85..000000000000 --- a/www-servers/lighttpd/files/lighttpd-1.3.11-upstream.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff --exclude='*~' -urN lighttpd-1.3.11.orig/src/mod_cgi.c lighttpd-1.3.11/src/mod_cgi.c ---- lighttpd-1.3.11.orig/src/mod_cgi.c 2005-02-22 22:22:46.000000000 -0500 -+++ lighttpd-1.3.11/src/mod_cgi.c 2005-02-23 06:24:09.490319288 -0500 -@@ -690,12 +690,14 @@ - - #ifndef __WIN32 - -- /* stat the exec file */ -- if (-1 == (stat(cgi_handler->ptr, &st))) { -- log_error_write(srv, __FILE__, __LINE__, "sbss", -- "stat for cgi-handler", cgi_handler, -- "failed:", strerror(errno)); -- return -1; -+ if (cgi_handler->used > 1) { -+ /* stat the exec file */ -+ if (-1 == (stat(cgi_handler->ptr, &st))) { -+ log_error_write(srv, __FILE__, __LINE__, "sbss", -+ "stat for cgi-handler", cgi_handler, -+ "failed:", strerror(errno)); -+ return -1; -+ } - } - - if (pipe(to_cgi_fds)) { diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff new file mode 100644 index 000000000000..e29f15d5b764 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.3.13-pam-name.diff @@ -0,0 +1,12 @@ +diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/src/http_auth.c lighttpd-1.3.13/src/http_auth.c +--- lighttpd-1.3.13.orig/src/http_auth.c 2005-06-05 13:54:29.000000000 -0400 ++++ lighttpd-1.3.13/src/http_auth.c 2005-06-05 13:56:20.000000000 -0400 +@@ -457,7 +457,7 @@ + pam_handle_t *pamh=NULL; + int retval; + +- retval = pam_start("login", username->ptr, &conv, &pamh); ++ retval = pam_start("lighttpd", username->ptr, &conv, &pamh); + + if (retval == PAM_SUCCESS) + retval = pam_authenticate(pamh, 0); /* is user really user? */ diff --git a/www-servers/lighttpd/lighttpd-1.3.11.ebuild b/www-servers/lighttpd/lighttpd-1.3.11.ebuild deleted file mode 100644 index ce0f559420c2..000000000000 --- a/www-servers/lighttpd/lighttpd-1.3.11.ebuild +++ /dev/null @@ -1,86 +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.11.ebuild,v 1.1 2005/02/23 11:37:25 ka0ttic Exp $ - -inherit eutils - -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="~x86 ~ppc" -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}/${P}-upstream.diff - epatch ${FILESDIR}/${P}-gentoo.diff - use php && epatch ${FILESDIR}/${P}-php.diff -} - -src_compile() { - local my_conf="--libdir=/usr/$(get_libdir)/${PN}" - - 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-r2.ebuild b/www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild new file mode 100644 index 000000000000..00c6b6c415f9 --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.3.13-r2.ebuild @@ -0,0 +1,91 @@ +# 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-r2.ebuild,v 1.1 2005/06/05 17:59:47 ka0ttic Exp $ + +inherit eutils + +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="~x86 ~ppc" +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 + epatch ${FILESDIR}/${P}-pam-name.diff + use php && epatch ${FILESDIR}/${PN}-1.3.11-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.ebuild b/www-servers/lighttpd/lighttpd-1.3.13.ebuild deleted file mode 100644 index fac35370a34d..000000000000 --- a/www-servers/lighttpd/lighttpd-1.3.13.ebuild +++ /dev/null @@ -1,85 +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.ebuild,v 1.1 2005/03/07 10:30:45 ka0ttic Exp $ - -inherit eutils - -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="~x86 ~ppc" -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 - use php && epatch ${FILESDIR}/${PN}-1.3.11-php.diff -} - -src_compile() { - local my_conf="--libdir=/usr/$(get_libdir)/${PN}" - - 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 -} -- cgit v1.2.3-65-gdbad