From owner-svn-ports-head@freebsd.org Mon Apr 16 17:18:02 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D3B77F950BD; Mon, 16 Apr 2018 17:18:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7F9E17F250; Mon, 16 Apr 2018 17:18:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A3562041B; Mon, 16 Apr 2018 17:18:01 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3GHI1XS026091; Mon, 16 Apr 2018 17:18:01 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3GHI19N026088; Mon, 16 Apr 2018 17:18:01 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201804161718.w3GHI19N026088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 16 Apr 2018 17:18:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467493 - in head: . mail/postgrey X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head: . mail/postgrey X-SVN-Commit-Revision: 467493 X-SVN-Commit-Repository: ports 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.25 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: Mon, 16 Apr 2018 17:18:02 -0000 Author: pi Date: Mon Apr 16 17:18:00 2018 New Revision: 467493 URL: https://svnweb.freebsd.org/changeset/ports/467493 Log: mail/postgrey: fix conflict of PG_USER variable with PostgreSQL Please note: 20180416: AFFECTS: users of mail/postgrey AUTHOR: ports.maintainer@evilphi.com If you use any of the optional make.conf variables to specify the postgrey user, group, db dir, or run dir when building the port, you will need to change the prefix from PG_ to POSTGREY_*. The variables were renamed to solve a namespace collision with the PostgreSQL ports. PR: 227261 Submitted by: Melissa Pilgrim (maintainer) Reported by: Piotr Kubaj Modified: head/UPDATING head/mail/postgrey/Makefile head/mail/postgrey/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Apr 16 17:05:57 2018 (r467492) +++ head/UPDATING Mon Apr 16 17:18:00 2018 (r467493) @@ -5,6 +5,15 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20180416: + AFFECTS: users of mail/postgrey + AUTHOR: ports.maintainer@evilphi.com + + If you use any of the optional make.conf variables to specify the + postgrey user, group, db dir, or run dir when building the port, you will + need to change the prefix from PG_ to POSTGREY_*. The variables were + renamed to solve a namespace collision with the PostgreSQL ports. + 20180412: AFFECTS: users of devel/php-composer AUTHOT: madpilot@FreeBSD.org Modified: head/mail/postgrey/Makefile ============================================================================== --- head/mail/postgrey/Makefile Mon Apr 16 17:05:57 2018 (r467492) +++ head/mail/postgrey/Makefile Mon Apr 16 17:18:00 2018 (r467493) @@ -3,7 +3,7 @@ PORTNAME= postgrey PORTVERSION= 1.37 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://postgrey.schweikert.ch/pub/ \ http://postgrey.schweikert.ch/pub/old/ @@ -30,21 +30,21 @@ NO_BUILD= yes POD2MAN?= pod2man PORTDOCS= README Changes README.exim -PG_DBDIR?= /var/db/postgrey -PG_GROUP?= postgrey -PG_RUNDIR?= /var/run/postgrey -PG_USER?= postgrey +POSTGREY_DBDIR?= /var/db/postgrey +POSTGREY_GROUP?= postgrey +POSTGREY_RUNDIR?= /var/run/postgrey +POSTGREY_USER?= postgrey -SUB_LIST= PG_DBDIR=${PG_DBDIR} \ - PG_RUNDIR=${PG_RUNDIR} +SUB_LIST= POSTGREY_DBDIR=${POSTGREY_DBDIR} \ + POSTGREY_RUNDIR=${POSTGREY_RUNDIR} -PLIST_SUB+= PG_DBDIR=${PG_DBDIR} \ - PG_GROUP=${PG_GROUP} \ - PG_RUNDIR=${PG_RUNDIR} \ - PG_USER=${PG_USER} +PLIST_SUB+= POSTGREY_DBDIR=${POSTGREY_DBDIR} \ + POSTGREY_GROUP=${POSTGREY_GROUP} \ + POSTGREY_RUNDIR=${POSTGREY_RUNDIR} \ + POSTGREY_USER=${POSTGREY_USER} -USERS= ${PG_USER} -GROUPS= ${PG_GROUP} +USERS= ${POSTGREY_USER} +GROUPS= ${POSTGREY_GROUP} MANPAGES= postgrey.1 policy-test.1 postgreyreport.1 ETCFILES= whitelist_clients whitelist_recipients @@ -54,11 +54,11 @@ SHEBANG_FILES= postgrey policy-test contrib/postgreyre OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's#nogroup#${PG_GROUP}#' \ + @${REINPLACE_CMD} -e 's#nogroup#${POSTGREY_GROUP}#' \ -e 's#/etc/main.cf#/etc/postfix/main.cf#' ${WRKSRC}/postgrey @${REINPLACE_CMD} -e 's#/etc/postfix#${PREFIX}&#' \ ${WRKSRC}/postgrey ${WRKSRC}/postgrey_whitelist_* - @${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${PG_DBDIR}#' \ + @${REINPLACE_CMD} -e 's#/var/spool/postfix/postgrey#${POSTGREY_DBDIR}#' \ ${WRKSRC}/postgrey ${WRKSRC}/contrib/postgreyreport do-install: @@ -69,8 +69,8 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/policy-test ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport \ ${STAGEDIR}${PREFIX}/sbin - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}${PG_DBDIR} \ - ${STAGEDIR}${PG_RUNDIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/postfix ${STAGEDIR}${POSTGREY_DBDIR} \ + ${STAGEDIR}${POSTGREY_RUNDIR} .for i in ${ETCFILES} ${INSTALL_DATA} ${WRKSRC}/postgrey_${i} \ ${STAGEDIR}${PREFIX}/etc/postfix/postgrey_${i}.sample Modified: head/mail/postgrey/pkg-plist ============================================================================== --- head/mail/postgrey/pkg-plist Mon Apr 16 17:05:57 2018 (r467492) +++ head/mail/postgrey/pkg-plist Mon Apr 16 17:18:00 2018 (r467493) @@ -7,5 +7,5 @@ sbin/postgrey sbin/policy-test sbin/postgreyreport @dir etc/postfix -@dir(%%PG_USER%%,%%PG_GROUP%%,750) %%PG_DBDIR%% -@dir(%%PG_USER%%,%%PG_GROUP%%,750) %%PG_RUNDIR%% +@dir(%%POSTGREY_USER%%,%%POSTGREY_GROUP%%,750) %%POSTGREY_DBDIR%% +@dir(%%POSTGREY_USER%%,%%POSTGREY_GROUP%%,750) %%POSTGREY_RUNDIR%%