diff options
author | Xin LI <delphij@FreeBSD.org> | 2006-07-12 08:09:13 +0000 |
---|---|---|
committer | Xin LI <delphij@FreeBSD.org> | 2006-07-12 08:09:13 +0000 |
commit | 237b66a9d53b6deb3a30ced2cc3d729b1a26a8f0 (patch) | |
tree | 371cad6d81750e3d55c85cc3e3ef21511334993a /mail/dk-milter | |
parent | - Update to 7.6.5 (diff) |
- Update to 0.4.1
- Fix some issues with rc.d script, add an option to ease the
task to specify the selector.
Notes
Notes:
svn path=/head/; revision=167573
Diffstat (limited to 'mail/dk-milter')
-rw-r--r-- | mail/dk-milter/Makefile | 2 | ||||
-rw-r--r-- | mail/dk-milter/distinfo | 6 | ||||
-rw-r--r-- | mail/dk-milter/files/milter-dk.sh.in | 24 |
3 files changed, 17 insertions, 15 deletions
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index b17d3f3f543b..56923c3b91a3 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dk-milter -PORTVERSION= 0.4.0 +PORTVERSION= 0.4.1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= dk-milter diff --git a/mail/dk-milter/distinfo b/mail/dk-milter/distinfo index bf3093170cf8..33929efc8671 100644 --- a/mail/dk-milter/distinfo +++ b/mail/dk-milter/distinfo @@ -1,3 +1,3 @@ -MD5 (dk-milter-0.4.0.tar.gz) = fe8a26ad63a753860f34bc1a5f4baa37 -SHA256 (dk-milter-0.4.0.tar.gz) = de322d20dd897117821415b94f87671ecfb2b0d34044115acbb4493c599c77ae -SIZE (dk-milter-0.4.0.tar.gz) = 312890 +MD5 (dk-milter-0.4.1.tar.gz) = ec5f4fa17d53a2f39ebb0025caccabe0 +SHA256 (dk-milter-0.4.1.tar.gz) = 51f19981cbd1f4fea343982912a92cee7e2e302b7b48fe1703430afa414bcfb1 +SIZE (dk-milter-0.4.1.tar.gz) = 313092 diff --git a/mail/dk-milter/files/milter-dk.sh.in b/mail/dk-milter/files/milter-dk.sh.in index 03143f79ccde..519e53d1dd05 100644 --- a/mail/dk-milter/files/milter-dk.sh.in +++ b/mail/dk-milter/files/milter-dk.sh.in @@ -21,10 +21,19 @@ # milterdk_domain (str): Domainpart of From: in mails to sign. # milterdk_key (str): Path to the private key file to sign with. # milterdk_flags (str): Flags passed to start command. +# milterdk_selector (str): Selector from which the receiving side should +# obtain the public key. # # milterdk_${profile}_* : Variables per profile. # Sockets must be different from each other. # + +. %%RC_SUBR%% + +name="milterdk" +rcvar=`set_rcvar` +load_rc_config $name + # DO NOT CHANGE THESE DEFAULT VALUES HERE # milterdk_enable=${milterdk_enable:-"NO"} @@ -32,14 +41,9 @@ milterdk_profiles=${milterdk_profiles:-} milterdk_socket=${milterdk_socket:-"local:/var/run/dk-filter"} milterdk_domain=${milterdk_domain:-"example.com"} milterdk_key=${milterdk_key:-"/var/db/domainkeys/default.key.pem"} -## milterdk_flags expands escaped variables later. -milterdk_flags=${milterdk_flags:-"-d \${milterdk_domain\} -c nofws -H -m MSA \ --s \${milterdk_key\} -S default"} - -. %%RC_SUBR%% - -name="milterdk" -rcvar=`set_rcvar` +milterdk_selector=${milterdk_selector:-"default"} +milterdk_flags=${milterdk_flags:-"-d ${milterdk_domain} -c nofws -H -m MSA \ +-s ${milterdk_key} -S ${milterdk_selector}"} start_precmd="dk_prepcmd" stop_postcmd="dk_prepcmd" @@ -47,8 +51,6 @@ command="%%PREFIX%%/libexec/dk-filter" _pidprefix="/var/run/dk-filter" pidfile="${_pidprefix}.pid" -load_rc_config $name - if [ -n "$2" ]; then profile="$2" if [ "x${milterdk_profiles}" != "x" ]; then @@ -71,7 +73,7 @@ else if [ "x$1" != "xrestart" ]; then for profile in ${milterdk_profiles}; do echo "===> milterdk profile: ${profile}" - %%PREFIX%%/etc/rc.d/milter-dk.sh $1 ${profile} + $0 $1 ${profile} retcode="$?" if [ "0${retcode}" -ne 0 ]; then failed="${profile} (${retcode}) ${failed:-}" |