diff options
Diffstat (limited to 'www-servers')
15 files changed, 149 insertions, 267 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index fbd5f1857dd7..18df1086c7c4 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,18 @@ # 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.10 2005/02/14 11:39:01 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.11 2005/02/14 14:48:29 ka0ttic Exp $ + +*lighttpd-1.3.10-r1 (14 Feb 2005) + + 14 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> + files/lighttpd-1.1.8-gentoo.diff, +files/lighttpd-1.3.10-gentoo.diff, + files/lighttpd-1.3.10-php.diff, +files/lighttpd-1.3.10-upstream.diff, + -files/lighttpd.initd, -lighttpd-1.1.8-r1.ebuild, -lighttpd-1.1.8.ebuild, + -lighttpd-1.2.2.ebuild, +lighttpd-1.3.10-r1.ebuild, + -lighttpd-1.3.10.ebuild: + Revision bump; fixed manual page patching which should occur in the -gentoo + patch, not the -php patch. Also added some post-1.3.10 upstream fixes and + fixed LICENSE. *lighttpd-1.3.10 (14 Feb 2005) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 17b01762b5bc..352a09692bc5 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,30 +1,15 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 4750f33210e9131c3697e0b093b27325 lighttpd-1.3.5.ebuild 2345 -MD5 652480723c1420c6f1b84a9c97a8c21f lighttpd-1.3.10.ebuild 2608 -MD5 06f884c7ab1b91b0e2910d79fb4f9c74 lighttpd-1.1.8.ebuild 1923 -MD5 276acf7b725ea3cc31e0ff3ad79d24eb lighttpd-1.1.8-r1.ebuild 1926 -MD5 3024a23f39f07e22494335728970d301 ChangeLog 3378 +MD5 0ac423da1402b0f7d2e40587ae8f8dc8 lighttpd-1.3.10-r1.ebuild 2636 +MD5 7850a272390458bca4e7e1db574486d2 ChangeLog 3935 MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225 -MD5 4084d21b36bf6a0dc9349fa75ccacde9 lighttpd-1.2.2.ebuild 2046 MD5 1d925aed297ec4541fb230dd19e11bc1 files/spawn-fcgi.confd 1076 MD5 e605a4ead0ce7b1e0788c0b0b1161871 files/spawn-fcgi.initd 1383 MD5 32569e20d3ecdd51ac0534cc85d52354 files/lighttpd-1.2.2-php.diff 1184 MD5 7a09197e7483749e8963e177138c7622 files/lighttpd-1.3.10.initd 661 MD5 dcfa5883c3433b49204b6b4de25a9a3c files/lighttpd-1.2.2.initd 800 -MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10 67 -MD5 91e4a4594c8cc136d7acf8f161e3840e files/lighttpd-1.3.10-php.diff 1356 -MD5 0b20460d5762811ccb8312c2666107e6 files/lighttpd.initd 635 -MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8 66 -MD5 0d9277bbfb98755640329afa81c8bee2 files/digest-lighttpd-1.2.2 66 +MD5 39a52ad2d8f21296e767ee2663243716 files/digest-lighttpd-1.3.10-r1 67 +MD5 1b01aa98985e773539dc8b6dc0be977f files/lighttpd-1.3.10-upstream.diff 1974 +MD5 4bb3bdffa967a53d266668b1040f2678 files/lighttpd-1.3.10-php.diff 971 MD5 0cf0d92da4da90a9fc4f1b9a58b4eb1e files/digest-lighttpd-1.3.5 66 -MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301 -MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8-r1 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCEI5VEZCkKN40op4RAi+cAJ9XYo74+EnUyoOf+SA4ntJ17yB9BQCfTtb1 -edxKhWpvkp8G0FuhrbwQrKY= -=kIKv ------END PGP SIGNATURE----- +MD5 40dd57c102e7cefdabf25bff26e5124c files/lighttpd-1.1.8-gentoo.diff 1577 +MD5 faeefb6d35a7cd7b4a2b4b78d63622f7 files/lighttpd-1.3.10-gentoo.diff 1777 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.1.8 b/www-servers/lighttpd/files/digest-lighttpd-1.1.8 deleted file mode 100644 index 1b351f1c99d1..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.1.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 1f955ac35765a2630050a0cbf113d15f lighttpd-1.1.8.tar.gz 536169 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.1.8-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.1.8-r1 deleted file mode 100644 index 1b351f1c99d1..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.1.8-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1f955ac35765a2630050a0cbf113d15f lighttpd-1.1.8.tar.gz 536169 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.2.2 b/www-servers/lighttpd/files/digest-lighttpd-1.2.2 deleted file mode 100644 index 912463f0f519..000000000000 --- a/www-servers/lighttpd/files/digest-lighttpd-1.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 37877e1df7e6d2fea2728c3c5b10e9f5 lighttpd-1.2.2.tar.gz 558948 diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.3.10 b/www-servers/lighttpd/files/digest-lighttpd-1.3.10-r1 index 2084989a4e2c..2084989a4e2c 100644 --- a/www-servers/lighttpd/files/digest-lighttpd-1.3.10 +++ b/www-servers/lighttpd/files/digest-lighttpd-1.3.10-r1 diff --git a/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff index f75fd3ccbe20..8df2fb291728 100644 --- a/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff +++ b/www-servers/lighttpd/files/lighttpd-1.1.8-gentoo.diff @@ -1,3 +1,14 @@ +--- doc/lighttpd.1.orig 2005-02-06 23:58:57.661234800 -0500 ++++ doc/lighttpd.1 2005-02-06 23:59:30.758203296 -0500 +@@ -5,7 +5,7 @@ + lighttpd -D -f <configfile> + .SH DESCRIPTION + .SH FILES +-/etc/lighttpd/lighttpd.conf ++/etc/lighttpd.conf + .SH CONFORMING TO + HTTP/1.0 + HTTP/1.0 --- doc/lighttpd.conf.orig 2004-04-23 18:31:13.985795352 +0100 +++ doc/lighttpd.conf 2004-04-23 18:34:00.191528240 +0100 @@ -25,10 +25,10 @@ diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-gentoo.diff new file mode 100644 index 000000000000..9a77e7ef60b8 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.3.10-gentoo.diff @@ -0,0 +1,50 @@ +diff --exclude='*~' -urN lighttpd-1.3.10.orig/doc/lighttpd.1 lighttpd-1.3.10/doc/lighttpd.1 +--- lighttpd-1.3.10.orig/doc/lighttpd.1 2005-02-14 09:06:23.787031048 -0500 ++++ lighttpd-1.3.10/doc/lighttpd.1 2005-02-14 09:06:57.909397488 -0500 +@@ -5,7 +5,7 @@ + lighttpd -D -f <configfile> + .SH DESCRIPTION + .SH FILES +-/etc/lighttpd/lighttpd.conf ++/etc/lighttpd.conf + .SH CONFORMING TO + HTTP/1.0 + HTTP/1.0 +diff --exclude='*~' -urN lighttpd-1.3.10.orig/doc/lighttpd.conf lighttpd-1.3.10/doc/lighttpd.conf +--- lighttpd-1.3.10.orig/doc/lighttpd.conf 2005-02-14 09:06:23.787031048 -0500 ++++ lighttpd-1.3.10/doc/lighttpd.conf 2005-02-14 09:08:14.745722997 -0500 +@@ -35,10 +35,10 @@ + + ## a static document-root, for virtual-hosting take look at the + ## server.virtual-* options +-server.document-root = "/www/pages/" ++server.document-root = "/var/www/localhost/htdocs/" + + ## where to send error-messages to +-server.errorlog = "/www/logs/lighttpd.error.log" ++server.errorlog = "/var/log/lighttpd/error.log" + + # files to check for if .../ is requested + server.indexfiles = ( "index.php", "index.html", +@@ -103,7 +103,7 @@ + # server.tag = "lighttpd" + + #### accesslog module +-accesslog.filename = "/www/logs/access.log" ++accesslog.filename = "/var/log/lighttpd/access.log" + + ## deny access the file-extensions + # +@@ -164,10 +164,10 @@ + #server.chroot = "/" + + ## change uid to <uid> (default: don't care) +-#server.username = "wwwrun" ++server.username = "lighttpd" + + ## change uid to <uid> (default: don't care) +-#server.groupname = "wwwrun" ++server.groupname = "lighttpd" + + #### compress module + #compress.cache-dir = "/tmp/lighttpd/cache/compress/" diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff index f2ec6c0ecefc..6afcda2a8207 100644 --- a/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff +++ b/www-servers/lighttpd/files/lighttpd-1.3.10-php.diff @@ -1,15 +1,3 @@ -diff -urN lighttpd-1.3.10.orig/doc/lighttpd.1 lighttpd-1.3.10/doc/lighttpd.1 ---- lighttpd-1.3.10.orig/doc/lighttpd.1 2005-02-06 23:58:57.661234800 -0500 -+++ lighttpd-1.3.10/doc/lighttpd.1 2005-02-06 23:59:30.758203296 -0500 -@@ -5,7 +5,7 @@ - lighttpd -D -f <configfile> - .SH DESCRIPTION - .SH FILES --/etc/lighttpd/lighttpd.conf -+/etc/lighttpd.conf - .SH CONFORMING TO - HTTP/1.0 - HTTP/1.0 diff -urN lighttpd-1.3.10.orig/doc/lighttpd.conf lighttpd-1.3.10/doc/lighttpd.conf --- lighttpd-1.3.10.orig/doc/lighttpd.conf 2005-02-06 23:58:57.661234800 -0500 +++ lighttpd-1.3.10/doc/lighttpd.conf 2005-02-07 00:00:50.500080688 -0500 diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10-upstream.diff b/www-servers/lighttpd/files/lighttpd-1.3.10-upstream.diff new file mode 100644 index 000000000000..c28dbd688765 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.3.10-upstream.diff @@ -0,0 +1,64 @@ +diff --exclude='*~' -urN lighttpd-1.3.10.orig/src/base.h lighttpd-1.3.10/src/base.h +--- lighttpd-1.3.10.orig/src/base.h 2005-02-14 08:59:15.496738424 -0500 ++++ lighttpd-1.3.10/src/base.h 2005-02-14 09:02:47.454746494 -0500 +@@ -45,6 +45,13 @@ + # define SSIZE_MAX ((size_t)~0 >> 1) + #endif + ++/* for MacOS X */ ++#ifdef __APPLE__ ++# include <crt_externs.h> ++# define environ (* _NSGetEnviron()) ++#else ++ extern char **environ; ++#endif + + /* for solaris 2.5 and NetBSD 1.3.x */ + #ifndef HAVE_SOCKLEN_T +diff --exclude='*~' -urN lighttpd-1.3.10.orig/src/cgi.c lighttpd-1.3.10/src/cgi.c +--- lighttpd-1.3.10.orig/src/cgi.c 2005-02-14 08:59:15.462744036 -0500 ++++ lighttpd-1.3.10/src/cgi.c 2005-02-14 09:00:45.386898712 -0500 +@@ -686,16 +686,17 @@ + + int to_cgi_fds[2]; + int from_cgi_fds[2]; +- struct stat st; +- ++ + #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; ++ struct stat st; ++ 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 --exclude='*~' -urN lighttpd-1.3.10.orig/src/response.c lighttpd-1.3.10/src/response.c +--- lighttpd-1.3.10.orig/src/response.c 2005-02-14 08:59:15.462744036 -0500 ++++ lighttpd-1.3.10/src/response.c 2005-02-14 09:04:16.505044865 -0500 +@@ -1245,13 +1245,6 @@ + default: + break; + } +- +- if (HANDLER_GO_ON == file_cache_get_entry(srv, con, srv->tmp_buf, &(con->fce))) { +- /* rewrite uri.path to the real path (/ -> /index.php) */ +- buffer_append_string_buffer(con->uri.path, ds->value); +- +- break; +- } + } + + if (k == con->conf.indexfiles->used) { diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd deleted file mode 100644 index 73018a9a5781..000000000000 --- a/www-servers/lighttpd/files/lighttpd.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.2 2004/09/28 02:01:03 swegener Exp $ - -PID_FILE="/var/run/lighttpd.pid" -LIGHTTPD_BIN="/usr/sbin/lighttpd" -LIGHTTPD_CONF="/etc/conf.d/lighttpd.conf" - -depend() { - need net - use mysql logger - after sshd -} - -start() { - ebegin "Starting lighttpd" - ${LIGHTTPD_BIN} -u lighttpd -f ${LIGHTTPD_CONF} - RET=$? - pidof lighttpd >${PID_FILE} - eend ${RET} -} - -stop() { - ebegin "Stopping lighttpd" - kill `cat ${PID_FILE}` - RET=$? - eend ${RET} -} diff --git a/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild b/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild deleted file mode 100644 index 231954373213..000000000000 --- a/www-servers/lighttpd/lighttpd-1.1.8-r1.ebuild +++ /dev/null @@ -1,62 +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.1.8-r1.ebuild,v 1.2 2005/01/04 13:34:15 swegener Exp $ - -inherit eutils - -DESCRIPTION="lighttpd is intended to be a frontend for ad-servers which have to deliver small files concurrently to many connections." -HOMEPAGE="http://jan.kneschke.de/projects/lighttpd" -SRC_URI="http://jan.kneschke.de/projects/lighttpd/download/${P}.tar.gz" -LICENSE="QPL-1.0" -SLOT="0" -KEYWORDS="~x86 ~ppc" -IUSE="mysql ssl" -DEPEND="virtual/libc - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - >=sys-devel/libtool-1.4 - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 )" -RDEPEND=">=sys-libs/zlib-1.1 - >=sys-devel/libtool-1.4 - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 )" -S=${WORKDIR}/${P} -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -pkg_setup() { - if ! grep -q ^lighttpd: /etc/passwd ; then - useradd -g nofiles -s /bin/false -d ${LIGHTTPD_DIR} \ - -c "lighttpd" lighttpd || die "problem adding user lighttpd" - fi -} - -src_compile() { - epatch ${FILESDIR}/lighttpd-1.1.8-gentoo.diff - if use ssl; then - USE_SSL="--with-openssl" - fi - econf --libdir=/usr/lib/${PN} \ - `use_with mysql` \ - ${USE_SSL} \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die - dodoc README COPYING - newdoc doc/lighttpd.conf lighttpd.conf.example - dodoc doc/fastcgi.txt doc/authentification.txt - insinto /etc/conf.d/; doins doc/lighttpd.conf - exeinto /etc/init.d; newexe ${FILESDIR}/lighttpd.initd lighttpd - dodir ${LIGHTTPD_DIR} ${LOG_DIR} - chown lighttpd:root ${D}/${LOG_DIR} -} - -pkg_postinst() { - einfo "In order to use fast-cgi for php you have to emerge dev-php/php-cgi and" - einfo "please read /usr/share/doc/lighttpd-1.1.8/fastcgi.txt.gz for more information" -} diff --git a/www-servers/lighttpd/lighttpd-1.1.8.ebuild b/www-servers/lighttpd/lighttpd-1.1.8.ebuild deleted file mode 100644 index 23f1fdaad7a1..000000000000 --- a/www-servers/lighttpd/lighttpd-1.1.8.ebuild +++ /dev/null @@ -1,62 +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.1.8.ebuild,v 1.2 2005/01/04 13:34:15 swegener Exp $ - -inherit eutils - -DESCRIPTION="lighttpd is intended to be a frontend for ad-servers which have to deliver small files concurrently to many connections." -HOMEPAGE="http://jan.kneschke.de/projects/lighttpd" -SRC_URI="http://jan.kneschke.de/projects/lighttpd/download/${P}.tar.gz" -LICENSE="QPL-1.0" -SLOT="0" -KEYWORDS="~x86 ~ppc" -IUSE="mysql ssl" -DEPEND="virtual/libc - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - >=sys-devel/libtool-1.4 - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 )" -RDEPEND=">=sys-libs/zlib-1.1 - >=sys-devel/libtool-1.4 - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 )" -S=${WORKDIR}/${P} -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -pkg_setup() { - if ! grep -q ^lighttpd: /etc/passwd ; then - useradd -g nofiles -s /bin/false -d ${LIGHTTPD_DIR} \ - -c "lighttpd" lighttpd || die "problem adding user lighttpd" - fi -} - -src_compile() { - epatch ${FILESDIR}/lighttpd-1.1.8-gentoo.diff - if use ssl; then - USE_SSL="--with-openssl" - fi - econf --libdir=/usr/lib/${PN} \ - `use_with mysql` \ - ${USE_SSL} \ - || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die - dodoc README COPYING - newdoc doc/lighttpd.conf lighttpd.conf.example - dodoc doc/fastcgi.txt doc/authentification.txt - insinto /etc/conf.d/; doins doc/lighttpd.conf - exeinto /etc/init.d; newexe ${FILESDIR}/lighttpd.initd lighttpd - dodir ${LIGHTTPD_DIR} ${LOG_DIR} - chown lighttpd:root ${D}/${LOG_DIR} -} - -pkg_postinst() { - einfo "In order to use fast-cgi for php you have to emerge dev-php/php-cgi and" - einfo "please read /usr/share/doc/lighttpd-1.1.8/fastcgi.txt.gz for more information" -} diff --git a/www-servers/lighttpd/lighttpd-1.2.2.ebuild b/www-servers/lighttpd/lighttpd-1.2.2.ebuild deleted file mode 100644 index f237d5141340..000000000000 --- a/www-servers/lighttpd/lighttpd-1.2.2.ebuild +++ /dev/null @@ -1,73 +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.2.2.ebuild,v 1.3 2005/01/04 13:34:15 swegener Exp $ - -inherit eutils - -URI_ROOT="http://jan.kneschke.de/projects/lighttpd/download/" -DESCRIPTION="lightweight high-performance web server" -HOMEPAGE="http://jan.kneschke.de/projects/lighttpd/" -SRC_URI="$URI_ROOT/${P}.tar.gz" -LICENSE="QPL-1.0" -SLOT="0" -KEYWORDS="~x86 ~ppc" -IUSE="mysql ssl php" -DEPEND="virtual/libc - >=dev-libs/libpcre-3.1 - >=sys-libs/zlib-1.1 - >=sys-devel/libtool-1.4 - >=dev-libs/localizer-0.3.3 - 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 )" -RDEPEND=">=sys-libs/zlib-1.1 - >=sys-devel/libtool-1.4 - mysql? ( >=dev-db/mysql-4.0.0 ) - ssl? ( >=dev-libs/openssl-0.9.7 )" -S=${WORKDIR}/${P} -LIGHTTPD_DIR="/var/www/localhost/htdocs/" -LOG_DIR="/var/log/lighttpd/" - -pkg_setup() { - if ! grep -q ^lighttpd: /etc/passwd ; then - useradd -g nofiles -s /bin/false -d ${LIGHTTPD_DIR} \ - -c "lighttpd" lighttpd || die "problem adding user lighttpd" - fi -} - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PN}-1.1.8-gentoo.diff - if useq php ; then - epatch ${FILESDIR}/${PN}-1.2.2-php.diff - fi -} - -src_compile() { - local my_conf - - my_conf="--libdir=/usr/lib/${PN}" - my_conf="$my_conf `use_with ssl openssl`" - my_conf="$my_conf `use_with ldap`" - my_conf="$my_conf `use_with mysql`" - my_conf="$my_conf --enable-mod-localizer" - econf $my_conf || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR=${D} install || die - dodoc README COPYING - newdoc doc/lighttpd.conf lighttpd.conf.example - dodoc doc/fastcgi.txt doc/authentification.txt - insinto /etc; doins doc/lighttpd.conf - exeinto /etc/init.d; newexe ${FILESDIR}/${PN}-${PV}.initd ${PN} - dodir ${LIGHTTPD_DIR} ${LOG_DIR} - chown lighttpd:root ${D}/${LOG_DIR} -} - -pkg_postinst () { - einfo "lighttpd.conf has moved from /etc/conf.d to /etc" -} diff --git a/www-servers/lighttpd/lighttpd-1.3.10.ebuild b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild index 02f1ce50e22c..354ec6d06103 100644 --- a/www-servers/lighttpd/lighttpd-1.3.10.ebuild +++ b/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild @@ -1,13 +1,13 @@ # 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.10.ebuild,v 1.1 2005/02/14 11:39:01 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.10-r1.ebuild,v 1.1 2005/02/14 14:48:29 ka0ttic Exp $ inherit eutils confutils DESCRIPTION="lightweight high-performance web server" HOMEPAGE="http://www.lighttpd.net/" SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz" -LICENSE="QPL-1.0" +LICENSE="BSD" SLOT="0" KEYWORDS="x86 ~ppc" IUSE="mysql ssl php modchat modcache modlocalizer xattr ldap" @@ -33,7 +33,8 @@ pkg_setup() { src_unpack() { unpack ${A} cd ${S} - epatch ${FILESDIR}/${PN}-1.1.8-gentoo.diff + epatch ${FILESDIR}/${P}-upstream.diff + epatch ${FILESDIR}/${P}-gentoo.diff use php && epatch ${FILESDIR}/${P}-php.diff } |