X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lighttpd.spec;h=bf9fa24436bed97f5252cb556ee21237e142ae40;hb=af35593f3ebe9e92f7df1ed17ca500c9c62e5752;hp=da8bbb76fd664aa57f90af75c79cc8654d79d68d;hpb=86099f38ca9a6e84d78fc889ca32f418b65f14fa;p=packages%2Flighttpd.git diff --git a/lighttpd.spec b/lighttpd.spec index da8bbb7..bf9fa24 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -1,16 +1,3 @@ -# 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 -# # Conditional build for lighttpd: %bcond_without xattr # support of extended attributes %bcond_without ipv6 # IPv4-only version (doesn't require IPv6 in kernel) @@ -21,7 +8,7 @@ %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 @@ -35,12 +22,12 @@ Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd -Version: 1.4.22 -Release: 2 +Version: 1.4.26 +Release: 6 License: BSD Group: Networking/Daemons/HTTP -Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2 -# Source0-md5: ed4ca3897eadf419c893b03fee53c982 +Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2 +# Source0-md5: a682c8efce47a2f4263a247ba0813c9b Source1: %{name}.init Source2: %{name}.conf Source3: %{name}.user @@ -49,15 +36,16 @@ 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 Source100: %{name}-mod_access.conf Source101: %{name}-mod_accesslog.conf Source102: %{name}-mod_alias.conf @@ -96,17 +84,18 @@ 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 +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 Patch4: %{name}-modinit-before-fork.patch Patch5: %{name}-mod_deflate.patch -Patch6: %{name}-mod_rrdtool-emptyfile.patch +Patch6: etag-32bit-overflow.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 @@ -126,6 +115,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 @@ -139,12 +129,13 @@ 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.1.26-2 Requires: rpm-whiteout >= 1.5 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 @@ -352,6 +343,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 @@ -429,7 +421,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://blog.lighttpd.net/articles/2006/03/09/flv-streaming-with-lighttpd +URL: http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ModFLVStreaming Requires: %{name} = %{version}-%{release} %description mod_flv_streaming @@ -456,6 +448,7 @@ Moduł lighttpd do pseudostreamingu plików QuickTime/MPEG-4. 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) @@ -469,6 +462,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 @@ -545,6 +539,7 @@ Summary(pl.UTF-8): Moduł lighttpd do wewnętrznych przekierowań i przepisywani 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 @@ -756,19 +751,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 @@ -776,6 +758,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 @@ -790,7 +773,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 @@ -803,7 +787,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. @@ -826,7 +812,7 @@ Plik monitrc do monitorowania serwera www lighttpd. %prep %setup -q -#%patch100 -p0 +%patch100 -p0 %patch4 -p0 %patch0 -p1 %patch1 -p1 @@ -839,8 +825,15 @@ rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied i # 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} @@ -869,7 +862,7 @@ sh %{SOURCE6} /etc/mime.types %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 \ + $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 \ @@ -886,9 +879,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 @@ -911,12 +901,10 @@ 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 %{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 @@ -932,6 +920,9 @@ 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 %{SOURCE134} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/55_mod_magnet.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 @@ -952,7 +943,7 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf 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 @@ -964,7 +955,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 @@ -1075,10 +1066,11 @@ fi %files %defattr(644,root,root,755) -%doc NEWS README ChangeLog doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh +%doc NEWS README doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh 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 @@ -1086,19 +1078,22 @@ fi %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}/man1/lighttpd.1* +%{_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 @@ -1232,7 +1227,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) @@ -1289,12 +1284,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 -%{_mandir}/man1/spawn-fcgi.1* - %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