Date: Tue, 17 Apr 2018 09:53:27 +1200 From: Pierre Guinoiseau <pierre@guinoiseau.eu> To: Kurt Jaeger <pi@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r467493 - in head: . mail/postgrey Message-ID: <20180416215327.GA51416@asgard.yggdrasil.nz> In-Reply-To: <201804161718.w3GHI19N026088@repo.freebsd.org> References: <201804161718.w3GHI19N026088@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--azLHFNyN32YCQGCU Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, please update mail/postgrey/files/postgrey.in for PG_RUNDIR as well, the packaged rc script is currently broken after this change. Cheers, Pierre On 2018-04-16 17:18:01, Kurt Jaeger <pi@FreeBSD.org> wrote: > Author: pi > Date: Mon Apr 16 17:18:00 2018 > New Revision: 467493 > URL: https://svnweb.freebsd.org/changeset/ports/467493 >=20 > Log: > mail/postgrey: fix conflict of PG_USER variable with PostgreSQL > =20 > Please note: > =20 > 20180416: > AFFECTS: users of mail/postgrey > AUTHOR: ports.maintainer@evilphi.com > =20 > 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. > =20 > PR: 227261 > Submitted by: Melissa Pilgrim <ports.maintainer@evilphi.com> (maintaine= r) > Reported by: Piotr Kubaj <pkubaj@anongoth.pl> >=20 > Modified: > head/UPDATING > head/mail/postgrey/Makefile > head/mail/postgrey/pkg-plist >=20 > Modified: head/UPDATING > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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. > =20 > +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 w= ill > + 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 >=20 > Modified: head/mail/postgrey/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D postgrey > PORTVERSION=3D 1.37 > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D mail > MASTER_SITES=3D http://postgrey.schweikert.ch/pub/ \ > http://postgrey.schweikert.ch/pub/old/ > @@ -30,21 +30,21 @@ NO_BUILD=3D yes > POD2MAN?=3D pod2man > PORTDOCS=3D README Changes README.exim > =20 > -PG_DBDIR?=3D /var/db/postgrey > -PG_GROUP?=3D postgrey > -PG_RUNDIR?=3D /var/run/postgrey > -PG_USER?=3D postgrey > +POSTGREY_DBDIR?=3D /var/db/postgrey > +POSTGREY_GROUP?=3D postgrey > +POSTGREY_RUNDIR?=3D /var/run/postgrey > +POSTGREY_USER?=3D postgrey > =20 > -SUB_LIST=3D PG_DBDIR=3D${PG_DBDIR} \ > - PG_RUNDIR=3D${PG_RUNDIR} > +SUB_LIST=3D POSTGREY_DBDIR=3D${POSTGREY_DBDIR} \ > + POSTGREY_RUNDIR=3D${POSTGREY_RUNDIR} > =20 > -PLIST_SUB+=3D PG_DBDIR=3D${PG_DBDIR} \ > - PG_GROUP=3D${PG_GROUP} \ > - PG_RUNDIR=3D${PG_RUNDIR} \ > - PG_USER=3D${PG_USER} > +PLIST_SUB+=3D POSTGREY_DBDIR=3D${POSTGREY_DBDIR} \ > + POSTGREY_GROUP=3D${POSTGREY_GROUP} \ > + POSTGREY_RUNDIR=3D${POSTGREY_RUNDIR} \ > + POSTGREY_USER=3D${POSTGREY_USER} > =20 > -USERS=3D ${PG_USER} > -GROUPS=3D ${PG_GROUP} > +USERS=3D ${POSTGREY_USER} > +GROUPS=3D ${POSTGREY_GROUP} > =20 > MANPAGES=3D postgrey.1 policy-test.1 postgreyreport.1 > ETCFILES=3D whitelist_clients whitelist_recipients > @@ -54,11 +54,11 @@ SHEBANG_FILES=3D postgrey policy-test contrib/postgre= yre > OPTIONS_DEFINE=3D DOCS > =20 > 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 > =20 > 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 >=20 > Modified: head/mail/postgrey/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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%% > _______________________________________________ > svn-ports-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-ports-all > To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org" --=20 Pierre Guinoiseau <pierre@guinoiseau.eu> https://segmentationfau.lt/ | +PierreGuinoiseau | @peikk00 --azLHFNyN32YCQGCU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEuArpwS2+RKVR4MXG3hN3wszXuZ8FAlrVG1cACgkQ3hN3wszX uZ92uQ//UwnUaK1ChNNsD7uoE2MF7gKKqo5AHGpY4VJ2q0DprW2TU56pp4th/+P9 gt9KYB45A2vvInKLwEq3iH7s723+BlkRG30XSBJSkuDqIEUybmEMiezm0ZGAo7X2 9nbz4T0S7wqackkWspdqgfxkHVvVzavHSTNn9/VUJn1fyUiiWIMMMjuCZomQ360k SA5bI4cF7uAmPgQeREeafvQl8i26Vg26B2m6sPei2ERy0JUJmwG8VdyUKfQrVlQu kNThz2k+ykVfjqMIDzMlTfjPUBku1TwFF/f10xIDtU7BQ90mhVj/JcFQZSuQ2C43 KpyK5e4HvuONmQEO1dDeX8oC91XZlGsRZR6RhuUs360ww0Nk7ElHyl/VkOXWiY6W pXceH/E6+Cq2mgXIZAW6+O+xwB4giF4ScaZle0dyoCrncmtmpLTe98y7wG/VM5vD h+T74NWeVkXbuxfONIQjgsRQuRfTQbq3IKFdG1UtR3l6hBsQFxllbe2g93iv0E2V BcxjDvgiwn8QZLVcip7axEDJS7Dcdd71QwtpQSAfBPr0I55cAlFvS88/qKTBVt8Y /RdQ7Mv4sVc4oAL7/ygnqq6optabST78EjClcWP6ceKVZglv5sBNmggjF1TOTwtW TkaGfT1xWlxtHDat/czdl6Qgto8K0NB4HSuZYKesKh60Alg2ejQ= =ejNK -----END PGP SIGNATURE----- --azLHFNyN32YCQGCU--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180416215327.GA51416>