Respect CC wrt bug #244140

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

3 files changed, 143 insertions, 2 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index fb7eaff95778..57d898ecf33e 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.60 2010/02/01 08:39:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.61 2010/07/10 22:18:20 hwoarang Exp $
+
+*dcc-1.3.119-r1 (10 Jul 2010)
+
+  10 Jul 2010; Markos Chandras <hwoarang@gentoo.org> +dcc-1.3.119-r1.ebuild:
+  Respect CC wrt bug #244140
 
 *dcc-1.3.119 (01 Feb 2010)
 
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 8af03ec73d97..eed36bd69cd9 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -6,8 +6,9 @@ DIST dcc-1.3.119.tar.Z 1635339 RMD160 bb830466e09088bc0726d295e84b23b228bc8a33 S
 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 4235 RMD160 00b7c88924a5587eec50550ff4a07b9dd3ef9633 SHA1 332676359980c49d196fddc76f4d6a5e0fbff363 SHA256 4310a1371a7177a02bfb55e170cfc553ab4451f494788f87ab4feeb035606a57
+EBUILD dcc-1.3.119-r1.ebuild 4316 RMD160 a96b559f914c363aea99844e63a9d0c0242c7cc0 SHA1 b2a154e58731659c4816bee90628378cb7835af9 SHA256 dd5febb6de63cc2fb531c61570f4863f49fb39c6fcb6ec4923cedb64398a7802
 EBUILD dcc-1.3.119.ebuild 4281 RMD160 28a2d0da63179a4004b18a3587509ff6716a1df6 SHA1 29a6813eabd963665da5a7459f473e2394108d3e SHA256 5e41bf38b798a92def77c40dabd34d7a243238565de8cdb945ad9990a7c8c9b1
 EBUILD dcc-1.3.55.ebuild 3905 RMD160 2048de4a0ea38b451806261e00cd5492475f3cd5 SHA1 750529f7bf9aec06595ad8831afd5a6ff16a0720 SHA256 6e40f958e75847e4b515dc20677294808ee11af0474b094c6e3bff160379a036
 EBUILD dcc-1.3.97.ebuild 4234 RMD160 16a8c7f27bea2d3ff7fc647fa11706273177c973 SHA1 9e572f511e0e6f933c2d8f1ce7229e18e6ead319 SHA256 a6aaa86f28b023a7c3d019aeda19bf3de65094bd10460cf5b14a4a9d4f12bc46
-MISC ChangeLog 7263 RMD160 5752d33da0a151b6e52b4b74383fea13fa0413cd SHA1 08714c47b85019ed570443b122dd51aeac403704 SHA256 1fb895a3d58cfd0eda70cfe8bbc9cbb2379a2105ad0618410e26cd4979eac34f
+MISC ChangeLog 7402 RMD160 15ab116c978aaa147b225bae974064ee9ce083de SHA1 7e257ff1b8a5f6aeeab881c1978ab80bb66850ee SHA256 9800dcc6cb6fb0c65aaae88c0abba1835ea23e9e61848aecf54f2b84516144e9
 MISC metadata.xml 324 RMD160 76205802852d0b5b55cdfe30c25452661675f4ae SHA1 9c261fe7a0389a016a42475447505c6c816a6a42 SHA256 ceb55854f84ec88f0305b0138c48c22bd8fa0834127c78cc158447527dad7155
diff --git a/mail-filter/dcc/dcc-1.3.119-r1.ebuild b/mail-filter/dcc/dcc-1.3.119-r1.ebuild
new file mode 100644
index 000000000000..8e6c092ab25e
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.119-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.119-r1.ebuild,v 1.1 2010/07/10 22:18:20 hwoarang Exp $
+
+inherit flag-o-matic toolchain-funcs
+
+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 )"
+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}"
+
+	# This is NOT a normal configure script.
+	./configure ${myconf} || die "configure failed!"
+	#make -C homedir
+	emake CC="$(tc-getCC)" || 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/
+}