summaryrefslogtreecommitdiff
path: root/mail-filter/sid-milter/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail-filter/sid-milter/files')
-rw-r--r--mail-filter/sid-milter/files/gentoo-config.m46
-rw-r--r--mail-filter/sid-milter/files/sid-filter.conf5
-rw-r--r--mail-filter/sid-milter/files/sid-filter.init-r188
-rw-r--r--mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch21
-rw-r--r--mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch57
5 files changed, 0 insertions, 177 deletions
diff --git a/mail-filter/sid-milter/files/gentoo-config.m4 b/mail-filter/sid-milter/files/gentoo-config.m4
deleted file mode 100644
index d5692bad0369..000000000000
--- a/mail-filter/sid-milter/files/gentoo-config.m4
+++ /dev/null
@@ -1,6 +0,0 @@
-define(`confNO_MAN_BUILD',`')
-define(`confCC', `@@CC@@')
-define(`confOPTIMIZE', `@@CFLAGS@@')
-define(`confLDOPTS', `@@LDFLAGS@@')
-define(`confENVDEF', `@@ENVDEF@@')
-define(`bld_USE_ARLIB', `true')
diff --git a/mail-filter/sid-milter/files/sid-filter.conf b/mail-filter/sid-milter/files/sid-filter.conf
deleted file mode 100644
index fb506c393889..000000000000
--- a/mail-filter/sid-milter/files/sid-filter.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Additional options for the Sender-ID Milter
-# see sid-filter(8) for more information.
-SOCKETSPEC="inet:8026@localhost"
-DOMAIN="example.com"
-SID_FILTER_OPTS="-u milter -l -p $SOCKETSPEC -d $DOMAIN -P /var/run/sid-filter.pid"
diff --git a/mail-filter/sid-milter/files/sid-filter.init-r1 b/mail-filter/sid-milter/files/sid-filter.init-r1
deleted file mode 100644
index 853e96653a02..000000000000
--- a/mail-filter/sid-milter/files/sid-filter.init-r1
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- # need net
- use dns logger net
-}
-
-parse_opts() {
- local filter_opt filter_flag=
- for filter_opt in ${SID_FILTER_OPTS}; do
- case "${filter_flag}" in
- -u) filter_user=${filter_opt}
- ;;
- -P) filter_pid=${filter_opt}
- ;;
- esac
- [ -n "${filter_user}" -a -n "${filter_pid}" ] && break
- filter_flag=${filter_opt}
- done
-
- if [ -z "${filter_user}" ]; then
- filter_user=milter
- SID_FILTER_OPTS="${SID_FILTER_OPTS} -u ${filter_user}"
- fi
- if [ -z "${filter_pid}" ]; then
- filter_pid="/var/run/sid-filter.pid"
- SID_FILTER_OPTS="${SID_FILTER_OPTS} -P ${filter_pid}"
- fi
-}
-
-clean_socket() {
- local socket_file= svc_pid=
-
- socket_file="$(echo ${SID_FILTER_OPTS} | sed -e 's/.*local:\(.*\) .*/\1/' | awk '{print $1}')"
- svc_pid="$(ps -C sid-filter -o pid=)"
- if [[ -z "${svc_pid}" ]] && [[ ! -z "${socket_file}" ]] && [[ -S "${socket_file}" ]]; then
- ewarn "Strange, the socket file already exist in \"${socket_file}\""
- ewarn "it will be removed now and re-created by the sid-filter server"
- ewarn "BUT please make your checks."
- rm -f "${socket_file}"
- fi
-}
-
-check_socketdir() {
- local socket_dir
- case "${SOCKETSPEC}" in
- local:*) socket_dir="$(echo ${SOCKETSPEC} | sed -e 's~^local:\(.*\)/.*$~\1~')"
- if [[ ! -d ${socket_dir} ]]; then
- checkpath -q -d -o ${filter_user}:${filter_user} -m 0755 ${socket_dir} || return 1
- fi ;;
- inet:*) ;;
- *) eerror "Unknown socket spec. Please check your /etc/conf.d/sid-milter file."
- return 1 ;;
- esac
-}
-
-
-start() {
- local filter_user= filter_pid=
-
- clean_socket
- parse_opts
- check_socketdir || return 1
- if ! (touch ${filter_pid} && chown ${filter_user} ${filter_pid}) ; then
- eerror "Failed to create pidfile"
- return 1
- fi
-
- ebegin "Starting Sender-ID Filter"
- start-stop-daemon --start --exec /usr/bin/sid-filter -- ${SID_FILTER_OPTS}
- eend $?
-}
-
-stop() {
- local filter_user= filter_pid=
-
- parse_opts
-
- ebegin "Stopping Sender-ID Filter"
- start-stop-daemon --stop --quiet --name sid-filter --pidfile ${filter_pid}
- eend $?
-
- if [ $? = 0 -a -f "${filter_pid}" ]; then
- rm ${filter_pid}
- fi
-}
diff --git a/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch b/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch
deleted file mode 100644
index 365604f721f6..000000000000
--- a/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nru sid-milter-1.0.0.orig/devtools/M4/UNIX/defines.m4 sid-milter-1.0.0/devtools/M4/UNIX/defines.m4
---- sid-milter-1.0.0.orig/devtools/M4/UNIX/defines.m4 2006-10-06 07:44:44.000000000 +0200
-+++ sid-milter-1.0.0/devtools/M4/UNIX/defines.m4 2009-07-08 17:11:06.000000000 +0200
-@@ -26,7 +26,7 @@
- CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC')
- # Linker for libraries
- LD= ifdef(`confLD', `confLD', `confCC')
--LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS')
- LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared')
-
- # Shell
-@@ -71,7 +71,7 @@
- LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS')
-
- # libraries required on your system
--LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST')
-+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `')
-
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
diff --git a/mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch b/mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch
deleted file mode 100644
index 868a2d9ecd55..000000000000
--- a/mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nru sid-milter-1.0.0.orig/sid-filter/sid-filter.c sid-milter-1.0.0/sid-filter/sid-filter.c
---- sid-milter-1.0.0.orig/sid-filter/sid-filter.c 2009-03-08 09:51:00.000000000 +0000
-+++ sid-milter-1.0.0/sid-filter/sid-filter.c 2009-03-08 16:29:24.000000000 +0000
-@@ -1279,30 +1279,35 @@
- switch (scope)
- {
- case SM_SCOPE_PRA:
--#ifdef _FFR_NH_MFROM
-- if ((strncasecmp(mreplies[rcount],
-- "spf2.0/pra",
-- 10) == 0) ||
-- (strncasecmp(mreplies[rcount],
-- "spf2.0/mfrom,pra",
-- 16) == 0))
--#else /* _FFR_NH_MFROM */
-- if (strncasecmp(mreplies[rcount],
-- "spf2.0/pra", 10) == 0)
--#endif /* _FFR_NH_MFROM */
-+ if ((
-+ (strncasecmp(mreplies[rcount],
-+ "spf2.0/pra",
-+ 10) == 0) ||
-+ (strncasecmp(mreplies[rcount],
-+ "spf2.0/mfrom,pra",
-+ 16) == 0)) &&
-+ (strncasecmp(policy,
-+ "spf2.0/",
-+ 7) != 0))
- {
- sm_strlcpy(policy,
- mreplies[rcount],
- sizeof policy);
- }
-- else if (!nopraspf1 &&
-- (strncasecmp(mreplies[rcount],
-- "v=spf1", 6) == 0) &&
-- policy[0] == '\0')
-+ else if (strncasecmp(mreplies[rcount],
-+ "v=spf1", 6) == 0)
- {
-- sm_strlcpy(policy,
-- mreplies[rcount],
-- sizeof policy);
-+ if (nopraspf1)
-+ {
-+ memset(mreplies[rcount], '\0',
-+ sizeof mreplies[rcount]);
-+ }
-+ else if (policy[0] == '\0')
-+ {
-+ sm_strlcpy(policy,
-+ mreplies[rcount],
-+ sizeof policy);
-+ }
- }
- break;
-