%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)
+%bcond_with h264_streaming # build h264_streaming module
%if %{with webdav_locks}
%define webdav_progs 1
Summary: Fast and light HTTP server
Summary(pl.UTF-8): Szybki i lekki serwer HTTP
Name: lighttpd
-Version: 1.4.35
-Release: 6
+Version: 1.4.42
+Release: 0.1
License: BSD
Group: Networking/Daemons/HTTP
-Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.bz2
-# Source0-md5: f7a88130ee9984b421ad8aa80629750a
+Source0: http://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz
+# Source0-md5: 53c55d7e1dac7adec161cd5490491f6d
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.user
Source12: %{name}.monitrc
Source13: branch.sh
Source14: TODO
-Source15: %{name}.upstart
Source16: %{name}.tmpfiles
Source17: %{name}.service
Source100: %{name}-mod_access.conf
Source136: %{name}-mod_h264_streaming.conf
Source137: %{name}-mod_cgi_php.conf
Source138: %{name}-mod_compress.tmpwatch
+# use branch.sh script to create branch.diff
#Patch100: %{name}-branch.diff
+## Patch100-md5: 7bd09235304c8bcb16f34d49d480c0fb
Patch0: %{name}-use_bin_sh.patch
Patch1: %{name}-mod_evasive-status_code.patch
Patch2: %{name}-mod_h264_streaming.patch
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.647
%{?with_webdav_props:BuildRequires: sqlite3-devel}
+BuildRequires: tar >= 1:1.22
%{?with_valgrind:BuildRequires: valgrind}
BuildRequires: which
+BuildRequires: xz
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Conflicts: rpm < 4.4.2-0.2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _libdir %{_prefix}/%{_lib}/%{name}
+%define _libexecdir %{_libdir}/%{name}
%define _lighttpddir /home/services/%{name}
%define _sysconfdir /etc/%{name}
%prep
%setup -q
-#%patch100 -p0
-#%patch4 -p0
+#%patch100 -p1
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1 UPDATE (and submit upstream!) if you need this
+%{?with_h264_streaming:%patch2 -p1}
%patch3 -p1
%{?with_deflate:%patch5 -p1}
%patch6 -p1
-%patch7 -p0
+#%patch7 -p1 probably fixed upstream
rm -f src/mod_ssi_exprparser.h # bad patching: should be removed by is emptied instead
%if "%{pld_release}" == "ac"
%{__sed} -i -e 's/ serial_tests//' configure.ac
+%{__sed} -i -e 's/dist-xz/dist-bzip2/' configure.ac
%endif
%build
fi
%{__libtoolize}
+%{__autoheader}
%{__aclocal}
%{__autoconf}
%{__automake}
%configure \
+ --libdir=%{_libexecdir} \
%{!?with_ipv6:--disable-ipv6} \
%{!?with_largefile:--disable-lfs} \
%{?with_valgrind:--with-valgrind} \
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,init,monit}} \
+install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,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 \
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
cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
cp -p %{SOURCE17} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.la
# Install lighttpd images
cp -p %{SOURCE7} %{SOURCE8} %{SOURCE9} $RPM_BUILD_ROOT%{_lighttpddir}/html
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
+%if %{with h264_streaming}
cp -p %{SOURCE136} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/50_mod_h264_streaming.conf
+%endif
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
%if %{without mysql}
# avoid packaging dummy module
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/mod_mysql_vhost.so
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/mod_mysql_vhost.so
%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/*_mod_mysql_vhost.conf
%endif
%if %{without deflate}
%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}
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
%attr(755,root,root) %{_sbindir}/lighttpd
%attr(755,root,root) %{_sbindir}/lighttpd-angel
-%dir %{_libdir}
+%dir %{_libexecdir}
%{_mandir}/man8/lighttpd.8*
%dir %{_lighttpddir}
%dir %{_lighttpddir}/cgi-bin
%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
-%attr(755,root,root) %{_libdir}/mod_access.so
+%attr(755,root,root) %{_libexecdir}/mod_access.so
%files mod_accesslog
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_accesslog.conf
-%attr(755,root,root) %{_libdir}/mod_accesslog.so
+%attr(755,root,root) %{_libexecdir}/mod_accesslog.so
%files mod_alias
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_alias.conf
-%attr(755,root,root) %{_libdir}/mod_alias.so
+%attr(755,root,root) %{_libexecdir}/mod_alias.so
%files mod_auth
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_auth.conf
-%attr(755,root,root) %{_libdir}/mod_auth.so
+%attr(755,root,root) %{_libexecdir}/mod_auth.so
%files mod_cgi
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_cgi.conf
-%attr(755,root,root) %{_libdir}/mod_cgi.so
+%attr(755,root,root) %{_libexecdir}/mod_cgi.so
%files mod_cgi_php
%defattr(644,root,root,755)
%files mod_cml
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_cml.conf
-%attr(755,root,root) %{_libdir}/mod_cml.so
+%attr(755,root,root) %{_libexecdir}/mod_cml.so
%files mod_compress
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/tmpwatch/lighttpd-mod_compress.conf
%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
+%attr(755,root,root) %{_libexecdir}/mod_compress.so
%dir %attr(775,root,lighttpd) /var/cache/lighttpd/mod_compress
%if %{with deflate}
%files mod_deflate
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_deflate.conf
-%attr(755,root,root) %{_libdir}/mod_deflate.so
+%attr(755,root,root) %{_libexecdir}/mod_deflate.so
%endif
%files mod_dirlisting
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_dirlisting.conf
-%attr(755,root,root) %{_libdir}/mod_dirlisting.so
+%attr(755,root,root) %{_libexecdir}/mod_dirlisting.so
%files mod_evasive
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_evasive.conf
-%attr(755,root,root) %{_libdir}/mod_evasive.so
+%attr(755,root,root) %{_libexecdir}/mod_evasive.so
%files mod_evhost
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_evhost.conf
-%attr(755,root,root) %{_libdir}/mod_evhost.so
+%attr(755,root,root) %{_libexecdir}/mod_evhost.so
%files mod_expire
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_expire.conf
-%attr(755,root,root) %{_libdir}/mod_expire.so
+%attr(755,root,root) %{_libexecdir}/mod_expire.so
%files mod_extforward
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_extforward.conf
-%attr(755,root,root) %{_libdir}/mod_extforward.so
+%attr(755,root,root) %{_libexecdir}/mod_extforward.so
%files mod_fastcgi
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_fastcgi.conf
-%attr(755,root,root) %{_libdir}/mod_fastcgi.so
+%attr(755,root,root) %{_libexecdir}/mod_fastcgi.so
%files mod_flv_streaming
%defattr(644,root,root,755)
%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
+%attr(755,root,root) %{_libexecdir}/mod_flv_streaming.so
+%if %{with h264_streaming}
%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
+%attr(755,root,root) %{_libexecdir}/mod_h264_streaming.so
+%endif
%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
-%attr(755,root,root) %{_libdir}/mod_indexfile.so
+%attr(755,root,root) %{_libexecdir}/mod_indexfile.so
%files mod_magnet
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_magnet.conf
-%attr(755,root,root) %{_libdir}/mod_magnet.so
+%attr(755,root,root) %{_libexecdir}/mod_magnet.so
%if %{with mysql}
%files mod_mysql_vhost
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_mysql_vhost.conf
-%attr(755,root,root) %{_libdir}/mod_mysql_vhost.so
+%attr(755,root,root) %{_libexecdir}/mod_mysql_vhost.so
%endif
%files mod_proxy
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_proxy.conf
-%attr(755,root,root) %{_libdir}/mod_proxy.so
+%attr(755,root,root) %{_libexecdir}/mod_proxy.so
%files mod_redirect
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_redirect.conf
-%attr(755,root,root) %{_libdir}/mod_redirect.so
+%attr(755,root,root) %{_libexecdir}/mod_redirect.so
%files mod_rewrite
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_rewrite.conf
-%attr(755,root,root) %{_libdir}/mod_rewrite.so
+%attr(755,root,root) %{_libexecdir}/mod_rewrite.so
%files mod_rrdtool
%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
+%attr(755,root,root) %{_libexecdir}/mod_rrdtool.so
%attr(640,lighttpd,stats) %ghost /var/lib/lighttpd/lighttpd.rrd
%files mod_scgi
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_scgi.conf
-%attr(755,root,root) %{_libdir}/mod_scgi.so
+%attr(755,root,root) %{_libexecdir}/mod_scgi.so
%files mod_secdownload
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_secdownload.conf
-%attr(755,root,root) %{_libdir}/mod_secdownload.so
+%attr(755,root,root) %{_libexecdir}/mod_secdownload.so
%files mod_setenv
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_setenv.conf
-%attr(755,root,root) %{_libdir}/mod_setenv.so
+%attr(755,root,root) %{_libexecdir}/mod_setenv.so
%files mod_simple_vhost
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_simple_vhost.conf
-%attr(755,root,root) %{_libdir}/mod_simple_vhost.so
+%attr(755,root,root) %{_libexecdir}/mod_simple_vhost.so
%files mod_ssi
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_ssi.conf
-%attr(755,root,root) %{_libdir}/mod_ssi.so
+%attr(755,root,root) %{_libexecdir}/mod_ssi.so
%files mod_staticfile
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_staticfile.conf
-%attr(755,root,root) %{_libdir}/mod_staticfile.so
+%attr(755,root,root) %{_libexecdir}/mod_staticfile.so
%files mod_status
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_status.conf
-%attr(755,root,root) %{_libdir}/mod_status.so
+%attr(755,root,root) %{_libexecdir}/mod_status.so
%files mod_trigger_b4_dl
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_trigger_b4_dl.conf
-%attr(755,root,root) %{_libdir}/mod_trigger_b4_dl.so
+%attr(755,root,root) %{_libexecdir}/mod_trigger_b4_dl.so
%files mod_userdir
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_userdir.conf
-%attr(755,root,root) %{_libdir}/mod_userdir.so
+%attr(755,root,root) %{_libexecdir}/mod_userdir.so
%files mod_usertrack
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*mod_usertrack.conf
-%attr(755,root,root) %{_libdir}/mod_usertrack.so
+%attr(755,root,root) %{_libexecdir}/mod_usertrack.so
%files mod_webdav
%defattr(644,root,root,755)
%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
+%attr(755,root,root) %{_libexecdir}/mod_webdav.so
%files php-spawned
%defattr(644,root,root,755)