From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../dcc/files/dcc-1.3.140-configure-fix.patch | 17 +++ mail-filter/dcc/files/dcc-1.3.140-freebsd.patch | 13 ++ mail-filter/dcc/files/dcc-1.3.86.patch | 41 +++++++ mail-filter/dcc/files/dcc.confd | 14 +++ mail-filter/dcc/files/dcc.initd | 136 +++++++++++++++++++++ mail-filter/dcc/files/dcc.initd-1.3.140 | 101 +++++++++++++++ mail-filter/dcc/files/dcc.initd-1.3.154 | 103 ++++++++++++++++ 7 files changed, 425 insertions(+) create mode 100644 mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch create mode 100644 mail-filter/dcc/files/dcc-1.3.140-freebsd.patch create mode 100644 mail-filter/dcc/files/dcc-1.3.86.patch create mode 100644 mail-filter/dcc/files/dcc.confd create mode 100644 mail-filter/dcc/files/dcc.initd create mode 100644 mail-filter/dcc/files/dcc.initd-1.3.140 create mode 100644 mail-filter/dcc/files/dcc.initd-1.3.154 (limited to 'mail-filter/dcc/files') 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 new file mode 100644 index 000000000000..41620929c61e --- /dev/null +++ b/mail-filter/dcc/files/dcc-1.3.140-configure-fix.patch @@ -0,0 +1,17 @@ +Avoid installing into /no/. + +Signed-off-by: Lars Wendler (Polynomial-C) +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-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-1.3.86.patch b/mail-filter/dcc/files/dcc-1.3.86.patch new file mode 100644 index 000000000000..c1ac27f1075c --- /dev/null +++ b/mail-filter/dcc/files/dcc-1.3.86.patch @@ -0,0 +1,41 @@ +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 + +This patch is from Gentoo bug 182172, and was submitted by steveb +. + +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 + } + diff --git a/mail-filter/dcc/files/dcc.confd b/mail-filter/dcc/files/dcc.confd new file mode 100644 index 000000000000..a6e556827dbd --- /dev/null +++ b/mail-filter/dcc/files/dcc.confd @@ -0,0 +1,14 @@ +# Config file for /etc/init.d/dcc + +# Start server or DCC daemon +START_DCC_DCCD="yes" + +# Start DCC greylisting +START_DCC_GREY="yes" + +# Start milter interface +START_DCC_DCCM="yes" + +# Start general Perl and MTA interface +# and Postfix before-queue filter +START_DCC_DCCIF="yes" diff --git a/mail-filter/dcc/files/dcc.initd b/mail-filter/dcc/files/dcc.initd new file mode 100644 index 000000000000..a730ddcdf8f5 --- /dev/null +++ b/mail-filter/dcc/files/dcc.initd @@ -0,0 +1,136 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 000000000000..f6fa080338c0 --- /dev/null +++ b/mail-filter/dcc/files/dcc.initd-1.3.140 @@ -0,0 +1,101 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 +} diff --git a/mail-filter/dcc/files/dcc.initd-1.3.154 b/mail-filter/dcc/files/dcc.initd-1.3.154 new file mode 100644 index 000000000000..a810d05f8810 --- /dev/null +++ b/mail-filter/dcc/files/dcc.initd-1.3.154 @@ -0,0 +1,103 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 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/.*=// ) + 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 ${?} + 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 + + 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 -s 15 $(cat ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null + eend ${?} + fi + + if [ -r "${DCC_RUNDIR}/dccm.pid" ]; then + ebegin "Stopping dccm" + kill -s 15 $(cat ${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 +} -- cgit v1.2.3-18-g5258