Changes - j0ke.net Open Build Service

Changes of Revision 34

[-] [+]	Changed	lighttpd.spec
@@ -1,18 +1,26 @@ # -# spec file for package lighttpd (Version 1.4.26) +# spec file for package lighttpd (Version 1.4.23) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: lighttpd Version: 1.4.26 -Release: 10 +Release: 0 # %define pkg_name lighttpd %define pkg_user lighttpd @@ -27,7 +35,7 @@ %define with_tests 1 %define with_enh_webdav 1 %define with_mod_magnet 1 -%if 0%{?sles_version} == 9 \|\| 0%{?sles_version} == 10 +%if 0%{?sles_version} == 9 %define with_tests 0 %define with_enh_webdav 0 %endif @@ -39,7 +47,7 @@ BuildRequires: sqlite-devel >= 3 %endif # -%if 0%{?opensuse_bs} +%if "x%{?_repository}" != "x" && "x%{?_repository}" != "xstandard" %if 0%{?suse_version} < 1030 BuildRequires: lua51-devel %else @@ -48,7 +56,7 @@ %define with_geoip 1 %else BuildRequires: lua-devel -%if 0%{sles_version} == 9 +%if 0%{?sles_version} == 9 %define with_mod_magnet 0 %endif %endif @@ -61,15 +69,19 @@ BuildRequires: php5-fastcgi %endif # -%if 0%{?suse_version} == 930 \|\| 0%{?sles_version} == 9 +%if 0%{?suse_version} < 1000 BuildRequires: libstdc++-devel %endif %if 0%{?suse_version} > 1020 BuildRequires: libbz2-devel %endif -PreReq: %insserv_prereq %fillup_prereq /usr/sbin/groupadd /usr/sbin/useradd +%if 0%{?suse_version} >= 1010 +Recommends: logrotate +%endif +PreReq: %insserv_prereq %fillup_prereq pwdutils +Requires: spawn-fcgi # -URL: http://www.lighttpd.net/ +Url: http://www.lighttpd.net/ Source: http://www.lighttpd.net/download/%{pkg_name}-%{version}.tar.bz2 Source1: %{pkg_name}.init Source2: %{pkg_name}.sysconfig @@ -77,19 +89,16 @@ Source4: lightytest.sh Source5: lighttpd.SuSEfirewall Source6: lighttpd-ssl.SuSEfirewall -Patch0: 08-ssl-retval-fix.patch -#Patch1: lighttpd-1.4.16_testsuite.patch -Patch2: lighttpd-1.4.13_geoip.patch -## included in 1.4.23 -##Patch3: log-cronolog2.diff +Source7: lighttpd.logrotate +Patch: lighttpd-1.4.13_geoip.patch +Patch1: lighttpd-ssl-retval-fix.patch # Summary: A Secure, Fast, Compliant, and Very Flexible Web Server - %description -Lighttpd a secure, fast, compliant, and very flexible Web server that -has been optimized for high-performance environments. It has a very low -memory footprint compared to other Web servers and takes care of CPU -load. Its advanced feature set (FastCGI, CGI, Auth, +Lighttpd is a secure, fast, compliant, and very flexible Web server +that has been optimized for high-performance environments. It has a +very low memory footprint compared to other Web servers and takes care +of CPU load. Its advanced feature set (FastCGI, CGI, Auth, Output-Compression, URL-Rewriting, and more) makes lighttpd the perfect Web server software for every server that is suffering load problems. @@ -100,10 +109,10 @@ Jan Kneschke <jan@kneschke.de> %package mod_cml +License: BSD 3-Clause Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: CML (Cache Meta Language) module for Lighttpd - %description mod_cml CML is a Meta language to describe the dependencies of a page at one side and building a page from its fragments on the oth er side using @@ -128,10 +137,10 @@ Jan Kneschke <jan@kneschke.de> %package mod_magnet +License: BSD 3-Clause Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: A module to control the request handling in lighttpd - %description mod_magnet A module to control the request handling in lighttpd. @@ -144,10 +153,10 @@ Jan Kneschke <jan@kneschke.de> %package mod_mysql_vhost +License: BSD 3-Clause Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: MySQL based virtual hosts (vhosts) module for Lighttpd - %description mod_mysql_vhost With MySQL based vhosting you can put the information where to look for a. document-root of a given host into a MySQL database. @@ -159,10 +168,10 @@ Jan Kneschke <jan@kneschke.de> %package mod_trigger_b4_dl +License: BSD 3-Clause Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers Summary: Another anti hot-linking module for Lighttpd - %description mod_trigger_b4_dl Anti Hotlinking: @@ -185,11 +194,11 @@ Jan Kneschke <jan@kneschke.de> %package mod_rrdtool +License: BSD 3-Clause Requires: %{name} = %{version} Requires: rrdtool Group: Productivity/Networking/Web/Servers Summary: Lighttpd module to feed rrdtool databases - %description mod_rrdtool RRD_tool is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average). @@ -203,31 +212,37 @@ -------- Jan Kneschke <jan@kneschke.de> - %if 0%{?with_geoip} + %package mod_geoip +License: BSD 3-Clause Requires: %{name} = %{version} Group: Productivity/Networking/Web/Servers -Summary: Lighttpd module to lookup geoip databases - +Summary: A Secure, Fast, Compliant, and Very Flexible Web Server %description mod_geoip -mod_geoip is a module for fast ip/location lookups. It uses MaxMind GeoIP / -GeoCity databases. If the ip was found in the database the module sets the -appropriate environments variables to the request, thus making other -modules/fcgi be informed. +Lighttpd a secure, fast, compliant, and very flexible Web server that +has been optimized for high-performance environments. It has a very low +memory footprint compared to other Web servers and takes care of CPU +load. Its advanced feature set (FastCGI, CGI, Auth, +Output-Compression, URL-Rewriting, and more) makes lighttpd the perfect +Web server software for every server that is suffering load problems. + +This is just a dummy package which is not build in autobuild. see the +buildservice project server:http if you want it.
[-] [+]	Deleted	08-ssl-retval-fix.patch ^
@@ -1,12 +0,0 @@ -diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c ---- orig/src/network.c 2010-01-28 10:43:33.829209750 -0500 -+++ lighttpd-1.4.25/src/network.c 2010-01-28 10:44:22.639208732 -0500 -@@ -525,7 +525,7 @@ int network_init(server srv) { - - if (!s->ssl_use_sslv2) { - / disable SSLv2 */ -- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) { -+ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { - log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", - ERR_error_string(ERR_get_error(), NULL)); - return -1;
[-] [+]	Added	lighttpd-ssl-retval-fix.patch ^
@@ -0,0 +1,12 @@ +diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c +--- orig/src/network.c 2010-01-28 10:43:33.829209750 -0500 ++++ lighttpd-1.4.25/src/network.c 2010-01-28 10:44:22.639208732 -0500 +@@ -525,7 +525,7 @@ int network_init(server srv) { + + if (!s->ssl_use_sslv2) { + / disable SSLv2 */ +- if (SSL_OP_NO_SSLv2 != SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) { ++ if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1;