Bring in DCC fixes from Bugzilla: #418417 (FreeBSD support, by Naohiro Aota <naota@gentoo.org>), #463504 (Milter TCP, Stevan Bajić <stevan@bajic.ch>), #472338 (dccm timeout), #447816+#447814 (AR/RANLIB/CC variables; Fix by Michael Mair-Keimberger <bu9zilla@gmail.com>), #425956 (license for scripts).

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 44 insertions, 25 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 33b8254e1dc8..1d7953190c0b 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.76 2013/12/28 04:33:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.77 2013/12/28 04:50:23 robbat2 Exp $
+
+  28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/dcc-1.3.140-freebsd.patch, dcc-1.3.154.ebuild, files/dcc.initd-1.3.154:
+  Bring in DCC fixes from Bugzilla: #418417 (FreeBSD support, by Naohiro Aota
+  <naota@gentoo.org>), #463504 (Milter TCP, Stevan Bajić <stevan@bajic.ch>),
+  #472338 (dccm timeout), #447816+#447814 (AR/RANLIB/CC variables; Fix by
+  Michael Mair-Keimberger <bu9zilla@gmail.com>), #425956 (license for scripts).
 
 *dcc-1.3.154 (28 Dec 2013)
 
diff --git a/mail-filter/dcc/dcc-1.3.154.ebuild b/mail-filter/dcc/dcc-1.3.154.ebuild
index 19feef3f5b3b..9685bd557b3e 100644
--- a/mail-filter/dcc/dcc-1.3.154.ebuild
+++ b/mail-filter/dcc/dcc-1.3.154.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.154.ebuild,v 1.1 2013/12/28 04:33:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.154.ebuild,v 1.2 2013/12/28 04:50:23 robbat2 Exp $
 
 EAPI=5
 
@@ -10,9 +10,9 @@ DESCRIPTION="Distributed Checksum Clearinghouse"
 HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
 SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z"
 
-LICENSE="DCC"
+LICENSE="DCC GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" # ~amd64-fbsd
 IUSE="cgi ipv6 rrdtool milter"
 
 RDEPEND="dev-lang/perl
@@ -29,10 +29,10 @@ dcc_libexec=/usr/sbin
 dcc_man=/usr/share/man
 dcc_rundir=/var/run/dcc
 
-PATCHES=( )
-#"${FILESDIR}"/dcc-1.3.140-configure-fix.patch # Merged upstream
+PATCHES=( "${FILESDIR}"/dcc-1.3.140-freebsd.patch )
 
 src_configure() {
+	tc-export CC AR RANLIB
 	local myconf
 	myconf="${myconf} --homedir=${dcc_homedir}"
 	myconf="${myconf} --bindir=/usr/bin"
@@ -49,6 +49,7 @@ src_configure() {
 	myconf="${myconf} --with-db-memory=64"
 	myconf="${myconf} --with-max-db-mem=128"
 	myconf="${myconf} --with-max-log-size=0"
+	myconf="${myconf} --with-make-cmd=${MAKE:-make}"
 	myconf="${myconf} $(use_enable ipv6 IPv6)"
 	myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})"
 	myconf="${myconf} $(use_enable milter dccm)"
@@ -60,10 +61,6 @@ src_configure() {
 	./configure ${myconf} || die "configure failed!"
 }
 
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed!"
-}
-
 moveconf() {
 	local into=/etc/dcc/
 	for i in $@; do
@@ -74,7 +71,7 @@ moveconf() {
 
 src_install() {
 	# stolen from the RPM .spec and modified for gentoo
-	MANOWN=root MANGRP=root export MANOWN MANGRP
+	MANOWN=root MANGRP=$(id -g -n 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
@@ -88,7 +85,7 @@ src_install() {
 
 	# 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 "emake install failed"
+	emake install
 
 	# branding and setting reasonable defaults
 	sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
diff --git a/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch b/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch
new file mode 100644
index 000000000000..e72224f41c2f
--- /dev/null
+++ b/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 5efe49d..de8d6f2 100755
+--- a/configure
++++ b/configure
+@@ -3677,7 +3677,7 @@ case "$TARGET_SYS" in
+ 	#   compressed via /usr/share/mk
+ 	mancat=man
+ 	MANX='$(MAN8)'
+-	USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
++	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+ 	;;
+     DragonFly)
+ 	# default to /usr/local/man/man8 and use nroff files, possibly
diff --git a/mail-filter/dcc/files/dcc.initd-1.3.154 b/mail-filter/dcc/files/dcc.initd-1.3.154
index f55c91b7a2a6..f05901242930 100644
--- a/mail-filter/dcc/files/dcc.initd-1.3.154
+++ b/mail-filter/dcc/files/dcc.initd-1.3.154
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/files/dcc.initd-1.3.154,v 1.1 2013/12/28 04:33:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/files/dcc.initd-1.3.154,v 1.2 2013/12/28 04:50:23 robbat2 Exp $
 
 depend() {
 	use logger
@@ -14,7 +14,7 @@ checkconfig() {
 		eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
 		return 1
 	fi
-	for i in DCCD_ENABLE GREY_ENABLE DCCM_ENABLE DCCIFD_ENABLE DCC_LIBEXEC DCC_RUNDIR \
+	for i in DCCD_ENABLE GREY_ENABLE DCCM_ENABLE DCCM_ARGS DCCIFD_ENABLE DCC_LIBEXEC DCC_RUNDIR \
 		SOCKET_USER SOCKET_GROUP SOCKET_MODE; do
 		read -r ${i} <<-EOF
 		$( grep ^[[:space:]]*${i} /etc/dcc/dcc_conf | sed s/.*=// )
@@ -51,17 +51,19 @@ start() {
 		ebegin "Starting dccm"
 		${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
 		eend ${?}
-		local dccmtimeout=0
-		while [ ${dcctimeout} -le 20 ] ; do
-			if [ -S "${DCC_RUNDIR}/dccm" ] || [ -r "${DCC_RUNDIR}/dccm" ]; then
-				break
-			else
-				sleep 1
-				dcctimeout=$(($dcctimeout + 1))
-			fi
-		done
-		chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
-		chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
+		if !(echo ${DCCM_ARGS}|grep -q "^\-p\|[[:space:]]\-p"); then
+			local dccmtimeout=0
+			while [ ${dccmtimeout} -le 20 ] ; do
+				if [ -S "${DCC_RUNDIR}/dccm" ] || [ -r "${DCC_RUNDIR}/dccm" ]; then
+					break
+				else
+					sleep 1
+					dccmtimeout=$(($dccmtimeout + 1))
+				fi
+			done
+			chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
+			chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
+		fi
 		sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid 1>/dev/null 2>&1 || return 1
 	fi