Date: Wed, 11 Jun 2008 21:43:11 +0900 From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/124486: [maintainer] mail/dkim-milter update to 2.6.0 Message-ID: <86hcc0ta5c.wl%umq@ueo.co.jp> Resent-Message-ID: <200806111250.m5BCo2ne035468@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124486 >Category: ports >Synopsis: [maintainer] mail/dkim-milter update to 2.6.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jun 11 12:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Hirohisa Yamaguchi >Release: FreeBSD 8.0-CURRENT amd64 >Organization: <organization of PR author (multiple lines)> >Environment: System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #15: Fri Jan 18 14:38:27 JST 2008 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64 >Description: The new version of mail/dkim-milter 2.6.0 has been released. Release notes: https://sourceforge.net/project/shownotes.php?release_id=606077 >How-To-Repeat: N/A >Fix: UPGRADING note: AFFECTS: users of mail/dkim-milter AUTHOR: umq@ueo.co.jp Most of the command line options are now can be set in configure files. So the default values (such as milterdkim_socket) are changed to blank. Upgrading users should check the values both in rc.conf and dkim-filter.conf. The patch follows: cvs server: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v retrieving revision 1.49 diff -u -r1.49 Makefile --- Makefile 18 May 2008 14:32:48 -0000 1.49 +++ Makefile 11 Jun 2008 12:20:24 -0000 @@ -13,8 +13,7 @@ ## base system, building this port may fail. PORTNAME= dkim-milter -PORTVERSION= 2.5.5 -PORTREVISION= 1 +PORTVERSION= 2.6.0 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -52,10 +51,10 @@ PLIST_DIRS= etc/mail PORTDOCS= FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \ autorespond.csh \ - draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-01.txt \ + draft-hoffman-dac-vbr-03.txt draft-ietf-dkim-deployment-01.txt \ draft-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \ - draft-kucherawy-sender-auth-header-14.txt \ - rfc4686.txt rfc4871.txt rfc5016.txt + draft-kucherawy-dkim-reporting-02.txt draft-kucherawy-sender-auth-header-14.txt \ + draft-shafranovich-feedback-report-04.txt rfc4686.txt rfc4871.txt rfc5016.txt .if !defined(NOPORTDOCS) LIBDOCS= ${DOCSDIR_REL}/libdkim/index.html \ ${DOCSDIR_REL}/libdkim/overview.html \ @@ -91,15 +90,16 @@ ${DOCSDIR_REL}/libdkim/dkim_options.html \ ${DOCSDIR_REL}/libdkim/dkim_param_t.html \ ${DOCSDIR_REL}/libdkim/dkim_policy.html \ + ${DOCSDIR_REL}/libdkim/dkim_policy_getreportinfo.html \ ${DOCSDIR_REL}/libdkim/dkim_policy_syntax.html \ ${DOCSDIR_REL}/libdkim/dkim_policy_t.html \ ${DOCSDIR_REL}/libdkim/dkim_presult.html \ ${DOCSDIR_REL}/libdkim/dkim_pstate.html \ ${DOCSDIR_REL}/libdkim/dkim_query_t.html \ - ${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \ ${DOCSDIR_REL}/libdkim/dkim_set_dns_callback.html \ ${DOCSDIR_REL}/libdkim/dkim_set_final.html \ ${DOCSDIR_REL}/libdkim/dkim_set_key_lookup.html \ + ${DOCSDIR_REL}/libdkim/dkim_set_margin.html \ ${DOCSDIR_REL}/libdkim/dkim_set_policy_lookup.html \ ${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \ ${DOCSDIR_REL}/libdkim/dkim_set_signature_handle.html \ @@ -115,9 +115,11 @@ ${DOCSDIR_REL}/libdkim/dkim_sig_geterrorstr.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_getflags.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_getkeysize.html \ + ${DOCSDIR_REL}/libdkim/dkim_sig_getreportinfo.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_getselector.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_getsignalg.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_getsigntime.html \ + ${DOCSDIR_REL}/libdkim/dkim_sig_hdrsigned.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_process.html \ ${DOCSDIR_REL}/libdkim/dkim_sig_syntax.html \ Index: Makefile.features =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile.features,v retrieving revision 1.10 diff -u -r1.10 Makefile.features --- Makefile.features 7 Mar 2008 13:26:39 -0000 1.10 +++ Makefile.features 11 Jun 2008 12:20:24 -0000 @@ -11,10 +11,6 @@ SITE_SUB+= -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||' .endif -.if defined(WITH_AUTHSERV_JOBID) && !defined(WITHOUT_AUTHSERV_JOBID) -SITE_SUB+= -e '/-D_FFR_AUTHSERV_JOBID/s|^dnl ||' -.endif - .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB) SITE_SUB+= -e '/-D_FFR_BODYLENGTH_DB/s|^dnl ||' .endif Index: distinfo =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/distinfo,v retrieving revision 1.37 diff -u -r1.37 distinfo --- distinfo 26 Apr 2008 15:18:44 -0000 1.37 +++ distinfo 11 Jun 2008 12:20:24 -0000 @@ -1,3 +1,3 @@ -MD5 (dkim-milter-2.5.5.tar.gz) = 8e2be29e0edb198642523880821b3166 -SHA256 (dkim-milter-2.5.5.tar.gz) = 683b9924225e30ec4add5eb3229552fd8f5e3b94f5bace50429f66f2235424fe -SIZE (dkim-milter-2.5.5.tar.gz) = 646196 +MD5 (dkim-milter-2.6.0.tar.gz) = ce97bbd5b220bb4266cfd662c8fdf6d0 +SHA256 (dkim-milter-2.6.0.tar.gz) = dfc84cbb2de3f16fca9beea543da34225fa56bf873fc422c6ae63145e57f64b3 +SIZE (dkim-milter-2.6.0.tar.gz) = 681667 Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/pkg-message,v retrieving revision 1.4 diff -u -r1.4 pkg-message --- pkg-message 15 Dec 2006 16:12:36 -0000 1.4 +++ pkg-message 11 Jun 2008 12:20:24 -0000 @@ -1,9 +1,9 @@ ************************************************************************ -In order to run this port, please add the following lines to -/etc/mail/<your_configuration>.mc: +In order to run this port, write your dkim-filter.conf and add the +milter socket path in /etc/mail/<your_configuration>.mc: -INPUT_MAIL_FILTER(`dkim-filter', `S=unix:/var/run/milterdkim/filter, F=T, T=R:2m') +INPUT_MAIL_FILTER(`dkim-filter', `S=_YOUR_SOCKET_PATH_, F=T, T=R:2m') And to run the milter from startup, add milterdkim_enable="YES" in your /etc/rc.conf. Index: pkg-message.postfix =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/pkg-message.postfix,v retrieving revision 1.2 diff -u -r1.2 pkg-message.postfix --- pkg-message.postfix 1 Oct 2006 15:06:48 -0000 1.2 +++ pkg-message.postfix 11 Jun 2008 12:20:24 -0000 @@ -1,9 +1,9 @@ ************************************************************************ -In order to run this port, please add the following lines to -${PREFIX}/etc/mail/main.cf: +In order to run this port, write your dkim-filter.conf and add your +milter socket path in ${PREFIX}/etc/mail/main.cf: -smtpd_milters = unix:/var/run/milterdkim/filter +smtpd_milters = _YOUR_SOCKET_PATH_ And to run the milter from startup, add milterdkim_enable="YES" in your /etc/rc.conf. cvs server: Diffing files Index: files/milter-dkim.sh.in =================================================================== RCS file: /home/ncvs/ports/mail/dkim-milter/files/milter-dkim.sh.in,v retrieving revision 1.11 diff -u -r1.11 milter-dkim.sh.in --- files/milter-dkim.sh.in 26 Apr 2008 15:18:44 -0000 1.11 +++ files/milter-dkim.sh.in 11 Jun 2008 12:20:24 -0000 @@ -18,24 +18,27 @@ # milterdkim_uid (str): Set username to run milter. # milterdkim_profiles (list): Set to "" by default. # Define your profiles here. +# milterdkim_cfgfile (str): Configuration file. See dkim-filter.conf(5) +# +# milterdkim_${profile}_* : Variables per profile. +# Sockets must be different from each other. +# +# all parameters below now can be set in dkim-filter.conf(5). # milterdkim_socket (str): Path to the milter socket. -# milterdkim_cfgfile (str): Configuration file. Also see dkim-filter.conf(5) # milterdkim_domain (str): Domainpart of From: in mails to sign. # milterdkim_key (str): Path to the private key file to sign with. # milterdkim_selector (str): Selector to use when signing # milterdkim_alg (str): Algorithm to use when signing # milterdkim_flags (str): Flags passed to start command. # -# milterdkim_${profile}_* : Variables per profile. -# Sockets must be different from each other. -# # DO NOT CHANGE THESE DEFAULT VALUES HERE # milterdkim_enable=${milterdkim_enable:-"NO"} milterdkim_uid=${milterdkim_uid:-"mailnull"} milterdkim_profiles=${milterdkim_profiles:-} -milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"} milterdkim_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"} + +milterdkim_socket=${milterdkim_socket:-} milterdkim_domain=${milterdkim_domain:-} milterdkim_key=${milterdkim_key:-} milterdkim_selector=${milterdkim_selector:-} @@ -78,6 +81,9 @@ else milterdkim_cfgfile="" fi + if [ "x${milterdkim_socket}" != "x" ];then + milterdkim_socket="-p ${milterdkim_socket}" + fi if [ "x${milterdkim_domain}" != "x" ];then milterdkim_domain="-d ${milterdkim_domain}" fi @@ -90,7 +96,7 @@ if [ "x${milterdkim_alg}" != "x" ];then milterdkim_alg="-S ${milterdkim_alg}" fi - command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" + command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" else echo "$0: extra argument ignored" fi >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86hcc0ta5c.wl%umq>