From umq@ueo.co.jp  Sat Jan 17 00:44:45 2009
Return-Path: <umq@ueo.co.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 92483106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2009 00:44:45 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from msa04b.plala.or.jp (msa04.plala.or.jp [58.93.240.4])
	by mx1.freebsd.org (Postfix) with ESMTP id 239088FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2009 00:44:44 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from terpsichore.kaumoge.org ([125.205.3.93])
          by msa04b.plala.or.jp with ESMTP
          id <20090117004443.JMON14738.msa04b.plala.or.jp@terpsichore.kaumoge.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Sat, 17 Jan 2009 09:44:43 +0900
Received: from calliope.kaumoge.org (calliope.kaumoge.org [192.168.24.120])
	by terpsichore.kaumoge.org (8.14.3/8.14.2/20080818) with ESMTP id n0H0igIk035821
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Jan 2009 09:44:43 +0900 (JST)
	(envelope-from umq@ueo.co.jp)
Message-Id: <86ocy6wykl.wl%umq@ueo.co.jp>
Date: Sat, 17 Jan 2009 09:44:42 +0900
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [maintainer] mail/dkim-milter security update to 2.8.1
X-Send-Pr-Version: 3.113

>Number:         130636
>Category:       ports
>Synopsis:       [maintainer] mail/dkim-milter security update to 2.8.1
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 17 00:50:00 UTC 2009
>Closed-Date:    Mon Jan 19 20:50:58 UTC 2009
>Last-Modified:  Mon Jan 19 21:00:00 UTC 2009
>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 #17: Thu Jul 10 06:27:38 JST 2008 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64

>Description:
	The new version of mail/dkim-milter 2.8.1 has been released.
	Users of the port from 2.6.0 thru 2.8.0 are recommended to update.

	Release notes: http://sourceforge.net/project/shownotes.php?group_id=139420&release_id=654247
>How-To-Repeat:
	N/A
>Fix:

	The patch follows:
	  this patch supersedes ports/130363, too.

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.55
diff -p -u -r1.55 Makefile
--- Makefile	9 Jan 2009 23:09:17 -0000	1.55
+++ Makefile	17 Jan 2009 00:42:51 -0000
@@ -13,7 +13,7 @@
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	2.8.0
+PORTVERSION=	2.8.1
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -198,7 +198,7 @@ SITE_SUB+=	-e '/-DQUERY_CACHE/s/^dnl //g
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 LIBDK_PORT=	mail/dk-milter
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
-LIBDK_PATH!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
+LIBDK_PATH_CMD=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
 SITE_SUB+=	-e '\|bld_VERIFY_DOMAINKEYS|s/^dnl //'
 PORTDOCS+=	rfc4870.txt
 .endif
@@ -274,8 +274,8 @@ post-patch:
 
 pre-configure:
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
-	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
-	${CP} ${LIBDK_PATH}/rfc4870.txt ${WRKSRC}/
+	${LN} -s $$(${LIBDK_PATH_CMD})/libdk ${WRKSRC}/
+	${CP} $$(${LIBDK_PATH_CMD})/rfc4870.txt ${WRKSRC}/
 .endif
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/distinfo,v
retrieving revision 1.42
diff -p -u -r1.42 distinfo
--- distinfo	9 Jan 2009 23:09:17 -0000	1.42
+++ distinfo	17 Jan 2009 00:42:51 -0000
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-2.8.0.tar.gz) = 060ffddd0d8d114d4c482e04337af5a9
-SHA256 (dkim-milter-2.8.0.tar.gz) = 94c16d3b69d7300678d5c44e80803622ae7cee65ffe1084cc64824f3e4593be2
-SIZE (dkim-milter-2.8.0.tar.gz) = 725718
+MD5 (dkim-milter-2.8.1.tar.gz) = a822f7f5eb36f15d1377ca534d5d7edf
+SHA256 (dkim-milter-2.8.1.tar.gz) = adf233574cbc74d4dd8d0614ad3e0d88b8b581e53a281e7c395cacdd5cde2fb4
+SIZE (dkim-milter-2.8.1.tar.gz) = 726239
cvs diff: 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.14
diff -p -u -r1.14 milter-dkim.sh.in
--- files/milter-dkim.sh.in	28 Jul 2008 20:15:40 -0000	1.14
+++ files/milter-dkim.sh.in	17 Jan 2009 00:42:51 -0000
@@ -30,22 +30,6 @@
 # milterdkim_selector (str):  Selector to use when signing
 # milterdkim_alg (str):       Algorithm to use when signing
 # milterdkim_flags (str):     Flags passed to start command.
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-milterdkim_enable=${milterdkim_enable:-"NO"}
-milterdkim_uid=${milterdkim_uid:-"mailnull"}
-milterdkim_profiles=${milterdkim_profiles:-}
-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:-}
-milterdkim_alg=${milterdkim_alg:-}
-# Options other than above can be set with $milterdkim_flags.
-# see dkim-milter documentation for detail.
-milterdkim_flags=${milterdkim_flags:-}
 
 . %%RC_SUBR%%
 
@@ -60,6 +44,23 @@ pidfile="${_piddir}/pid"
 
 load_rc_config $name
 
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+: ${milterdkim_enable="NO"}
+: ${milterdkim_uid="mailnull"}
+: ${milterdkim_profiles=""}
+: ${milterdkim_cfgfile="%%PREFIX%%/etc/mail/dkim-filter.conf"}
+
+: ${milterdkim_socket=""}
+: ${milterdkim_domain=""}
+: ${milterdkim_key=""}
+: ${milterdkim_selector=""}
+: ${milterdkim_alg=""}
+# Options other than above can be set with $milterdkim_flags.
+# see dkim-milter documentation for detail.
+:milterdkim_flags=${milterdkim_flags=""}
+
 if [ -n "$2" ]; then
     profile="$2"
     if [ "x${milterdkim_profiles}" != "x" ]; then
@@ -84,6 +85,9 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_socket}" != "x" ];then
 	    _socket_prefix="-p"
 	fi
+	if [ "x${milterdkim_uid}" != "x" ];then
+	    _uid_prefix="-u"
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -96,7 +100,7 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${_socket_prefix} ${milterdkim_socket} ${_uid_prefix} ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     else
 	echo "$0: extra argument ignored"
     fi
@@ -126,6 +130,9 @@ else
 	if [ "x${milterdkim_socket}" != "x" ];then
 	    _socket_prefix="-p"
 	fi
+	if [ "x${milterdkim_uid}" != "x" ];then
+	    _uid_prefix="-u"
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -138,7 +145,7 @@ else
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${_socket_prefix} ${milterdkim_socket} ${_uid_prefix} ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     fi
 fi
 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Jan 17 12:00:55 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130636 
Responsible-Changed-From-To: miwi->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Sun Jan 18 14:28:08 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130636 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Mon Jan 19 20:50:57 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=130636 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/130636: commit references a PR
Date: Mon, 19 Jan 2009 20:50:39 +0000 (UTC)

 wxs         2009-01-19 20:50:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dkim-milter     Makefile distinfo 
     mail/dkim-milter/files milter-dkim.sh.in 
   Log:
   - Update to 2.8.1
   - Defer use of !=
   - Update RC script to be more modern
   
   PR:             ports/130636
   Submitted by:   Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
   
   Revision  Changes    Path
   1.56      +4 -4      ports/mail/dkim-milter/Makefile
   1.43      +3 -3      ports/mail/dkim-milter/distinfo
   1.15      +26 -19    ports/mail/dkim-milter/files/milter-dkim.sh.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
