diff options
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/lighttpd/ChangeLog | 10 | ||||
| -rw-r--r-- | net-www/lighttpd/Manifest | 12 | ||||
| -rw-r--r-- | net-www/lighttpd/files/digest-lighttpd-1.2.2 | 1 | ||||
| -rw-r--r-- | net-www/lighttpd/files/lighttpd-1.2.2-php.diff | 47 | ||||
| -rw-r--r-- | net-www/lighttpd/files/lighttpd-1.2.2.initd | 32 | ||||
| -rw-r--r-- | net-www/lighttpd/lighttpd-1.2.2.ebuild | 73 |
6 files changed, 170 insertions, 5 deletions
diff --git a/net-www/lighttpd/ChangeLog b/net-www/lighttpd/ChangeLog index 3e3d9dab7545..8717bbd59a4e 100644 --- a/net-www/lighttpd/ChangeLog +++ b/net-www/lighttpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-www/lighttpd # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/ChangeLog,v 1.8 2004/06/25 20:10:19 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/ChangeLog,v 1.9 2004/06/27 00:21:42 stuart Exp $ + +*lighttpd-1.2.2 (27 Jun 2004) + + 27 Jun 2004; Stuart Herbert <stuart@gentoo.org> + +files/lighttpd-1.2.2-php.diff, +files/lighttpd-1.2.2.initd, + +lighttpd-1.2.2.ebuild: + Version bump; php support now available; thanks to Boris Wachtmeister + <sirro@nurfuerspam.de>; see bug #55049 25 Jun 2004; Aron Griffis <agriffis@gentoo.org> lighttpd-1.1.8-r1.ebuild, lighttpd-1.1.8.ebuild: diff --git a/net-www/lighttpd/Manifest b/net-www/lighttpd/Manifest index 413833f625e6..b0a1fe019058 100644 --- a/net-www/lighttpd/Manifest +++ b/net-www/lighttpd/Manifest @@ -1,8 +1,12 @@ -MD5 de9927ffdda6be914310b9cb9e8c29db lighttpd-1.1.8.ebuild 1920 +MD5 da2bc924f728663989f87e1c47145533 ChangeLog 1588 MD5 2fe9ea647ac9b2684773eb8edc2da77d lighttpd-1.1.8-r1.ebuild 1923 -MD5 2b980a0257c85abc6cf173b91bf3dee5 ChangeLog 1306 +MD5 de9927ffdda6be914310b9cb9e8c29db lighttpd-1.1.8.ebuild 1920 MD5 3d182d43f7f0341a9a42f96694f04e72 metadata.xml 224 -MD5 8201ea6394b0c7ea9fc90deecd68bec3 files/lighttpd.initd 637 +MD5 ef27fe6acfde819ab06d2f7adc644ac0 lighttpd-1.2.2.ebuild 2036 MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8 66 -MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301 MD5 eb94c0fc2149e2543beb50e93058de99 files/digest-lighttpd-1.1.8-r1 66 +MD5 352e2fac9cb73bdae7672f977b044894 files/lighttpd-1.1.8-gentoo.diff 1301 +MD5 8201ea6394b0c7ea9fc90deecd68bec3 files/lighttpd.initd 637 +MD5 0d9277bbfb98755640329afa81c8bee2 files/digest-lighttpd-1.2.2 66 +MD5 32569e20d3ecdd51ac0534cc85d52354 files/lighttpd-1.2.2-php.diff 1184 +MD5 59b78c3d7f4bb89134a61bacd16f8e9e files/lighttpd-1.2.2.initd 802 diff --git a/net-www/lighttpd/files/digest-lighttpd-1.2.2 b/net-www/lighttpd/files/digest-lighttpd-1.2.2 new file mode 100644 index 000000000000..912463f0f519 --- /dev/null +++ b/net-www/lighttpd/files/digest-lighttpd-1.2.2 @@ -0,0 +1 @@ +MD5 37877e1df7e6d2fea2728c3c5b10e9f5 lighttpd-1.2.2.tar.gz 558948 diff --git a/net-www/lighttpd/files/lighttpd-1.2.2-php.diff b/net-www/lighttpd/files/lighttpd-1.2.2-php.diff new file mode 100644 index 000000000000..7ace09086270 --- /dev/null +++ b/net-www/lighttpd/files/lighttpd-1.2.2-php.diff @@ -0,0 +1,47 @@ +diff -u olddoc/lighttpd.1 doc/lighttpd.1 +--- olddoc/lighttpd.1 2004-06-24 10:26:54.888331272 +0200 ++++ doc/lighttpd.1 2004-06-24 10:27:48.352203528 +0200 +@@ -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 -u olddoc/lighttpd.conf doc/lighttpd.conf +--- olddoc/lighttpd.conf 2004-06-24 10:26:54.900329448 +0200 ++++ doc/lighttpd.conf 2004-06-24 10:26:35.252316400 +0200 +@@ -16,7 +16,7 @@ + "mod_access", + # "mod_auth", + # "mod_status", +-# "mod_fastcgi", ++ "mod_fastcgi", + # "mod_simple_vhost", + # "mod_evhost", + # "mod_cgi", +@@ -114,14 +114,14 @@ + + #### fastcgi module + ## read fastcgi.txt for more info +-#fastcgi.server = ( ".php" => +-# ( "grisu" => +-# ( +-# "host" => "192.168.2.10", +-# "port" => 1026 +-# ) +-# ) +-# ) ++fastcgi.server = ( ".php" => ++ ( "localhost" => ++ ( ++ "host" => "127.0.0.1", ++ "port" => 1026 ++ ) ++ ) ++ ) + + #### CGI module + #cgi.assign = ( ".pl" => "/usr/bin/perl", diff --git a/net-www/lighttpd/files/lighttpd-1.2.2.initd b/net-www/lighttpd/files/lighttpd-1.2.2.initd new file mode 100644 index 000000000000..eba8d0bc6da4 --- /dev/null +++ b/net-www/lighttpd/files/lighttpd-1.2.2.initd @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/files/lighttpd-1.2.2.initd,v 1.1 2004/06/27 00:21:43 stuart Exp $ + +LIGHTTPD_PID="/var/run/lighttpd.pid" +LIGHTTPD_BIN="/usr/sbin/lighttpd" +LIGHTTPD_CONF="/etc/lighttpd.conf" + +depend() { + need net + use mysql logger spawn-fcgi + after spawn-fcgi +} + +start() { + ebegin "Starting lighttpd" + ${LIGHTTPD_BIN} -f ${LIGHTTPD_CONF} + eend ${?} + pidof lighttpd >${LIGHTTPD_PID} +} + +stop() { + if [ -r ${LIGHTTPD_PID} ]; then + ebegin "Stopping lighttpd" + kill `cat ${LIGHTTPD_PID}` + eend $? + if [ -w ${LIGHTTPD_PID} ]; then rm ${LIGHTTPD_PID}; fi; + else + eerror "lighttpd: no PID-file found. no process killed!" + fi +} diff --git a/net-www/lighttpd/lighttpd-1.2.2.ebuild b/net-www/lighttpd/lighttpd-1.2.2.ebuild new file mode 100644 index 000000000000..5121e69ef23a --- /dev/null +++ b/net-www/lighttpd/lighttpd-1.2.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/lighttpd/lighttpd-1.2.2.ebuild,v 1.1 2004/06/27 00:21:42 stuart 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" +IUSE="mysql ssl php" +DEPEND="virtual/glibc + >=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" +} |