Bug #125994, version bump. Also clean up minor QA item.

(Portage version: 2.1_pre6-r7)

5 files changed, 131 insertions, 4 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 46931f896c41..0da1263e4e8e 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.27 2006/03/26 10:07:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.28 2006/03/26 10:11:11 robbat2 Exp $
+
+*dcc-1.3.31 (26 Mar 2006)
+
+  26 Mar 2006; Robin H. Johnson <robbat2@gentoo.org> dcc-1.3.24.ebuild,
+  +dcc-1.3.31.ebuild:
+  Bug #125994, version bump. Also clean up minor QA item.
 
   26 Mar 2006; Robin H. Johnson <robbat2@gentoo.org> dcc-1.3.24.ebuild:
   Bug #117900, rrdtool is optional, and the procmail interface is usable
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index e1317d00bbf7..1f80d3f4d3f2 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -16,6 +16,9 @@ SHA256 5b01ec8e443cf18d090a584f44cc52fd94e7a7fe5aaef0ad5cffb05555e7f2a7 dcc-1.3.
 MD5 2f0c990719945740669b316ab41dd33b dcc-1.3.24.ebuild 3935
 RMD160 358bf5bbefa6bdd068f874eca61c27baf97f39d8 dcc-1.3.24.ebuild 3935
 SHA256 c37fe2cb7fb99bf1590586a30b9a72076ae48a5168971f11a6057b4500c85d17 dcc-1.3.24.ebuild 3935
+MD5 7de6a60ef75a54c6f3c516a161043f57 dcc-1.3.31.ebuild 3948
+RMD160 f4d095bd9612e6766cc55d7eda4fd32f28f9358c dcc-1.3.31.ebuild 3948
+SHA256 c74f4bfdf5dc6861469826b9512b3bffb854e20e628e3f4ecc03ac68d89b24b5 dcc-1.3.31.ebuild 3948
 MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28 67
 RMD160 5c04163e71870bfd08291466ffce46aaee31269e files/digest-dcc-1.2.28 67
 SHA256 1237d991925a80fd6ee9f07d2b18a059f08b9af3fcebb937decd2c5b23eacd36 files/digest-dcc-1.2.28 67
@@ -31,6 +34,9 @@ SHA256 08bedcf7846ea76c89f61b1aea51783cdb0cf7c976e1d84ad87094006d46cb82 files/di
 MD5 a055d56425b58fa58fd225c92c063d58 files/digest-dcc-1.3.24 247
 RMD160 fe31df476cdddfb19965d2639657d583d5fa03b3 files/digest-dcc-1.3.24 247
 SHA256 d1edff47a4b87b36b3de0dcf0f708aaebfe71db0d776892437a3b7a123183a22 files/digest-dcc-1.3.24 247
+MD5 8d925686c6729563a2b5a8e473ad9dd3 files/digest-dcc-1.3.31 247
+RMD160 29c310f2988324a48e4c450c5baed030c10506f7 files/digest-dcc-1.3.31 247
+SHA256 684f6ecafc6bd492c8349f12f623e8bfad0e2ad8a972a1007b5e616f6dc1b846 files/digest-dcc-1.3.31 247
 MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
 RMD160 7a7b22292aa2fdfd4c9e3f9abe62aff83170f428 metadata.xml 224
 SHA256 d67b611ce73649753af8a136a53c5dfae6628c053d01687779f108753fd20929 metadata.xml 224
diff --git a/mail-filter/dcc/dcc-1.3.24.ebuild b/mail-filter/dcc/dcc-1.3.24.ebuild
index 810bc65f32c0..b99de4ec2f5d 100644
--- a/mail-filter/dcc/dcc-1.3.24.ebuild
+++ b/mail-filter/dcc/dcc-1.3.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.24.ebuild,v 1.6 2006/03/26 10:07:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.24.ebuild,v 1.7 2006/03/26 10:11:11 robbat2 Exp $
 
 inherit flag-o-matic
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/${MY_P}.tar.Z"
 LICENSE="DCC"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6"
+IUSE="ipv6 rrdtool"
 
 RDEPEND="dev-lang/perl
 	rrdtool? ( net-analyzer/rrdtool )
@@ -99,7 +99,7 @@ src_install() {
 		eval mv $statslist ${D}/usr/sbin/ || die "Failed to move rrdtool apps"
 	else
 		einfo "Removing rrdtool interface scripts"
-		rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
+		eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
 	fi
 
 	einfo "Cleaning up"
diff --git a/mail-filter/dcc/dcc-1.3.31.ebuild b/mail-filter/dcc/dcc-1.3.31.ebuild
new file mode 100644
index 000000000000..d02c5b4b5d9c
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.31.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.31.ebuild,v 1.1 2006/03/26 10:11:11 robbat2 Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
+MY_P="dcc-dccd-${PV}"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/${MY_P}.tar.Z"
+
+LICENSE="DCC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 rrdtool"
+
+RDEPEND="dev-lang/perl
+	rrdtool? ( net-analyzer/rrdtool )
+	|| ( net-misc/wget www-client/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
+	sed -i -e "s:@installroot@:${D}:" \
+		cgi-bin/Makefile.in
+
+	local myconf
+	append-ldflags $(bindnow-flags)
+	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 DCC_HOMEDIR=${D}${dcc_homedir} 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 "Putting system code in sbin instead of bin"
+	mv ${D}/usr/bin/{dbclean,dblist,dccd,dccsight,start-dccd,stop-dccd,wlist,newwebuser,stats-get,dccifd,start-grey,start-dccifd,fetch-testmsg-whitelist} ${D}/usr/sbin/ || die "Failed to move apps to sbin"
+
+	statslist="${D}/usr/bin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
+	if use rrdtool; then
+		einfo "Installing rrdtool interface scripts"
+		eval mv $statslist ${D}/usr/sbin/ || die "Failed to move rrdtool apps"
+	else
+		einfo "Removing rrdtool interface scripts"
+		eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
+	fi
+
+	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.3.31 b/mail-filter/dcc/files/digest-dcc-1.3.31
new file mode 100644
index 000000000000..10618c09cc23
--- /dev/null
+++ b/mail-filter/dcc/files/digest-dcc-1.3.31
@@ -0,0 +1,3 @@
+MD5 5b818c323b7282dd10dc97b538097f6f dcc-dccd-1.3.31.tar.Z 1406285
+RMD160 d3df67cf9e86ccf4819264de37571ef16b4c5484 dcc-dccd-1.3.31.tar.Z 1406285
+SHA256 e3a30c57e5e0978b478430e7cbf35eed685922d0008efb44f856d1c0010e5922 dcc-dccd-1.3.31.tar.Z 1406285