From owner-svn-ports-head@FreeBSD.ORG Wed Oct 29 23:00:55 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 C5BB0B7D; Wed, 29 Oct 2014 23:00:55 +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 954B2767; Wed, 29 Oct 2014 23:00:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9TN0tUB017405; Wed, 29 Oct 2014 23:00:55 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9TN0sIW017402; Wed, 29 Oct 2014 23:00:54 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201410292300.s9TN0sIW017402@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Wed, 29 Oct 2014 23:00:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371721 - in head/mail/postgrey: . files 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: Wed, 29 Oct 2014 23:00:55 -0000 Author: bapt Date: Wed Oct 29 23:00:54 2014 New Revision: 371721 URL: https://svnweb.freebsd.org/changeset/ports/371721 QAT: https://qat.redports.org/buildarchive/r371721/ Log: Convert to new plist formats which fixes the postgrey credential on the db directory Modified: head/mail/postgrey/Makefile head/mail/postgrey/files/pkg-install.in head/mail/postgrey/pkg-plist Modified: head/mail/postgrey/Makefile ============================================================================== --- head/mail/postgrey/Makefile Wed Oct 29 22:43:21 2014 (r371720) +++ head/mail/postgrey/Makefile Wed Oct 29 23:00:54 2014 (r371721) @@ -3,7 +3,7 @@ PORTNAME= postgrey PORTVERSION= 1.34 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= http://postgrey.schweikert.ch/pub/ \ http://postgrey.schweikert.ch/pub/old/ @@ -23,6 +23,8 @@ NO_BUILD= yes POD2MAN?= pod2man PORTDOCS= README Changes README.exim SUB_FILES= pkg-install +PLIST_SUB= USER=${PGY_USERNAME} \ + GROUP=${PGY_GROUPNAME} SUB_LIST= USER=${PGY_USERNAME} \ GROUP=${PGY_GROUPNAME} \ ETCFILES="${ETCFILES}" \ Modified: head/mail/postgrey/files/pkg-install.in ============================================================================== --- head/mail/postgrey/files/pkg-install.in Wed Oct 29 22:43:21 2014 (r371720) +++ head/mail/postgrey/files/pkg-install.in Wed Oct 29 23:00:54 2014 (r371721) @@ -14,20 +14,6 @@ PRE-INSTALL) ;; POST-INSTALL) - echo "---> Starting post-install script:" - - # Create home directory if required - if [ -d "%%POSTGREYDIR%%" ]; then - echo "---> Using existing Postgrey database directory (%%POSTGREYDIR%%)" - echo " (There may be existing active postgrey databases - this installation" - echo " will attempt to preserve them.)" - else - echo "---> Creating Postgrey database directory (%%POSTGREYDIR%%)" - (umask 002 && /bin/mkdir -p "%%POSTGREYDIR%%") || exit 1 - /usr/sbin/chown -R "%%USER%%:%%GROUP%%" "%%POSTGREYDIR%%" || exit 1 - /bin/chmod g+s "%%POSTGREYDIR%%" || exit 1 - fi - for i in %%ETCFILES%%; do if [ ! -f "%%PREFIX%%/etc/postfix/postgrey_${i}" ]; then echo "---> Installing new config file %%PREFIX%%/etc/postfix/postgrey_${i}" Modified: head/mail/postgrey/pkg-plist ============================================================================== --- head/mail/postgrey/pkg-plist Wed Oct 29 22:43:21 2014 (r371720) +++ head/mail/postgrey/pkg-plist Wed Oct 29 23:00:54 2014 (r371721) @@ -8,5 +8,4 @@ man/man1/postgreyreport.1.gz sbin/postgrey sbin/policy-test sbin/postgreyreport -@dirrmtry etc/postfix -@unexec rmdir /var/db/postgrey 2>/dev/null || true +@dir(%%USER%%,%%GROUP%%,2775) /var/db/postgrey