X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=977eaa742bc4de48a6ad56d130599c7d6b57a99d;hb=902fac5f9d9a3b2be63da86c001fcf0cebb14157;hp=9244a6020ff234d454313231097378ce62be9742;hpb=7a4f7caa7fc9f472ced4c3f7468414d1ef040274;p=packages%2Flighttpd.git diff --git a/lighttpd.spec b/lighttpd.spec index 9244a60..977eaa7 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -1,17 +1,10 @@ + # TODO: -# - test 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 +# - provide or autogenerate self signed cert in post, so after installing +# lighttpd-ssl server will still work # -# Conditional build for lighttpd: +# Conditional build: +%bcond_without tests # build with tests %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) @@ -21,32 +14,26 @@ %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 6 Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.20 -Release: %{rel}%{?_snap:.%(echo %{_snap}|tr - _)}%{?_svn:.%{_svn}} +Version: 1.4.29 +Release: 4 License: BSD Group: Networking/Daemons/HTTP -Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2 -# Source0-md5: ed6ee0bb714f393219a32768d86984d8 +Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2 +# Source0-md5: e6e67b09986cb504db630b5a86b2dd76 Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -55,15 +42,17 @@ 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 +Source13: branch.sh +Source14: TODO +Source15: %{name}.upstart Source100: %{name}-mod_access.conf Source101: %{name}-mod_accesslog.conf Source102: %{name}-mod_alias.conf @@ -107,13 +96,12 @@ Patch0: %{name}-use_bin_sh.patch Patch1: %{name}-mod_evasive-status_code.patch Patch2: %{name}-mod_h264_streaming.patch Patch3: %{name}-branding.patch -Patch4: %{name}-modinit-before-fork.patch +#Patch4: %{name}-modinit-before-fork.patch Patch5: %{name}-mod_deflate.patch -Patch6: %{name}-mod_rrdtool-emptyfile.patch -Patch7: %{name}-bug-1877.patch +#Patch8: %{name}-errorlog-before-fork.patch URL: http://www.lighttpd.net/ %{?with_xattr:BuildRequires: attr-devel} -BuildRequires: autoconf +BuildRequires: autoconf >= 2.57 BuildRequires: automake BuildRequires: bzip2-devel BuildRequires: fcgi-devel @@ -133,6 +121,7 @@ BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.268 %{?with_webdav_props:BuildRequires: sqlite3-devel} %{?with_valgrind:BuildRequires: valgrind} +BuildRequires: which BuildRequires: zlib-devel Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel @@ -146,13 +135,14 @@ Requires(pre): /usr/sbin/usermod Requires: %{name}-mod_dirlisting = %{version}-%{release} Requires: %{name}-mod_indexfile = %{version}-%{release} Requires: %{name}-mod_staticfile = %{version}-%{release} -Requires: rc-scripts +Requires: rc-scripts >= 0.4.3.0 Requires: rpm-whiteout >= 1.5 -Requires: webapps +Suggests: %{name}-mod_accesslog Provides: group(http) Provides: group(lighttpd) Provides: user(lighttpd) Provides: webserver +Provides: webserver(mime) Conflicts: logrotate < 3.7-4 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed. Conflicts: rpm < 4.4.2-0.2 @@ -185,6 +175,7 @@ powodu problemów z obciążeniem. Summary: lighttpd module for making access restrictions Summary(pl.UTF-8): Moduł lighttpd ograniczający dostęp Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAccess Requires: %{name} = %{version}-%{release} Provides: webserver(access) @@ -200,6 +191,7 @@ Moduł access służy do ograniczania dostępu do plików o podanych Summary: lighttpd module to record access logs Summary(pl.UTF-8): Moduł lighttpd do zapisu logów dostępu Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAccessLog Requires: %{name} = %{version}-%{release} %description mod_accesslog @@ -212,6 +204,7 @@ Domyślnie podobny do CLF, elastyczny jak Apache. Summary: lighttpd module for making URL aliasing Summary(pl.UTF-8): Moduł lighttpd odpowiadający za aliasy URL-i Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAlias Requires: %{name} = %{version}-%{release} Provides: webserver(alias) @@ -227,6 +220,7 @@ dla podanego podzbioru URL-i. Summary: lighttpd module for authentication support Summary(pl.UTF-8): Moduł lighttpd do obsługi uwierzytelniania Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModAuth Requires: %{name} = %{version}-%{release} Provides: webserver(auth) @@ -242,6 +236,7 @@ basic i digest. Summary: lighttpd module for CGI handling Summary(pl.UTF-8): Moduł lighttpd do obsługi CGI 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) @@ -283,6 +278,7 @@ prosty i naturalny sposób. Summary: lighttpd module for Cache Meta Language Summary(pl.UTF-8): Moduł Cache Meta Language Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCML Requires: %{name} = %{version}-%{release} %description mod_cml @@ -298,6 +294,7 @@ z drugiej strony do budowania strony z fragmentów przy użyciu LUA. Summary: lighttpd module for output compression Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModCompress Requires: %{name} = %{version}-%{release} %description mod_compress @@ -322,7 +319,7 @@ Obsługiwane są gzip, deflate i bzip. Summary: lighttpd module for output compression using deflate method Summary(pl.UTF-8): Moduł lighttpd do kompresji wyjścia metodą deflate Group: Networking/Daemons/HTTP -URL: http://trac.lighttpd.net/trac/wiki/Mod_Deflate +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Mod_Deflate Requires: %{name} = %{version}-%{release} %description mod_deflate @@ -338,6 +335,7 @@ mod_compress. Summary: lighttpd module for directory listings Summary(pl.UTF-8): Moduł lighttpd do tworzenia listingów katalogów Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModDirlisting Requires: %{name} = %{version}-%{release} %description mod_dirlisting @@ -352,6 +350,7 @@ kontrolą CSS. Summary: lighttpd evasive module Summary(pl.UTF-8): Moduł evasive dla lighttpd Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEvasive Requires: %{name} = %{version}-%{release} %description mod_evasive @@ -364,6 +363,7 @@ Moduł evasive dla lighttpd. Summary: lighttpd module for enhanced virtual-hosting Summary(pl.UTF-8): Moduł lighttpd rozszerzający obsługę hostów wirtualnych Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModEVhost Requires: %{name} = %{version}-%{release} %description mod_evhost @@ -380,6 +380,7 @@ nazwy hosta. 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/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModExpire Requires: %{name} = %{version}-%{release} Provides: webserver(expires) @@ -393,6 +394,7 @@ mod_expire steruje ustawianiem nagłówka odpowiedzi Expire. 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/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/DocsModExtForward Requires: %{name} = %{version}-%{release} %description mod_extforward @@ -409,6 +411,7 @@ serwerów stojących za odwrotnymi serwerami proxy. Summary: lighttpd module for FastCGI interface Summary(pl.UTF-8): Moduł lighttpd do interfejsu FastCGI Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFastCGI Requires: %{name} = %{version}-%{release} %description mod_fastcgi @@ -425,6 +428,7 @@ jak Perl, PHP czy własne aplikacje. Summary: lighttpd module for flv streaming Summary(pl.UTF-8): Moduł lighttpd do streamingu flv Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming Requires: %{name} = %{version}-%{release} %description mod_flv_streaming @@ -435,20 +439,23 @@ Moduł lighttpd do streamingu flv. %package mod_h264_streaming Summary: lighttpd module for h264 streaming -License: GPL v3+ +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/ +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/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Index-file-names.Details Requires: %{name} = %{version}-%{release} Provides: webserver(indexfile) @@ -462,6 +469,7 @@ Moduł indexfile. Summary: lighttpd powermagnet module Summary(pl.UTF-8): Moduł powermagnet dla lighttpd Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/wiki/lighttpd/Docs:ModMagnet Requires: %{name} = %{version}-%{release} %description mod_magnet @@ -474,6 +482,7 @@ mod_magnet to moduł sterujący obsługą żądań w lighty. Summary: lighttpd module for MySQL based vhosting Summary(pl.UTF-8): Moduł lighttpd obsługujący vhosty oparte na MySQL-u Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModMySQLVhost Requires: %{name} = %{version}-%{release} Conflicts: %{name}-mod_simple_vhost @@ -487,6 +496,7 @@ Ten moduł udostępnia wirtualne hosty (vhosty) oparte na tabeli MySQL. Summary: lighttpd module for proxying requests Summary(pl.UTF-8): Moduł lighttpd do przekazywania żądań Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModProxy Requires: %{name} = %{version}-%{release} %description mod_proxy @@ -520,6 +530,7 @@ Ten pakiet zawiera nowy moduł proxy. Summary: lighttpd module for URL redirects Summary(pl.UTF-8): Moduł lighttpd do przekierowań URL-i Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRedirect Requires: %{name} = %{version}-%{release} %description mod_redirect @@ -533,7 +544,9 @@ zewnątrz. 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/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 @@ -547,6 +560,7 @@ WWW _przed_ ich obsługą. 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/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModRRDTool Requires: %{name} = %{version}-%{release} Requires: rrdtool @@ -569,6 +583,7 @@ WWW. Summary: lighttpd module for SCGI interface Summary(pl.UTF-8): Moduł lighttpd do interfejsu SCGI Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSCGI Requires: %{name} = %{version}-%{release} %description mod_scgi @@ -583,6 +598,7 @@ Pythona z WSGI. Summary: lighttpd module for secure and fast downloading Summary(pl.UTF-8): Moduł lighttpd do bezpiecznego i szybkiego ściągania danych Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSecDownload Requires: %{name} = %{version}-%{release} %description mod_secdownload @@ -597,6 +613,7 @@ uwierzytelnieniem i zapobiec używaniu bezpośrednich odnośników. Summary: lighttpd module for setting conditional request headers Summary(pl.UTF-8): Moduł lighttpd do ustawiania warunkowych nagłówków żądań Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSetEnv Requires: %{name} = %{version}-%{release} Provides: webserver(setenv) @@ -610,6 +627,7 @@ mod_setenv służy do dodawania nagłówków żądań. Summary: lighttpd module for simple virtual-hosting Summary(pl.UTF-8): Moduł lighttpd do prostych hostów wirtualnych Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSimpleVhost Requires: %{name} = %{version}-%{release} Conflicts: %{name}-mod_mysql_vhost @@ -623,6 +641,7 @@ Moduł lighttpd do prostych hostów wirtualnych. Summary: lighttpd module for server-side includes Summary(pl.UTF-8): Moduł lighttpd do SSI (server-side includes) Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModSSI Requires: %{name} = %{version}-%{release} %description mod_ssi @@ -649,6 +668,7 @@ Moduł lighttpd do serwowania statycznych plików. Summary: lighttpd module for displaying server status Summary(pl.UTF-8): Moduł lighttpd do wyświetlania stanu serwera Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModStatus Requires: %{name} = %{version}-%{release} %description mod_status @@ -661,6 +681,7 @@ mod_status wyświetla stan i konfigurację serwera. Summary: Trigger before Download Summary(pl.UTF-8): Wyzwalacz przed ściąganiem Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModTriggerBeforeDownload Requires: %{name} = %{version}-%{release} %description mod_trigger_b4_dl @@ -673,6 +694,7 @@ Jeszcze jeden moduł blokujący bezpośrednie linkowanie. Summary: lighttpd module for user homedirs Summary(pl.UTF-8): Moduł lighttpd obsługujący katalogi domowe użytkowników Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModUserDir Requires: %{name} = %{version}-%{release} %description mod_userdir @@ -687,6 +709,7 @@ użytkowników do globalnej przestrzeni nazw serwera WWW. Summary: lighttpd usertrack module Summary(pl.UTF-8): Moduł usertrack dla lighttpd Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModUserTrack Requires: %{name} = %{version}-%{release} %description mod_usertrack @@ -699,6 +722,7 @@ Moduł usertrack dla lighttpd. Summary: WebDAV module for lighttpd Summary(pl.UTF-8): Moduł WebDAV dla libghttpd Group: Networking/Daemons/HTTP +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModWebDAV Requires: %{name} = %{version}-%{release} %description mod_webdav @@ -734,19 +758,6 @@ 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 @@ -754,6 +765,7 @@ 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 @@ -768,7 +780,8 @@ Summary(pl.UTF-8): Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrzn 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 @@ -781,7 +794,9 @@ Obsługa PHP przez FastCGI, uruchamianie sterowane zewnętrznie. Summary: lighttpd support for SSLv2 and SSLv3 Summary(pl.UTF-8): Obsługa SSLv2 i SSLv3 dla lighttpd 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. @@ -805,21 +820,26 @@ Plik monitrc do monitorowania serwera www lighttpd. %prep %setup -q %patch100 -p0 -%patch4 -p0 +#%patch4 -p0 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %{?with_deflate:%patch5 -p1} -%patch6 -p1 -%patch7 -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 +cp -a %{SOURCE14} PLD-TODO %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} @@ -845,10 +865,14 @@ sh %{SOURCE6} /etc/mime.types # -j1 as src/mod_ssi_exprparser.h regeneration deps are broken %{__make} -j1 +%if %{with tests} +%{__make} check +%endif + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,monit}} \ - $RPM_BUILD_ROOT%{_sysconfdir}/{conf,webapps}.d \ +install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,init,monit}} \ + $RPM_BUILD_ROOT%{_sysconfdir}/{conf,vhosts,webapps}.d \ $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \ $RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \ $RPM_BUILD_ROOT/var/lib/lighttpd \ @@ -857,80 +881,80 @@ install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} -install %{SOURCE2} %{SOURCE3} mime.types.conf $RPM_BUILD_ROOT%{_sysconfdir} -install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} -install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name} -install %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc +install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name} +cp -p %{SOURCE2} %{SOURCE3} mime.types.conf $RPM_BUILD_ROOT%{_sysconfdir} +cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/%{name} +cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/monit/%{name}.monitrc +cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/init/%{name}.conf 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 -install %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html +cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html +cp -p %{SOURCE10} $RPM_BUILD_ROOT%{_lighttpddir}/html/pld_button.png +cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_lighttpddir}/html/index.html # NOTE: the order of the modules is somewhat important as the modules are # handled in the way they are specified. mod_rewrite should always be the first # module, mod_accesslog always the last. -install %{SOURCE117} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/10_mod_rewrite.conf -install %{SOURCE116} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/11_mod_redirect.conf - -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/91_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 -install %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf -install %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_magnet.conf -install %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.conf -install %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf -install %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_scgi.conf -install %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf -install %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_setenv.conf -install %{SOURCE122} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_simple_vhost.conf -install %{SOURCE123} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_ssi.conf -install %{SOURCE124} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_staticfile.conf -install %{SOURCE125} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_status.conf -install %{SOURCE126} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_trigger_b4_dl.conf -install %{SOURCE127} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_userdir.conf -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 %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf - -install %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf -install %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf -install %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf +cp -p %{SOURCE117} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/10_mod_rewrite.conf +cp -p %{SOURCE116} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/11_mod_redirect.conf + +cp -p %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_access.conf +cp -p %{SOURCE102} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_alias.conf +cp -p %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_auth.conf +cp -p %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi.conf +cp -p %{SOURCE137} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cgi_php.conf +cp -p %{SOURCE105} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_cml.conf +cp -p %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_deflate.conf +cp -p %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_dirlisting.conf +cp -p %{SOURCE109} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evasive.conf +cp -p %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_evhost.conf +cp -p %{SOURCE112} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_fastcgi.conf +cp -p %{SOURCE113} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_flv_streaming.conf +cp -p %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf +cp -p %{SOURCE114} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_indexfile.conf +cp -p %{SOURCE115} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_proxy.conf +cp -p %{SOURCE118} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_rrdtool.conf +cp -p %{SOURCE119} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_scgi.conf +cp -p %{SOURCE120} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_secdownload.conf +cp -p %{SOURCE121} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_setenv.conf +cp -p %{SOURCE122} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_simple_vhost.conf +cp -p %{SOURCE123} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_ssi.conf +cp -p %{SOURCE124} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_staticfile.conf +cp -p %{SOURCE125} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_status.conf +cp -p %{SOURCE126} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_trigger_b4_dl.conf +cp -p %{SOURCE127} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_userdir.conf +cp -p %{SOURCE128} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_usertrack.conf +cp -p %{SOURCE129} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_webdav.conf +cp -p %{SOURCE133} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_mysql_vhost.conf + +cp -p %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_magnet.conf +cp -p %{SOURCE111} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_expire.conf + +cp -p %{SOURCE106} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/60_mod_compress.conf + +cp -p %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_accesslog.conf +cp -p %{SOURCE135} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/91_mod_extforward.conf + +cp -p %{SOURCE130} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-spawned.conf +cp -p %{SOURCE131} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/php-external.conf +cp -p %{SOURCE132} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/ssl.conf touch $RPM_BUILD_ROOT/var/lib/lighttpd/lighttpd.rrd %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 +%{__rm} $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf %endif %if %{without deflate} -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_deflate.conf +%{__rm} $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 @@ -942,7 +966,7 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -969,7 +993,7 @@ fi # # 1. at the end of transaction. (posttrans, feature from rpm 4.4.2) # 2. first install of module (post: $1 = 1) -# 2. uninstall of module (postun: $1 == 0) +# 2. uninstall of module (postun: $1 = 0) # # the strict internal deps between lighttpd modules and # main package are very important for all this to work. @@ -1053,30 +1077,35 @@ fi %files %defattr(644,root,root,755) -%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh +%doc NEWS README PLD-TODO %dir %attr(751,root,lighttpd) %{_sysconfdir} -%dir %attr(750,root,root) %{_sysconfdir}/webapps.d %dir %attr(750,root,root) %{_sysconfdir}/conf.d +%dir %attr(750,root,root) %{_sysconfdir}/vhosts.d +%dir %attr(750,root,root) %{_sysconfdir}/webapps.d %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user +%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} %attr(750,root,root) %dir /var/log/archive/%{name} %dir %attr(751,root,root) /var/log/%{name} -%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/access.log -%ghost %attr(644,lighttpd,lighttpd) /var/log/%{name}/error.log +%attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/access.log +%attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/error.log +%attr(644,lighttpd,lighttpd) %ghost /var/log/%{name}/breakage.log %dir %attr(770,root,lighttpd) /var/run/%{name} %attr(754,root,root) /etc/rc.d/init.d/%{name} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/* %attr(755,root,root) %{_sbindir}/lighttpd %attr(755,root,root) %{_sbindir}/lighttpd-angel %dir %{_libdir} -%{_mandir}/man?/* +%{_mandir}/man8/lighttpd.8* %dir %{_lighttpddir} %dir %{_lighttpddir}/cgi-bin %dir %{_lighttpddir}/html -%config(noreplace,missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/* +%config(noreplace,missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/index.html +%config(missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*.png +%config(missingok) %verify(not md5 mtime size) %{_lighttpddir}/html/*.ico %dir %{_datadir}/lighttpd %dir %{_datadir}/lighttpd/errordocs @@ -1210,7 +1239,7 @@ fi %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rrdtool.conf %attr(755,root,root) %{_libdir}/mod_rrdtool.so -%ghost %attr(640,lighttpd,stats) /var/lib/lighttpd/lighttpd.rrd +%attr(640,lighttpd,stats) %ghost /var/lib/lighttpd/lighttpd.rrd %files mod_scgi %defattr(644,root,root,755) @@ -1267,11 +1296,6 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_webdav.conf %attr(755,root,root) %{_libdir}/mod_webdav.so -%files -n spawn-fcgi -%defattr(644,root,root,755) -%doc doc/spawn-php.sh -%attr(755,root,root) %{_sbindir}/spawn-fcgi - %files php-spawned %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/php-spawned.conf