Bump to 1.3.102. Fixes #258249

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 144 insertions, 2 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 20b3973ec743..6a33b1d85b9b 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.56 2009/02/24 06:30:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.57 2009/04/23 16:11:19 patrick Exp $
+
+*dcc-1.3.102 (23 Apr 2009)
+
+  23 Apr 2009; Patrick Lauer <patrick@gentoo.org> +dcc-1.3.102.ebuild:
+  Bump to 1.3.102. Fixes #258249
 
   24 Feb 2009; Joseph Jezak <josejx@gentoo.org> dcc-1.3.97.ebuild:
   Marked ~ppc for bug #239121.
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 8b2c85762749..b136a9d28156 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,9 +1,11 @@
 AUX dcc-1.3.86.patch 1337 RMD160 266253bd960c5a81c7af50174818538b6fd734f6 SHA1 dead098768cad2add66d6ab57d973c6aa3e8a285 SHA256 0ff766a5c4254be8af20bfc7e3b350e8f9990faa6ebb87d1f5d8b982f8bb572b
 AUX dcc.confd 274 RMD160 da42330e9085960e6dae4fe26db74ae2742ef0a9 SHA1 36e1920c5cab693e123f6b324bd229903531d8f2 SHA256 c3c379c26d3c06a18ba87bd22bb299cbcacad262eff78ce75385c6d753373a0e
 AUX dcc.initd 3112 RMD160 ed649dac393301fb96f4f0b415a5010af5dd896d SHA1 ea1894b1fc9a88e33dbdb5902cd7940ad7200d26 SHA256 0db8f6330c2fb3d06e16c0c527b0326f0cd1ea29550cdf223aeb587c7192cc5f
+DIST dcc-1.3.102.tar.Z 2451793 RMD160 06f19438705ec8a9a5ea506289b44f92106f900a SHA1 dc6fbdf7a7f617f206434aa16ecf883a99e70ebb SHA256 5da6d017048801b8dec39a7a4a078e15b41fa26aa1c486ad69c1fc1b41bde149
 DIST dcc-1.3.97.tar.Z 2548599 RMD160 b777ed19912f3bb0a617d083d479b9cc2cc47b59 SHA1 8212e07c5eee573c36cdb7527e1efe7573bc05a1 SHA256 d959351a7440e0703f35ebcfc4bfd8e83b92867a82970f716816aa84c55c49f7
 DIST dcc-dccd-1.3.55.tar.Z 1457561 RMD160 8182bdd8f5c96a68ba6989bf37807dfa5aee19b7 SHA1 fa926bfb6c8418cea65cbc0c442c9b0a9a833b36 SHA256 9aa82c645b90a1000c6cc812e6df18768885486e053194220e8753d1c45ebb94
+EBUILD dcc-1.3.102.ebuild 4249 RMD160 31572561cbd72cb9372bab0d2805ef58697d8389 SHA1 a767bf45852fe9940fd745c55cdb13ab87c142d1 SHA256 ccb60d1b3bd2fae24f79b953c96be684bfaeff8f89a1e019704f983591936885
 EBUILD dcc-1.3.55.ebuild 3951 RMD160 729f9031eeb03fb886a96cf39c7b2b432fcb64d8 SHA1 fb18088300ee92f119d33d0c66aa9bba528f8eee SHA256 a9fef6979c6cbaea90bde58a1d48b2009ff8fd23960e792278bbda548093246a
 EBUILD dcc-1.3.97.ebuild 4247 RMD160 bead67008f16304a78394357ecf92bf051c4ba99 SHA1 6047dffad7e2b638f1c3ea18f8682b1f5dd653b9 SHA256 92ddba0f7640e8aa1ddcbdd773ee015a789d253c6a0d4546f86ba9b2cc6953c9
-MISC ChangeLog 6754 RMD160 e40e022a96cf6abcde3b157c398cb92dfc4107bc SHA1 3bb0b9e3a3b3d68bc705063bbfe1233c3f022b04 SHA256 3b722c5aafd07dd515281adaa3632e20ca468325ebc93f19b94beeebe0f7ca48
+MISC ChangeLog 6888 RMD160 87ca2329142ce6fd160056bbab40d569e7cede5b SHA1 2eda300828ad56a2fabd69a35b3cba48d298cb89 SHA256 e90d044fdf8a93589fa0e019751e0ee8ab3d60ebc746f76daa2f3bdd57e50ede
 MISC metadata.xml 324 RMD160 76205802852d0b5b55cdfe30c25452661675f4ae SHA1 9c261fe7a0389a016a42475447505c6c816a6a42 SHA256 ceb55854f84ec88f0305b0138c48c22bd8fa0834127c78cc158447527dad7155
diff --git a/mail-filter/dcc/dcc-1.3.102.ebuild b/mail-filter/dcc/dcc-1.3.102.ebuild
new file mode 100644
index 000000000000..78abdab9c0d0
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.102.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.102.ebuild,v 1.1 2009/04/23 16:11:19 patrick Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${PN}-${PV}.tar.Z"
+
+LICENSE="DCC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 rrdtool milter"
+
+RDEPEND="dev-lang/perl
+	rrdtool? ( net-analyzer/rrdtool )
+	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
+	milter? ( mail-filter/libmilter )
+	virtual/libc"
+DEPEND="sys-apps/sed
+	sys-devel/gcc
+	${RDEPEND}"
+
+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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.3.86.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} --homedir=${dcc_homedir}"
+	myconf="${myconf} --bindir=/usr/bin"
+	myconf="${myconf} --libexecdir=${dcc_libexec}"
+	myconf="${myconf} --mandir=/usr/share/man"
+	myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile"
+	myconf="${myconf} --with-installroot=${D}"
+	myconf="${myconf} --with-DCC-MD5"
+	myconf="${myconf} --with-uid=root"
+	myconf="${myconf} --enable-server"
+	myconf="${myconf} --enable-dccifd"
+	#myconf="${myconf} --without-cgibin"
+	myconf="${myconf} --with-cgibin=${dcc_cgibin}"
+	myconf="${myconf} --with-rundir=${dcc_rundir}"
+	myconf="${myconf} --with-db-memory=64"
+	myconf="${myconf} --with-max-db-mem=128"
+	myconf="${myconf} --with-max-log-size=0"
+	myconf="${myconf} $(use_enable ipv6 IPv6)"
+
+	if use milter ; then
+		myconf="${myconf} --enable-dccm"
+		myconf="${myconf} --with-sendmail="
+	else
+		myconf="${myconf} --disable-dccm"
+	fi
+
+	einfo "Using config: ${myconf}"
+
+	./configure ${myconf} || die "configure failed!"
+	#make -C homedir
+	emake || die "emake failed!"
+}
+
+moveconf() {
+	for i in $@; do
+		local into=/etc/dcc/
+		mv "${D}"${dcc_homedir}/${i} "${D}"${into}
+		dosym ${into}${i} ${dcc_homedir}/${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
+
+	addwrite "${dcc_homedir}/map"
+# This package now takes "${D}" at compile-time!
+#	make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die
+	emake 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 "Enabling milter"
+	if use milter ; then
+		sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+			"${D}"${dcc_homedir}/dcc_conf
+	fi
+
+	einfo "Providing cronjob"
+	mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd
+
+	einfo "Cleaning up"
+	mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc
+
+	statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
+	if ! use rrdtool; then
+		einfo "Removing rrdtool interface scripts"
+		eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
+	fi
+
+	einfo "Cleaning up"
+	rm -f "${D}"/usr/sbin/{rcDCC,updatedcc}
+
+	einfo "Placing configuration files into /etc instead of /var/dcc"
+	moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
+
+	einfo "Install conf.d configuration"
+	newconfd "${FILESDIR}"/dcc.confd dcc
+
+	einfo "Install init.d script"
+	newinitd "${FILESDIR}"/dcc.initd dcc
+
+	rmdir "${D}"/var/dcc/log/
+}