# HG changeset patch # User Jiri Kukacka # Date 1403532723 25200 # Node ID 44a15b136f48bdb1b106878d8014f8b537fd69fa # Parent 29f1541876588edc0e925502220f05583d375b66 18450732 Upgrade lighttpd to version 1.4.35 18394858 problem in UTILITY/LIGHTTPD diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/Makefile --- a/components/lighttpd/Makefile Wed Jun 25 00:57:56 2014 -0700 +++ b/components/lighttpd/Makefile Mon Jun 23 07:12:03 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) LIGHTTPD_INSTALLDIR=/usr/lighttpd/1.4 diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/Solaris/http-lighttpd14 --- a/components/lighttpd/Solaris/http-lighttpd14 Wed Jun 25 00:57:56 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -#!/usr/bin/ksh93 -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. -# - -source /lib/svc/share/smf_include.sh - -# constants -typeset -r lighttpd_version="1.4" -typeset -r lighttpd_home="/usr/lighttpd/${lighttpd_version}" -typeset -r lighttpd_bin="${lighttpd_home}/sbin/lighttpd" -typeset -r conf_file="/etc/lighttpd/${lighttpd_version}/lighttpd.conf" -typeset -r pidfile=`sed -n -e 's/"//g' -e 's/server\.pid-file *= *//p' ${conf_file}` - - -[[ ! -f "${conf_file}" ]] && exit $SMF_EXIT_ERR_CONFIG - -case "$1" in - start) - rm -f "${pidfile}" - exec ${lighttpd_bin} -f ${conf_file} 2>&1 - ;; - refresh) - print "Going to refresh" - if [[ -f "${pidfile}" ]]; then - kill -HUP "$( < "${pidfile}" )" - fi - ;; - stop) - if [[ -f ${pidfile} ]] ; then - kill "$( < "${pidfile}" )" - fi - ;; - *) - printf "Usage: %s {start|stop|refresh}\n" "$0" - exit 1 - ;; -esac diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/Solaris/http-lighttpd14.xml --- a/components/lighttpd/Solaris/http-lighttpd14.xml Wed Jun 25 00:57:56 2014 -0700 +++ b/components/lighttpd/Solaris/http-lighttpd14.xml Mon Jun 23 07:12:03 2014 -0700 @@ -22,7 +22,7 @@ @@ -76,15 +76,14 @@ - @@ -92,9 +91,8 @@ - diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/lighttpd.p5m --- a/components/lighttpd/lighttpd.p5m Wed Jun 25 00:57:56 2014 -0700 +++ b/components/lighttpd/lighttpd.p5m Mon Jun 23 07:12:03 2014 -0700 @@ -27,7 +27,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) @@ -133,7 +133,6 @@ file Solaris/auth_attr path=etc/security/auth_attr.d/lighttpd file Solaris/prof_attr path=etc/security/prof_attr.d/lighttpd file Solaris/http-lighttpd14.xml path=lib/svc/manifest/network/http-lighttpd14.xml -file Solaris/http-lighttpd14 path=lib/svc/method/http-lighttpd14 file path=usr/lighttpd/1.4/lib/mod_access.so file path=usr/lighttpd/1.4/lib/mod_accesslog.so file path=usr/lighttpd/1.4/lib/mod_alias.so diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/patches/lighttpd-conf_file.patch --- a/components/lighttpd/patches/lighttpd-conf_file.patch Wed Jun 25 00:57:56 2014 -0700 +++ b/components/lighttpd/patches/lighttpd-conf_file.patch Mon Jun 23 07:12:03 2014 -0700 @@ -1,5 +1,8 @@ ---- doc/config/lighttpd.conf 2014-01-22 05:36:22.027115196 -0800 -+++ doc/config/lighttpd.conf 2014-01-22 05:34:05.471641339 -0800 +Developed in-house, not fed back. +Solaris-specific: configuration file customization. + +--- doc/config/lighttpd.conf 2013-11-04 08:53:35.317845225 -0800 ++++ doc/config/lighttpd.conf 2013-11-04 08:52:54.468735970 -0800 @@ -13,11 +13,11 @@ ## if you add a variable here. Add the corresponding variable in the ## chroot example aswell. @@ -46,13 +49,12 @@ ## ## The value for the "Server:" response field. -@@ -124,7 +124,8 @@ +@@ -124,7 +124,7 @@ ## ## store a pid file ## -server.pid-file = state_dir + "/lighttpd.pid" -+# There must be full path in order to SMF methods work properly -+server.pid-file = "/var/lighttpd/1.4/logs/lighttpd14.pid" ++server.pid-file = log_root + "/run.pid" ## ####################################################################### @@ -92,9 +94,8 @@ ## ## mimetype mapping -116,128d121 ---- doc/config/conf.d/fastcgi.conf 2013-10-07 07:21:24.418114603 -0700 -+++ doc/config/conf.d/fastcgi.conf 2013-10-07 07:24:01.824986033 -0700 +--- doc/config/conf.d/fastcgi.conf 2013-10-07 07:21:24.418114603 -0700 ++++ doc/config/conf.d/fastcgi.conf 2013-10-07 07:24:01.824986033 -0700 @@ -22,8 +22,8 @@ #fastcgi.server = ( ".php" => # ( "php-local" => diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/patches/lighttpd-manpage.patch --- a/components/lighttpd/patches/lighttpd-manpage.patch Wed Jun 25 00:57:56 2014 -0700 +++ b/components/lighttpd/patches/lighttpd-manpage.patch Mon Jun 23 07:12:03 2014 -0700 @@ -13,7 +13,7 @@ The standard location for the configuration file. .TP 8 -/var/run/lighttpd.pid -+/var/run/lighttpd14.pid ++/var/lighttpd/1.4/logs/run.pid The standard location for the PID of the running \fBlighttpd\fP process. . .SH SEE ALSO diff -r 29f154187658 -r 44a15b136f48 components/lighttpd/patches/lighttpd-src.Makefile.am.patch --- a/components/lighttpd/patches/lighttpd-src.Makefile.am.patch Wed Jun 25 00:57:56 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) - -