From: Robin H. Johnson Date: Tue, 9 Jan 2007 18:20:10 +0000 (+0000) Subject: Fix bugs 157813, 158423, 160903, 160939. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43a606417e40b6411e620ccd738b03ac43369af4;p=gentoo.git Fix bugs 157813, 158423, 160903, 160939. Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 744662087628..8ff57a6fef23 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.93 2007/01/09 18:00:38 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.94 2007/01/09 18:20:10 robbat2 Exp $ + +*lighttpd-1.4.13-r1 (09 Jan 2007) + + 09 Jan 2007; Robin H. Johnson + +files/lighttpd.initd-1.4.13-r1, + +files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff, + +lighttpd-1.4.13-r1.ebuild: + Fix bugs 157813, 158423, 160903, 160939. 09 Jan 2007; Robin H. Johnson lighttpd-1.4.13.ebuild: Compile fix: for USE=minimal, we need to remove mod_magnet as well. diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 1927e1727071..ee38c08e4c25 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -30,6 +30,10 @@ AUX 1.4.13/02_lighttpd-1.4.13-fcgi-auth-type.diff 2087 RMD160 fcd67f8f5b06b76052 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 1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267 RMD160 d835aea73d87626240970d946b33663b510c2cd5 SHA1 69e289cd7c167507ca86c1f37b13480623666b55 SHA256 ea327f316cfebe2b7269bf48700453506e412e7bd0e7243e2f1e15ee2c5e7a89 +MD5 99d59d7e470f9057c2f836ca774fcd48 files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267 +RMD160 d835aea73d87626240970d946b33663b510c2cd5 files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267 +SHA256 ea327f316cfebe2b7269bf48700453506e412e7bd0e7243e2f1e15ee2c5e7a89 files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff 5267 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 @@ -74,6 +78,10 @@ AUX lighttpd.initd 1164 RMD160 5db761cd95781c457035a0b03459c22554b54dab SHA1 ee4 MD5 063fe5cdf400eebf73c263188f76f03e files/lighttpd.initd 1164 RMD160 5db761cd95781c457035a0b03459c22554b54dab files/lighttpd.initd 1164 SHA256 823ed1ae9b0dde0939285761b8af547116c51b597c1488dbd3f45a934e291213 files/lighttpd.initd 1164 +AUX lighttpd.initd-1.4.13-r1 1645 RMD160 bbe1d1c48ca1d19333e95920f77672f8c6ca224e SHA1 1d28579db73f3fd9a8cf8992e2fdc63e8d5655ea SHA256 0b196a26796693256d8f5a04739d981509aae17445dc81304a6b26014158c438 +MD5 bab08022d65188a60d02d7ae272eea32 files/lighttpd.initd-1.4.13-r1 1645 +RMD160 bbe1d1c48ca1d19333e95920f77672f8c6ca224e files/lighttpd.initd-1.4.13-r1 1645 +SHA256 0b196a26796693256d8f5a04739d981509aae17445dc81304a6b26014158c438 files/lighttpd.initd-1.4.13-r1 1645 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c MD5 ad091c9157134890499f26d170352c9f files/lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c files/lighttpd.logrotate 487 @@ -97,14 +105,18 @@ 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 +EBUILD lighttpd-1.4.13-r1.ebuild 5527 RMD160 c7814ac24584cc975a0fb40c7af4044fd05209a7 SHA1 ea5218dbd04f9a7bea208e2409f72829f456b378 SHA256 f297620c2ef03e9f1ca7a256c213f969002c53609a918a2f59d12933a086bca8 +MD5 eefa971808e8eececcd67052c5646c34 lighttpd-1.4.13-r1.ebuild 5527 +RMD160 c7814ac24584cc975a0fb40c7af4044fd05209a7 lighttpd-1.4.13-r1.ebuild 5527 +SHA256 f297620c2ef03e9f1ca7a256c213f969002c53609a918a2f59d12933a086bca8 lighttpd-1.4.13-r1.ebuild 5527 EBUILD lighttpd-1.4.13.ebuild 5459 RMD160 081507355b35012248bd85ccb42d97ace3c87dd8 SHA1 5adb04d1e47d3c31041a16bc02443375213d302b SHA256 20336448c4a291a7371661cae73153c50fa575b898056191bc80cf02a1feb475 MD5 6934f5d5ec6ee1a6b6a85845c9f30f34 lighttpd-1.4.13.ebuild 5459 RMD160 081507355b35012248bd85ccb42d97ace3c87dd8 lighttpd-1.4.13.ebuild 5459 SHA256 20336448c4a291a7371661cae73153c50fa575b898056191bc80cf02a1feb475 lighttpd-1.4.13.ebuild 5459 -MISC ChangeLog 25813 RMD160 e81a870088f3029f401e243dbb6a6b359898ad76 SHA1 654e1960b9bf87d8e41192d2b8abba79644c47c8 SHA256 3e210ca285bceb4e924846f47177df2b669c8e4322fea4c94e87da6a8d509405 -MD5 8a0a2eda0c63f115bc137adcc5cda64e ChangeLog 25813 -RMD160 e81a870088f3029f401e243dbb6a6b359898ad76 ChangeLog 25813 -SHA256 3e210ca285bceb4e924846f47177df2b669c8e4322fea4c94e87da6a8d509405 ChangeLog 25813 +MISC ChangeLog 26065 RMD160 0a2c540ad4c36db2791c41b4301cf7bc5d818eca SHA1 e6328089957e13d5535022f7549cbd169d43402a SHA256 addb967473249577e0e2f99131cb843dbbec2825fc537b14e0d171f94f66c931 +MD5 1e1aa07c67f695a5b4d9cb1fb7cf5603 ChangeLog 26065 +RMD160 0a2c540ad4c36db2791c41b4301cf7bc5d818eca ChangeLog 26065 +SHA256 addb967473249577e0e2f99131cb843dbbec2825fc537b14e0d171f94f66c931 ChangeLog 26065 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725 @@ -118,3 +130,6 @@ SHA256 134236010b24b21a1a403a663ca1fc927bee6247a0f9b3ba8b2d525905381d82 files/di 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 +MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r1 247 +RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r1 247 +SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r1 247 diff --git a/www-servers/lighttpd/files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff new file mode 100644 index 000000000000..1e6caf8e4bd1 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.13/03_lighttpd-1.4.13-errorlog-pipe.diff @@ -0,0 +1,179 @@ +diff -ur lighttpd-1.4.11.orig/src/base.h lighttpd-1.4.11/src/base.h +--- lighttpd-1.4.11.orig/src/base.h 2006-01-11 06:51:04.000000000 -0800 ++++ lighttpd-1.4.11/src/base.h 2006-12-17 18:01:39.000000000 -0800 +@@ -505,7 +505,7 @@ + + /* the errorlog */ + int errorlog_fd; +- enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG } errorlog_mode; ++ enum { ERRORLOG_STDERR, ERRORLOG_FILE, ERRORLOG_SYSLOG, ERRORLOG_PIPE } errorlog_mode; + buffer *errorlog_buf; + + fdevents *ev, *ev_ins; +diff -ur lighttpd-1.4.11.orig/src/log.c lighttpd-1.4.11/src/log.c +--- lighttpd-1.4.11.orig/src/log.c 2005-11-07 05:01:35.000000000 -0800 ++++ lighttpd-1.4.11/src/log.c 2006-12-17 18:09:43.000000000 -0800 +@@ -34,10 +34,11 @@ + /** + * open the errorlog + * +- * we have 3 possibilities: ++ * we have 4 possibilities: + * - stderr (default) + * - syslog + * - logfile ++ * - pipe + * + * if the open failed, report to the user and die + * +@@ -57,21 +58,81 @@ + srv->errorlog_mode = ERRORLOG_SYSLOG; + } else if (!buffer_is_empty(srv->srvconf.errorlog_file)) { + const char *logfile = srv->srvconf.errorlog_file->ptr; +- +- if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) { +- log_error_write(srv, __FILE__, __LINE__, "SSSS", +- "opening errorlog '", logfile, +- "' failed: ", strerror(errno)); +- ++ ++ if (logfile[0] == '|') { ++#ifdef HAVE_FORK ++ /* create write pipe and spawn process */ ++ ++ int to_log_fds[2]; ++ pid_t pid; ++ ++ if (pipe(to_log_fds)) { ++ log_error_write(srv, __FILE__, __LINE__, "ss", ++ "pipe failed: ", strerror(errno)); ++ return -1; ++ } ++ ++ /* fork, execve */ ++ switch (pid = fork()) { ++ case 0: ++ /* child */ ++ ++ close(STDIN_FILENO); ++ dup2(to_log_fds[0], STDIN_FILENO); ++ close(to_log_fds[0]); ++ /* not needed */ ++ close(to_log_fds[1]); ++ ++ /* we don't need the client socket */ ++ for (fd = 3; fd < 256; fd++) { ++ close(fd); ++ } ++ ++ /* exec the log-process (skip the | ) ++ * ++ */ ++ ++ execl("/bin/sh", "sh", "-c", logfile + 1, NULL); ++ ++ log_error_write(srv, __FILE__, __LINE__, "sss", ++ "spawning log-process failed: ", ++ strerror(errno), logfile + 1); ++ ++ exit(-1); ++ break; ++ case -1: ++ /* error */ ++ log_error_write(srv, __FILE__, __LINE__, "ss", "fork failed:", strerror(errno)); ++ break; ++ default: ++ close(to_log_fds[0]); ++ ++ srv->errorlog_fd = to_log_fds[1]; ++ ++ break; ++ } ++ srv->errorlog_mode = ERRORLOG_PIPE; ++#else ++ log_error_write(srv, __FILE__, __LINE__, "SSS", ++ "opening errorlog '", logfile,"' impossible"); + return -1; +- } ++#endif ++ } else { ++ if (-1 == (srv->errorlog_fd = open(logfile, O_APPEND | O_WRONLY | O_CREAT | O_LARGEFILE, 0644))) { ++ log_error_write(srv, __FILE__, __LINE__, "SSSS", ++ "opening errorlog '", logfile, ++ "' failed: ", strerror(errno)); ++ ++ return -1; ++ } ++ srv->errorlog_mode = ERRORLOG_FILE; ++ } + #ifdef FD_CLOEXEC +- /* close fd on exec (cgi) */ +- fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC); ++ /* close fd on exec (cgi) */ ++ fcntl(srv->errorlog_fd, F_SETFD, FD_CLOEXEC); + #endif +- srv->errorlog_mode = ERRORLOG_FILE; +- } +- ++ } ++ + log_error_write(srv, __FILE__, __LINE__, "s", "server started"); + + #ifdef HAVE_VALGRIND_VALGRIND_H +@@ -99,7 +160,7 @@ + */ + + int log_error_cycle(server *srv) { +- /* only cycle if we are not in syslog-mode */ ++ /* only cycle if the error log is a file */ + + if (srv->errorlog_mode == ERRORLOG_FILE) { + const char *logfile = srv->srvconf.errorlog_file->ptr; +@@ -135,6 +196,7 @@ + log_error_write(srv, __FILE__, __LINE__, "s", "server stopped"); + + switch(srv->errorlog_mode) { ++ case ERRORLOG_PIPE: /* fall through */ + case ERRORLOG_FILE: + close(srv->errorlog_fd); + break; +@@ -154,6 +216,7 @@ + va_list ap; + + switch(srv->errorlog_mode) { ++ case ERRORLOG_PIPE: + case ERRORLOG_FILE: + case ERRORLOG_STDERR: + /* cache the generated timestamp */ +@@ -238,6 +301,7 @@ + va_end(ap); + + switch(srv->errorlog_mode) { ++ case ERRORLOG_PIPE: /* fall through */ + case ERRORLOG_FILE: + BUFFER_APPEND_STRING_CONST(srv->errorlog_buf, "\n"); + write(srv->errorlog_fd, srv->errorlog_buf->ptr, srv->errorlog_buf->used - 1); +diff -ur lighttpd-1.4.11.orig/src/mod_cgi.c lighttpd-1.4.11/src/mod_cgi.c +--- lighttpd-1.4.11.orig/src/mod_cgi.c 2006-02-22 05:15:10.000000000 -0800 ++++ lighttpd-1.4.11/src/mod_cgi.c 2006-12-17 18:01:39.000000000 -0800 +@@ -750,7 +750,7 @@ + * + * we feed the stderr of the CGI to our errorlog, if possible + */ +- if (srv->errorlog_mode == ERRORLOG_FILE) { ++ if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) { + close(STDERR_FILENO); + dup2(srv->errorlog_fd, STDERR_FILENO); + } +diff -ur lighttpd-1.4.11.orig/src/mod_rrdtool.c lighttpd-1.4.11/src/mod_rrdtool.c +--- lighttpd-1.4.11.orig/src/mod_rrdtool.c 2005-08-21 15:52:24.000000000 -0700 ++++ lighttpd-1.4.11/src/mod_rrdtool.c 2006-12-17 18:01:39.000000000 -0800 +@@ -134,7 +134,7 @@ + + close(STDERR_FILENO); + +- if (srv->errorlog_mode == ERRORLOG_FILE) { ++ if ((srv->errorlog_mode == ERRORLOG_FILE) || (srv->errorlog_mode == ERRORLOG_PIPE)) { + dup2(srv->errorlog_fd, STDERR_FILENO); + close(srv->errorlog_fd); + } diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r1 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r1 new file mode 100644 index 000000000000..7a885e91935a --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r1 @@ -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/files/lighttpd.initd-1.4.13-r1 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1 new file mode 100644 index 000000000000..b6122976bea7 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1 @@ -0,0 +1,71 @@ +#!/sbin/runscript +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r1,v 1.1 2007/01/09 18:20:10 robbat2 Exp $ + +opts="depend checkconfig start stop reload graceful" + +depend() { + need net + use mysql logger spawn-fcgi ldap slapd + after famd + after sshd +} + +checkconfig() { + if [[ ! -f ${LIGHTTPD_CONF} ]] ; then + ewarn "${LIGHTTPD_CONF} does not exist." + return 1 + fi + + /usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null +} + +start() { + checkconfig || return 1 + + ebegin "Starting lighttpd" + start-stop-daemon --start --quiet \ + --background --pidfile ${LIGHTTPD_PID} \ + --exec /usr/sbin/lighttpd -- -f ${LIGHTTPD_CONF} + eend $? +} + +stop() { + local rv=0 + ebegin "Stopping lighttpd" + if start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \ + --signal 2 ; then + rm -f ${LIGHTTPD_PID} + else + rv=1 + fi + eend $rv +} + +reload() { + if [ ! -f ${LIGHTTPD_PID} ]; then + eerror "lighttpd isn't running" + return 1 + fi + checkconfig || return 1 + ebegin "Re-opening lighttpd log files" + kill -HUP `cat ${LIGHTTPD_PID}` &>/dev/null + eend $? +} + +graceful() { + if ! service_started "${myservice}" ; then + eerror "Lighttpd is not running! Please start it before trying to reload it." + else + checkconfig || return 1 + ebegin "Gracefully stopping lighttpd" + ## s-s-d for consistency or kill because it's cleaner? + ## s-s-d causes a 5 second delay here + #start-stop-daemon --stop --quiet --pidfile ${LIGHTTPD_PID} \ + # --signal SIGINT + kill -INT `cat ${LIGHTTPD_PID}` + rm -f ${LIGHTTPD_PID} + start + fi +} diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild new file mode 100644 index 000000000000..40270b8623b1 --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild @@ -0,0 +1,206 @@ +# 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-r1.ebuild,v 1.1 2007/01/09 18:20:10 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-5.1 ) + 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 + sys-fs/e2fsprogs + ) + 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,magnet}.* + 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 webdav webdav-locks) \ + $(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-1.4.13-r1 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 +}