* [gentoo-commits] repo/gentoo:master commit in: mail-filter/dcc/files/
@ 2016-12-22 15:47 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2016-12-22 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 9e8a667ef8cf00e0d007765a997935125d4b7f94
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Dec 13 20:23:56 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:46:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e8a667e
mail-filter/dcc: remove unused patch
mail-filter/dcc/files/dcc-1.3.86.patch | 41 ----------------------------------
1 file changed, 41 deletions(-)
diff --git a/mail-filter/dcc/files/dcc-1.3.86.patch b/mail-filter/dcc/files/dcc-1.3.86.patch
deleted file mode 100644
index c1ac27f..00000000
--- a/mail-filter/dcc/files/dcc-1.3.86.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-I know it looks weird that we are patching configure here, but there is NO
-configure.{ac,in} source included with this package.
-- Robin H. Johnson <robbat2@gentoo.org>
-
-This patch is from Gentoo bug 182172, and was submitted by steveb
-<steeeeeveee@gmx.net>.
-
-diff -Naur dcc-1.3.86/configure dcc-1.3.86.new/configure
---- dcc-1.3.86/configure 2008-03-11 16:38:41.000000000 +0100
-+++ dcc-1.3.86.new/configure 2008-03-24 19:50:52.802962250 +0100
-@@ -1058,8 +1058,7 @@
- FreeBSD|DragonFly)
- PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
- if test -s /usr/lib/libc_r.a; then
-- # use libc_r on ancient versions
-- appendvar PTHREAD_LIBS -lc_r
-+ appendvar PTHREAD_LIBS
- fi
- ;;
- Darwin)
-@@ -3511,7 +3510,7 @@
- mancat=man
- MAN8='dcc.8 $(SUBDIR_MAN8)'
- MAN8INST=''
-- USE_DCCMANINSTALL='# do not use dccmaninstall'
-+ USE_DCCMANINSTALL='maninstall:dccmaninstall'
- ;;
- DragonFly)
- # default to /usr/local/man/man8 and use nroff files, possibly
-diff -Naur dcc-1.3.86/thrlib/cmn.c dcc-1.3.86.new/thrlib/cmn.c
---- dcc-1.3.86/thrlib/cmn.c 2008-02-11 06:00:45.000000000 +0100
-+++ dcc-1.3.86.new/thrlib/cmn.c 2008-03-24 19:51:36.333682750 +0100
-@@ -667,7 +667,7 @@
- LOG_CMN_CAPTION(cwp, DCC_LOG_TRN_MSG_CR);
- cwp->log_size = MAX_LOG_SIZE+1;
- #else
-- log_write(&wp->cw, buf, buflen);
-+ log_write(cwp, buf, buflen);
- #endif
- }
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-filter/dcc/files/
@ 2018-07-11 12:04 Tony Vroon
0 siblings, 0 replies; 2+ messages in thread
From: Tony Vroon @ 2018-07-11 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 8c47ba9769acbb30f7b9784d11952a0c4442ce51
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 17:57:28 2018 +0000
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 12:04:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c47ba97
mail-filter/dcc: remove unused patches and files
Closes: https://github.com/gentoo/gentoo/pull/9018
.../dcc/files/dcc-1.3.140-configure-fix.patch | 17 ---
mail-filter/dcc/files/dcc.initd | 135 ---------------------
mail-filter/dcc/files/dcc.initd-1.3.140 | 100 ---------------
3 files changed, 252 deletions(-)
diff --git a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch b/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
deleted file mode 100644
index 41620929c61..00000000000
--- a/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid installing into /no/.
-
-Signed-off-by: Lars Wendler (Polynomial-C) <polynomial-c@gentoo.org>
-X-Gentoo-Bug: 388383
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/388383
-
---- dcc-1.3.140/configure
-+++ dcc-1.3.140/configure
-@@ -3256,7 +3256,7 @@
- withval="$with_cgibin"
- :
- fi
--if test -n "$with_cgibin" -a "$with_cgi_bin" != no; then
-+if test -n "$with_cgibin" -a "$with_cgibin" != no; then
- cgibin="$with_cgibin"
- fi
-
diff --git a/mail-filter/dcc/files/dcc.initd b/mail-filter/dcc/files/dcc.initd
deleted file mode 100644
index 1e64a16c630..00000000000
--- a/mail-filter/dcc/files/dcc.initd
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use logger
- need net
- before mta
-}
-
-checkconfig() {
- if [[ ! -f "/etc/dcc/dcc_conf" || ! -r "/etc/dcc/dcc_conf" ]]
- then
- eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
- return 1
- else
- source "/etc/dcc/dcc_conf"
- fi
-}
-
-start() {
- checkconfig || return 1
-
- if [[ "${START_DCC_DCCD}" == "yes" ]]
- then
- if [[ "${DCCD_ENABLE}" != "on" ]]
- then
- einfo "DCCD_ENABLE is not setto 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-dccd" ]]
- then
- ebegin "Starting dccd"
- ${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
- eend ${?}
- else
- eerror "You enabled DCCD but start-dccd is missing or not executable"
- fi
- fi
- fi
-
- if [[ "${START_DCC_GREY}" == "yes" ]]
- then
- if [[ "${GREY_ENABLE}" != "on" ]]
- then
- einfo "GREY_ENABLE is not set to 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-grey" ]]
- then
- ebegin "Starting grey"
- ${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
- eend ${?}
- else
- eerror "You enabled GREY but start-grey is missing or not executable"
- fi
- fi
- fi
-
- if [[ "${START_DCC_DCCM}" == "yes" ]]
- then
- if [[ "${DCCM_ENABLE}" != "on" ]]
- then
- einfo "DCCM_ENABLE is not set to 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-dccm" ]]
- then
- ebegin "Starting dccm"
- ${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
- eend ${?}
- for ((dccmtimeout=0 ; dccmtimeout <= 20 ; dccmtimeout++))
- do
- if [[ ! -S "${DCC_RUNDIR}/dccm" || ! -r "${DCC_RUNDIR}/dccm" ]]
- then
- sleep 1
- else
- break
- 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
- sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid
- else
- eerror "You enabled DCCM but start-dccm is missing or not executable"
- fi
- fi
- fi
-
- if [[ "${START_DCC_DCCIF}" == "yes" ]]
- then
- if [[ "${DCCIFD_ENABLE}" != "on" ]]
- then
- einfo "DCCIFD_ENABLE is not set to 'on' in dcc_conf"
- else
- if [[ -x "${DCC_LIBEXEC}/start-dccifd" ]]
- then
- ebegin "Starting dccif"
- ${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
- eend ${?}
- else
- eerror "You enabled DCCIF but start-dccif is missing or not executable"
- fi
- fi
- fi
-}
-
-stop() {
- checkconfig || return 1
-
- if [[ -r "${DCC_RUNDIR}/dccifd.pid" ]]
- then
- ebegin "Stopping dccif"
- kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
- eend ${?}
- fi
-
- if [[ -r "${DCC_RUNDIR}/dccm.pid" ]]
- then
- ebegin "Stopping dccm"
- kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
- then
- ebegin "Stopping dccd"
- ${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
- then
- ebegin "Stopping grey"
- ${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
- eend ${?}
- fi
-}
diff --git a/mail-filter/dcc/files/dcc.initd-1.3.140 b/mail-filter/dcc/files/dcc.initd-1.3.140
deleted file mode 100644
index 8fc4ac3540c..00000000000
--- a/mail-filter/dcc/files/dcc.initd-1.3.140
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- use logger
- need net
- before mta
-}
-
-checkconfig() {
- if [ ! -f "/etc/dcc/dcc_conf" ]; then
- 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 \
- SOCKET_USER SOCKET_GROUP SOCKET_MODE; do
- read -r ${i} <<-EOF
- $( grep ^[[:space:]]*${i} /etc/dcc/dcc_conf | sed s/.*=// )
- EOF
- done
- DCC_RUNDIR="${DCC_RUNDIR:-/var/run/dcc}"
- if [ ! -d "${DCC_RUNDIR}" ]; then
- checkpath -q -d -o root:root -m 0755 "${DCC_RUNDIR}" || return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- local atleastone="${DCCD_ENABLE}${GREY_ENABLE}${DCCM_ENABLE}${DCCIFD_ENABLE}"
- atleastone=$( echo ${atleastone} | tr -d 'off' )
- if [ -z "${atleastone}" ]; then
- eend 1 "At least one service should be 'on' in /etc/dcc/dcc_conf"
- return 1
- fi
-
- if [ "${DCCD_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccd" ]; then
- ebegin "Starting dccd"
- ${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
- eend ${?}
- fi
-
- if [ "${GREY_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-grey" ]; then
- ebegin "Starting grey"
- ${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
- eend ${?}
- fi
-
- if [ "${DCCM_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccm" ]; then
- 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
- sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid 1>/dev/null 2>&1 || return 1
- fi
-
- if [ "${DCCIFD_ENABLE}" = "on" ] && [ -x "${DCC_LIBEXEC}/start-dccifd" ]; then
- ebegin "Starting dccif"
- ${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
- eend ${?}
- fi
-}
-
-stop() {
- checkconfig || return 1
-
- if [ -r "${DCC_RUNDIR}/dccifd.pid" ]; then
- ebegin "Stopping dccif"
- kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
- eend ${?}
- fi
-
- if [ -r "${DCC_RUNDIR}/dccm.pid" ]; then
- ebegin "Stopping dccm"
- kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [ -x "${DCC_LIBEXEC}/stop-dccd" ]; then
- ebegin "Stopping dccd"
- ${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
- eend ${?}
- fi
-
- if (pidof dccd >/dev/null 2>&1) && [ -x "${DCC_LIBEXEC}/stop-dccd" ]; then
- ebegin "Stopping grey"
- ${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
- eend ${?}
- fi
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-11 12:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-22 15:47 [gentoo-commits] repo/gentoo:master commit in: mail-filter/dcc/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2018-07-11 12:04 Tony Vroon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox