Author: oden
Date: Fri Feb 2 09:32:59 2007
New Revision: 115886
Added:
packages/cooker/dcc/current/SOURCES/dcc-1.3.48.tar.bz2 (contents, props
changed)
packages/cooker/dcc/current/SOURCES/dcc-dccd-initscript.diff
Removed:
packages/cooker/dcc/current/SOURCES/dcc-1.3.42.tar.bz2
packages/cooker/dcc/current/SOURCES/dcc-dccd-1.2.2-initscript.patch.bz2
Modified:
packages/cooker/dcc/current/SPECS/dcc.spec
Log:
- 1.3.48
- rediffed P0
Added: packages/cooker/dcc/current/SOURCES/dcc-1.3.48.tar.bz2
==============================================================================
Binary file. No diff available.
Added: packages/cooker/dcc/current/SOURCES/dcc-dccd-initscript.diff
==============================================================================
--- (empty file)
+++ packages/cooker/dcc/current/SOURCES/dcc-dccd-initscript.diff Fri Feb
2 09:32:59 2007
@@ -0,0 +1,57 @@
+--- misc/rcDCC.in 2007-01-30 01:50:05.000000000 +0100
++++ misc/rcDCC.in.oden 2007-02-02 09:18:09.000000000 +0100
+@@ -64,6 +64,7 @@
+ # Rhyolite Software DCC 1.3.48-1.30 $Revision$
+ # @configure_input@
+
++. /etc/rc.d/init.d/functions
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@ # in case dcc_conf has disappeared
+@@ -82,10 +83,15 @@
+
+ case "$1" in
+ start)
+- $DCC_LIBEXEC/start-dccd $DEBUG
+- $DCC_LIBEXEC/start-grey $DEBUG
+- $DCC_LIBEXEC/start-dccm $DEBUG
+- $DCC_LIBEXEC/start-dccifd $DEBUG
++ @libexecdir@/start-dccd $DEBUG
++ @libexecdir@/start-grey $DEBUG
++
++ # the sendmail dcc milter might not be installed
++ if [ -x /usr/sbin/dccm ]; then
++ @libexecdir@/start-dccm $DEBUG
++ fi
++
++ @libexecdir@/start-dccifd $DEBUG
+ ;;
+
+ stop)
+@@ -97,8 +103,8 @@
+ /bin/kill -15 $PID
+ done
+ # stop dccd
+- $DCC_LIBEXEC/stop-dccd -S $DEBUG
+- $DCC_LIBEXEC/stop-dccd -G -S $DEBUG
++ @libexecdir@/stop-dccd -S $DEBUG
++ @libexecdir@/stop-dccd -G -S $DEBUG
+ ;;
+
+ restart|reload)
+@@ -112,8 +118,14 @@
+ echo $DEBUG restart
+ ;;
+
++status)
++ # for Linux
++ status $0
++ status dccifd
++ ;;
++
+ *)
+- echo "Usage: $0 {start|stop|restart|reload|probe}"
++ echo "Usage: $0 {start|stop|restart|reload|probe|status}"
+ exit 1
+ ;;
+
Modified: packages/cooker/dcc/current/SPECS/dcc.spec
==============================================================================
--- packages/cooker/dcc/current/SPECS/dcc.spec (original)
+++ packages/cooker/dcc/current/SPECS/dcc.spec Fri Feb 2 09:32:59 2007
@@ -5,13 +5,13 @@
Summary: Distributed Checksum Clearinghouse, anti-spam tool
Name: dcc
-Version: 1.3.42
+Version: 1.3.48
Release: %mkrel 1
License: BSD-like
Group: System/Servers
URL: http://www.rhyolite.com/anti-spam/dcc/
Source0:
http://www.rhyolite.com/anti-spam/dcc/source/%{name}-%{version}.tar.bz2
-Patch0: dcc-dccd-1.2.2-initscript.patch.bz2
+Patch0: dcc-dccd-initscript.diff
Requires(post): rpm-helper perl rrdtool
Requires(preun): rpm-helper perl rrdtool
Requires(pre): rpm-helper
@@ -80,7 +80,7 @@
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .initscript
+%patch0 -p0 -b .initscript
# fix defaults
find . -type f | xargs perl -pi -e "s|/usr/local|%{_prefix}|g"
@@ -259,6 +259,7 @@
%attr(4755,root,root) %{_bindir}/cdcc
%attr(4755,root,root) %{_bindir}/dccproc
+%attr(0755,root,root) %{_bindir}/dccif-test
%attr(0755,root,root) %{_sbindir}/dbclean
%attr(0755,root,root) %{_sbindir}/dblist
@@ -274,6 +275,7 @@
%attr(0755,root,root) %{_sbindir}/start-grey
%attr(0755,root,root) %{_sbindir}/fetchblack
%attr(0755,root,root) %{_sbindir}/list-clients
+%attr(0755,root,root) %{_sbindir}/dns-helper
# rrdtool stuff
%attr(0755,root,root) %{_sbindir}/dcc-stats-collect
@@ -339,6 +341,8 @@
%attr(0755,root,root) /var/www/dcc-bin/list-log
%attr(0755,root,root) /var/www/dcc-bin/list-msg
%attr(0755,root,root) /var/www/dcc-bin/webuser-notify
+%attr(0755,root,root) /var/www/dcc-bin/footer
+%attr(0755,root,root) /var/www/dcc-bin/header
%files devel
%defattr(-,root,root)
