From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 27 20:30:13 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75296106566C for ; Mon, 27 Dec 2010 20:30:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 392DE8FC16 for ; Mon, 27 Dec 2010 20:30:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oBRKUDeW065031 for ; Mon, 27 Dec 2010 20:30:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oBRKUDVn065030; Mon, 27 Dec 2010 20:30:13 GMT (envelope-from gnats) Resent-Date: Mon, 27 Dec 2010 20:30:13 GMT Resent-Message-Id: <201012272030.oBRKUDVn065030@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Roberto de Iriarte Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61E4D106564A for ; Mon, 27 Dec 2010 20:26:55 +0000 (UTC) (envelope-from roberto@mail.spock.cl) Received: from mail.spock.cl (enteljoven2.enteljoven.cl [164.77.63.23]) by mx1.freebsd.org (Postfix) with ESMTP id A0E5B8FC12 for ; Mon, 27 Dec 2010 20:26:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) (uid 1001) by mail.spock.cl with local; Mon, 27 Dec 2010 17:15:16 -0300 id 00000B19.000000004D18F3D4.00008B60 Message-Id: Date: Mon, 27 Dec 2010 17:15:16 -0300 From: Roberto de Iriarte To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/153473: [patch] Courier MTA port upgrade from 0.63.0 to 0.65.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Roberto de Iriarte List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Dec 2010 20:30:13 -0000 >Number: 153473 >Category: ports >Synopsis: [patch] Courier MTA port upgrade from 0.63.0 to 0.65.2 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 27 20:30:12 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Roberto de Iriarte >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: Spock Ltda >Environment: System: FreeBSD tolten.spock.cl 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Sun Dec 19 01:24:49 CLST 2010 root@especial.ope.local:/usr/obj/usr/src/sys/GENERIC amd64 For your review. The following patch updates the Courier MTA port at /usr/ports/mail/courier from version 0.63.0 to version 0.65.2 Best regards, --- courier.diff begins here --- diff -ruN courier.bak/Makefile courier/Makefile --- courier.bak/Makefile 2010-12-04 04:32:28.000000000 -0300 +++ courier/Makefile 2010-12-22 03:32:48.876504751 -0300 @@ -6,7 +6,7 @@ # PORTNAME= courier -PORTVERSION= 0.63.0 +PORTVERSION= 0.65.2 PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= SF diff -ruN courier.bak/distinfo courier/distinfo --- courier.bak/distinfo 2010-03-12 21:51:31.000000000 -0300 +++ courier/distinfo 2010-12-22 03:31:23.272462058 -0300 @@ -1,3 +1,3 @@ -MD5 (courier-0.63.0.tar.bz2) = a4d12aa593a52aee90373fad9eb9ff17 -SHA256 (courier-0.63.0.tar.bz2) = 3a52363605f75f4156105aefa6bd375626f742033fbf09b5592179f274322044 -SIZE (courier-0.63.0.tar.bz2) = 7133009 +MD5 (courier-0.65.2.tar.bz2) = 76df195810894c34d383be8b2851b619 +SHA256 (courier-0.65.2.tar.bz2) = 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2 +SIZE (courier-0.65.2.tar.bz2) = 7152680 diff -ruN courier.bak/files/patch-courier__configure courier/files/patch-courier__configure --- courier.bak/files/patch-courier__configure 2010-03-12 21:51:31.000000000 -0300 +++ courier/files/patch-courier__configure 2010-12-22 05:08:33.995439949 -0300 @@ -1,6 +1,6 @@ ---- courier/configure.orig 2009-09-05 13:59:59.000000000 +0200 -+++ courier/configure 2010-02-15 20:05:20.000000000 +0100 -@@ -819,6 +819,7 @@ +--- courier/configure.orig 2010-12-22 05:07:11.906399582 -0300 ++++ courier/configure 2010-12-22 05:07:55.033419637 -0300 +@@ -638,6 +638,7 @@ dirlist transport MODE @@ -8,7 +8,7 @@ COPYRIGHT testmode COURIERAUTHCONFIG -@@ -954,6 +955,7 @@ +@@ -773,6 +774,7 @@ enable_libtool_lock with_softlinkdir with_testmode @@ -16,7 +16,7 @@ with_transport with_db with_courierlogger -@@ -1629,6 +1631,7 @@ +@@ -1435,6 +1437,7 @@ --with-softlinks=dir:link,dir:link... specify soft links for installation subdirectories. -- This space intentionally left blank -- @@ -24,19 +24,19 @@ --with-transport='local esmtp ...' Specify list of modules to install -@@ -2553,7 +2556,7 @@ +@@ -2842,7 +2845,7 @@ fi fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="install -s -o root -g wheel -m 555 -s" - { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -@@ -15882,6 +15885,14 @@ +@@ -14668,6 +14671,13 @@ + ;; esac - +# Check whether --with-piddir was given. +if test "${with_piddir+set}" = set; then + withval=$with_piddir; piddir="$withval" @@ -44,20 +44,10 @@ + piddir=$localstatedir/run +fi + -+ - version=`cat ../version` - - COPYRIGHT="Courier $version Copyright 1999-2008 Double Precision, Inc." -@@ -17008,7 +17019,7 @@ - - # Check whether --with-ldapaliasd was given. - if test "${with_ldapaliasd+set}" = set; then -- withval=$with_ldapaliasd; ldapaliasd="$withval"; ldapaliasd="yes" -+ withval=$with_ldapaliasd; ldapaliasd="$withval" - fi + version=`cat ../version` -@@ -18397,9 +18408,9 @@ +@@ -15902,9 +15912,9 @@ if test "$testmode" = "0" then diff -ruN courier.bak/files/patch-imap__mkimapdcert.in courier/files/patch-imap__mkimapdcert.in --- courier.bak/files/patch-imap__mkimapdcert.in 2010-03-12 21:51:31.000000000 -0300 +++ courier/files/patch-imap__mkimapdcert.in 2010-12-22 04:16:20.785800206 -0300 @@ -1,11 +1,11 @@ ---- imap/mkimapdcert.in.orig 2010-02-15 21:42:15.000000000 +0100 -+++ imap/mkimapdcert.in 2010-02-15 21:36:46.000000000 +0100 +--- imap/mkimapdcert.in.orig 2010-12-22 04:14:42.394751343 -0300 ++++ imap/mkimapdcert.in 2010-12-22 04:15:32.764775187 -0300 @@ -40,7 +40,7 @@ then - cp /dev/null @mydatadir@/imapd.pem - chmod 600 @mydatadir@/imapd.pem -- chown @mailuser@ @mydatadir@/imapd.pem -+ /usr/sbin/chown @mailuser@ @mydatadir@/imapd.pem + cp /dev/null @certsdir@/imapd.pem + chmod 600 @certsdir@/imapd.pem +- chown @mailuser@ @certsdir@/imapd.pem ++ /usr/sbin/chown @mailuser@ @certsdir@/imapd.pem - dd if=@RANDOMV@ of=@mydatadir@/imapd.rand count=1 2>/dev/null + dd if=@RANDOMV@ of=@certsdir@/imapd.rand count=1 2>/dev/null @OPENSSL@ req -new -x509 -days 365 -nodes \ diff -ruN courier.bak/files/patch-imap__mkpop3dcert.in courier/files/patch-imap__mkpop3dcert.in --- courier.bak/files/patch-imap__mkpop3dcert.in 2010-03-12 21:51:31.000000000 -0300 +++ courier/files/patch-imap__mkpop3dcert.in 2010-12-22 04:18:01.976850186 -0300 @@ -1,11 +1,11 @@ ---- imap/mkpop3dcert.in.orig 2010-02-15 21:45:23.000000000 +0100 -+++ imap/mkpop3dcert.in 2010-02-15 21:37:01.000000000 +0100 +--- imap/mkpop3dcert.in.orig 2010-12-22 04:17:07.303823306 -0300 ++++ imap/mkpop3dcert.in 2010-12-22 04:17:35.415836146 -0300 @@ -40,7 +40,7 @@ then - cp /dev/null @mydatadir@/pop3d.pem - chmod 600 @mydatadir@/pop3d.pem -- chown @mailuser@ @mydatadir@/pop3d.pem -+ /usr/sbin/chown @mailuser@ @mydatadir@/pop3d.pem + cp /dev/null @certsdir@/pop3d.pem + chmod 600 @certsdir@/pop3d.pem +- chown @mailuser@ @certsdir@/pop3d.pem ++ /usr/sbin/chown @mailuser@ @certsdir@/pop3d.pem - dd if=@RANDOMV@ of=@mydatadir@/pop3d.rand count=1 2>/dev/null + dd if=@RANDOMV@ of=@certsdir@/pop3d.rand count=1 2>/dev/null @OPENSSL@ req -new -x509 -days 365 -nodes \ --- courier.diff ends here --- >Description: >How-To-Repeat: >Fix: >Release-Note: >Audit-Trail: >Unformatted: