X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=201bf667a8d7f83787909837e4674af9de59ba04;hb=b4c9cd459a2c9ed1e7466971bc67b3dcc5e6307a;hp=49441ec270ab5d5ee2beaf9db02e587367de0f8c;hpb=a57abebd3955073bfd7ed2dd519e1412d209426f;p=packages%2Flighttpd.git diff --git a/lighttpd.spec b/lighttpd.spec index 49441ec..201bf66 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -1,52 +1,33 @@ -# TODO: -# - test ldap and mysql (failed at this time) -# - mysql issue: http://www.freebsd.org/cgi/query-pr.cgi?pr=76866 -# - fam over gamin is possible, just configure doesn't check other than gamin -# - feature stat-cache-fam (doesn't work) -# - lighttpd writes early startup messages to stderr, and if started from -# rc-scripts the stderr is closed which causes lighttpd to abort(): -# 2006-07-20 21:05:52: (server.c.1233) WARNING: unknown config-key: url.rewrite-final (ignored) -# -# NOTES: -# - disable largefile, if you have 2.4 kernel to get sendfile() support, and don't need > 2GB file requests, -# see http://article.gmane.org/gmane.comp.web.lighttpd:722 -# # Conditional build for lighttpd: %bcond_without xattr # support of extended attributes %bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) %bcond_without largefile # largefile support (see notes above) %bcond_without ssl # ssl support %bcond_without mysql # mysql support in mod_mysql_vhost -%bcond_with ldap # ldap support in mod_auth +%bcond_without ldap # ldap support in mod_auth %bcond_without lua # LUA support in mod_cml (needs LUA >= 5.1) %bcond_with memcache # memcached support in mod_cml / mod_trigger_b4_dl %bcond_with gamin # gamin for reducing number of stat() calls. - # NOTE: must be enabled in config: server.stat-cache-engine = "fam" + # NOTE: must be enabled in config: server.stat-cache-engine = "fam" %bcond_with gdbm # gdbm in mod_trigger_b4_dl %bcond_with webdav_props # properties in mod_webdav (includes extra sqlite3/libxml deps) %bcond_with webdav_locks # webdav locks with extra efsprogs deps %bcond_with valgrind # compile code with valgrind support. %bcond_with deflate # build deflate module (needs patch update with current svn) -# SVN snapshot -#define _svn 1277 -# Prerelease -#define _snap r1332 - %if %{with webdav_locks} %define webdav_progs 1 %endif -%define _rel 10 Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.18 -Release: %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)}%{?_svn:.%{_svn}} +Version: 1.4.24 +Release: 2 License: BSD -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2 -# Source0-md5: 26f98dddf9d8c0775221b800986003ee +# Source0-md5: e2324a24e4a5bce74663c21c58ddd200 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -55,14 +36,15 @@ Source5: %{name}.sysconfig Source6: %{name}-mime.types.sh Source7: http://glen.alkohol.ee/pld/lighty/favicon.ico # Source7-md5: 00fcac5b861a54f5eb147a589504d480 -Source8: http://www.lighttpd.net/light_button.png -# Source8-md5: 02330e2313fadc29144edfd6000879f8 -Source9: http://www.lighttpd.net/light_logo.png -# Source9-md5: ac20784510e420d5cbe5fc1cdb53d7a7 -Source10: http://gdl.hopto.org/~spider/pldstats/gfx/pld1.png -# Source10-md5: 486ecec3f6f4fe7f9bf7cee757b864f4 +Source8: light_button.png +# Source8-md5: 3e1008ee1d3d6d390cf81fe3072b4f50 +Source9: light_logo.png +# Source9-md5: cbb7f0676e51ee2e26cf004df293fc62 +Source10: pld_button.png +# Source10-md5: 185afa921e81bd726b9f0f9f0909dc6e Source11: %{name}-pld.html Source12: %{name}.monitrc +Source13: %{name}-branch.sh Source100: %{name}-mod_access.conf Source101: %{name}-mod_accesslog.conf Source102: %{name}-mod_alias.conf @@ -100,12 +82,15 @@ Source133: %{name}-mod_mysql_vhost.conf Source134: %{name}-mod_magnet.conf Source135: %{name}-mod_extforward.conf Source136: %{name}-mod_h264_streaming.conf +Source137: %{name}-mod_cgi_php.conf Patch100: %{name}-branch.diff Patch0: %{name}-use_bin_sh.patch Patch1: %{name}-mod_evasive-status_code.patch Patch2: %{name}-mod_h264_streaming.patch Patch3: %{name}-branding.patch -#Patchx: %{name}-mod_deflate.patch +Patch4: %{name}-modinit-before-fork.patch +Patch5: %{name}-mod_deflate.patch +#Patch8: %{name}-errorlog-before-fork.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} BuildRequires: autoconf @@ -121,7 +106,7 @@ BuildRequires: libuuid-devel %{?with_lua:BuildRequires: lua51-devel} BuildRequires: mailcap >= 2.1.14-4.4 %{?with_mysql:BuildRequires: mysql-devel} -%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6} +%{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel} BuildRequires: pcre-devel BuildRequires: pkgconfig @@ -138,11 +123,11 @@ Requires(pre): /usr/lib/rpm/user_group.sh Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod -Requires: %{name}-mod_dirlisting -Requires: %{name}-mod_indexfile -Requires: %{name}-mod_staticfile +Requires: %{name}-mod_dirlisting = %{version}-%{release} +Requires: %{name}-mod_indexfile = %{version}-%{release} +Requires: %{name}-mod_staticfile = %{version}-%{release} Requires: rc-scripts -Requires: webapps +Requires: rpm-whiteout >= 1.5 Provides: group(http) Provides: group(lighttpd) Provides: user(lighttpd) @@ -178,7 +163,8 @@ powodu problemów z obciążeniem. %package mod_access Summary: lighttpd module for making access restrictions Summary(pl.UTF-8): Moduł lighttpd ograniczający dostęp -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAccess Requires: %{name} = %{version}-%{release} Provides: webserver(access) @@ -193,7 +179,8 @@ Moduł access służy do ograniczania dostępu do plików o podanych %package mod_accesslog Summary: lighttpd module to record access logs Summary(pl.UTF-8): Moduł lighttpd do zapisu logów dostępu -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAccessLog Requires: %{name} = %{version}-%{release} %description mod_accesslog @@ -205,7 +192,8 @@ Domyślnie podobny do CLF, elastyczny jak Apache. %package mod_alias Summary: lighttpd module for making URL aliasing Summary(pl.UTF-8): Moduł lighttpd odpowiadający za aliasy URL-i -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAlias Requires: %{name} = %{version}-%{release} Provides: webserver(alias) @@ -220,7 +208,8 @@ dla podanego podzbioru URL-i. %package mod_auth Summary: lighttpd module for authentication support Summary(pl.UTF-8): Moduł lighttpd do obsługi uwierzytelniania -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAuth Requires: %{name} = %{version}-%{release} Provides: webserver(auth) @@ -235,7 +224,8 @@ basic i digest. %package mod_cgi Summary: lighttpd module for CGI handling Summary(pl.UTF-8): Moduł lighttpd do obsługi CGI -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCGI Requires: %{name} = %{version}-%{release} Requires: %{name}-mod_alias = %{version}-%{release} Provides: webserver(cgi) @@ -252,10 +242,32 @@ Moduł cgi udostępnia interfejs zgodny z CGI. Programy CGI pozwalają rozszerzać funkcjonalność serwera w bardzo prosty i naturalny sposób. +%package mod_cgi_php +Summary: lighttpd module for CGI handling PHP scripts +Summary(pl.UTF-8): Moduł lighttpd do obsługi skryptów PHP przez CGI +Group: Networking/Daemons/HTTP +Requires: %{name}-mod_cgi = %{version}-%{release} +Requires: php(cgi) +Provides: webserver(php) + +%description mod_cgi_php +The cgi module provides a CGI-conforming interface for PHP scripts. + +CGI programs allow you to enhance the functionality of the server in a +very straight and simple way. + +%description mod_cgi_php -l pl.UTF-8 +Moduł cgi udostępnia interfejs zgodny z CGI do wywoływania skryptów +PHP. + +Programy CGI pozwalają rozszerzać funkcjonalność serwera w bardzo +prosty i naturalny sposób. + %package mod_cml Summary: lighttpd module for Cache Meta Language Summary(pl.UTF-8): Moduł Cache Meta Language -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCML Requires: %{name} = %{version}-%{release} %description mod_cml @@ -270,7 +282,8 @@ z drugiej strony do budowania strony z fragmentów przy użyciu LUA. %package mod_compress Summary: lighttpd module for output compression Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCompress Requires: %{name} = %{version}-%{release} %description mod_compress @@ -294,8 +307,8 @@ Obsługiwane są gzip, deflate i bzip. %package mod_deflate Summary: lighttpd module for output compression using deflate method Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia metodą deflate -Group: Networking/Daemons -URL: http://trac.lighttpd.net/trac/wiki/Mod_Deflate +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Mod_Deflate Requires: %{name} = %{version}-%{release} %description mod_deflate @@ -310,7 +323,8 @@ mod_compress. %package mod_dirlisting Summary: lighttpd module for directory listings Summary(pl.UTF-8): Moduł lighttpd do tworzenia listingów katalogów -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModDirlisting Requires: %{name} = %{version}-%{release} %description mod_dirlisting @@ -324,7 +338,8 @@ kontrolą CSS. %package mod_evasive Summary: lighttpd evasive module Summary(pl.UTF-8): Moduł evasive dla lighttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEvasive Requires: %{name} = %{version}-%{release} %description mod_evasive @@ -336,7 +351,8 @@ Moduł evasive dla lighttpd. %package mod_evhost Summary: lighttpd module for enhanced virtual-hosting Summary(pl.UTF-8): Moduł lighttpd rozszerzający obsługę hostów wirtualnych -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEVhost Requires: %{name} = %{version}-%{release} %description mod_evhost @@ -352,8 +368,10 @@ nazwy hosta. %package mod_expire Summary: lighttpd module for controlling the expiration of content in caches Summary(pl.UTF-8): Moduł lighttpd sterujący wygasaniem treści w cache'ach -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModExpire Requires: %{name} = %{version}-%{release} +Provides: webserver(expires) %description mod_expire mod_expire controls the setting of the the Expire response header. @@ -364,7 +382,8 @@ mod_expire steruje ustawianiem nagłówka odpowiedzi Expire. %package mod_extforward Summary: lighttpd module to extract the client's "real" IP from X-Forwarded-For header Summary(pl.UTF-8): Moduł lighttpd wyciągający "prawdziwy" IP klienta z nagłówka X-Forwarded-For -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/DocsModExtForward Requires: %{name} = %{version}-%{release} %description mod_extforward @@ -380,7 +399,8 @@ serwerów stojących za odwrotnymi serwerami proxy. %package mod_fastcgi Summary: lighttpd module for FastCGI interface Summary(pl.UTF-8): Moduł lighttpd do interfejsu FastCGI -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFastCGI Requires: %{name} = %{version}-%{release} %description mod_fastcgi @@ -396,7 +416,8 @@ jak Perl, PHP czy własne aplikacje. %package mod_flv_streaming Summary: lighttpd module for flv streaming Summary(pl.UTF-8): Moduł lighttpd do streamingu flv -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming Requires: %{name} = %{version}-%{release} %description mod_flv_streaming @@ -407,20 +428,23 @@ Moduł lighttpd do streamingu flv. %package mod_h264_streaming Summary: lighttpd module for h264 streaming -License: GPL v3+ -Group: Networking/Daemons -URL: http://h264.code-shop.com/ +Summary(pl.UTF-8): Moduł lighttpd do emisji strumieni h264 +License: CC 3.0 BY-NC-SA +Group: Networking/Daemons/HTTP +URL: http://h264.code-shop.com/trac/wiki/Mod-H264-Streaming-Lighttpd-Version2 Requires: %{name} = %{version}-%{release} %description mod_h264_streaming -lighttpd module for h264 streaming. +A lighttpd plugin for pseudo-streaming QuickTime/MPEG-4 files. -Please note that this module is experimental and work-in-progress. +%description mod_h264_streaming -l pl.UTF-8 +Moduł lighttpd do pseudostreamingu plików QuickTime/MPEG-4. %package mod_indexfile Summary: lighttpd indexfile module Summary(pl.UTF-8): Moduł indexfile dla lighttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Index-file-names.Details Requires: %{name} = %{version}-%{release} Provides: webserver(indexfile) @@ -433,7 +457,8 @@ Moduł indexfile. %package mod_magnet Summary: lighttpd powermagnet module Summary(pl.UTF-8): Moduł powermagnet dla lighttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/wiki/lighttpd/Docs:ModMagnet Requires: %{name} = %{version}-%{release} %description mod_magnet @@ -445,7 +470,8 @@ mod_magnet to moduł sterujący obsługą żądań w lighty. %package mod_mysql_vhost Summary: lighttpd module for MySQL based vhosting Summary(pl.UTF-8): Moduł lighttpd obsługujący vhosty oparte na MySQL-u -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModMySQLVhost Requires: %{name} = %{version}-%{release} Conflicts: %{name}-mod_simple_vhost @@ -458,7 +484,8 @@ Ten moduł udostępnia wirtualne hosty (vhosty) oparte na tabeli MySQL. %package mod_proxy Summary: lighttpd module for proxying requests Summary(pl.UTF-8): Moduł lighttpd do przekazywania żądań -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModProxy Requires: %{name} = %{version}-%{release} %description mod_proxy @@ -472,7 +499,7 @@ mającymi interfejs HTTP. %package mod_proxy_core Summary: lighttpd module for proxying requests Summary(pl.UTF-8): Moduł lighttpd do przekazywania żądań -Group: Networking/Daemons +Group: Networking/Daemons/HTTP URL: http://blog.lighttpd.net/articles/2006/07/18/mod_proxy_core-commited-to-svn Requires: %{name} = %{version}-%{release} @@ -491,7 +518,8 @@ Ten pakiet zawiera nowy moduł proxy. %package mod_redirect Summary: lighttpd module for URL redirects Summary(pl.UTF-8): Moduł lighttpd do przekierowań URL-i -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRedirect Requires: %{name} = %{version}-%{release} %description mod_redirect @@ -504,8 +532,10 @@ zewnątrz. %package mod_rewrite Summary: lighttpd module for internal redirects, URL rewrite Summary(pl.UTF-8): Moduł lighttpd do wewnętrznych przekierowań i przepisywania URL-i -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRewrite Requires: %{name} = %{version}-%{release} +Provides: webserver(rewrite) %description mod_rewrite This module allows you rewrite a set of URLs interally in the @@ -518,7 +548,8 @@ WWW _przed_ ich obsługą. %package mod_rrdtool Summary: lighttpd module for monitoring traffic and server load Summary(pl.UTF-8): Moduł lighttpd do monitorowania ruchu i obciążenia serwera -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRRDTool Requires: %{name} = %{version}-%{release} Requires: rrdtool @@ -540,7 +571,8 @@ WWW. %package mod_scgi Summary: lighttpd module for SCGI interface Summary(pl.UTF-8): Moduł lighttpd do interfejsu SCGI -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSCGI Requires: %{name} = %{version}-%{release} %description mod_scgi @@ -554,7 +586,8 @@ Pythona z WSGI. %package mod_secdownload Summary: lighttpd module for secure and fast downloading Summary(pl.UTF-8): Moduł lighttpd do bezpiecznego i szybkiego ściągania danych -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSecDownload Requires: %{name} = %{version}-%{release} %description mod_secdownload @@ -568,8 +601,10 @@ uwierzytelnieniem i zapobiec używaniu bezpośrednich odnośników. %package mod_setenv Summary: lighttpd module for setting conditional request headers Summary(pl.UTF-8): Moduł lighttpd do ustawiania warunkowych nagłówków żądań -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSetEnv Requires: %{name} = %{version}-%{release} +Provides: webserver(setenv) %description mod_setenv mod_setenv is used to add request headers. @@ -580,7 +615,8 @@ mod_setenv służy do dodawania nagłówków żądań. %package mod_simple_vhost Summary: lighttpd module for simple virtual-hosting Summary(pl.UTF-8): Moduł lighttpd do prostych hostów wirtualnych -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSimpleVhost Requires: %{name} = %{version}-%{release} Conflicts: %{name}-mod_mysql_vhost @@ -593,7 +629,8 @@ Moduł lighttpd do prostych hostów wirtualnych. %package mod_ssi Summary: lighttpd module for server-side includes Summary(pl.UTF-8): Moduł lighttpd do SSI (server-side includes) -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSSI Requires: %{name} = %{version}-%{release} %description mod_ssi @@ -607,7 +644,7 @@ znanym z NSCA/Apache'a. %package mod_staticfile Summary: lighttpd module for static file serving Summary(pl.UTF-8): Moduł lighttpd do serwowania statycznych plików -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name} = %{version}-%{release} %description mod_staticfile @@ -619,7 +656,8 @@ Moduł lighttpd do serwowania statycznych plików. %package mod_status Summary: lighttpd module for displaying server status Summary(pl.UTF-8): Moduł lighttpd do wyświetlania stanu serwera -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModStatus Requires: %{name} = %{version}-%{release} %description mod_status @@ -631,7 +669,8 @@ mod_status wyświetla stan i konfigurację serwera. %package mod_trigger_b4_dl Summary: Trigger before Download Summary(pl.UTF-8): Wyzwalacz przed ściąganiem -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModTriggerBeforeDownload Requires: %{name} = %{version}-%{release} %description mod_trigger_b4_dl @@ -643,7 +682,8 @@ Jeszcze jeden moduł blokujący bezpośrednie linkowanie. %package mod_userdir Summary: lighttpd module for user homedirs Summary(pl.UTF-8): Moduł lighttpd obsługujący katalogi domowe użytkowników -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModUserDir Requires: %{name} = %{version}-%{release} %description mod_userdir @@ -657,7 +697,8 @@ użytkowników do globalnej przestrzeni nazw serwera WWW. %package mod_usertrack Summary: lighttpd usertrack module Summary(pl.UTF-8): Moduł usertrack dla lighttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModUserTrack Requires: %{name} = %{version}-%{release} %description mod_usertrack @@ -669,7 +710,8 @@ Moduł usertrack dla lighttpd. %package mod_webdav Summary: WebDAV module for lighttpd Summary(pl.UTF-8): Moduł WebDAV dla libghttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModWebDAV Requires: %{name} = %{version}-%{release} %description mod_webdav @@ -699,31 +741,20 @@ zaimplementowane. Jak na razie są: - DELETE - PUT - LOCK (experimental) + oraz zwykłe GET, POST, HEAD z HTTP/1.1. Jak na razie montowanie zasobu webdav pod Windows XP działa i podstawowe testy lakmusowe przechodzą. -%package -n spawn-fcgi -Summary: Spawn fcgi-process directly -Summary(pl.UTF-8): Bezpośrednie uruchamianie procesów fcgi -Group: Applications - -%description -n spawn-fcgi -spawn-fcgi is used to spawn fcgi-process directly without the help of -a webserver or the programm itself. - -%description -n spawn-fcgi -l pl.UTF-8 -spawn-fcgi służy do uruchamiania procesów fcgi bezpośrednio, bez -pomocy serwera WWW ani samego programu. - %package php-spawned Summary: PHP support via FastCGI, spawned by lighttpd Summary(pl.UTF-8): Obsługa PHP przez FastCGI, uruchamiane przez lighttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name} = %{version}-%{release} Requires: %{name}-mod_fastcgi = %{version}-%{release} Requires: php-fcgi +Provides: webserver(php) Obsoletes: lighttpd-php-external %description php-spawned @@ -735,10 +766,11 @@ Obsługa PHP przez FastCGI, uruchamiane przez lighttpd. %package php-external Summary: PHP support via FastCGI, spawning controlled externally Summary(pl.UTF-8): Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrznie -Group: Networking/Daemons +Group: Networking/Daemons/HTTP Requires: %{name} = %{version}-%{release} Requires: %{name}-mod_fastcgi = %{version}-%{release} -Requires: php-fcgi-init +Suggests: php-fcgi-init +Suggests: php-fpm Obsoletes: lighttpd-php-spawned %description php-external @@ -750,8 +782,10 @@ Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrznie. %package ssl Summary: lighttpd support for SSLv2 and SSLv3 Summary(pl.UTF-8): Obsługa SSLv2 i SSLv3 dla lighttpd -Group: Networking/Daemons +Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:SSL Requires: %{name} = %{version}-%{release} +Suggests: ca-certificates %description ssl lighttpd support for SSLv2 and SSLv3. @@ -775,15 +809,25 @@ Plik monitrc do monitorowania serwera www lighttpd. %prep %setup -q %patch100 -p0 +%patch4 -p0 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%{?with_deflate:%patch5 -p1} + +rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead # build mime.types.conf sh %{SOURCE6} /etc/mime.types %build +ver=$(awk '/AC_INIT/{a=$2;gsub(/[\[\],]/, "", a); print a}' configure.ac) +if [ "$ver" != "%{version}" ]; then + : configure.ac specifies wrong version + exit 1 +fi + %{__libtoolize} %{__aclocal} %{__autoconf} @@ -791,6 +835,7 @@ sh %{SOURCE6} /etc/mime.types %configure \ --enable-maintainer-mode \ + --with-distribution="PLD Linux" \ %{!?with_ipv6:--disable-ipv6} \ %{!?with_largefile:--disable-lfs} \ %{?with_valgrind:--with-valgrind} \ @@ -805,7 +850,8 @@ sh %{SOURCE6} /etc/mime.types %{?with_gamin:--with-gamin} \ %{?with_gdbm:--with-gdbm} -%{__make} +# -j1 as src/mod_ssi_exprparser.h regeneration deps are broken +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT @@ -827,9 +873,6 @@ install %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -# could use automake patch, but automake generation fails... -mv $RPM_BUILD_ROOT%{_bindir}/spawn-fcgi $RPM_BUILD_ROOT%{_sbindir}/spawn-fcgi - # Install lighttpd images install %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html install %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png @@ -846,14 +889,12 @@ install %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_access.conf install %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_alias.conf install %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_auth.conf install %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi.conf +install %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi_php.conf install %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cml.conf -install %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_compress.conf install %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_deflate.conf install %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_dirlisting.conf install %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf install %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf -install %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_expire.conf -install %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_extforward.conf install %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf install %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf install %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf @@ -874,7 +915,12 @@ install %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf install %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf install %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf +install %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_expire.conf + +install %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/60_mod_compress.conf + install %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf +install %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/91_mod_extforward.conf install %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf install %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf @@ -882,16 +928,16 @@ install %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf touch $RPM_BUILD_ROOT/var/lib/lighttpd/lighttpd.rrd -%if !%{with mysql} +%if %{without mysql} # avoid packaging dummy module rm -f $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf %endif -%if !%{with deflate} +%if %{without deflate} rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf %endif -touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error}.log +touch $RPM_BUILD_ROOT/var/log/%{name}/{access,error,breakage}.log %clean rm -rf $RPM_BUILD_ROOT @@ -899,11 +945,11 @@ rm -rf $RPM_BUILD_ROOT %pre %groupadd -g 109 lighttpd %groupadd -g 51 http -%useradd -u 116 -d %{_lighttpddir} -c "LigHTTPd User" -g lighttpd lighttpd +%useradd -u 116 -d %{_lighttpddir} -c "Lighttpd User" -g lighttpd lighttpd %addusertogroup lighttpd http %post -for a in access.log error.log; do +for a in access.log error.log breakage.log; do if [ ! -f /var/log/%{name}/$a ]; then touch /var/log/%{name}/$a chown lighttpd:lighttpd /var/log/%{name}/$a @@ -934,7 +980,7 @@ fi # # the strict internal deps between lighttpd modules and # main package are very important for all this to work. -%service %{name} restart "LigHTTPd webserver" +%service %{name} restart "Lighttpd webserver" exit 0 # macro called at module post scriptlet @@ -1006,16 +1052,16 @@ fi %module_scripts php-spawned %module_scripts php-external -%triggerpostun -- %{name} <= 1.3.6-2 -%banner %{name} -e <