diff options
Diffstat (limited to 'mail')
-rw-r--r-- | mail/antivirus-milter/Makefile | 4 | ||||
-rw-r--r-- | mail/antivirus-milter/files/antivirus.in (renamed from mail/antivirus-milter/files/antivirus-milter.in) | 32 | ||||
-rw-r--r-- | mail/archivesmtp/Makefile | 2 | ||||
-rw-r--r-- | mail/archivesmtp/files/archivesmtp.in | 21 | ||||
-rw-r--r-- | mail/milter-regex/Makefile | 1 | ||||
-rw-r--r-- | mail/milter-regex/files/milterregex.in | 21 | ||||
-rw-r--r-- | mail/noattach/Makefile | 2 | ||||
-rw-r--r-- | mail/noattach/files/noattach.in | 26 | ||||
-rw-r--r-- | mail/rbl-milter/Makefile | 46 | ||||
-rw-r--r-- | mail/rbl-milter/files/rblmilter.in | 30 | ||||
-rw-r--r-- | mail/sid-milter/Makefile | 4 | ||||
-rw-r--r-- | mail/sid-milter/files/miltersid.in (renamed from mail/sid-milter/files/milter-sid.in) | 31 | ||||
-rw-r--r-- | mail/spamilter/Makefile | 2 | ||||
-rw-r--r-- | mail/spamilter/files/spamilter.in | 23 | ||||
-rw-r--r-- | mail/vbsfilter/Makefile | 2 | ||||
-rw-r--r-- | mail/vbsfilter/files/vbsfilter.in | 30 |
16 files changed, 153 insertions, 124 deletions
diff --git a/mail/antivirus-milter/Makefile b/mail/antivirus-milter/Makefile index 57c81839847f..2f9ea3bacd8e 100644 --- a/mail/antivirus-milter/Makefile +++ b/mail/antivirus-milter/Makefile @@ -2,7 +2,7 @@ PORTNAME= antivirus PORTVERSION= 3.30 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= mail MASTER_SITES= LOCAL/dinoex @@ -17,7 +17,7 @@ PLIST_SUB+= ANTIVIRUS=${ANTIVIRUS_DIR} SUB_LIST+= ANTIVIRUS=${ANTIVIRUS_DIR} SED_SCRIPT= -e 's|%%ANTIVIRUS%%|${ANTIVIRUS_DIR}|g' \ -e 's|%%PREFIX%%|${PREFIX}|g' -USE_RC_SUBR= antivirus-milter +USE_RC_SUBR= antivirus ANTIVIRUS_DIR?= /var/spool/antivirus diff --git a/mail/antivirus-milter/files/antivirus-milter.in b/mail/antivirus-milter/files/antivirus.in index 57ace61e9835..485894520c59 100644 --- a/mail/antivirus-milter/files/antivirus-milter.in +++ b/mail/antivirus-milter/files/antivirus.in @@ -1,15 +1,15 @@ #!/bin/sh - +# # $FreeBSD$ - +# # Start or stop antivirus - +# # PROVIDE: antivirus # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown # - +# # Define these antivirus_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -17,31 +17,33 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -antivirus_enable=${antivirus_enable:-"NO"} # Enable antivirus-milter -antivirus_pidfile=${antivirus_pidfile:-"%%ANTIVIRUS%%/run/antivirus.pid"} # Path to pidfile -antivirus_socket=${antivirus_socket:-"%%ANTIVIRUS%%/antivirus.sock"} # Path to socket -#antivirus_flags=${antivirus_flags:-""} # Flags to antivirus . /etc/rc.subr name="antivirus" +desc="Antivirus Milter Daemon" rcvar="antivirus_enable" + +load_rc_config $name + +: ${antivirus_enable:="NO"} +: ${antivirus_pidfile:="%%ANTIVIRUS%%/run/antivirus.pid"} +: ${antivirus_socket:="%%ANTIVIRUS%%/antivirus.sock"} command="%%PREFIX%%/libexec/antivirus" +command_args="-p local:${antivirus_socket} ${antivirus_flags}" +pidfile="${antivirus_pidfile}" required_files="%%PREFIX%%/etc/antivirus.conf" start_precmd="antivirus_prestart" stop_postcmd="antivirus_poststop" -antivirus_prestart() { +antivirus_prestart() +{ /bin/rm -f "${pidfile}" "${antivirus_socket}" } -antivirus_poststop() { +antivirus_poststop() +{ /bin/rm -f "${pidfile}" "${antivirus_socket}" } -load_rc_config $name - -pidfile="${antivirus_pidfile}" -command_args="-p local:${antivirus_socket} ${antivirus_flags}" - run_rc_command "$1" diff --git a/mail/archivesmtp/Makefile b/mail/archivesmtp/Makefile index 2e7242ba14c9..188b891c7316 100644 --- a/mail/archivesmtp/Makefile +++ b/mail/archivesmtp/Makefile @@ -3,7 +3,7 @@ PORTNAME= archivesmtp PORTVERSION= 1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.dancingfortune.com/projects/archivesmtp/files/ diff --git a/mail/archivesmtp/files/archivesmtp.in b/mail/archivesmtp/files/archivesmtp.in index ce14d0c415ee..4267118e093b 100644 --- a/mail/archivesmtp/files/archivesmtp.in +++ b/mail/archivesmtp/files/archivesmtp.in @@ -1,30 +1,29 @@ #!/bin/sh - +# # $FreeBSD$ # # PROVIDE: archivesmtp +# REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown . /etc/rc.subr name="archivesmtp" -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/${name}" +desc="Achive SMTP Milter Daemon" +rcvar="archivesmtp_enable" # Read settings and set defaults load_rc_config "$name" -: ${archivesmtp_enable="NO"} -: ${archivesmtp_chuser="nobody"} -: ${archivesmtp_socket="unix:%%SOCKETBASE%%/%%SOCKETDIR%%/mta.sock"} -: ${archivesmtp_config="%%PREFIX%%/etc/archivesmtp.conf"} -: ${archivesmtp_pidfile="%%SOCKETBASE%%/%%SOCKETDIR%%/run.pid"} +: ${archivesmtp_enable:="NO"} +: ${archivesmtp_chuser:="nobody"} +: ${archivesmtp_socket:="unix:%%SOCKETBASE%%/%%SOCKETDIR%%/mta.sock"} +: ${archivesmtp_config:="%%PREFIX%%/etc/archivesmtp.conf"} +: ${archivesmtp_pidfile:="%%SOCKETBASE%%/%%SOCKETDIR%%/run.pid"} # archivesmtp_flags= May be used to set optional behaviours. - +command="%%PREFIX%%/sbin/${name}" pidfile="${archivesmtp_pidfile}" - command_args="-p ${archivesmtp_socket} -f ${archivesmtp_config} -u ${archivesmtp_chuser} -r ${archivesmtp_pidfile} ${archivesmtp_flags} &" run_rc_command "$1" diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile index cf5ff6aff7ef..81705326b448 100644 --- a/mail/milter-regex/Makefile +++ b/mail/milter-regex/Makefile @@ -3,6 +3,7 @@ PORTNAME= milter-regex PORTVERSION= 2.7 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://www.benzedrine.ch/ diff --git a/mail/milter-regex/files/milterregex.in b/mail/milter-regex/files/milterregex.in index 8c3dcae175af..ffe75abfb960 100644 --- a/mail/milter-regex/files/milterregex.in +++ b/mail/milter-regex/files/milterregex.in @@ -1,16 +1,12 @@ #!/bin/sh # $FreeBSD$ - -# Start or stop milterregex - +# # PROVIDE: milterregex # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown - -spooldir=%%SPOOLDIR%% - +# # Define these milterregex_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -20,21 +16,24 @@ spooldir=%%SPOOLDIR%% # # milterregex_flags Flags to milter-regex program -[ -z "$milterregex_enable" ] && milterregex_enable="NO" # Enable milter-regex - . /etc/rc.subr name="milterregex" +desc="RegEx Milter Daemon" rcvar="milterregex_enable" + +load_rc_config $name + +: ${milterregex_enable:="NO"} command="%%PREFIX%%/libexec/milter-regex" -pidfile="${spooldir}/milter-regex.pid" +pidfile="%%SPOOLDIR%%/milter-regex.pid" required_files="%%PREFIX%%/etc/milter-regex.conf" stop_postcmd="milterregex_poststop" command_args="-r ${pidfile}" -milterregex_poststop() { +milterregex_poststop() +{ /bin/rm -f ${pidfile} } -load_rc_config $name run_rc_command "$1" diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile index 1691678df51e..a7922d9c2cda 100644 --- a/mail/noattach/Makefile +++ b/mail/noattach/Makefile @@ -2,7 +2,7 @@ PORTNAME= noattach PORTVERSION= 1.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/ diff --git a/mail/noattach/files/noattach.in b/mail/noattach/files/noattach.in index ac167c52feca..3e4d40f44818 100644 --- a/mail/noattach/files/noattach.in +++ b/mail/noattach/files/noattach.in @@ -19,35 +19,39 @@ # # noattach_flags Flags to noattach -noattach_enable=${noattach_enable:-"NO"} # Enable noattach -noattach_pidfile=${noattach_pidfile:-"/var/run/noattach.pid"} # Path to pidfile -noattach_socket=${noattach_socket:-"/var/run/noattach"} # Path to socket - . /etc/rc.subr name="noattach" +desc="Noattach Milter Daemon" rcvar="noattach_enable" + +load_rc_config $name + +: ${noattach_enable:="NO"} +: ${noattach_pidfile:="/var/run/noattach.pid"} +: ${noattach_socket:="/var/run/noattach"} command="%%PREFIX%%/libexec/${name}" required_files="%%PREFIX%%/etc/noattach.patterns" start_precmd="noattach_prestart" stop_postcmd="noattach_poststop" reload_cmd="noattach_reload" extra_commands="reload" +pidfile="${noattach_pidfile}" +command_args="-p local:${noattach_socket} ${noattach_flags}" -noattach_prestart() { +noattach_prestart() +{ /bin/rm -f "${pidfile}" "${noattach_socket}" } -noattach_poststop() { +noattach_poststop() +{ /bin/rm -f "${pidfile}" "${noattach_socket}" } -noattach_reload() { +noattach_reload() +{ kill -USR1 `head -1 "${pidfile}"` } -load_rc_config $name -pidfile="${noattach_pidfile}" -command_args="-p local:${noattach_socket} ${noattach_flags}" - run_rc_command "$1" diff --git a/mail/rbl-milter/Makefile b/mail/rbl-milter/Makefile index 3f30cdfac05d..a7922d9c2cda 100644 --- a/mail/rbl-milter/Makefile +++ b/mail/rbl-milter/Makefile @@ -1,24 +1,44 @@ -# Created by: wolpert # $FreeBSD$ -PORTNAME= rbl-milter -PORTVERSION= 0.30 -PORTREVISION= 5 +PORTNAME= noattach +PORTVERSION= 1.2 +PORTREVISION= 4 CATEGORIES= mail -MASTER_SITES= http://www.gnu-darwin.org/distfiles/ +MASTER_SITES= ftp://ftp.dinoex.de/pub/FreeBSD/distfiles/ MAINTAINER= dinoex@FreeBSD.org -COMMENT= Milter that adds mail header warnings on mail from open-relays +COMMENT= Attachment filter for Sendmail Milter -USES= gmake GNU_CONFIGURE= yes +USE_RC_SUBR= noattach +DOCSFILES= AUTHORS THANKS INSTALL NEWS README TODO ChangeLog +SAMPLEFILES= README noattach.patterns noattach.patterns.johncon -USE_RC_SUBR= rblmilter -PLIST_FILES= sbin/rbl-milter +OPTIONS_DEFINE= DOCS EXAMPLES -CONFIGURE_ARGS+= --with-sendmail=${MILTERBASE} \ - --with-sendmail-obj=${MILTERBASE}/lib +.include <bsd.port.pre.mk> -.include "${.CURDIR}/../sendmail/bsd.milter.mk" +.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" -.include <bsd.port.mk> +CONFIGURE_ENV+= MILTER_INCLUDES="${MILTERINC}" +MAKE_ENV+= MILTER_INCLUDES="${MILTERINC}" + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach + ${INSTALL_MAN} ${WRKSRC}/noattach.8 ${STAGEDIR}${PREFIX}/man/man8/ + ${INSTALL_DATA} ${WRKSRC}/examples/noattach.patterns \ + ${STAGEDIR}${PREFIX}/etc/noattach.patterns-dist + +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${DOCSFILES} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ +.endfor + +do-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for i in ${SAMPLEFILES} + ${INSTALL_DATA} ${WRKSRC}/examples/${i} ${STAGEDIR}${EXAMPLESDIR}/ +.endfor + +.include <bsd.port.post.mk> diff --git a/mail/rbl-milter/files/rblmilter.in b/mail/rbl-milter/files/rblmilter.in index 89d1b1141aca..163cf44ebba1 100644 --- a/mail/rbl-milter/files/rblmilter.in +++ b/mail/rbl-milter/files/rblmilter.in @@ -1,15 +1,15 @@ #!/bin/sh - +# # $FreeBSD$ - +# # Start or stop rblmilter - +# # PROVIDE: rblmilter # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown # - +# # Define these rblmilter_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -17,30 +17,32 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -rblmilter_enable=${rblmilter_enable:-"NO"} # Enable rblmilter -rblmilter_socket=${rblmilter_socket:-"/var/run/rbl-milter"} # Path to socket -rblmilter_flags=${rblmilter_flags:-"-l -r -d relays.ordb.org"} # Flags to rblmilter . /etc/rc.subr name="rblmilter" +desc="RBL Milter Daemon" rcvar="rblmilter_enable" + +load_rc_config $name + +: ${rblmilter_enable:="NO"} +: ${rblmilter_socket:="/var/run/rbl-milter"} +: ${rblmilter_flags:="-l -r -d relays.ordb.org"} command="%%PREFIX%%/sbin/rbl-milter" start_precmd="rblmilter_prestart" stop_postcmd="rblmilter_poststop" extra_commands="reload" +command_args="-p local:${rblmilter_socket} ${rblmilter_flags}" -rblmilter_prestart() { +rblmilter_prestart() +{ /bin/rm -f "${rblmilter_socket}" } -rblmilter_poststop() { +rblmilter_poststop() +{ /bin/rm -f "${rblmilter_socket}" } -load_rc_config $name -command_args="-p local:${rblmilter_socket} ${rblmilter_flags}" - run_rc_command "$1" - -# eof diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile index 5a6086a0e462..3dff9123eca4 100644 --- a/mail/sid-milter/Makefile +++ b/mail/sid-milter/Makefile @@ -2,7 +2,7 @@ PORTNAME= sid-milter PORTVERSION= 1.0.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/SenderID%20Milter/${PORTVERSION} @@ -19,7 +19,7 @@ DOCSFILES= FEATURES INSTALL KNOWNBUGS LICENSE README README-SenderID \ RELEASE_NOTES rfc4406.txt rfc4407.txt rfc4408.txt INSTALL_WRKSRC= ${WRKSRC}/sid-filter PLIST_FILES= libexec/sid-filter man/man8/sid-filter.8.gz -USE_RC_SUBR= milter-sid +USE_RC_SUBR= miltersid PORTDOCS= ${DOCSFILES} SITE+= ${FILESDIR}/site.config.m4 diff --git a/mail/sid-milter/files/milter-sid.in b/mail/sid-milter/files/miltersid.in index a923e2b8f0b7..9b1cc9470134 100644 --- a/mail/sid-milter/files/milter-sid.in +++ b/mail/sid-milter/files/miltersid.in @@ -2,42 +2,43 @@ # # $FreeBSD$ # - +# # PROVIDE: miltersid # REQUIRE: DAEMON # BEFORE: mail localpkg - +# KEYWORD: shutdown +# # Define these miltersid_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # /etc/rc.conf.d/miltersid # +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# . /etc/rc.subr name="miltersid" +desc="SID Milter Daemon" rcvar="miltersid_enable" load_rc_config $name -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -: ${miltersid_enable="NO"} -: ${miltersid_socket="local:/var/run/sid-filter"} -: ${miltersid_pid="/var/run/sid-filter.pid"} -: ${miltersid_flags="-r 0 -t"} - +: ${miltersid_enable:="NO"} +: ${miltersid_socket:="local:/var/run/sid-filter"} +: ${miltersid_pid:="/var/run/sid-filter.pid"} +: ${miltersid_flags:="-r 0 -t"} pidfile=${miltersid_pid} command="%%PREFIX%%/libexec/sid-filter" command_args="-l -p ${miltersid_socket} -P ${miltersid_pid}" start_precmd="sid_precmd" -sid_precmd () +sid_precmd() { - if [ -S ${miltersid_socket##local:} ] ; then - rm -f ${miltersid_socket##local:} - elif [ -S ${miltersid_socket##unix:} ] ; then - rm -f ${miltersid_socket##unix:} - fi + if [ -S ${miltersid_socket##local:} ] ; then + rm -f ${miltersid_socket##local:} + elif [ -S ${miltersid_socket##unix:} ] ; then + rm -f ${miltersid_socket##unix:} + fi } run_rc_command "$1" diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile index 227dbd004ad1..e182099bbf46 100644 --- a/mail/spamilter/Makefile +++ b/mail/spamilter/Makefile @@ -2,7 +2,7 @@ PORTNAME= spamilter PORTVERSION= 0.60 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= http://www.wanlink.com/spamilter/download/ diff --git a/mail/spamilter/files/spamilter.in b/mail/spamilter/files/spamilter.in index 645b044d61c2..ddcb1268d0a0 100644 --- a/mail/spamilter/files/spamilter.in +++ b/mail/spamilter/files/spamilter.in @@ -1,15 +1,12 @@ #!/bin/sh - +# # $FreeBSD$ - -# Start or stop spamilter - +# # PROVIDE: spamilter # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown # - # Define these spamilter_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -19,26 +16,30 @@ # # spamilter_flags Flags to spamilter -spamilter_enable=${spamilter_enable:-"NO"} # Enable spamilter-milter - . /etc/rc.subr name="spamilter" +desc="Spamilter (SPAM Milter) Daemon" rcvar="spamilter_enable" + +load_rc_config $name + +: ${spamilter_enable:="NO"} + command="%%PREFIX%%/bin/spamilter" pidfile="/tmp/Spamilter.pid" required_files="%%PREFIX%%/etc/spamilter.rc" start_precmd="spamilter_prestart" stop_postcmd="spamilter_poststop" -spamilter_prestart() { +spamilter_prestart() +{ /bin/rm -f "${pidfile}" } -spamilter_poststop() { +spamilter_poststop() +{ /bin/rm -f "${pidfile}" } -load_rc_config $name - run_rc_command "$1" diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile index a0f1a116b516..4277990d8774 100644 --- a/mail/vbsfilter/Makefile +++ b/mail/vbsfilter/Makefile @@ -2,7 +2,7 @@ PORTNAME= vbsfilter PORTVERSION= 1.15 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ftp://ftp.dinoex.de/pub/approved/ EXTRACT_SUFX= .c diff --git a/mail/vbsfilter/files/vbsfilter.in b/mail/vbsfilter/files/vbsfilter.in index 608d173965c1..0f7c24188dd6 100644 --- a/mail/vbsfilter/files/vbsfilter.in +++ b/mail/vbsfilter/files/vbsfilter.in @@ -1,15 +1,15 @@ #!/bin/sh - +# # $FreeBSD$ - +# # Start or stop vbsfilter - +# # PROVIDE: vbsfilter # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown # - +# # Define these vbsfilter_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -19,30 +19,30 @@ # # vbsfilter_flags Flags to vbsfilter -vbsfilter_enable=${vbsfilter_enable:-"NO"} # Enable vbsfilter-milter -vbsfilter_socket=${vbsfilter_socket:-"/var/run/vbsfilter"} # Path to socket - . /etc/rc.subr name="vbsfilter" +desc="Vbs Attatchment Milter Daemon" rcvar="vbsfilter_enable" + +load_rc_config $name + +: ${vbsfilter_enable:="NO"} +: ${vbsfilter_socket:="/var/run/vbsfilter"} command="%%PREFIX%%/libexec/vbsfilter" +command_args="-p local:${vbsfilter_socket}" procname="${command}" start_precmd="vbsfilter_prestart" stop_postcmd="vbsfilter_poststop" -vbsfilter_prestart() { +vbsfilter_prestart() +{ /bin/rm -f "${vbsfilter_socket}" } -vbsfilter_poststop() { +vbsfilter_poststop() +{ /bin/rm -f "${vbsfilter_socket}" } -load_rc_config $name - -command_args="-p local:${vbsfilter_socket}" - run_rc_command "$1" - -# eof |