%define webdav_progs 1
%endif
-%define _rel 8
+%define _rel 2
Summary: Fast and light HTTP server
Summary(pl.UTF-8): Szybki i lekki serwer HTTP
Name: lighttpd
-Version: 1.4.13
+Version: 1.4.19
Release: %{_rel}%{?_snap:.%(echo %{_snap}|tr - _)}%{?_svn:.%{_svn}}
License: BSD
Group: Networking/Daemons
-Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.gz
-# Source0-md5: d775d6478391b95d841a1018c8db0b95
+Source0: http://www.lighttpd.net/download/%{name}-%{version}.tar.bz2
+# Source0-md5: d787374e4e4aaa09d5cfa9ab9d23ad40
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.user
Source4: %{name}.logrotate
Source5: %{name}.sysconfig
Source6: %{name}-mime.types.sh
-Source7: http://www.lighttpd.net/favicon.ico
-# Source7-md5: a358994becabd4060393a5454bde505d
+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
Source133: %{name}-mod_mysql_vhost.conf
Source134: %{name}-mod_magnet.conf
Source135: %{name}-mod_extforward.conf
-Patch100: %{name}-branch.diff
+Source136: %{name}-mod_h264_streaming.conf
+#Patch100: %{name}-branch.diff
Patch0: %{name}-use_bin_sh.patch
Patch1: %{name}-mod_evasive-status_code.patch
-Patch2: %{name}-mod_deflate.patch
-Patch3: %{name}-mod_extforward-v2.patch
+Patch2: %{name}-mod_h264_streaming.patch
+Patch3: %{name}-branding.patch
+#Patchx: %{name}-mod_deflate.patch
URL: http://www.lighttpd.net/
%{?with_xattr:BuildRequires: attr-devel}
BuildRequires: autoconf
%{?with_lua:BuildRequires: lua51-devel}
BuildRequires: mailcap >= 2.1.14-4.4
%{?with_mysql:BuildRequires: mysql-devel}
-%{?with_ldap:BuildRequires: openldap-devel}
+%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6}
%{?with_ssl:BuildRequires: openssl-devel}
BuildRequires: pcre-devel
BuildRequires: pkgconfig
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
Provides: group(http)
Provides: group(lighttpd)
Provides: user(lighttpd)
Provides: webserver
+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
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description mod_flv_streaming -l pl.UTF-8
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/
+Requires: %{name} = %{version}-%{release}
+
+%description mod_h264_streaming
+lighttpd module for h264 streaming.
+
+Please note that this module is experimental and work-in-progress.
+
%package mod_indexfile
Summary: lighttpd indexfile module
Summary(pl.UTF-8): Moduł indexfile dla lighttpd
- 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
Requires: monit
%description -n monit-rc-lighttpd
-monitrc file for monitoring MySQL database server.
+monitrc file for monitoring lighttpd web server.
%description -n monit-rc-lighttpd -l pl.UTF-8
-Plik monitrc do monitorowania serwera baz danych MySQL.
+Plik monitrc do monitorowania serwera www lighttpd.
%prep
%setup -q
-%patch100 -p0
+#%patch100 -p0
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%patch3 -p1
# build mime.types.conf
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{/var/log/{%{name},archiv/%{name}},/var/run/%{name}} \
+ $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
$RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \
- $RPM_BUILD_ROOT/var/lib/lighttpd
+ $RPM_BUILD_ROOT/var/lib/lighttpd \
+ $RPM_BUILD_ROOT/var/cache/lighttpd/mod_compress
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
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 %{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
%module_scripts mod_extforward
%module_scripts mod_fastcgi
%module_scripts mod_flv_streaming
+%module_scripts mod_h264_streaming
%module_scripts mod_indexfile
%module_scripts mod_magnet
%module_scripts mod_mysql_vhost
%module_scripts php-spawned
%module_scripts php-external
-%triggerpostun -- %{name} <= 1.3.6-2
-%banner %{name} -e <<EOF
-spawn-fcgi program is now available separately from spawn-fcgi package.
-
-EOF
+%triggerpostun -- %{name} < 1.4.18-10.1
+if [ -f /etc/lighttpd/conf.d/50_mod_extforward.conf.rpmsave ]; then
+ cp -f /etc/lighttpd/conf.d/91_mod_extforward.conf{,.rpmnew}
+ mv -f /etc/lighttpd/conf.d/{50_mod_extforward.conf.rpmsave,91_mod_extforward.conf}
+fi
%files
%defattr(644,root,root,755)
%attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
-%attr(750,root,root) %dir /var/log/archiv/%{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
%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}/*
+%attr(755,root,root) %{_sbindir}/lighttpd
+%attr(755,root,root) %{_sbindir}/lighttpd-angel
%dir %{_libdir}
%{_mandir}/man?/*
%dir %{_lighttpddir}
# rrdtool database is stored there
%dir %attr(771,root,lighttpd) /var/lib/lighttpd
+# mod_compress can put cached files there
+%dir /var/cache/lighttpd
+
%files mod_access
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_access.conf
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_compress.conf
%attr(755,root,root) %{_libdir}/mod_compress.so
+%dir %attr(775,root,lighttpd) /var/cache/lighttpd/mod_compress
%if %{with deflate}
%files mod_deflate
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_flv_streaming.conf
%attr(755,root,root) %{_libdir}/mod_flv_streaming.so
+%files mod_h264_streaming
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_h264_streaming.conf
+%attr(755,root,root) %{_libdir}/mod_h264_streaming.so
+
%files mod_indexfile
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_indexfile.conf