diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index adf632793244..dcca4f9d3617 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -1,162 +1,158 @@ PORTNAME= lighttpd PORTVERSION= 1.4.74 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://download.lighttpd.net/lighttpd/releases-1.4.x/ MAINTAINER= pkubaj@FreeBSD.org COMMENT= Secure, fast, compliant, and flexible Web Server WWW= https://www.lighttpd.net/ PATCH_SITES= https://git.lighttpd.net/lighttpd/lighttpd1.4/commit/ PATCHFILES= 106c4b147b7bc357d8764cddd0bf30fa9e8c0bf9.patch:-p1 LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpcre2-8.so:devel/pcre2 USES= compiler:c11 cmake cpe localbase:ldflags pkgconfig tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd TEST_TARGET= check PORTDOCS= AUTHORS COPYING INSTALL NEWS README USE_RC_SUBR= lighttpd REQUIRE= LOGIN OPTIONS_DEFINE= ATTR DBI DOCS KRB5 LUA MAXMINDDB NETTLE LDAP SPAWNFCGI \ WEBDAV ZSTD OPTIONS_GROUP= SSL OPTIONS_GROUP_SSL= OPENSSL GNUTLS MBEDTLS NSS WOLFSSL OPTIONS_DEFAULT= NETTLE LUA OPENSSL OPTIONS_SUB= yes ATTR_DESC= extended attributes support DBI_DESC= DBI authentication (mod_authn_dbi) KRB5_DESC= Kerberos authentication (mod_authn_gssapi) LDAP_DESC= LDAP authentication (mod_authn_ldap) LUA_DESC= lua support (mod_magnet) MAXMINDDB_DESC= IP-based geolocation lookup (mod_maxminddb) NETTLE_DESC= Crypto support from Nettle SPAWNFCGI_DESC= Depend on spawn-fcgi utility WEBDAV_DESC= WebDAV support ZSTD_DESC= mod_deflate support for zstd (Zstandard) ATTR_CMAKE_BOOL= WITH_XATTR DBI_CMAKE_BOOL= WITH_DBI DBI_LIB_DEPENDS= libdbi.so:databases/libdbi GNUTLS_CMAKE_BOOL= WITH_GNUTLS GNUTLS_LIBS= -lgnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls KRB5_CMAKE_BOOL= WITH_KRB5 KRB5_CPPFLAGS= ${GSSAPICPPFLAGS} KRB5_LDFLAGS= ${GSSAPILDFLAGS} KRB5_LIBS= ${GSSAPILIBS} KRB5_USES= gssapi:mit LDAP_CMAKE_BOOL= WITH_LDAP LDAP_USES= ldap LDAP_VARS= REQUIRE+=slapd LUA_USES= lua LUA_CMAKE_BOOL= WITH_LUA LUA_CMAKE_ON= -DWITH_LUA_VERSION:STRING="lua-${LUA_VER}" MAXMINDDB_CMAKE_BOOL= WITH_MAXMINDDB MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb MBEDTLS_CMAKE_BOOL= WITH_MBEDTLS MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls NETTLE_CMAKE_BOOL= WITH_NETTLE NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NSS_CMAKE_BOOL= WITH_NSS NSS_CPPFLAGS= -I${LOCALBASE}/include/nspr NSS_LIB_DEPENDS= libnss3.so:security/nss OPENSSL_USES= ssl OPENSSL_CMAKE_BOOL= WITH_OPENSSL SPAWNFCGI_RUN_DEPENDS= spawn-fcgi:www/spawn-fcgi WEBDAV_CMAKE_BOOL= WITH_WEBDAV_LOCKS \ WITH_WEBDAV_PROPS WEBDAV_LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libsqlite3.so:databases/sqlite3 WOLFSSL_CMAKE_BOOL= WITH_WOLFSSL WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl ZSTD_CMAKE_BOOL= WITH_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd LIGHTTPD_CONF_FILES= lighttpd.conf modules.conf LIGHTTPD_CONF_D_FILES= access_log.conf \ auth.conf \ cgi.conf \ debug.conf \ dirlisting.conf \ evhost.conf \ expire.conf \ fastcgi.conf \ magnet.conf \ mime.conf \ proxy.conf \ rrdtool.conf \ scgi.conf \ simple_vhost.conf \ ssi.conf \ status.conf \ userdir.conf \ webdav.conf USERS= ${WWWOWN} GROUPS= ${WWWGRP} CACHEDIR= /var/cache/${PORTNAME} LOGDIR= /var/log/${PORTNAME} HOMEDIR= /var/run/${PORTNAME} RUNDIR= /var/run PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" CACHEDIR="${CACHEDIR}" \ HOMEDIR="${HOMEDIR}" LOGDIR="${LOGDIR}" SUB_LIST= REQUIRE="${REQUIRE}" post-patch: @${REINPLACE_CMD} -E -e \ 's|^(server.document-root.*=).*|\1 "${PREFIX}/www" + "/data"|' \ -e "s|/etc/lighttpd|${ETCDIR}|g" \ -e 's|^(server.event-handler.*=).*|\1 "freebsd-kqueue"|' \ -e 's|^(server.network-backend.*=).*|\1 "writev"|' \ -e "s|^(server.username.*=).*|\1 \"${WWWOWN}\"|" \ -e "s|^(server.groupname.*=).*|\1 \"${WWWGRP}\"|" \ -e "s|^(var.log_root.*=).*|\1 \"${LOGDIR}\"|" \ -e "s|^(var.server_root.*=).*|\1 \"${WWWDIR}\"|" \ -e "s|^(var.home_dir.*=).*|\1 \"${HOMEDIR}\"|" \ -e "s|^(var.state_dir.*=).*|\1 \"${RUNDIR}\"|" \ -e "s|^(var.cache_dir.*=).*|\1 \"${CACHEDIR}\"|" \ ${WRKSRC}/doc/config/lighttpd.conf @${REINPLACE_CMD} -e "s|/usr/bin/python|${LOCALBASE}/bin/python|" \ ${WRKSRC}/doc/config/conf.d/cgi.conf - @${ECHO} >> ${WRKSRC}/doc/config/lighttpd.conf - @${ECHO} "# IPv4 listening socket" >> \ - ${WRKSRC}/doc/config/lighttpd.conf - @${ECHO} "\$$SERVER[\"socket\"] == \"0.0.0.0:80\" { }" >> \ - ${WRKSRC}/doc/config/lighttpd.conf post-install: @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d ${STAGEDIR}${ETCDIR}/vhosts.d .for FILE in ${LIGHTTPD_CONF_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/${FILE} \ ${STAGEDIR}${ETCDIR}/${FILE}.sample .endfor .for FILE in ${LIGHTTPD_CONF_D_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/config/conf.d/${FILE} \ ${STAGEDIR}${ETCDIR}/conf.d/${FILE}.sample .endfor ${INSTALL_DATA} ${WRKSRC}/doc/config/vhosts.d/vhosts.template \ ${STAGEDIR}${ETCDIR}/vhosts.d/vhosts.template @${MKDIR} ${STAGEDIR}${WWWDIR} @${MKDIR} -m 0700 ${STAGEDIR}${CACHEDIR} @${MKDIR} -m 0700 ${STAGEDIR}${HOMEDIR}/sockets @${MKDIR} -m 0700 ${STAGEDIR}${LOGDIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include diff --git a/www/lighttpd/files/COPYING.mod_h264_streaming b/www/lighttpd/files/COPYING.mod_h264_streaming deleted file mode 100644 index 8c238c7bac8b..000000000000 --- a/www/lighttpd/files/COPYING.mod_h264_streaming +++ /dev/null @@ -1,341 +0,0 @@ -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS -CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS -PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE -WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS -PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND -AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS -LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU -THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF -SUCH TERMS AND CONDITIONS. - -1. Definitions - - 1. "Adaptation" means a work based upon the Work, or upon the -Work and other pre-existing works, such as a translation, -adaptation, derivative work, arrangement of music or other -alterations of a literary or artistic work, or phonogram or -performance and includes cinematographic adaptations or any other -form in which the Work may be recast, transformed, or adapted -including in any form recognizably derived from the original, except -that a work that constitutes a Collection will not be considered an -Adaptation for the purpose of this License. For the avoidance of -doubt, where the Work is a musical work, performance or phonogram, -the synchronization of the Work in timed-relation with a moving -image ("synching") will be considered an Adaptation for the purpose -of this License. - 2. "Collection" means a collection of literary or artistic works, -such as encyclopedias and anthologies, or performances, phonograms -or broadcasts, or other works or subject matter other than works -listed in Section 1(g) below, which, by reason of the selection and -arrangement of their contents, constitute intellectual creations, in -which the Work is included in its entirety in unmodified form along -with one or more other contributions, each constituting separate and -independent works in themselves, which together are assembled into a -collective whole. A work that constitutes a Collection will not be -considered an Adaptation (as defined above) for the purposes of this -License. - 3. "Distribute" means to make available to the public the -original and copies of the Work or Adaptation, as appropriate, -through sale or other transfer of ownership. - 4. "License Elements" means the following high-level license -attributes as selected by Licensor and indicated in the title of -this License: Attribution, Noncommercial, ShareAlike. - 5. "Licensor" means the individual, individuals, entity or -entities that offer(s) the Work under the terms of this License. - 6. "Original Author" means, in the case of a literary or artistic -work, the individual, individuals, entity or entities who created -the Work or if no individual or entity can be identified, the -publisher; and in addition (i) in the case of a performance the -actors, singers, musicians, dancers, and other persons who act, -sing, deliver, declaim, play in, interpret or otherwise perform -literary or artistic works or expressions of folklore; (ii) in the -case of a phonogram the producer being the person or legal entity -who first fixes the sounds of a performance or other sounds; and, -(iii) in the case of broadcasts, the organization that transmits the -broadcast. - 7. "Work" means the literary and/or artistic work offered under -the terms of this License including without limitation any -production in the literary, scientific and artistic domain, whatever -may be the mode or form of its expression including digital form, -such as a book, pamphlet and other writing; a lecture, address, -sermon or other work of the same nature; a dramatic or -dramatico-musical work; a choreographic work or entertainment in -dumb show; a musical composition with or without words; a -cinematographic work to which are assimilated works expressed by a -process analogous to cinematography; a work of drawing, painting, -architecture, sculpture, engraving or lithography; a photographic -work to which are assimilated works expressed by a process analogous -to photography; a work of applied art; an illustration, map, plan, -sketch or three-dimensional work relative to geography, topography, -architecture or science; a performance; a broadcast; a phonogram; a -compilation of data to the extent it is protected as a copyrightable -work; or a work performed by a variety or circus performer to the -extent it is not otherwise considered a literary or artistic work. - 8. "You" means an individual or entity exercising rights under -this License who has not previously violated the terms of this -License with respect to the Work, or who has received express -permission from the Licensor to exercise rights under this License -despite a previous violation. - 9. "Publicly Perform" means to perform public recitations of the -Work and to communicate to the public those public recitations, by -any means or process, including by wire or wireless means or public -digital performances; to make available to the public Works in such -a way that members of the public may access these Works from a place -and at a place individually chosen by them; to perform the Work to -the public by any means or process and the communication to the -public of the performances of the Work, including by public digital -performance; to broadcast and rebroadcast the Work by any means -including signs, sounds or images. - 10. "Reproduce" means to make copies of the Work by any means -including without limitation by sound or visual recordings and the -right of fixation and reproducing fixations of the Work, including -storage of a protected performance or phonogram in digital form or -other electronic medium. - -2. Fair Dealing Rights. Nothing in this License is intended to -reduce, limit, or restrict any uses free from copyright or rights -arising from limitations or exceptions that are provided for in -connection with the copyright protection under copyright law or -other applicable laws. - -3. License Grant. Subject to the terms and conditions of this -License, Licensor hereby grants You a worldwide, royalty-free, -non-exclusive, perpetual (for the duration of the applicable -copyright) license to exercise the rights in the Work as stated -below: - - 1. to Reproduce the Work, to incorporate the Work into one or -more Collections, and to Reproduce the Work as incorporated in the -Collections; - 2. to create and Reproduce Adaptations provided that any such -Adaptation, including any translation in any medium, takes -reasonable steps to clearly label, demarcate or otherwise identify -that changes were made to the original Work. For example, a -translation could be marked "The original work was translated from -English to Spanish," or a modification could indicate "The original -work has been modified."; - 3. to Distribute and Publicly Perform the Work including as -incorporated in Collections; and, - 4. to Distribute and Publicly Perform Adaptations. - -The above rights may be exercised in all media and formats whether -now known or hereafter devised. The above rights include the right -to make such modifications as are technically necessary to exercise -the rights in other media and formats. Subject to Section 8(f), all -rights not expressly granted by Licensor are hereby reserved, -including but not limited to the rights described in Section 4(e). - -4. Restrictions. The license granted in Section 3 above is expressly -made subject to and limited by the following restrictions: - - 1. You may Distribute or Publicly Perform the Work only under the -terms of this License. You must include a copy of, or the Uniform -Resource Identifier (URI) for, this License with every copy of the -Work You Distribute or Publicly Perform. You may not offer or impose -any terms on the Work that restrict the terms of this License or the -ability of the recipient of the Work to exercise the rights granted -to that recipient under the terms of the License. You may not -sublicense the Work. You must keep intact all notices that refer to -this License and to the disclaimer of warranties with every copy of -the Work You Distribute or Publicly Perform. When You Distribute or -Publicly Perform the Work, You may not impose any effective -technological measures on the Work that restrict the ability of a -recipient of the Work from You to exercise the rights granted to -that recipient under the terms of the License. This Section 4(a) -applies to the Work as incorporated in a Collection, but this does -not require the Collection apart from the Work itself to be made -subject to the terms of this License. If You create a Collection, -upon notice from any Licensor You must, to the extent practicable, -remove from the Collection any credit as required by Section 4(d), -as requested. If You create an Adaptation, upon notice from any -Licensor You must, to the extent practicable, remove from the -Adaptation any credit as required by Section 4(d), as requested. - 2. You may Distribute or Publicly Perform an Adaptation only -under: (i) the terms of this License; (ii) a later version of this -License with the same License Elements as this License; (iii) a -Creative Commons jurisdiction license (either this or a later -license version) that contains the same License Elements as this -License (e.g., Attribution-NonCommercial-ShareAlike 3.0 US) -("Applicable License"). You must include a copy of, or the URI, for -Applicable License with every copy of each Adaptation You Distribute -or Publicly Perform. You may not offer or impose any terms on the -Adaptation that restrict the terms of the Applicable License or the -ability of the recipient of the Adaptation to exercise the rights -granted to that recipient under the terms of the Applicable License. -You must keep intact all notices that refer to the Applicable -License and to the disclaimer of warranties with every copy of the -Work as included in the Adaptation You Distribute or Publicly -Perform. When You Distribute or Publicly Perform the Adaptation, You -may not impose any effective technological measures on the -Adaptation that restrict the ability of a recipient of the -Adaptation from You to exercise the rights granted to that recipient -under the terms of the Applicable License. This Section 4(b) applies -to the Adaptation as incorporated in a Collection, but this does not -require the Collection apart from the Adaptation itself to be made -subject to the terms of the Applicable License. - 3. You may not exercise any of the rights granted to You in -Section 3 above in any manner that is primarily intended for or -directed toward commercial advantage or private monetary -compensation. The exchange of the Work for other copyrighted works -by means of digital file-sharing or otherwise shall not be -considered to be intended for or directed toward commercial -advantage or private monetary compensation, provided there is no -payment of any monetary compensation in con-nection with the -exchange of copyrighted works. - 4. If You Distribute, or Publicly Perform the Work or any -Adaptations or Collections, You must, unless a request has been made -pursuant to Section 4(a), keep intact all copyright notices for the -Work and provide, reasonable to the medium or means You are -utilizing: (i) the name of the Original Author (or pseudonym, if -applicable) if supplied, and/or if the Original Author and/or -Licensor designate another party or parties (e.g., a sponsor -institute, publishing entity, journal) for attribution ("Attribution -Parties") in Licensor's copyright notice, terms of service or by -other reasonable means, the name of such party or parties; (ii) the -title of the Work if supplied; (iii) to the extent reasonably -practicable, the URI, if any, that Licensor specifies to be -associated with the Work, unless such URI does not refer to the -copyright notice or licensing information for the Work; and, (iv) -consistent with Section 3(b), in the case of an Adaptation, a credit -identifying the use of the Work in the Adaptation (e.g., "French -translation of the Work by Original Author," or "Screenplay based on -original Work by Original Author"). The credit required by this -Section 4(d) may be implemented in any reasonable manner; provided, -however, that in the case of a Adaptation or Collection, at a -minimum such credit will appear, if a credit for all contributing -authors of the Adaptation or Collection appears, then as part of -these credits and in a manner at least as prominent as the credits -for the other contributing authors. For the avoidance of doubt, You -may only use the credit required by this Section for the purpose of -attribution in the manner set out above and, by exercising Your -rights under this License, You may not implicitly or explicitly -assert or imply any connection with, sponsorship or endorsement by -the Original Author, Licensor and/or Attribution Parties, as -appropriate, of You or Your use of the Work, without the separate, -express prior written permission of the Original Author, Licensor -and/or Attribution Parties. - 5. - - For the avoidance of doubt: - 1. Non-waivable Compulsory License Schemes. In those -jurisdictions in which the right to collect royalties through any -statutory or compulsory licensing scheme cannot be waived, the -Licensor reserves the exclusive right to collect such royalties for -any exercise by You of the rights granted under this License; - 2. Waivable Compulsory License Schemes. In those -jurisdictions in which the right to collect royalties through any -statutory or compulsory licensing scheme can be waived, the Licensor -reserves the exclusive right to collect such royalties for any -exercise by You of the rights granted under this License if Your -exercise of such rights is for a purpose or use which is otherwise -than noncommercial as permitted under Section 4(c) and otherwise -waives the right to collect royalties through any statutory or -compulsory licensing scheme; and, - 3. Voluntary License Schemes. The Licensor reserves the -right to collect royalties, whether individually or, in the event -that the Licensor is a member of a collecting society that -administers voluntary licensing schemes, via that society, from any -exercise by You of the rights granted under this License that is for -a purpose or use which is otherwise than noncommercial as permitted -under Section 4(c). - 6. Except as otherwise agreed in writing by the Licensor or as -may be otherwise permitted by applicable law, if You Reproduce, -Distribute or Publicly Perform the Work either by itself or as part -of any Adaptations or Collections, You must not distort, mutilate, -modify or take other derogatory action in relation to the Work which -would be prejudicial to the Original Author's honor or reputation. -Licensor agrees that in those jurisdictions (e.g. Japan), in which -any exercise of the right granted in Section 3(b) of this License -(the right to make Adaptations) would be deemed to be a distortion, -mutilation, modification or other derogatory action prejudicial to -the Original Author's honor and reputation, the Licensor will waive -or not assert, as appropriate, this Section, to the fullest extent -permitted by the applicable national law, to enable You to -reasonably exercise Your right under Section 3(b) of this License -(right to make Adaptations) but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING AND TO -THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, LICENSOR OFFERS THE -WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND -CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, -INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF -LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF -ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW -THE EXCLUSION OF IMPLIED WARRANTIES, SO THIS EXCLUSION MAY NOT APPLY -TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY -APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY -LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR -EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE -WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - -7. Termination - - 1. This License and the rights granted hereunder will terminate -automatically upon any breach by You of the terms of this License. -Individuals or entities who have received Adaptations or Collections -from You under this License, however, will not have their licenses -terminated provided such individuals or entities remain in full -compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will -survive any termination of this License. - 2. Subject to the above terms and conditions, the license granted -here is perpetual (for the duration of the applicable copyright in -the Work). Notwithstanding the above, Licensor reserves the right to -release the Work under different license terms or to stop -distributing the Work at any time; provided, however that any such -election will not serve to withdraw this License (or any other -license that has been, or is required to be, granted under the terms -of this License), and this License will continue in full force and -effect unless terminated as stated above. - -8. Miscellaneous - - 1. Each time You Distribute or Publicly Perform the Work or a -Collection, the Licensor offers to the recipient a license to the -Work on the same terms and conditions as the license granted to You -under this License. - 2. Each time You Distribute or Publicly Perform an Adaptation, -Licensor offers to the recipient a license to the original Work on -the same terms and conditions as the license granted to You under -this License. - 3. If any provision of this License is invalid or unenforceable -under applicable law, it shall not affect the validity or -enforceability of the remainder of the terms of this License, and -without further action by the parties to this agreement, such -provision shall be reformed to the minimum extent necessary to make -such provision valid and enforceable. - 4. No term or provision of this License shall be deemed waived -and no breach consented to unless such waiver or consent shall be in -writing and signed by the party to be charged with such waiver or -consent. - 5. This License constitutes the entire agreement between the -parties with respect to the Work licensed here. There are no -understandings, agreements or representations with respect to the -Work not specified here. Licensor shall not be bound by any -additional provisions that may appear in any communication from You. -This License may not be modified without the mutual written -agreement of the Licensor and You. - 6. The rights granted under, and the subject matter referenced, -in this License were drafted utilizing the terminology of the Berne -Convention for the Protection of Literary and Artistic Works (as -amended on September 28, 1979), the Rome Convention of 1961, the -WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms -Treaty of 1996 and the Universal Copyright Convention (as revised on -July 24, 1971). These rights and subject matter take effect in the -relevant jurisdiction in which the License terms are sought to be -enforced according to the corresponding provisions of the -implementation of those treaty provisions in the applicable national -law. If the standard suite of rights granted under applicable -copyright law includes additional rights not granted under this -License, such additional rights are deemed to be included in the -License; this License is not intended to restrict the license of any -rights under applicable law. diff --git a/www/lighttpd/files/h264_streaming.conf b/www/lighttpd/files/h264_streaming.conf deleted file mode 100644 index c5c695bae170..000000000000 --- a/www/lighttpd/files/h264_streaming.conf +++ /dev/null @@ -1,19 +0,0 @@ -####################################################################### -## -## H.264 Streaming Module -## ------------------------ -## -server.modules += ( "mod_h264_streaming" ) - -## -## Configure streaming for .mp4 files -## -h264-streaming.extensions = ( ".mp4", ".f4v" ) - -## -## Bandwidth shaping -## -#h264-streaming.buffer-seconds = 10 - -## -####################################################################### diff --git a/www/lighttpd/files/lighttpd.in b/www/lighttpd/files/lighttpd.in index 3ea8749e615e..3daddadd7b73 100644 --- a/www/lighttpd/files/lighttpd.in +++ b/www/lighttpd/files/lighttpd.in @@ -1,136 +1,136 @@ #!/bin/sh # PROVIDE: lighttpd # REQUIRE: %%REQUIRE%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable lighttpd: # # lighttpd_enable (bool): Set it to "YES" to enable lighttpd # Default is "NO". # lighttpd_conf (path): Set full path to configuration file. # Default is "%%ETCDIR%%/lighttpd.conf". # lighttpd_pidfile (path): Set full path to pid file. # Default is "/var/run/lighttpd.pid". # # Add the following lines to /etc/rc.conf for multiple instances: # (overrides lighttpd_conf and lighttpd_pidfile from above) # # lighttpd_instances (string): Instances of lighttpd # Default is "" (no instances). # lighttpd_${i}_conf (path): Set full path to instance configuration file. # Default is "%%ETCDIR%%/${i}.conf". # lighttpd_${i}_pidfile (path): Set full path to instance pid file # Default is "/var/run/lighttpd_${i}.pid". # . /etc/rc.subr name="lighttpd" rcvar=lighttpd_enable load_rc_config $name : ${lighttpd_enable="NO"} : ${lighttpd_pidfile="/var/run/${name}.pid"} # Compatibility for old configuration file location deprecated_conf= if [ -z "${lighttpd_conf}" ]; then if [ -f "%%PREFIX%%/etc/lighttpd.conf" ]; then deprecated_conf=1 lighttpd_conf="%%PREFIX%%/etc/lighttpd.conf" else lighttpd_conf="%%ETCDIR%%/lighttpd.conf" fi fi command=%%PREFIX%%/sbin/lighttpd stop_postcmd=stop_postcmd restart_precmd="lighttpd_checkconfig" graceful_precmd="lighttpd_checkconfig" graceful_cmd="lighttpd_graceful" gracefulstop_cmd="lighttpd_gracefulstop" configtest_cmd="lighttpd_checkconfig" extra_commands="reload graceful gracefulstop configtest" command_args="-f ${lighttpd_conf}" pidfile=${lighttpd_pidfile} required_files=${lighttpd_conf} lighttpd_check_deprecated() { if [ -n "${deprecated_conf}" ]; then echo "" echo "*** NOTICE: ***" echo "The default location of %%PREFIX%%/etc/lighttpd.conf is deprecated" echo "Please consider moving to %%ETCDIR%%/lighttpd.conf" echo "" fi } lighttpd_checkconfig() { echo "Performing sanity check on ${name} configuration:" eval "${command} ${command_args} -tt" } lighttpd_gracefulstop() { echo "Stopping ${name} gracefully." - sig_reload="INT" + sig_reload="SIGUSR1" run_rc_command reload } lighttpd_graceful() { lighttpd_gracefulstop rm -f ${pidfile} run_rc_command start } lighttpd_run_instance() { _i="$1" _rcmd="$2" name=${_orig_name}_${_i} eval ${name}_enable=${lighttpd_enable} eval lighttpd_conf=\"\${lighttpd_${_i}_conf:-"%%ETCDIR%%/${_i}.conf"}\" eval lighttpd_pidfile=\"\${lighttpd_${_i}_pidfile:-"/var/run/lighttpd_${_i}.pid"}\" command_args="-f ${lighttpd_conf}" pidfile=${lighttpd_pidfile} required_files=${lighttpd_conf} run_rc_command ${_rcmd} } stop_postcmd() { rm -f ${pidfile} } if [ -n "${lighttpd_instances}" ]; then _orig_name="${name}" _run_cmd="$1" if [ $# -gt 0 ]; then shift fi if [ -n "$*" ]; then _run_instances="$*" fi if [ -n "${_run_instances}" ]; then for _a in $_run_instances; do for _in in ${lighttpd_instances}; do if [ "$_a" = "$_in" ]; then _runlist="${_runlist} ${_a}" fi done done else _runlist="${lighttpd_instances}" fi for _in in ${_runlist}; do lighttpd_run_instance $_in $_run_cmd done else start_precmd="lighttpd_check_deprecated" run_rc_command "$1" fi diff --git a/www/lighttpd/pkg-descr b/www/lighttpd/pkg-descr index 62c8bce32835..e73db01f972f 100644 --- a/www/lighttpd/pkg-descr +++ b/www/lighttpd/pkg-descr @@ -1,6 +1,7 @@ -lighttpd a secure, fast, compliant and very flexible web-server which -has been optimized for high-performance environments. It has a very -low memory footprint compared to other webservers and takes care of -cpu-load. Its advanced feature-set (FastCGI, CGI, Auth, Output-Compression, -URL-Rewriting and many more) make lighttpd the perfect webserver-software -for every server that is suffering load problems. +lighttpd (pronounced /lighty/) is a secure, fast, compliant, and very flexible +web server that has been optimized for high-performance environments. +lighttpd uses memory and CPU efficiently and has lower resource use than other +popular web servers. Its advanced feature-set (FastCGI, CGI, Auth, +Output-Compression, URL-Rewriting and much more) make lighttpd the perfect web +server for all systems, small and large. lighttpd is released under the Open +Source revised BSD license.