diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-29 23:00:54 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-10-29 23:00:54 +0000 |
| commit | 33a8245017f2f165811768051e32d217d16dbfe6 (patch) | |
| tree | 1e18d7143ed9b1d1928acf83e5d7acf95ba8919c /mail/postgrey | |
| parent | b569014a83d98cb47278778978a6e0268af829de (diff) | |
| download | ports-33a8245017f2f165811768051e32d217d16dbfe6.tar.gz ports-33a8245017f2f165811768051e32d217d16dbfe6.zip | |
Convert to new plist formats which fixes the postgrey credential on the db
directory
Notes
Notes:
svn path=/head/; revision=371721
Diffstat (limited to 'mail/postgrey')
| -rw-r--r-- | mail/postgrey/Makefile | 4 | ||||
| -rw-r--r-- | mail/postgrey/files/pkg-install.in | 14 | ||||
| -rw-r--r-- | mail/postgrey/pkg-plist | 3 |
3 files changed, 4 insertions, 17 deletions
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile index f3b22ca0e475..53a94a316ecb 100644 --- a/mail/postgrey/Makefile +++ b/mail/postgrey/Makefile @@ -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}" \ diff --git a/mail/postgrey/files/pkg-install.in b/mail/postgrey/files/pkg-install.in index 46cff86c0e60..ca7ef451e3c7 100644 --- a/mail/postgrey/files/pkg-install.in +++ b/mail/postgrey/files/pkg-install.in @@ -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}" diff --git a/mail/postgrey/pkg-plist b/mail/postgrey/pkg-plist index 0f06b0f655bf..26161ec3c0fc 100644 --- a/mail/postgrey/pkg-plist +++ b/mail/postgrey/pkg-plist @@ -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 |