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).

Package-Manager: portage-2.2.7/cvs/Linux x86_64

5 files changed, 48 insertions, 28 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/Manifest b/mail-filter/dcc/Manifest
index f65b2485c3da..f8dbce481172 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,9 +1,10 @@
 AUX dcc-1.3.140-configure-fix.patch 426 SHA256 b3cebec1d0f22d3158f15613a227c924dc6e8edc1f14fd9e562306da3fc132ba SHA512 e6057fef60053a07013c5575422e46ad50004583385650f5b95593bbb45949779fe65c10776952eaa3edaa504d24a1243fa6be8026873b63a915bfccb0b8740a WHIRLPOOL c59d9ec0343180e9682b2278dd5c015a01e30211d8ab8488829879aca96cb457d62d9842fa49dc0a4540e99ffc3f6ce3b42958845219f8f29af8bb1e596d06bf
+AUX dcc-1.3.140-freebsd.patch 381 SHA256 0614869d2343bc96d6e9ef5bb3ad190cc4134156e339f33558e0ad833545b1b3 SHA512 b622085c54246cb38185262f851d611bad6e636d91a4a94ec7b966565a7d01a1a2a0445616eb3086f6c1d62a6c865e7248fcc828efbaaa70cdc7bbe2975c01d4 WHIRLPOOL 5d48e6cb46a825dd70c5e27e8f3079bb456f8b07549f7c787ecb63e71c7fd780e701f44ebe8167c5490193a6b544dec4b29febc867f958992eb323de00e6439f
 AUX dcc-1.3.86.patch 1337 SHA256 0ff766a5c4254be8af20bfc7e3b350e8f9990faa6ebb87d1f5d8b982f8bb572b SHA512 4d50a6d0f682603155f5a5ac025944356f8bee03fbea8f0782342c9f6aa2f3174069e02386dcd6eecd400f6be8066c656fcdfc88a3baa1f812b2170d4ba84143 WHIRLPOOL 923fd00df319f4c064fcc0f186189f918fc603161b088356e805f32cb4c01353cfbbd8c387ee44c5c0619f839122962cd1e7292b3d3b6c199834fc9d802ebd8e
 AUX dcc.confd 274 SHA256 c3c379c26d3c06a18ba87bd22bb299cbcacad262eff78ce75385c6d753373a0e SHA512 15b7e4ded3e56e9d15509305df244e29ec7a6c3c163c49a4597e16274317d88f5aff5522984a2a3002f838d0220d04c2ea3def8d771712a11685408a4983d3b4 WHIRLPOOL b69c606ee2ab80a430ee45ccfcb1b329ded8938aecfc751187e085aafb10733dc74a62d57751c4797b1211c9f47a72c347e18a2065c505c45c5c6d399c1f0515
 AUX dcc.initd 3119 SHA256 3b953c64975953d657f67d7d4697626508696ef262e786616a951017445dd339 SHA512 b3a3d050528127e8550f101e77cf07ebbe991c6a0cd51e8d9506c9747b8a212193ee87a201931425ca1be77c427c1098fa0d02b4d1eb511a0a9218c66be337c4 WHIRLPOOL 1a73ec208fea17cd128424a5f318d34804c1a7a61b048ba987d7e4f29e0f6af8b2f64ba76756d96a662a25d820a6e9d3f6b049b2e3cb4259391de42ea8cb399a
 AUX dcc.initd-1.3.140 2812 SHA256 8ccc6f817d8cc9568fee920c597987340114b319436e79403336faf82f5c5b50 SHA512 e29613b7159f30a23eb58253801813cd0e5636a0d6ddeabf9d89d9e9556a1d46961cadae779ae2bfe756f125751ef00ac0a44431af699a3ea6344d155c121eea WHIRLPOOL ed81bb971a5e58dbbdb8e41994183e1b9bd1ce8b43379d00e5dc74ddd3b6b097e66ed1910a22760437acf49182d945bce7d331ddf05b1b913dadac9d9477763f
-AUX dcc.initd-1.3.154 2815 SHA256 52fbf589ebf813b6bb051d88e179d19fb2179303f6d4c94b8898e543dd6bc8cd SHA512 baafe53a9ee5543794a1aaa563dc7e759cd9b18d065314d7b3bcd7a89f8a004af0847c757bd5f3396a98b9af9a2d8a38c85040657495c9d85bb83cf50ecff161 WHIRLPOOL 8b0b605698a1f4849a724710146443a4a9ba6a15db8a5cc0212ede91d384b37143cdb3fb9355214ad9736d23153968a33565f73f34156bc951c431ffc5e3be2a
+AUX dcc.initd-1.3.154 2907 SHA256 a5fd663d06e0cd2469d1e2c3c35b01e722aacdf0d1a2ff2afbf31f66535132e8 SHA512 9357cc3ed6c1278e326ce24f47af316d13811f8ef384eb0dd3485017af819f6d0dbe18e717d14d5e039ed816e1518789e048888df3b13185e61274d96e70616c WHIRLPOOL 15c4b5fb408d1b982ed42b86d379145d0652a94297a8f84f1321b1809b1ae18f779f63c451081f736f613499685f834756c7554b47bc7e1e6fb89f272c912c81
 DIST dcc-1.3.102.tar.Z 2451793 SHA256 5da6d017048801b8dec39a7a4a078e15b41fa26aa1c486ad69c1fc1b41bde149 SHA512 eced863f2955756c7fbd2a2f951fe79b77369ad4d86a6df6a790bb81c89c0f792b93feef84ce2a8e750e1a9b72fb35a33a4beae2cc265f861dcb9c15602ef6e2 WHIRLPOOL 8ac599b2c0647723a4ad9f59f5bb549be1900cf18806b2071e45c881623f9c234ac6388c1d47b686a500a38ef0a4365dcd639e9b3e4a885ffcd803f9f30711f1
 DIST dcc-1.3.119.tar.Z 1635339 SHA256 1527d293481a7c957227cc2e39609135401adb0c1281b48f4132ee31bc903bd2 SHA512 ea22941031edd02e1f86755a03b78214baf9acbc3f9764ada9e2948cc0a07e9ac4ab7e5566e506d9f40a56f15d482a97b404f3709ac174f84b1fd2f5c3377454 WHIRLPOOL 3bc5e8b3a80139982fda42f042a9f2945f94c1ac3c7460a7fc40f467718f4d026161635be9e2eb59687536d841faf212364dc92f3fae68416bcab71612fa487b
 DIST dcc-1.3.135.tar.Z 1680018 SHA256 d439c2d4b05884826646b46139a81a769857e669150c732266cede6a30506670 SHA512 48fd0a496915e9a5c6678613ab6a80e70767f1a8122ae687b955314d90dc5fef44dc24daf43874dbac99987094b238173a0e090694976532e19a4232931d57f9 WHIRLPOOL 2270549c30c1b12f60281fe61df397d41a7a00c35d2faa840efeaa4f1631ef4212751109ec56a82f575832305118affd2db4ca058e57bfc0384b3a7a120a1e90
@@ -16,8 +17,8 @@ EBUILD dcc-1.3.119-r1.ebuild 4316 SHA256 dd5febb6de63cc2fb531c61570f4863f49fb39c
 EBUILD dcc-1.3.119.ebuild 4281 SHA256 5e41bf38b798a92def77c40dabd34d7a243238565de8cdb945ad9990a7c8c9b1 SHA512 9b6156799e998cec0493e117805de4bedfc90e5cc2469822364e70cc64d1dc641abb95e6986e273daac49c359409aaf6b9c723089b748399c86010283eb7a8e0 WHIRLPOOL 50e78833927355ab4bd639cfb5998d6ce666efcb9d86707db3225bc672ee0dfd3f3feb2f42b0c7c2897a9f34a29a2a789646d41444fc540a691f4e1c90319b84
 EBUILD dcc-1.3.135.ebuild 4312 SHA256 9259c69aae7641f99b001638902bf6f7597938d3bfe237b15c3d9e0b4da1f4d5 SHA512 46c88df862d3a605e7cbf25000beae7003dcf2e148b9d3803ba9501c7b7a4619a322a1e03c10c1d8bf77a5779ebed47109636cb289522387a05ae4cb57284d6b WHIRLPOOL 97bdd35a6017cee61a31a3d0b83ae48753db4e2be32c56ac2413f0749dc3c760be4109684eda0754d08b865fafb178e17e68c91edbe53b2826075b934d2f3aec
 EBUILD dcc-1.3.140-r1.ebuild 4560 SHA256 73a6cbe5e37398351af758a3b31289aeb45bf7083f58e0ff66999e4df3b8e7cf SHA512 c4428d6ef0232e18bbcf23b9f4adbe203b7c245053089ae587bcc0de1da9af2fc0e4441c6555b0c986d8c8d9a9de7369760946376cd04798f16cf69507ac82b1 WHIRLPOOL 753ad160163ed57e826344654d690d50dccfe77d3991f7abeddd5ad52967b4718e02d67f0210ea9072e5a327a1dc463b912f545c69ab3aba970d747aef40417a
-EBUILD dcc-1.3.154.ebuild 4473 SHA256 2f8960b5c9ab85ffc179e1196b08de9460628bd8e5e5b510ce56e20f1d26e3c3 SHA512 010e428b5c8f8ec3456ddee1f116efb1e3dc65b1a94ca306c6a8cfb832b4e6fab5bef6cc382d8c3985da998fedcc3b8acef737022dcca799bc140e530b0f5681 WHIRLPOOL 889e52fb580f7539f3f8d1daaf1c2aa1b519c9c8839598f73a1591ca6d3949ab961fcf76f9c02f3d7f35cde0ad7980e0d05241427ecfa96e9a71515e143a8dc8
+EBUILD dcc-1.3.154.ebuild 4468 SHA256 b62c824c7e8450389c21ad511ee418e461d7d517539f831f825298c21cb5e4d5 SHA512 4aa015875e555b8bca0856a35bd50b101fecb97ce95999f35f94842bd87e96bccfb75f939b1e606de06e5ee963146ac653f56e841dfd554d3de61539c875d864 WHIRLPOOL 43575d7f54b60f678ff987a8c6afb6c82905e3d1fec79f85d5547c96c900118fb6837b1eb00a0df150b8c9268c3c3499350523cb778ea3ca7c2d083e92b1c645
 EBUILD dcc-1.3.55.ebuild 3905 SHA256 6e40f958e75847e4b515dc20677294808ee11af0474b094c6e3bff160379a036 SHA512 380fb1ccbb88f96a008694a4398444a00591601b1f4ead3820b95080c10feb7f040498eeec6ed52608cccef2791bc86d0788895d3dbc69a49c616d8da2c44849 WHIRLPOOL 05a4b98fc6a165e107d221be145b319a58676b0520f0d47bbf2a6c68643b31054cf93bd1a5f3852f392b1c31023e77b0475c25c8a00e4d887b52315c8eac2cca
 EBUILD dcc-1.3.97.ebuild 4241 SHA256 0833e9402dd81fabae7c99f63a25e8ee0b11eebf950884643cc6c22329c9ff4d SHA512 7fe980e4dec6632c5dd2c77967a4d10babbb14dcbcb253cf047c088a818c05ebd156da212eb7d82c3f8d3d3fcd5f92d1fa432eb5789f933594994c63b268ffef WHIRLPOOL c7ec85d3eaeaf3ec76a0075569b97c1f05c17f57f1bf1f891b794adb03f0d9260f6fec330782d85968e82721ce0542b5c3ce04304cf45f7f0437df9e8af36553
-MISC ChangeLog 9528 SHA256 f034cd501a4ae1eeb1ccf033b556f668d16067b37f22739d7e108707da420395 SHA512 e69eb6ffece470fe688881594d6c1cf96965700616919bc83967dd795961ad36d547bf5877057c2a3596f88cc871187c88479eed4ae4601260963aac7d7ebecf WHIRLPOOL bb8491a3b83539d7f5e22b1ee230bf66530bbb38284be1332b43267344075a936add5d2ea1f94ba73ee2260a948deaf5d3b63293bca3f286d0f0863529422998
+MISC ChangeLog 9973 SHA256 9ba0f5499ea69aeb5288b018ba86611ecd5cb160cf74ad4b4b285d47b3859bba SHA512 68ef39a6cb71c2f95ecdc9a4d6c4f399e0ef6fa531709c2d1af620b936a425cc2b1690d5937600a2dcdbaee10073d77794b4dc719f381db15a3d41edc54d7955 WHIRLPOOL 9543959dae8b8eda8af9e1e3a23bbafaa23fca9467fed0a9643b545a7a3f50e2d423908f4ce756059c4673c4c4319d4e6f582cb5d5c677d5ecc06f5ebbfa8151
 MISC metadata.xml 324 SHA256 ceb55854f84ec88f0305b0138c48c22bd8fa0834127c78cc158447527dad7155 SHA512 cd9f142a6a797fdc44efb0f11740c7a940140d6e4a8ad80c0369925062da0f9bc6e93645d53400941c91396e547200f79ce0c54de96034fa788be19b5794f25a WHIRLPOOL 7f4703f428f5b3902b1b50b7c09082a7bfee2f2a6913574eb6d5c73076157ac42796def2dea991cc996cc4b3c6949de555a07aa44992dc4e2d3e4504cbf70fd9
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