From owner-svn-ports-head@FreeBSD.ORG Sun Nov 9 18:21:24 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 78F47E2; Sun, 9 Nov 2014 18:21:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 639637CA; Sun, 9 Nov 2014 18:21:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA9ILOXj010946; Sun, 9 Nov 2014 18:21:24 GMT (envelope-from ohauer@FreeBSD.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA9ILNjl010944; Sun, 9 Nov 2014 18:21:23 GMT (envelope-from ohauer@FreeBSD.org) Message-Id: <201411091821.sA9ILNjl010944@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ohauer set sender to ohauer@FreeBSD.org using -f From: Olli Hauer Date: Sun, 9 Nov 2014 18:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372370 - head/mail/postfix X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Nov 2014 18:21:24 -0000 Author: ohauer Date: Sun Nov 9 18:21:23 2014 New Revision: 372370 URL: https://svnweb.freebsd.org/changeset/ports/372370 QAT: https://qat.redports.org/buildarchive/r372370/ Log: - sort OPTIONS_DEFINE - fix build and install for non root users, (sgid and group for sbin/postdrop and sbin/postqueue was lost if build as non root and installed with sudo) - install /var/spool/postfix directories with correct owner/mode - use $WRKDIR instead of /tmp Approved by: sahil (implicit) Modified: head/mail/postfix/Makefile head/mail/postfix/pkg-plist Modified: head/mail/postfix/Makefile ============================================================================== --- head/mail/postfix/Makefile Sun Nov 9 18:14:26 2014 (r372369) +++ head/mail/postfix/Makefile Sun Nov 9 18:21:23 2014 (r372370) @@ -3,6 +3,7 @@ PORTNAME= postfix PORTVERSION= 2.11.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -38,8 +39,8 @@ USE_SUBMAKE= yes USE_PERL5= build SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}" -OPTIONS_DEFINE= PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \ - CDB NIS VDA TEST SPF INST_BASE LMDB DOCS +OPTIONS_DEFINE= BDB CDB DOCS INST_BASE LDAP_SASL LMDB MYSQL NIS \ + OPENLDAP PCRE PGSQL SASL2 SPF SQLITE TEST TLS VDA OPTIONS_RADIO= RG1 RG2 OPTIONS_RADIO_RG1= DOVECOT DOVECOT2 @@ -332,7 +333,7 @@ pre-install: .endif do-install: - @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=/tmp \ + @(cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=${STAGEDIR} tempdir=${WRKDIR} \ config_directory=${ETCDIR} \ command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ Modified: head/mail/postfix/pkg-plist ============================================================================== --- head/mail/postfix/pkg-plist Sun Nov 9 18:14:26 2014 (r372369) +++ head/mail/postfix/pkg-plist Sun Nov 9 18:21:23 2014 (r372370) @@ -127,32 +127,36 @@ libexec/postfix/virtual sbin/postalias sbin/postcat sbin/postconf -sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti +@group maildrop +@mode 2755 +sbin/postdrop sbin/postqueue +@group +@mode sbin/postsuper sbin/sendmail @dir /var/db/postfix -@dir /var/spool/postfix/active -@dir /var/spool/postfix/bounce -@dir /var/spool/postfix/corrupt -@dir /var/spool/postfix/defer -@dir /var/spool/postfix/deferred -@dir /var/spool/postfix/flush -@dir /var/spool/postfix/hold -@dir /var/spool/postfix/incoming -@dir /var/spool/postfix/maildrop -@dir /var/spool/postfix/pid -@dir /var/spool/postfix/private -@dir /var/spool/postfix/public -@dir /var/spool/postfix/saved -@dir /var/spool/postfix/trace -@dir /var/spool/postfix +@dir(postfix,,700) /var/spool/postfix/active +@dir(postfix,,700) /var/spool/postfix/bounce +@dir(postfix,,700) /var/spool/postfix/corrupt +@dir(postfix,,700) /var/spool/postfix/defer +@dir(postfix,,700) /var/spool/postfix/deferred +@dir(postfix,,700) /var/spool/postfix/flush +@dir(postfix,,700) /var/spool/postfix/hold +@dir(postfix,,700) /var/spool/postfix/incoming +@dir(postfix,maildrop,730) /var/spool/postfix/maildrop +@dir(,postfix,755) /var/spool/postfix/pid +@dir(postfix,,700) /var/spool/postfix/private +@dir(postfix,maildrop,710) /var/spool/postfix/public +@dir(postfix,,700) /var/spool/postfix/saved +@dir(postfix,,700) /var/spool/postfix/trace +@dir(postfix,postfix,700) /var/spool/postfix %%BASE%%@cwd / @dir etc/postfix @cwd %%RESETPREFIX%%