mail-filter/dcc: remove unused patches and files
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Wed, 13 Jun 2018 17:57:28 +0000 (19:57 +0200)
committerTony Vroon <chainsaw@gentoo.org>
Wed, 11 Jul 2018 12:04:34 +0000 (13:04 +0100)
Closes: https://github.com/gentoo/gentoo/pull/9018

mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch [deleted file]
mail-filter/dcc/files/dcc.initd [deleted file]
mail-filter/dcc/files/dcc.initd-1.3.140 [deleted file]

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 (file)
index 4162092..0000000
+++ /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 (file)
index 1e64a16..0000000
+++ /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 (file)
index 8fc4ac3..0000000
+++ /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
-}