summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2008-02-12 23:18:41 +0000
committerThilo Bangert <bangert@gentoo.org>2008-02-12 23:18:41 +0000
commitae95a7241b3a59759b046ed722373f559ea315a0 (patch)
tree0804414ab2993627bed92e5c580fec7cc3e049aa /www-servers/lighttpd
parentamd64 stable wrt bug #204500 (diff)
downloadhistorical-ae95a7241b3a59759b046ed722373f559ea315a0.tar.gz
historical-ae95a7241b3a59759b046ed722373f559ea315a0.tar.bz2
historical-ae95a7241b3a59759b046ed722373f559ea315a0.zip
remove insecure version - bug #189786
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'www-servers/lighttpd')
-rw-r--r--www-servers/lighttpd/ChangeLog9
-rw-r--r--www-servers/lighttpd/Manifest9
-rw-r--r--www-servers/lighttpd/files/lighttpd-1.3.10.initd27
-rw-r--r--www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff50
-rw-r--r--www-servers/lighttpd/files/lighttpd-1.3.13-ldap-binddn.diff96
-rw-r--r--www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff45
-rw-r--r--www-servers/lighttpd/files/lighttpd-1.3.13-php.diff36
-rw-r--r--www-servers/lighttpd/lighttpd-1.3.16.ebuild101
8 files changed, 9 insertions, 364 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 05d1c072af0d..9de8d723968c 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-servers/lighttpd
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.150 2008/01/26 14:46:06 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.151 2008/02/12 23:18:40 bangert Exp $
+
+ 12 Feb 2008; Thilo Bangert <bangert@gentoo.org>
+ -files/lighttpd-1.3.10.initd, -files/lighttpd-1.3.11-gentoo.diff,
+ -files/lighttpd-1.3.13-ldap-binddn.diff,
+ -files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff,
+ -files/lighttpd-1.3.13-php.diff, -lighttpd-1.3.16.ebuild:
+ remove insecure version - bug #189786
26 Jan 2008; Thilo Bangert <bangert@gentoo.org> lighttpd-1.4.16.ebuild,
lighttpd-1.4.18.ebuild:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index d12439aad7cb..51ab7ed43be1 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -7,22 +7,15 @@ AUX conf/mime-types.conf 3291 RMD160 157c9a6f7d00e52c7d4118edcce8d1eb1e0a3c20 SH
AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 30066f52e469339cc8a5df8864b4cc2d9c558c3d SHA256 322656b4cfd22ca9f1f8ab160e0b932f1646622422fd49c6fc82ab416223eecf
AUX conf/mod_fastcgi.conf 661 RMD160 83b4126a4b0537fcd04db607a53e4742ceae039b SHA1 853a54799e9cd42ab9ff92bf0c07a0515ebe2d2a SHA256 61daa2ffac9e948d9d5130cc43f560a18c8dfb052cb7e3d4c6bd1decb6c9fd06
AUX conf/mod_fastcgi.conf-1.4.13-r2 687 RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 SHA1 ebb469944098a91772424a825fdd5a0464cef158 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e
-AUX lighttpd-1.3.10.initd 664 RMD160 cacd5e5cb80de790712ea0721d247fe2c0b1abcc SHA1 067be44a37828155bf80da043ed7487bc9e2bfe5 SHA256 c6799e8ec20a7295d44dba969db99864cbb53ab72aaf83cdd3128cb9d2c602ce
-AUX lighttpd-1.3.11-gentoo.diff 1784 RMD160 562fa1c98657afebbdededa9071aabbbc7ce973e SHA1 5540a55a5ff0c4414e7067bd1f62d45d082bfa1f SHA256 e383430afcd4bc2b055a395664e78428320d2b2d8069f0e5f65c1bef1034417f
-AUX lighttpd-1.3.13-ldap-binddn.diff 3863 RMD160 622033a88ca606872d68bfedb31a251b8655e7e1 SHA1 0d03b43f248d597209c5204f17cb03ef6798c651 SHA256 bce55b1d770f1f9002019257a941bd6dabf1f1fb002d9e686b1bbecffaaf2066
-AUX lighttpd-1.3.13-no-mysql-means-no-mysql.diff 1456 RMD160 976b9081a6eae177cf5db7f2856d589100bb2206 SHA1 e22cc8995f1bdcca816ed5707e9e69da9ad78b91 SHA256 d3930366baef28f58907aced7568e795e0ac89d6da0311dbb090b9c80da046ca
-AUX lighttpd-1.3.13-php.diff 1399 RMD160 521ac2e131f1c68c69e717902ef2f161d4f24f99 SHA1 6b16aae46bd11972b147d6423503f79703654a0d SHA256 dcf102367a768f8d6b1273327e5299a17f597ea4f7939b485c30a71bee8143ef
AUX lighttpd.confd 315 RMD160 c2d9c166a1209b853b400b5d21627f5d3f2d5216 SHA1 a09597a0d38d0b4d36a8f16f5d6fd5c4b7462b26 SHA256 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87
AUX lighttpd.initd 1162 RMD160 9a1afa2777428a27857e9e587c1e94457b95c6eb SHA1 e1208f1906cf089e8bac00d0271b4691e9922f60 SHA256 8bbe703055f65742158ceeed7725a914d2fa4059e720b9983fa5e647626111aa
AUX lighttpd.initd-1.4.13-r3 1442 RMD160 17ce31a67f06f22b351ba6abfd868925eb5ad85f SHA1 58678d19bb60fd4e52a55381d9277ca472cbe805 SHA256 a4865824084d952050a1edc93bdffcbca33532d69268e13e96bb86c1a9a4bae6
AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768
AUX spawn-fcgi.initd 1398 RMD160 3fd0fa41d100629e85960034237abc0866ec3d38 SHA1 9c07c9fd59ec73d5f37df109b188b8a7d691f949 SHA256 ae10c764e2bde9bfc483c57ca94a63d87c24cba00b4c06917885c533d2d245b1
-DIST lighttpd-1.3.16.tar.gz 706362 RMD160 3bf9b50be2e2d9b83f6fe4fe1b8bf5d8dca417d9 SHA1 47449370b58f488350a54d54b416747228e4120f SHA256 92f90ef3db84c4ebaf8f1fecc82547c2e99c95b3f4cce429e07a58d7440c2369
DIST lighttpd-1.4.16.tar.bz2 592540 RMD160 185948bb05f5e667d604a5e9c6db4f0d64526ba4 SHA1 8f137ff71f629fe24a745c758b72dce24a8669f2 SHA256 568a6ce34d0a185b3164be99bce88011201957952f4ac817f7e7101bc526b59f
DIST lighttpd-1.4.18.tar.bz2 600227 RMD160 9fcd5e09ee2b1b517868d8843883228cd8b4145f SHA1 a53a8f8ae8d42d036f0b5129764b822e943cc778 SHA256 d59123850f3dd4a10f067d9a0c527324a70203cd3f82f70f0e44b8cb8068db43
-EBUILD lighttpd-1.3.16.ebuild 2586 RMD160 ebcf74cf84ec75c361ea5894115d54f93f6eea51 SHA1 0984b9d7fb378b6b7bb08fd8155ff30b480adac0 SHA256 12818ec066898a0e019dcbb50fb4d190fe60363052d03213e8b5e4f4da5bbfe1
EBUILD lighttpd-1.4.16.ebuild 5834 RMD160 7826a08df78c8b984f4a9b90717a33406c690bfe SHA1 ac288cf249eca1acdaab29e52d7f05a1f5b16c90 SHA256 febee4a940469873d46063f479bfe788af2f2556c587d78caa4a315c67521a29
EBUILD lighttpd-1.4.18.ebuild 5835 RMD160 fa429054db8803c73cf20dd216db57d20a43efc3 SHA1 7b2019a39a552e7bf7d3035462e572b0f90aa486 SHA256 2cb1bdd319a8c2c785fe6d71032cb800ffe0a1747af0ee0e2f652cd2cc05cee2
-MISC ChangeLog 36244 RMD160 d314a74e1952223bc794c055c9e259e850caf7be SHA1 d0d597b1a2691a8708882b54b05bfba7242e6825 SHA256 18e72c58e275ba9cfd8f5fd13c8e7270fde00601d6d6c82837038fbc7c4d8a32
+MISC ChangeLog 36561 RMD160 ce14517e76232b4ff7f2d77825b2338cab543f4b SHA1 64f6e751fa36168a9db31cabc97db171877274de SHA256 ba45a9c97a8e4f12988f772c063b5e093a092081152c3071e8abd749681a8c59
MISC metadata.xml 633 RMD160 f53110608c976ad01e089359eb60da7b8d1d8812 SHA1 f072b189d3973eb56e8bb059197ef2b1683d2790 SHA256 ec78010aee8ea37993d032389ba33c1a00488d0c658e4b25cf096556af8f962e
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.10.initd b/www-servers/lighttpd/files/lighttpd-1.3.10.initd
deleted file mode 100644
index 451d236516b2..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.10.initd
+++ /dev/null
@@ -1,27 +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-1.3.10.initd,v 1.3 2007/10/12 20:54:46 swegener Exp $
-
-PID_FILE="/var/run/lighttpd.pid"
-LIGHTTPD_BIN="/usr/sbin/lighttpd"
-LIGHTTPD_CONF="/etc/lighttpd.conf"
-
-depend() {
- need net
- use mysql logger spawn-fcgi ldap
- after sshd
-}
-
-start() {
- ebegin "Starting lighttpd"
- start-stop-daemon --start --quiet --exec ${LIGHTTPD_BIN} -- \
- -f ${LIGHTTPD_CONF}
- eend $?
-}
-
-stop() {
- ebegin "Stopping lighttpd"
- start-stop-daemon --stop --quiet --exec ${LIGHTTPD_BIN}
- eend $?
-}
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff b/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff
deleted file mode 100644
index 9138690f58aa..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.11-gentoo.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --exclude='*~' -urN lighttpd-1.3.11.orig/doc/lighttpd.1 lighttpd-1.3.11/doc/lighttpd.1
---- lighttpd-1.3.11.orig/doc/lighttpd.1 2005-02-22 22:13:45.421019568 -0500
-+++ lighttpd-1.3.11/doc/lighttpd.1 2005-02-22 22:18:13.278299072 -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.11.orig/doc/lighttpd.conf lighttpd-1.3.11/doc/lighttpd.conf
---- lighttpd-1.3.11.orig/doc/lighttpd.conf 2005-02-22 22:13:45.421019568 -0500
-+++ lighttpd-1.3.11/doc/lighttpd.conf 2005-02-22 22:20:39.417082600 -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
- #
-@@ -165,10 +165,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.13-ldap-binddn.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-ldap-binddn.diff
deleted file mode 100644
index 936813a0aebd..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-ldap-binddn.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -urN lighttpd-1.3.13.orig/src/http_auth.h lighttpd-1.3.13/src/http_auth.h
---- lighttpd-1.3.13.orig/src/http_auth.h 2005-05-06 21:20:21.000000000 +0000
-+++ lighttpd-1.3.13/src/http_auth.h 2005-05-06 21:19:24.000000000 +0000
-@@ -27,6 +27,8 @@
-
- buffer *auth_ldap_hostname;
- buffer *auth_ldap_basedn;
-+ buffer *auth_ldap_binddn;
-+ buffer *auth_ldap_bindpw;
- buffer *auth_ldap_filter;
-
- unsigned short auth_debug;
-diff -urN lighttpd-1.3.13.orig/src/mod_auth.c lighttpd-1.3.13/src/mod_auth.c
---- lighttpd-1.3.13.orig/src/mod_auth.c 2005-05-06 21:20:21.000000000 +0000
-+++ lighttpd-1.3.13/src/mod_auth.c 2005-05-06 21:21:24.000000000 +0000
-@@ -67,6 +67,8 @@
-
- buffer_free(s->auth_ldap_hostname);
- buffer_free(s->auth_ldap_basedn);
-+ buffer_free(s->auth_ldap_binddn);
-+ buffer_free(s->auth_ldap_bindpw);
- buffer_free(s->auth_ldap_filter);
-
- #ifdef USE_LDAP
-@@ -152,6 +154,8 @@
- PATCH(auth_debug);
- PATCH(auth_ldap_hostname);
- PATCH(auth_ldap_basedn);
-+ PATCH(auth_ldap_binddn);
-+ PATCH(auth_ldap_bindpw);
- PATCH(auth_ldap_filter);
- #ifdef USE_LDAP
- PATCH(ldap);
-@@ -296,10 +300,12 @@
- { "auth.require", NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION },
- { "auth.backend.ldap.hostname", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- { "auth.backend.ldap.base-dn", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.ldap.bind-dn", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-+ { "auth.backend.ldap.bind-pw", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- { "auth.backend.ldap.filter", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
- { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
-- { "auth.debug", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 9 */
-+ { "auth.debug", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 11 */
- { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
- };
-
-@@ -320,6 +326,8 @@
-
- s->auth_ldap_hostname = buffer_init();
- s->auth_ldap_basedn = buffer_init();
-+ s->auth_ldap_binddn = buffer_init();
-+ s->auth_ldap_bindpw = buffer_init();
- s->auth_ldap_filter = buffer_init();
- s->auth_debug = 0;
-
-@@ -337,10 +345,12 @@
- cv[3].destination = s->auth_require;
- cv[4].destination = s->auth_ldap_hostname;
- cv[5].destination = s->auth_ldap_basedn;
-- cv[6].destination = s->auth_ldap_filter;
-- cv[7].destination = s->auth_htdigest_userfile;
-- cv[8].destination = s->auth_htpasswd_userfile;
-- cv[9].destination = &(s->auth_debug);
-+ cv[6].destination = s->auth_ldap_binddn;
-+ cv[7].destination = s->auth_ldap_bindpw;
-+ cv[8].destination = s->auth_ldap_filter;
-+ cv[9].destination = s->auth_htdigest_userfile;
-+ cv[10].destination = s->auth_htpasswd_userfile;
-+ cv[11].destination = &(s->auth_debug);
-
- p->config_storage[i] = s;
- ca = ((data_config *)srv->config_context->data[i])->value;
-@@ -532,10 +542,18 @@
-
-
- /* 1. */
-- if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) {
-- log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
--
-- return HANDLER_ERROR;
-+ if (s->auth_ldap_binddn->used) {
-+ if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, s->auth_ldap_binddn->ptr, s->auth_ldap_bindpw->ptr))) {
-+ log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
-+
-+ return HANDLER_ERROR;
-+ }
-+ } else {
-+ if (LDAP_SUCCESS != (ret = ldap_simple_bind_s(s->ldap, NULL, NULL))) {
-+ log_error_write(srv, __FILE__, __LINE__, "ss", "ldap:", ldap_err2string(ret));
-+
-+ return HANDLER_ERROR;
-+ }
- }
- }
- #else
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff
deleted file mode 100644
index cb8e39c84e22..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-no-mysql-means-no-mysql.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/configure.in lighttpd-1.3.13/configure.in
---- lighttpd-1.3.13.orig/configure.in 2005-05-13 04:00:39.000000000 -0400
-+++ lighttpd-1.3.13/configure.in 2005-05-13 04:26:00.000000000 -0400
-@@ -82,7 +82,7 @@
-
- dnl Checks for database.
- MYSQL_INCLUDE=""
--
-+USE_MYSQL=no
- AC_PATH_PROG(MYSQLCONFIG, mysql_config)
- AC_MSG_CHECKING(for MySQL support)
- AC_ARG_WITH(mysql,
-@@ -113,6 +113,7 @@
- CPPFLAGS="$old_CPPFLAGS"
-
- AC_DEFINE([HAVE_MYSQL], [1], [mysql support])
-+ USE_MYSQL=yes
- else
- AC_MSG_RESULT(no)
- fi
-@@ -120,7 +121,7 @@
-
- AC_SUBST(MYSQL_LIBS)
- AC_SUBST(MYSQL_INCLUDE)
--
-+AM_CONDITIONAL(USE_MYSQL, test x$USE_MYSQL = xyes)
-
- AC_MSG_CHECKING(for LDAP support)
- AC_ARG_WITH(ldap, AC_HELP_STRING([--with-ldap],[enable LDAP support]),
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/src/Makefile.am lighttpd-1.3.13/src/Makefile.am
---- lighttpd-1.3.13.orig/src/Makefile.am 2005-05-13 04:00:39.000000000 -0400
-+++ lighttpd-1.3.13/src/Makefile.am 2005-05-13 04:25:29.000000000 -0400
-@@ -68,10 +68,12 @@
- common_libadd =
- endif
-
-+if USE_MYSQL
- lib_LTLIBRARIES += mod_mysql_vhost.la
- mod_mysql_vhost_la_SOURCES = mod_mysql_vhost.c
- mod_mysql_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
- mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd)
-+endif
-
- lib_LTLIBRARIES += mod_cgi.la
- mod_cgi_la_SOURCES = mod_cgi.c
diff --git a/www-servers/lighttpd/files/lighttpd-1.3.13-php.diff b/www-servers/lighttpd/files/lighttpd-1.3.13-php.diff
deleted file mode 100644
index fec462e657ad..000000000000
--- a/www-servers/lighttpd/files/lighttpd-1.3.13-php.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN lighttpd-1.3.13.orig/doc/lighttpd.conf lighttpd-1.3.13/doc/lighttpd.conf
---- lighttpd-1.3.13.orig/doc/lighttpd.conf 2005-07-12 09:35:12.000000000 -0400
-+++ lighttpd-1.3.13/doc/lighttpd.conf 2005-07-12 09:36:19.000000000 -0400
-@@ -19,7 +19,7 @@
- # "mod_auth",
- # "mod_status",
- # "mod_setenv",
--# "mod_fastcgi",
-+ "mod_fastcgi",
- # "mod_proxy",
- # "mod_simple_vhost",
- # "mod_evhost",
-@@ -190,14 +190,15 @@
-
- #### fastcgi module
- ## read fastcgi.txt for more info
--#fastcgi.server = ( ".php" =>
--# ( "localhost" =>
--# (
--# "socket" => "/tmp/php-fastcgi.socket",
--# "bin-path" => "/usr/local/bin/php"
--# )
--# )
--# )
-+fastcgi.server = ( ".php" =>
-+ ( "localhost" =>
-+ (
-+ "host" => "127.0.0.1",
-+ "port" => 1026,
-+ "bin-path" => "/usr/bin/php-cgi"
-+ )
-+ )
-+ )
-
- #### CGI module
- #cgi.assign = ( ".pl" => "/usr/bin/perl",
diff --git a/www-servers/lighttpd/lighttpd-1.3.16.ebuild b/www-servers/lighttpd/lighttpd-1.3.16.ebuild
deleted file mode 100644
index 37e707542d8c..000000000000
--- a/www-servers/lighttpd/lighttpd-1.3.16.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.3.16.ebuild,v 1.12 2006/11/23 20:43:03 vivo Exp $
-
-inherit eutils depend.php
-
-RESTRICT="test"
-
-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="amd64 mips ~ppc x86"
-IUSE="mysql ssl php xattr ldap ipv6"
-
-RDEPEND="app-arch/bzip2
- >=dev-libs/libpcre-3.1
- >=sys-libs/zlib-1.1
- xattr? ( sys-apps/attr )
- ldap? ( >=net-nds/openldap-2.1.26 )
- mysql? ( >=virtual/mysql-4.0 )
- ssl? ( >=dev-libs/openssl-0.9.7 )
- php? (
- virtual/httpd-php
- !net-www/spawn-fcgi
- )"
-
-LIGHTTPD_DIR="/var/www/localhost/htdocs/"
-LOG_DIR="/var/log/lighttpd/"
-
-pkg_setup() {
- enewgroup lighttpd
- enewuser lighttpd -1 -1 "${LIGHTTPD_DIR}" lighttpd
-
- use php && require_php_with_use cgi
-}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${PN}-1.3.11-gentoo.diff
- epatch ${FILESDIR}/${PN}-1.3.13-no-mysql-means-no-mysql.diff
- epatch ${FILESDIR}/${PN}-1.3.13-ldap-binddn.diff
- use php && epatch ${FILESDIR}/${PN}-1.3.13-php.diff
-}
-
-src_compile() {
- local myconf="--libdir=/usr/$(get_libdir)/${PN}"
-
- # somehow during the process the BSD COPYING gets
- # overwritten with a GPL one
- mv COPYING{,.orig}
- einfo "Regenerating automake/autoconf files"
- autoreconf -f -i || die "autoreconf failed"
- mv COPYING{.orig,}
-
- econf --libdir=/usr/$(get_libdir)/${PN} \
- $(use_enable ipv6) \
- $(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
-}