- ver 2.10.0.2

- autoize
- webappize
- added lighttpd config
- added logrotate
- rel 0.1 not tested

Changed files:
    dansguardian.spec -> 1.12

diff --git a/dansguardian.spec b/dansguardian.spec
index 7d8625ab06c798f49f0a6175cb50c0433347cd22..79b58543f3792cc30c43c503c12a5f93ece3c565 100644 (file)
--- a/dansguardian.spec
+++ b/dansguardian.spec
@@ -1,26 +1,38 @@
-# TODO: logrotate. NFY
+# TODO:
 Summary:       Content filtering web proxy
 Summary(pl.UTF-8):     Proxy WWW filtrujące treść
 Name:          dansguardian
-Version:       2.8.0.6
+Version:       2.10.0.2
 Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://dansguardian.org/downloads/2/Stable/%{name}-%{version}.source.tar.gz
-# Source0-md5: aa619607198f37a528dbb65e4a503beb
+Source0:       http://dansguardian.org/downloads/2/Stable/%{name}-%{version}.tar.gz
+# Source0-md5: 0a6c6d35c9e0c82fbc4a2150e8ffe977
 Source1:       %{name}.init
 Source2:       %{name}.httpd
+Source3:       %{name}.lighttpd
+Source4:       %{name}.logrotate
 Patch0:                %{name}-zlib.patch
 Patch1:                %{name}-log.patch
 Patch2:                %{name}-conf.patch
 URL:           http://www.dansguardian.org/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: clamav-devel
 BuildRequires: libstdc++-devel
+BuildRequires: rpmbuild(macros) >= 1.304
 BuildRequires: zlib-devel
+Requires:      webapps
+
 Requires:      rc-scripts
+
 Requires(post,preun):  /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                cgidir          /home/services/httpd/cgi-bin
+%define                _webapp         %{name}
+%define                _webapps        /etc/webapps
+%define                _webappdir      %{_webapps}/%{_webapp}
+%define                _appdir         %{_datadir}/%{_webapp}
 
 %description
 DansGuardian is a web filtering engine that checks the content within
@@ -42,76 +54,104 @@ POST.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-
-sed -i 's/\.Include<\$prefixdir\$sysconfdir/\.Include<\$prefixdir\$datadir/g' configure
 
 %build
-./configure \
-       --bindir="%{_bindir}/" \
-       --cgidir="/home/services/httpd/cgi-bin/" \
-       --installprefix="$RPM_BUILD_ROOT" \
-       --logdir="%{_localstatedir}/log/dansguardian/" \
-       --logrotatedir="/etc/logrotate.d/" \
-       --mandir=%{_mandir}/ \
-       --sysconfdir="%{_sysconfdir}/dansguardian/" \
-       --sysvdir="/etc/rc.d/init.d/" \
-       --runas_usr="nobody" \
-       --runas_grp="nobody"
-
-%{__make} \
-       libdir="/usr/%{_lib}/"
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+
+%configure \
+       --enable-pcre \
+       --enable-lfs \
+       --enable-clamav \
+       --enable-clamd \
+       --enable-icap \
+       --enable-kavd \
+       --enable-commandline \
+       --enable-fancydm \
+       --enable-trickledm \
+       --enable-ntlm \
+       --enable-email \
+%if %{with debug}
+       --enable-segv-backtrace \
+       --with-dgdebug \
+%endif
+       --with-proxyuser nobody \
+       --with-proxygroup nobody
+
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man8} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/{dansguardian,httpd/httpd.conf} \
-       $RPM_BUILD_ROOT%{_datadir}/dansguardian/{languages,phraselists,pics,logrotation} \
-       $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} \
-       $RPM_BUILD_ROOT%{cgidir}
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d} \
+          $RPM_BUILD_ROOT/var/log/dansguardian \
+          $RPM_BUILD_ROOT%{_webappdir}
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dansguardian
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/dansguardian.conf
-install dansguardian.pl $RPM_BUILD_ROOT/home/services/httpd/cgi-bin/dansguardian.pl
-install dansguardian.conf $RPM_BUILD_ROOT%{_sysconfdir}/dansguardian/dansguardian.conf
-install dansguardianf1.conf $RPM_BUILD_ROOT%{_sysconfdir}/dansguardian/dansguardianf1.conf
-install pics $RPM_BUILD_ROOT%{_sysconfdir}/dansguardian/pics
-install dansguardian.8 $RPM_BUILD_ROOT%{_mandir}/man8/dansguardian.8
-install dansguardian $RPM_BUILD_ROOT%{_bindir}/dansguardian
-install transparent1x1.gif $RPM_BUILD_ROOT%{_datadir}/dansguardian/pics/transparent1x1.gif
-cp -r languages $RPM_BUILD_ROOT%{_datadir}/dansguardian
-cp -r phraselists $RPM_BUILD_ROOT%{_datadir}/dansguardian
-install *list $RPM_BUILD_ROOT%{_sysconfdir}/dansguardian
+install %{SOURCE2} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+
+%triggerin -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
+%%triggerin -- lighttpd
+%%webapp_register lighttpd %{_webapp}
+
+%%triggerun -- lighttpd
+%%webapp_unregister lighttpd %{_webapp}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add dansguardian
-if [ -r /var/lock/subsys/dansguardian ]; then
-       /etc/rc.d/init.d/dansguardian restart >&2
-else
-       echo "Run \"/etc/rc.d/init.d/dansguardian start\" to start DansGuardian."
-fi
+%service dansguardian restart "Dansguardian daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -r /var/lock/subsys/dansguardian ]; then
-               /etc/rc.d/init.d/dansguardian stop >&2
-       fi
+       %service dansguardian stop
        /sbin/chkconfig --del dansguardian
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALL README UPGRADING
+%doc doc/AuthPlugins doc/ContentScanners doc/DownloadManagers doc/FAQ doc/FAQ.html doc/Plugins
 %{_mandir}/man8/dansguardian.8*
 %attr(754,root,root) /etc/rc.d/init.d/dansguardian
-%attr(755,root,root) %{_bindir}/dansguardian
-%attr(755,root,root) /home/services/httpd/cgi-bin/dansguardian.pl
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/dansguardian.conf
+%attr(755,root,root) %{_sbindir}/dansguardian
+%dir %{_datadir}/dansguardian
+%{_datadir}/dansguardian/languages
+%{_datadir}/dansguardian/scripts
+%{_datadir}/dansguardian/transparent1x1.gif
+%attr(755,root,root) %{_datadir}/dansguardian/dansguardian.pl
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %dir %{_sysconfdir}/dansguardian
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dansguardian/*
-%{_datadir}/dansguardian
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dansguardian/*.conf
+%dir %{_sysconfdir}/dansguardian/authplugins
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dansguardian/authplugins/*.conf
+%dir %{_sysconfdir}/dansguardian/contentscanners/
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dansguardian/contentscanners/*.conf
+%dir %{_sysconfdir}/dansguardian/downloadmanagers
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dansguardian/downloadmanagers/*.conf
+%{_sysconfdir}/dansguardian/lists
+%dir %{_webappdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/lighttpd.conf
+%attr(750,root,root) %dir /var/log/dansguardian