# HG changeset patch # User Jiri Kukacka # Date 1396254749 25200 # Node ID 45d28e42b8283150d7726502ff2283ae9d529690 # Parent c77d43725b499a8d7563ef25e6c9e57321519247 18450732 Upgrade lighttpd to version 1.4.35 18394858 problem in UTILITY/LIGHTTPD diff -r c77d43725b49 -r 45d28e42b828 components/lighttpd/Makefile --- a/components/lighttpd/Makefile Tue Apr 01 06:28:58 2014 -0700 +++ b/components/lighttpd/Makefile Mon Mar 31 01:32:29 2014 -0700 @@ -26,12 +26,12 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= lighttpd -COMPONENT_VERSION= 1.4.33 +COMPONENT_VERSION= 1.4.35 COMPONENT_PROJECT_URL= http://www.lighttpd.net/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:91f574d8bea8d9f75535e86cb2abc389beb8be24f003b71e6304b8c8ba1d3753 + sha256:62c23de053fd82e1bf64f204cb6c6e44ba3c16c01ff1e09da680d982802ef1cc COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/lighttpd diff -r c77d43725b49 -r 45d28e42b828 components/lighttpd/lighttpd.p5m --- a/components/lighttpd/lighttpd.p5m Tue Apr 01 06:28:58 2014 -0700 +++ b/components/lighttpd/lighttpd.p5m Mon Mar 31 01:32:29 2014 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> @@ -30,7 +30,7 @@ set name=pkg.summary \ value="The Lighttpd Web Server" set name=com.oracle.info.description value="the Lightppd web server" -set name=com.oracle.info.tpno value=15577 +set name=com.oracle.info.tpno value=17006 set name=info.classification \ value="org.opensolaris.category.2008:Web Services/Application and Web Servers" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) diff -r c77d43725b49 -r 45d28e42b828 components/lighttpd/patches/02-automake-libtool-Solaris.patch --- a/components/lighttpd/patches/02-automake-libtool-Solaris.patch Tue Apr 01 06:28:58 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,239 +0,0 @@ -Developed in-house, fed back, accepted for ver 1.4.34 -http://redmine.lighttpd.net/issues/2533 -Due to differences between Linux and Solaris, we have to change -behavior of libtool, which uses -z defs even for shared libraries, -but this couldn't be used on Solaris. -There is -z text that could be used instead, but that would -require patching libtool files on build machine. So we skip - -z defs by omitting -no-undefined - ---- configure.ac 2013-11-04 03:03:07.543168957 -0800 -+++ configure.ac 2013-11-04 03:02:30.584721483 -0800 -@@ -45,6 +45,13 @@ - AC_ISC_POSIX - AC_MINIX - -+dnl Fix no-undefined if on solaris -+case $host_os in -+ *solaris* ) LIB_NO_UNDEFINED=no;; -+ * ) LIB_NO_UNDEFINED=yes;; -+esac -+AM_CONDITIONAL(LIB_NO_UNDEFINED, test x$LIB_NO_UNDEFINED = xyes) -+ - dnl AC_CANONICAL_HOST - case $host_os in - *darwin*|*cygwin*|*aix*|*mingw* ) NO_RDYNAMIC=yes;; ---- src/Makefile.am 2013-11-04 05:37:18.206746790 -0800 -+++ src/Makefile.am 2013-11-04 05:37:09.639723519 -0800 -@@ -96,173 +96,178 @@ - common_libadd = - endif - -+if LIB_NO_UNDEFINED -+LIB_NO_UNDEF="-no-undefined" -+else -+LIB_NO_UNDEF="" -+endif - lib_LTLIBRARIES += mod_flv_streaming.la - mod_flv_streaming_la_SOURCES = mod_flv_streaming.c --mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_flv_streaming_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_evasive.la - mod_evasive_la_SOURCES = mod_evasive.c --mod_evasive_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_evasive_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_evasive_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_webdav.la - mod_webdav_la_SOURCES = mod_webdav.c - mod_webdav_la_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS) $(SQLITE_CFLAGS) --mod_webdav_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_webdav_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_webdav_la_LIBADD = $(common_libadd) $(XML_LIBS) $(SQLITE_LIBS) $(UUID_LIBS) - - lib_LTLIBRARIES += mod_magnet.la - mod_magnet_la_SOURCES = mod_magnet.c mod_magnet_cache.c - mod_magnet_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) --mod_magnet_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_magnet_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_magnet_la_LIBADD = $(common_libadd) $(LUA_LIBS) -lm - - lib_LTLIBRARIES += mod_cml.la - mod_cml_la_SOURCES = mod_cml.c mod_cml_lua.c mod_cml_funcs.c - mod_cml_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) --mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_cml_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_cml_la_LIBADD = $(MEMCACHE_LIB) $(common_libadd) $(LUA_LIBS) -lm - - lib_LTLIBRARIES += mod_trigger_b4_dl.la - mod_trigger_b4_dl_la_SOURCES = mod_trigger_b4_dl.c --mod_trigger_b4_dl_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_trigger_b4_dl_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_trigger_b4_dl_la_LIBADD = $(GDBM_LIB) $(MEMCACHE_LIB) $(PCRE_LIB) $(common_libadd) - - 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_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_mysql_vhost_la_LIBADD = $(MYSQL_LIBS) $(common_libadd) - mod_mysql_vhost_la_CPPFLAGS = $(MYSQL_INCLUDE) - - lib_LTLIBRARIES += mod_cgi.la - mod_cgi_la_SOURCES = mod_cgi.c --mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_cgi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_cgi_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_scgi.la - mod_scgi_la_SOURCES = mod_scgi.c --mod_scgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_scgi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_scgi_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_staticfile.la - mod_staticfile_la_SOURCES = mod_staticfile.c --mod_staticfile_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_staticfile_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_staticfile_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_dirlisting.la - mod_dirlisting_la_SOURCES = mod_dirlisting.c --mod_dirlisting_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_dirlisting_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_dirlisting_la_LIBADD = $(common_libadd) $(PCRE_LIB) - - lib_LTLIBRARIES += mod_indexfile.la - mod_indexfile_la_SOURCES = mod_indexfile.c --mod_indexfile_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_indexfile_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_indexfile_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_setenv.la - mod_setenv_la_SOURCES = mod_setenv.c --mod_setenv_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_setenv_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_setenv_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_alias.la - mod_alias_la_SOURCES = mod_alias.c --mod_alias_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_alias_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_alias_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_userdir.la - mod_userdir_la_SOURCES = mod_userdir.c --mod_userdir_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_userdir_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_userdir_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_rrdtool.la - mod_rrdtool_la_SOURCES = mod_rrdtool.c --mod_rrdtool_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_rrdtool_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_rrdtool_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_usertrack.la - mod_usertrack_la_SOURCES = mod_usertrack.c --mod_usertrack_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_usertrack_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_usertrack_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_proxy.la - mod_proxy_la_SOURCES = mod_proxy.c --mod_proxy_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_proxy_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_proxy_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_ssi.la - mod_ssi_la_SOURCES = mod_ssi_exprparser.c mod_ssi_expr.c mod_ssi.c --mod_ssi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_ssi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_ssi_la_LIBADD = $(common_libadd) $(PCRE_LIB) - - lib_LTLIBRARIES += mod_secdownload.la - mod_secdownload_la_SOURCES = mod_secure_download.c --mod_secdownload_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_secdownload_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_secdownload_la_LIBADD = $(common_libadd) - - #lib_LTLIBRARIES += mod_httptls.la - #mod_httptls_la_SOURCES = mod_httptls.c --#mod_httptls_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+#mod_httptls_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - #mod_httptls_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_expire.la - mod_expire_la_SOURCES = mod_expire.c --mod_expire_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_expire_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_expire_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_evhost.la - mod_evhost_la_SOURCES = mod_evhost.c --mod_evhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_evhost_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_evhost_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_simple_vhost.la - mod_simple_vhost_la_SOURCES = mod_simple_vhost.c --mod_simple_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_simple_vhost_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_simple_vhost_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_fastcgi.la - mod_fastcgi_la_SOURCES = mod_fastcgi.c --mod_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_fastcgi_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_fastcgi_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_extforward.la - mod_extforward_la_SOURCES = mod_extforward.c --mod_extforward_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_extforward_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_extforward_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_access.la - mod_access_la_SOURCES = mod_access.c --mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_access_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_access_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_compress.la - mod_compress_la_SOURCES = mod_compress.c --mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_compress_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_compress_la_LIBADD = $(Z_LIB) $(BZ_LIB) $(common_libadd) - - lib_LTLIBRARIES += mod_auth.la - mod_auth_la_SOURCES = mod_auth.c http_auth.c --mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd) - - lib_LTLIBRARIES += mod_rewrite.la - mod_rewrite_la_SOURCES = mod_rewrite.c --mod_rewrite_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_rewrite_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_rewrite_la_LIBADD = $(PCRE_LIB) $(common_libadd) - - lib_LTLIBRARIES += mod_redirect.la - mod_redirect_la_SOURCES = mod_redirect.c --mod_redirect_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_redirect_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_redirect_la_LIBADD = $(PCRE_LIB) $(common_libadd) - - lib_LTLIBRARIES += mod_status.la - mod_status_la_SOURCES = mod_status.c --mod_status_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_status_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_status_la_LIBADD = $(common_libadd) - - lib_LTLIBRARIES += mod_accesslog.la - mod_accesslog_la_SOURCES = mod_accesslog.c --mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined -+mod_accesslog_la_LDFLAGS = -module -export-dynamic -avoid-version $(LIB_NO_UNDEF) - mod_accesslog_la_LIBADD = $(common_libadd) - - diff -r c77d43725b49 -r 45d28e42b828 components/lighttpd/patches/07-parfait-errors.patch --- a/components/lighttpd/patches/07-parfait-errors.patch Tue Apr 01 06:28:58 2014 -0700 +++ b/components/lighttpd/patches/07-parfait-errors.patch Mon Mar 31 01:32:29 2014 -0700 @@ -1,28 +1,6 @@ Developed in-house, fed to community. http://redmine.lighttpd.net/issues/2530 -Partially accepted, others should be fixed by version or not -at all, parfait annotations are ignored. Target version 1.4.34. ---- src/mod_webdav.c 2013-10-11 07:42:39.116745543 -0700 -+++ src/mod_webdav.c 2013-10-11 07:43:19.220464118 -0700 -@@ -1717,7 +1717,7 @@ - if (-1 == c->file.fd && /* open the file if not already open */ - -1 == (c->file.fd = open(c->file.name->ptr, O_RDONLY))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "open failed: ", strerror(errno)); -- -+ close(fd); - return HANDLER_ERROR; - } - -@@ -1726,7 +1726,7 @@ - strerror(errno), c->file.name, c->file.fd); - close(c->file.fd); - c->file.fd = -1; -- -+ close(fd); - return HANDLER_ERROR; - } - --- src/lempar.c 2012-08-31 07:11:20.000000000 -0700 +++ src/lempar.c 2013-10-14 02:10:29.201323553 -0700 @@ -486,6 +486,9 @@ @@ -49,24 +27,6 @@ s->mysql_pre = buffer_init(); s->mysql_post = buffer_init(); -@@ -248,7 +251,7 @@ - - if (NULL == (s->mysql = mysql_init(NULL))) { - log_error_write(srv, __FILE__, __LINE__, "s", "mysql_init() failed, exiting..."); -- -+ buffer_free(sel); - return HANDLER_ERROR; - } - -@@ -268,7 +271,7 @@ - FOO(mydb), s->port, FOO(mysock), 0)) { - #endif - log_error_write(srv, __FILE__, __LINE__, "s", mysql_error(s->mysql)); -- -+ buffer_free(sel); - return HANDLER_ERROR; - } - #undef FOO --- src/lemon.c 2012-08-31 07:11:20.000000000 -0700 +++ src/lemon.c 2013-10-14 04:29:24.547185717 -0700 @@ -453,13 +453,11 @@ @@ -101,27 +61,8 @@ return NULL; } ---- src/array.c 2010-08-17 02:04:38.000000000 -0700 -+++ src/array.c 2013-10-14 07:05:54.354135229 -0700 -@@ -168,6 +168,7 @@ - data_unset *array_replace(array *a, data_unset *du) { - int ndx; - -+ if (du == NULL) return NULL; - if (-1 == (ndx = array_get_index(a, du->key->ptr, du->key->used, NULL))) { - array_insert_unique(a, du); - return NULL; --- src/configfile.c 2012-11-07 06:50:29.000000000 -0800 +++ src/configfile.c 2013-10-15 06:45:37.918474628 -0700 -@@ -1121,7 +1121,7 @@ - if (NULL != getcwd(dcwd->value->ptr, dcwd->value->size - 1)) { - dcwd->value->used = strlen(dcwd->value->ptr) + 1; - buffer_copy_string_len(dcwd->key, CONST_STR_LEN("var.CWD")); -- array_insert_unique(srv->config, (data_unset *)dcwd); -+ if (array_insert_unique(srv->config, (data_unset *)dcwd) == -1) dcwd->free(dcwd); - } - - ret = config_parse_file(srv, &context, fn); @@ -1131,12 +1131,14 @@ context_free(&context); @@ -145,32 +86,6 @@ return -1; } -@@ -1159,19 +1162,23 @@ - } - - prepends = (data_array *)configparser_merge_data((data_unset *)prepends, (data_unset *)modules); -+ if (prepends == NULL) { -+ /* Parfait_ALLOW memory-leak - false positive dcwd variable - memory is properly freed on server close */ -+ return -1; -+ } - buffer_copy_string_buffer(prepends->key, modules->key); - array_replace(srv->config, (data_unset *)prepends); - modules->free((data_unset *)modules); - modules = prepends; - - /* append default modules */ -- if (NULL == array_get_element(modules->value, "mod_dirlisting")) { -+ if (modules != NULL && NULL == array_get_element(modules->value, "mod_dirlisting")) { - ds = data_string_init(); - buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_dirlisting")); - array_insert_unique(modules->value, (data_unset *)ds); - } - -- if (NULL == array_get_element(modules->value, "mod_staticfile")) { -+ if (modules != NULL && NULL == array_get_element(modules->value, "mod_staticfile")) { - ds = data_string_init(); - buffer_copy_string_len(ds->value, CONST_STR_LEN("mod_staticfile")); - array_insert_unique(modules->value, (data_unset *)ds); @@ -1200,9 +1207,11 @@ diff -r c77d43725b49 -r 45d28e42b828 components/lighttpd/resolve.deps --- a/components/lighttpd/resolve.deps Tue Apr 01 06:28:58 2014 -0700 +++ b/components/lighttpd/resolve.deps Mon Mar 31 01:32:29 2014 -0700 @@ -2,10 +2,10 @@ database/mysql-55/library library/pcre library/security/openssl +library/security/openssl/openssl-fips-140 library/zlib runtime/lua system/core-os system/library -system/library/math system/network web/fastcgi/spawn-fcgi