From 3c0b5ef9707e630fdd8218dd92249d6ff1894556 Mon Sep 17 00:00:00 2001 From: Thilo Bangert Date: Sat, 14 Apr 2007 20:31:25 +0000 Subject: [PATCH] security version bump - bug 174043 Package-Manager: portage-2.1.2.2 --- www-servers/lighttpd/ChangeLog | 10 +- www-servers/lighttpd/Manifest | 24 +- .../03_all_lighttpd-1.4.11-errorlog-pipe.diff | 179 +++++++++++++++ ...l_lighttpd-1.4.13-deprecated-ldap-api.diff | 10 + .../lighttpd/files/digest-lighttpd-1.4.15 | 3 + www-servers/lighttpd/lighttpd-1.4.15.ebuild | 213 ++++++++++++++++++ 6 files changed, 434 insertions(+), 5 deletions(-) create mode 100644 www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff create mode 100644 www-servers/lighttpd/files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff create mode 100644 www-servers/lighttpd/files/digest-lighttpd-1.4.15 create mode 100644 www-servers/lighttpd/lighttpd-1.4.15.ebuild diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index a3164ac762dc..fc5e1967374a 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.109 2007/04/10 10:34:20 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.110 2007/04/14 20:31:25 bangert Exp $ + +*lighttpd-1.4.15 (14 Apr 2007) + + 14 Apr 2007; Thilo Bangert + +files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff, + +files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff, + +lighttpd-1.4.15.ebuild: + security version bump - bug #174043 *lighttpd-1.4.13-r3 (10 Apr 2007) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 7bc4f4f1ef54..2372448e2adf 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -38,6 +38,14 @@ AUX 1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cd MD5 87cf789e1f6866b9ece50a4af418b5b8 files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 +AUX 1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 SHA1 22e0d05d49cecb652d1250ac66de13fdf228cce4 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 +MD5 34d6720749f96327d311661a02886a65 files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 +RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 +SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 +AUX 1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e SHA1 12c39cd4ca731509256e271daf4aaac8a62e82c4 SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a +MD5 87cf789e1f6866b9ece50a4af418b5b8 files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 +RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 +SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 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 @@ -113,6 +121,7 @@ SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1 files/sp DIST lighttpd-1.3.16.tar.gz 706362 RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 SHA1 47449370b58f488350a54d54b416747228e4120f SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369 DIST lighttpd-1.4.11.tar.gz 781656 RMD160 0434e6c09383f1ad443d985fd168a29f6f132d1f SHA1 ca904d3d4d9dde76f85156f2c709a394f30e28c8 SHA256 7782ac82af8ea8d14df5d35b6668c0d45c00f3ba43a6203c29c7fe7dfe98999c DIST lighttpd-1.4.13.tar.gz 797813 RMD160 4e67e42dc3692d50c044561cc903de7b906f260c SHA1 b17553e66609f85baec50263712a4a5aeca50ca5 SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 +DIST lighttpd-1.4.15.tar.bz2 591304 RMD160 6a0f7a498b2815c2eb576917e88775a8e16aad5c SHA1 742b567eca011fa5ef2cc506038389a4959eab56 SHA256 75128e53231c69a22c94ad0a01da974eaa266b21668c1354f71ad07e5f94d9cc EBUILD lighttpd-1.3.16.ebuild 2586 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 SHA1 0984b9d7fb378b6b7bb08fd8155ff30b480adac0 SHA256 12818ec066898a0e019dcbb50fb4d190fe60363052d03213e8b5e4f4da5bbfe1 MD5 21b1cf627412a4e10256724537880485 lighttpd-1.3.16.ebuild 2586 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 lighttpd-1.3.16.ebuild 2586 @@ -137,10 +146,14 @@ EBUILD lighttpd-1.4.13.ebuild 5431 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199 MD5 cca2c68140d653460de5c5895f3b6d6e lighttpd-1.4.13.ebuild 5431 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 lighttpd-1.4.13.ebuild 5431 SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5 lighttpd-1.4.13.ebuild 5431 -MISC ChangeLog 28796 RMD160 66092bd3d8f14dafaca0df7a31d5e6e3f1db53d1 SHA1 9e90c6ee5ac838d3d5f3176fef7e3aa46ed54bb5 SHA256 a817428fb4b9a7edf17a414d97d38cbdc0f7909a6731dbf2d095085db5b7d28e -MD5 e6fd6a19e7c53633d8460b05f36f4fd9 ChangeLog 28796 -RMD160 66092bd3d8f14dafaca0df7a31d5e6e3f1db53d1 ChangeLog 28796 -SHA256 a817428fb4b9a7edf17a414d97d38cbdc0f7909a6731dbf2d095085db5b7d28e ChangeLog 28796 +EBUILD lighttpd-1.4.15.ebuild 5838 RMD160 4d534f07078ba72b67e9fb8794b2dcd3b8917a47 SHA1 dbefa5d004aba3995fe63c8a1a1204c4b55516a9 SHA256 f61b8dd98dca30983afdea720fda8d72b99163f80f57445f0b1199fb3dbc031f +MD5 518a33a7e0ba15988d6c7e4185b2a5c8 lighttpd-1.4.15.ebuild 5838 +RMD160 4d534f07078ba72b67e9fb8794b2dcd3b8917a47 lighttpd-1.4.15.ebuild 5838 +SHA256 f61b8dd98dca30983afdea720fda8d72b99163f80f57445f0b1199fb3dbc031f lighttpd-1.4.15.ebuild 5838 +MISC ChangeLog 29068 RMD160 f5a8e73fbc43342774aa508d4fd2232254b8778f SHA1 1a73d01c685f988bf62e8a19811c27d946a72dab SHA256 abe5ce7592eb890cf623ca631f12a75d918771dfa99794597ec3060c23cad95e +MD5 04756ac6f7f1962cf966753447006c8b ChangeLog 29068 +RMD160 f5a8e73fbc43342774aa508d4fd2232254b8778f ChangeLog 29068 +SHA256 abe5ce7592eb890cf623ca631f12a75d918771dfa99794597ec3060c23cad95e ChangeLog 29068 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725 @@ -163,3 +176,6 @@ SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/di MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r3 247 RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r3 247 SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r3 247 +MD5 aeb9038042587a68806c8bae25abc8b0 files/digest-lighttpd-1.4.15 250 +RMD160 30662c16f3be53c5609f5645ab3846eda1e05c8d files/digest-lighttpd-1.4.15 250 +SHA256 92da9c6894ac3d83e16b7d8f90d1811f6740974d519c5d1ba3b6029eab0d1f7c files/digest-lighttpd-1.4.15 250 diff --git a/www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff b/www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-errorlog-pipe.diff new file mode 100644 index 000000000000..c168eba74683 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.15/03_all_lighttpd-1.4.11-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-13 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-13-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/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff new file mode 100644 index 000000000000..259ad4b279a5 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.15/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff @@ -0,0 +1,10 @@ +--- lighttpd-1.4.13.old/src/Makefile.am 2006-10-09 12:19:34.000000000 -0400 ++++ lighttpd-1.4.13/src/Makefile.am 2007-03-26 10:10:26.000000000 -0400 +@@ -213,6 +213,7 @@ + mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c + mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined + mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd) ++mod_auth_la_CFLAGS = -DLDAP_DEPRECATED + + lib_LTLIBRARIES += mod_rewrite.la + mod_rewrite_la_SOURCES = mod_rewrite.c diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.15 b/www-servers/lighttpd/files/digest-lighttpd-1.4.15 new file mode 100644 index 000000000000..0b575e222c44 --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.15 @@ -0,0 +1,3 @@ +MD5 b994b8c359da578dec073cae52c4924f lighttpd-1.4.15.tar.bz2 591304 +RMD160 6a0f7a498b2815c2eb576917e88775a8e16aad5c lighttpd-1.4.15.tar.bz2 591304 +SHA256 75128e53231c69a22c94ad0a01da974eaa266b21668c1354f71ad07e5f94d9cc lighttpd-1.4.15.tar.bz2 591304 diff --git a/www-servers/lighttpd/lighttpd-1.4.15.ebuild b/www-servers/lighttpd/lighttpd-1.4.15.ebuild new file mode 100644 index 000000000000..9acddb4e130b --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.15.ebuild @@ -0,0 +1,213 @@ +# 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.15.ebuild,v 1.1 2007/04/14 20:31:25 bangert 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.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~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_OPTS="-p1 -l -d ${S}" 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-r3 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/lighttpd.conf + doins ${FILESDIR}/conf/mime-types.conf + doins ${FILESDIR}/conf/mod_cgi.conf + newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 mod_fastcgi.conf + # Secure directory for fastcgi sockets + keepdir /var/run/lighttpd/ + fperms 0750 /var/run/lighttpd/ + fowners lighttpd:lighttpd /var/run/lighttpd/ + + # 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 +} -- 2.26.2