diff options
author | Thomas Sachau <tommy@gentoo.org> | 2009-11-05 18:19:30 +0000 |
---|---|---|
committer | Thomas Sachau <tommy@gentoo.org> | 2009-11-05 18:19:30 +0000 |
commit | 20efe632f475ade8bf9211c3fd5b7a7b5934eb8d (patch) | |
tree | 3b2d645c90b07c4757352ec8c1dc899c77a5d29f /www-servers/lighttpd | |
parent | Remove old. (diff) | |
download | historical-20efe632f475ade8bf9211c3fd5b7a7b5934eb8d.tar.gz historical-20efe632f475ade8bf9211c3fd5b7a7b5934eb8d.tar.bz2 historical-20efe632f475ade8bf9211c3fd5b7a7b5934eb8d.zip |
Dont build mod_rewrite with disabled pcre USE flag, fixes bug 291183
Package-Manager: portage-2.2_rc48-r1/cvs/Linux x86_64
Diffstat (limited to 'www-servers/lighttpd')
-rw-r--r-- | www-servers/lighttpd/ChangeLog | 7 | ||||
-rw-r--r-- | www-servers/lighttpd/Manifest | 17 | ||||
-rw-r--r-- | www-servers/lighttpd/files/lighttpd-1.4.24-mod_rewrite-without-pcre.patch | 232 | ||||
-rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.24.ebuild | 9 |
4 files changed, 257 insertions, 8 deletions
diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index a8c9bd572c46..440b313ea06c 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-servers/lighttpd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.210 2009/10/29 22:12:12 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.211 2009/11/05 18:19:29 tommy Exp $ + + 05 Nov 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + lighttpd-1.4.24.ebuild, + +files/lighttpd-1.4.24-mod_rewrite-without-pcre.patch: + Dont build mod_rewrite with disabled pcre USE flag, fixes bug 291183 *lighttpd-1.4.24 (29 Oct 2009) diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 26c33dee023e..d6c8ac13d9a9 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.4.20/03_all_lighttpd-1.4.11-errorlog-pipe.diff 4931 RMD160 7653167b0cd3fde6cb7d3d6fe4ae30a8d2e56ebe SHA1 bd0ff91b5caf447f78bcad66a444fbe3719897fb SHA256 2b1a253dda1dbc688ac072608656121f8c2d346a64be1080c65f2ca1d81f8e2d AUX 1.4.22-r1/03_all_lighttpd-1.4.11-errorlog-pipe.diff 4563 RMD160 a37ad759d8b430779b740047aeabfa541479ce66 SHA1 468e08b4bf32b677a0bb1e3ec36edd52e4bc024e SHA256 a26d8e23113a3ffc35a351be4192b3e183ff0237edba3633af8886af08e241c1 AUX conf/lighttpd.conf 8243 RMD160 0b99dbb49be34521ddda14abd9b06cef141bbfc9 SHA1 8fd27dd9b5aea94ca0d1611c8fb1d9e3cb720d0b SHA256 3c016c663d14bf1cb8bf1c7d87dc0ecc1fb4f189ebd4fb05e90ed23f20439ed5 @@ -6,6 +9,7 @@ AUX conf/mod_cgi.conf 869 RMD160 1d447bad36822657d014990128891cbdb6169468 SHA1 3 AUX conf/mod_fastcgi.conf 677 RMD160 4403ca232cfcfc51d1d71529be9903bf4123451e SHA1 2b4a3d35215ba8824b5eca943156b373479f1a45 SHA256 954bf2a030e268e7cd880d4cd7d6c13317c09e0ec4e87a8d7d887fb4e7dc83bd AUX conf/mod_fastcgi.conf-1.4.13-r2 687 RMD160 f165f27a08f35c4792bd332be3a04370b69152e3 SHA1 ebb469944098a91772424a825fdd5a0464cef158 SHA256 d1adc1358b5d9e85353caa2e706bfa231d145dd59c075cdcb3f818b3cb5d722e AUX lighttpd-1.4.24-mod_magnet-fix-pairs.patch 560 RMD160 bd715473d529e556c097de6d4f57a88d241fdaae SHA1 322e74cf3598170f8a33b768a9657fab7f9594dd SHA256 a34c65b98219219a32e1e77518891ca3640f2e6884c06c68000bf2fbb5a4db3c +AUX lighttpd-1.4.24-mod_rewrite-without-pcre.patch 5171 RMD160 f8b705fd3cb3de7cdec5d2d7ad94320d5ee12c7c SHA1 b86963379386a64cce0f485dce8d8563d0b0546b SHA256 980e9721b4da8a275749b36af3b738cade19af69108e990741a13562e88e5352 AUX lighttpd.confd 315 RMD160 c2d9c166a1209b853b400b5d21627f5d3f2d5216 SHA1 a09597a0d38d0b4d36a8f16f5d6fd5c4b7462b26 SHA256 94f69a173dc26610a43532474230537b9bc31ec846fb9f94cb72765f125edf87 AUX lighttpd.initd 1445 RMD160 0ebf75a57644912748a1c4173aa64c15981e5abc SHA1 0597c93d246639141ca8522f44f24b2431949e2e SHA256 72b08e97eae7de6a33160085bc46c0edd36f6924d6132239cd8191399998ec5a AUX lighttpd.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a @@ -19,6 +23,15 @@ DIST lighttpd-1.4.24.tar.bz2 622842 RMD160 9a323e8b4361c19d6231071c492369ea3996d EBUILD lighttpd-1.4.20.ebuild 5960 RMD160 19f74751b53e92f9876c0015b0fc850733c20021 SHA1 4de12f3cba5ef21bf55a16e4b5a9ca2ab64d1816 SHA256 45c275d895a00370c905b0aa37ebdba46872930034843bb0375fdfa1c0f78f72 EBUILD lighttpd-1.4.22-r1.ebuild 5727 RMD160 efb0331c3cc5678b6aeceb5ac7f1d73d59d89744 SHA1 2622b63db683b0f1e69dd1301c29cd68fb701871 SHA256 7dcd501c6322ecd75f7efcfdbf07fe120beb0d76f42a324f3352090cefa4f201 EBUILD lighttpd-1.4.23.ebuild 5782 RMD160 bff0e3ab4236b516a2ab40571d2f15a9102ba50d SHA1 16c1c81eea20e8e65ad385273f87f2d483a6cc46 SHA256 806b12e253682ba4250980f7f3fb9b8fcb634a5348340875dae133701eec5d9d -EBUILD lighttpd-1.4.24.ebuild 5849 RMD160 f3e7e9a2d293111c2530afad53034593a4553606 SHA1 a8f4c936a3500891e16db69e8cf7bc71f6be6dc8 SHA256 6f48e620d7e3536f50bc9b7bdfe5b6ec80db06ffc7daa4048cd64c802347e420 -MISC ChangeLog 47841 RMD160 ed0e7cf19f115414c994727d913e76b08ec34ddc SHA1 50d6c2942185a59bcf492ca2f2efd61f3a344579 SHA256 744ab9d23c93a9d297ac7e84e91280d2b64c2d3bd5d545396233724284f454f6 +EBUILD lighttpd-1.4.24.ebuild 5841 RMD160 6386433475934be8dfb22ad2bc72edf9d6e1acbc SHA1 9d348d0ea42767b6a6997394201fd202009c2d3b SHA256 da6730e9b0ff9e7cc436c08f95c96e38fbe8eefd4529d086ea5b85006033a4c2 +MISC ChangeLog 48053 RMD160 dcb4eb1575e555e4ea18f7fc21b43b329d7a95bc SHA1 3866fe0e4ac363ef698681ad2f1066abb88299ff SHA256 d3e1d50009704fcb24da0218240e04b212cb4e1cd546da7ebea961c8f652e9d2 MISC metadata.xml 927 RMD160 3d969f099d1bb8df70ec5f8ed78a83ad27d2b10d SHA1 1e564c4fc4edb8a4b2dc41f731071ec38e917027 SHA256 479db26201c5c934fd5fb5deccd8712a637114d5cde6e75da8ce9ad4872ec070 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iJwEAQECAAYFAkrzFz0ACgkQG7kqcTWJkGeNkQQAkbis2v9TY5AdZ/Svkuw/yJET +TMaYvKx6BvWvWuWWMaRt+PUb7qnsqjF9TVDaVpDhONBv1EAZVDwQb0/lKayLSfH6 +rGWgUsyAfV8Rl6g7rETqGKXlKaRcK8g3m+Dl0trHyREOnp9+9R/ZNIeZ536ku+gE +CuGylkjm/On80kknjE4= +=21Rm +-----END PGP SIGNATURE----- diff --git a/www-servers/lighttpd/files/lighttpd-1.4.24-mod_rewrite-without-pcre.patch b/www-servers/lighttpd/files/lighttpd-1.4.24-mod_rewrite-without-pcre.patch new file mode 100644 index 000000000000..dac3a8624045 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.4.24-mod_rewrite-without-pcre.patch @@ -0,0 +1,232 @@ +--- src/mod_rewrite.c (revision 2682) ++++ src/mod_rewrite.c (revision 2683) +@@ -9,10 +9,9 @@ + #include <stdlib.h> + #include <string.h> + +-typedef struct { + #ifdef HAVE_PCRE_H ++typedef struct { + pcre *key; +-#endif + + buffer *value; + +@@ -70,7 +69,6 @@ + } + + static int rewrite_rule_buffer_append(rewrite_rule_buffer *kvb, buffer *key, buffer *value, int once) { +-#ifdef HAVE_PCRE_H + size_t i; + const char *errptr; + int erroff; +@@ -109,18 +107,9 @@ + kvb->used++; + + return 0; +-#else +- UNUSED(kvb); +- UNUSED(value); +- UNUSED(once); +- UNUSED(key); +- +- return -1; +-#endif + } + + static void rewrite_rule_buffer_free(rewrite_rule_buffer *kvb) { +-#ifdef HAVE_PCRE_H + size_t i; + + for (i = 0; i < kvb->size; i++) { +@@ -130,7 +119,6 @@ + } + + if (kvb->ptr) free(kvb->ptr); +-#endif + + free(kvb); + } +@@ -201,24 +189,29 @@ + ((data_string *)(da->value->data[j]))->key, + ((data_string *)(da->value->data[j]))->value, + once)) { +-#ifdef HAVE_PCRE_H + log_error_write(srv, __FILE__, __LINE__, "sb", + "pcre-compile failed for", da->value->data[j]->key); +-#else +- log_error_write(srv, __FILE__, __LINE__, "s", +- "pcre support is missing, please install libpcre and the headers"); +-#endif + } + } + } + + return 0; + } ++#else ++static int parse_config_entry(server *srv, array *ca, const char *option) { ++ static int logged_message = 0; ++ if (logged_message) return 0; ++ if (NULL != array_get_element(ca, option)) { ++ logged_message = 1; ++ log_error_write(srv, __FILE__, __LINE__, "s", ++ "pcre support is missing, please install libpcre and the headers"); ++ } ++ return 0; ++} ++#endif + + SETDEFAULTS_FUNC(mod_rewrite_set_defaults) { +- plugin_data *p = p_d; + size_t i = 0; +- + config_values_t cv[] = { + { "url.rewrite-repeat", NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ + { "url.rewrite-once", NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ +@@ -243,33 +236,37 @@ + { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } + }; + ++#ifdef HAVE_PCRE_H ++ plugin_data *p = p_d; ++ + if (!p) return HANDLER_ERROR; + + /* 0 */ + p->config_storage = calloc(1, srv->config_context->used * sizeof(specific_config *)); ++#else ++ UNUSED(p_d); ++#endif + + for (i = 0; i < srv->config_context->used; i++) { +- plugin_config *s; + array *ca; ++#ifdef HAVE_PCRE_H ++ plugin_config *s; + + s = calloc(1, sizeof(plugin_config)); + s->rewrite = rewrite_rule_buffer_init(); + s->rewrite_NF = rewrite_rule_buffer_init(); +- +- cv[0].destination = s->rewrite; +- cv[1].destination = s->rewrite; +- cv[2].destination = s->rewrite_NF; +- cv[3].destination = s->rewrite_NF; +- cv[4].destination = s->rewrite; +- cv[5].destination = s->rewrite; +- + p->config_storage[i] = s; ++#endif ++ + ca = ((data_config *)srv->config_context->data[i])->value; + + if (0 != config_insert_values_global(srv, ca, cv)) { + return HANDLER_ERROR; + } + ++#ifndef HAVE_PCRE_H ++# define parse_config_entry(srv, ca, x, option, y) parse_config_entry(srv, ca, option) ++#endif + parse_config_entry(srv, ca, s->rewrite, "url.rewrite-once", 1); + parse_config_entry(srv, ca, s->rewrite, "url.rewrite-final", 1); + parse_config_entry(srv, ca, s->rewrite_NF, "url.rewrite-if-not-file", 1); +@@ -280,7 +277,9 @@ + + return HANDLER_GO_ON; + } ++ + #ifdef HAVE_PCRE_H ++ + #define PATCH(x) \ + p->conf.x = s->x; + static int mod_rewrite_patch_connection(server *srv, connection *con, plugin_data *p) { +@@ -330,7 +329,7 @@ + + return 0; + } +-#endif ++ + URIHANDLER_FUNC(mod_rewrite_con_reset) { + plugin_data *p = p_d; + +@@ -345,7 +344,6 @@ + } + + static int process_rewrite_rules(server *srv, connection *con, plugin_data *p, rewrite_rule_buffer *kvb) { +-#ifdef HAVE_PCRE_H + size_t i; + handler_ctx *hctx; + +@@ -444,19 +442,11 @@ + } + #undef N + } +-#else +- UNUSED(srv); +- UNUSED(con); +- UNUSED(p); +- UNUSED(hctx); +- UNUSED(kvb); +-#endif + + return HANDLER_GO_ON; + } + + URIHANDLER_FUNC(mod_rewrite_physical) { +-#ifdef HAVE_PCRE_H + plugin_data *p = p_d; + handler_t r; + stat_cache_entry *sce; +@@ -480,17 +470,11 @@ + default: + return r; + } +-#else +- UNUSED(srv); +- UNUSED(con); +- UNUSED(p_d); +-#endif + + return HANDLER_GO_ON; + } + + URIHANDLER_FUNC(mod_rewrite_uri_handler) { +-#ifdef HAVE_PCRE_H + plugin_data *p = p_d; + + mod_rewrite_patch_connection(srv, con, p); +@@ -498,29 +482,27 @@ + if (!p->conf.rewrite) return HANDLER_GO_ON; + + return process_rewrite_rules(srv, con, p, p->conf.rewrite); +-#else +- UNUSED(srv); +- UNUSED(con); +- UNUSED(p_d); +-#endif + + return HANDLER_GO_ON; + } ++#endif + + int mod_rewrite_plugin_init(plugin *p); + int mod_rewrite_plugin_init(plugin *p) { + p->version = LIGHTTPD_VERSION_ID; + p->name = buffer_init_string("rewrite"); + ++#ifdef HAVE_PCRE_H + p->init = mod_rewrite_init; + /* it has to stay _raw as we are matching on uri + querystring + */ + + p->handle_uri_raw = mod_rewrite_uri_handler; + p->handle_physical = mod_rewrite_physical; +- p->set_defaults = mod_rewrite_set_defaults; + p->cleanup = mod_rewrite_free; + p->connection_reset = mod_rewrite_con_reset; ++#endif ++ p->set_defaults = mod_rewrite_set_defaults; + + p->data = NULL; + diff --git a/www-servers/lighttpd/lighttpd-1.4.24.ebuild b/www-servers/lighttpd/lighttpd-1.4.24.ebuild index 21a69e39d14a..0363a88e4330 100644 --- a/www-servers/lighttpd/lighttpd-1.4.24.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.24.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.24.ebuild,v 1.1 2009/10/29 22:12:12 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.24.ebuild,v 1.2 2009/11/05 18:19:29 tommy Exp $ EAPI="2" @@ -96,12 +96,12 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/lighttpd-1.4.24-mod_magnet-fix-pairs.patch + epatch "${FILESDIR}"/lighttpd-1.4.24-{mod_magnet-fix-pairs,mod_rewrite-without-pcre}.patch # dev-python/docutils installs rst2html.py not rst2html sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.am || \ die "sed doc/Makefile.am failed" - eautoreconf || die + eautoreconf } src_configure() { @@ -119,8 +119,7 @@ src_configure() { $(use_with ssl openssl) \ $(use_with webdav webdav-props) \ $(use_with webdav webdav-locks) \ - $(use_with xattr attr) \ - || die "econf failed" + $(use_with xattr attr) } src_compile() { |