| 1 |
robbat2 13/12/28 04:50:23 |
| 2 |
|
| 3 |
Modified: dcc.initd-1.3.154 |
| 4 |
Added: dcc-1.3.140-freebsd.patch |
| 5 |
Log: |
| 6 |
Bring in DCC fixes from Bugzilla: #418417 (FreeBSD support, by Naohiro Aota <naota@g.o>), #463504 (Milter TCP, Stevan Bajić <stevan@×××××.ch>), #472338 (dccm timeout), #447816+#447814 (AR/RANLIB/CC variables; Fix by Michael Mair-Keimberger <bu9zilla@×××××.com>), #425956 (license for scripts). |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 mail-filter/dcc/files/dcc.initd-1.3.154 |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/files/dcc.initd-1.3.154?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/files/dcc.initd-1.3.154?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/files/dcc.initd-1.3.154?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: dcc.initd-1.3.154 |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dcc/files/dcc.initd-1.3.154,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 23 |
--- dcc.initd-1.3.154 28 Dec 2013 04:33:08 -0000 1.1 |
| 24 |
+++ dcc.initd-1.3.154 28 Dec 2013 04:50:23 -0000 1.2 |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
#!/sbin/runscript |
| 27 |
# Copyright 1999-2013 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $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 $ |
| 30 |
+# $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 $ |
| 31 |
|
| 32 |
depend() { |
| 33 |
use logger |
| 34 |
@@ -14,7 +14,7 @@ checkconfig() { |
| 35 |
eerror "You need a DCC configuration in /etc/dcc/dcc_conf" |
| 36 |
return 1 |
| 37 |
fi |
| 38 |
- for i in DCCD_ENABLE GREY_ENABLE DCCM_ENABLE DCCIFD_ENABLE DCC_LIBEXEC DCC_RUNDIR \ |
| 39 |
+ for i in DCCD_ENABLE GREY_ENABLE DCCM_ENABLE DCCM_ARGS DCCIFD_ENABLE DCC_LIBEXEC DCC_RUNDIR \ |
| 40 |
SOCKET_USER SOCKET_GROUP SOCKET_MODE; do |
| 41 |
read -r ${i} <<-EOF |
| 42 |
$( grep ^[[:space:]]*${i} /etc/dcc/dcc_conf | sed s/.*=// ) |
| 43 |
@@ -51,17 +51,19 @@ start() { |
| 44 |
ebegin "Starting dccm" |
| 45 |
${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1 |
| 46 |
eend ${?} |
| 47 |
+ if !(echo ${DCCM_ARGS}|grep -q "^\-p\|[[:space:]]\-p"); then |
| 48 |
local dccmtimeout=0 |
| 49 |
- while [ ${dcctimeout} -le 20 ] ; do |
| 50 |
+ while [ ${dccmtimeout} -le 20 ] ; do |
| 51 |
if [ -S "${DCC_RUNDIR}/dccm" ] || [ -r "${DCC_RUNDIR}/dccm" ]; then |
| 52 |
break |
| 53 |
else |
| 54 |
sleep 1 |
| 55 |
- dcctimeout=$(($dcctimeout + 1)) |
| 56 |
+ dccmtimeout=$(($dccmtimeout + 1)) |
| 57 |
fi |
| 58 |
done |
| 59 |
chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1 |
| 60 |
chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1 |
| 61 |
+ fi |
| 62 |
sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid 1>/dev/null 2>&1 || return 1 |
| 63 |
fi |
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.1 mail-filter/dcc/files/dcc-1.3.140-freebsd.patch |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch?rev=1.1&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/files/dcc-1.3.140-freebsd.patch?rev=1.1&content-type=text/plain |
| 72 |
|
| 73 |
Index: dcc-1.3.140-freebsd.patch |
| 74 |
=================================================================== |
| 75 |
diff --git a/configure b/configure |
| 76 |
index 5efe49d..de8d6f2 100755 |
| 77 |
--- a/configure |
| 78 |
+++ b/configure |
| 79 |
@@ -3677,7 +3677,7 @@ case "$TARGET_SYS" in |
| 80 |
# compressed via /usr/share/mk |
| 81 |
mancat=man |
| 82 |
MANX='$(MAN8)' |
| 83 |
- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no' |
| 84 |
+ USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes' |
| 85 |
;; |
| 86 |
DragonFly) |
| 87 |
# default to /usr/local/man/man8 and use nroff files, possibly |
Archives