Added RDEPEND on rrdtool and apply sed to change hardcoded rrdtool paths in scripts. Closes #43359.

4 files changed, 110 insertions, 2 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 16b5c49fe8a8..abe043f9368c 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.8 2004/09/20 01:09:18 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.9 2004/09/25 15:50:38 ticho Exp $
+
+*dcc-1.2.28-r1 (25 Sep 2004)
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> +dcc-1.2.28-r1.ebuild:
+  Added net-analyzer/rrdtool to RDEPEND, use sed to alter hard-coded paths to
+  rrdtool binary in dcc-stats-* scripts.
 
   19 Sep 2004; Scott W Taylor <swtaylor@gentoo.org> dcc-1.2.28.ebuild:
   fix rdepend. procmail does exist if courier is installed
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 3d5133dff419..1df0d158d876 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,4 +1,6 @@
-MD5 39bf0f4bed58ec5abab11ebf05e09342 dcc-1.2.28.ebuild 3115
 MD5 c38d4c88f1db979d96f636b8203a37ee ChangeLog 1081
 MD5 2f5d2faaf988e9e5fdad1e48c66f6fc4 metadata.xml 224
+MD5 d2e603198ac88ccd52d9410311b2130f dcc-1.2.28-r1.ebuild 3240
+MD5 39bf0f4bed58ec5abab11ebf05e09342 dcc-1.2.28.ebuild 3115
+MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28-r1 67
 MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28 67
diff --git a/mail-filter/dcc/dcc-1.2.28-r1.ebuild b/mail-filter/dcc/dcc-1.2.28-r1.ebuild
new file mode 100644
index 000000000000..7d696ba6bb39
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.2.28-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.2.28-r1.ebuild,v 1.1 2004/09/25 15:50:38 ticho Exp $
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
+MY_P="dcc-dccd-${PV}"
+SRC_URI="${HOMEPAGE}/source/${MY_P}.tar.Z"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="ipv6"
+
+RDEPEND="dev-lang/perl
+	net-analyzer/rrdtool
+	|| ( mail-filter/procmail mail-mta/courier )
+	|| ( net-misc/wget net-www/fetch net-misc/curl net-ftp/ftp )
+	virtual/libc"
+DEPEND="sys-apps/sed
+	sys-devel/gcc
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+dcc_cgibin=/var/www/localhost/cgi-bin/dcc
+dcc_homedir=/var/dcc
+dcc_libexec=/usr/sbin
+dcc_man=/usr/share/man
+dcc_rundir=/var/run/dcc
+
+src_compile() {
+	sed -i -e "s:^RRDTOOL=/usr/local/bin/rrdtool:RRDTOOL=/usr/bin/rrdtool:" \
+		misc/dcc-stats-init.in
+	sed -i -e "s:^RRDTOOL=/usr/local/bin/rrdtool:RRDTOOL=/usr/bin/rrdtool:" \
+		misc/dcc-stats-graph.in
+	sed -i -e "s:^RRDTOOL=/usr/local/bin/rrdtool:RRDTOOL=/usr/bin/rrdtool:" \
+		misc/dcc-stats-collect.in
+
+	local myconf
+	myconf="${myconf} --homedir=${dcc_homedir}"
+	myconf="${myconf} --libexecdir=${dcc_libexec}"
+	myconf="${myconf} --bindir=/usr/bin"
+	myconf="${myconf} --mandir=/usr/share/man"
+	myconf="${myconf} --with-cgibin=${dcc_cgibin}"
+	myconf="${myconf} --disable-dccm"
+	#myconf="${myconf} --without-cgibin"
+	myconf="${myconf} --with-rundir=/var/run/dcc"
+	myconf="${myconf} `use_enable ipv6 IPv6`"
+	./configure ${myconf} || die "configure failed!"
+	#make -C homedir
+	emake || die "emake failed!"
+}
+
+moveconf() {
+	for i in $@; do
+		local into=/etc/dcc/
+		local from=/var/dcc/
+		mv ${D}${from}${i} ${D}${into}
+		dosym ${into}${i} ${from}${i}
+	done
+}
+
+src_install() {
+	# stolen from the RPM .spec and modified for gentoo
+	MANOWN=root MANGRP=root export MANOWN MANGRP
+	BINOWN=$MANOWN BINGRP=$MANGRP export BINOWN BINGRP
+	DCC_PROTO_HOMEDIR=${D}${dcc_homedir} export DCC_PROTO_HOMEDIR
+	DCC_CGIBINDIR=${D}${dcc_cgibin} export DCC_CGIBINDIR
+	DCC_SUID=$BINOWN DCC_OWN=$BINOWN DCC_GRP=$BINGRP export DCC_SUID DCC_OWN DCC_GRP
+
+	dodir /etc/cron.daily ${dcc_homedir} ${dcc_cgibin} /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
+	keepdir /var/run/dcc /var/log/dcc
+
+	make DESTDIR=${D} DCC_BINDIR=${D}/usr/bin MANDIR=${D}/usr/share/man/man install || die
+
+	einfo "Branding and setting reasonable defaults"
+	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+		-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
+		-e "s,DCCM_LOGDIR=log\$,DCCM_LOGDIR=/var/log/dcc,;" \
+		-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
+		-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
+		-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
+		-i ${D}${dcc_homedir}/dcc_conf
+
+	einfo "Providing cronjob"
+	mv ${D}/usr/bin/cron-dccd ${D}/etc/cron.daily/dccd
+
+	einfo "Puting system code in sbin instead of bin"
+	mv ${D}/usr/bin/{dbclean,dblist,dccd,dccsight,refeed,start-dccd,stop-dccd,wlist,dcc-stats-graph,newwebuser,dcc-stats-init,stats-get,dcc-stats-collect,dccifd,start-grey,start-dccifd,fetch-testmsg-whitelist} ${D}/usr/sbin/
+
+	einfo "Cleaning up"
+	rm -f ${D}/usr/bin/{logger,hackmc,na-spam,ng-spam,rcDCC,start-dccm,updatedcc}
+
+	einfo "Placing configuration files into /etc instead of /var/run"
+	moveconf dcc_conf flod grey_flod grey_whitelist ids map.txt whiteclnt whitecommon whitelist
+
+	rmdir ${D}/var/dcc/log/
+}
diff --git a/mail-filter/dcc/files/digest-dcc-1.2.28-r1 b/mail-filter/dcc/files/digest-dcc-1.2.28-r1
new file mode 100644
index 000000000000..2910d3ee7679
--- /dev/null
+++ b/mail-filter/dcc/files/digest-dcc-1.2.28-r1
@@ -0,0 +1 @@
+MD5 10a8402de107e81a028664cf4b93ec97 dcc-dccd-1.2.28.tar.Z 1221437