svn commit: r361489 - head/mail/courier-pythonfilter

[Steve Wills]

Hi,

FYI:

https://jenkins.freebsd.org/pci/head-amd64/poudriere/data/headamd64-default/668/logs/errors/courier-pythonfilter-1.6.log
https://jenkins.freebsd.org/pci/head-i386/poudriere/data/headi386-default/668/logs/errors/courier-pythonfilter-1.6.log

====>> Error: Files or directories modified:
%%LOCALSTATEDIR%% user (0, 465) gid (0, 465)
libexec/filters user (0, 465) gid (0, 465)

Seems it's touching things outside the stage dir. Could you take a look?

Thanks,
Steve

On Thu, Jul 10, 2014 at 08:33:34PM +0000, Danilo Egea Gondolfo wrote:
> Author: danilo
> Date: Thu Jul 10 20:33:34 2014
> New Revision: 361489
> URL: http://svnweb.freebsd.org/changeset/ports/361489
> QAT: https://qat.redports.org/buildarchive/r361489/
> 
> Log:
>   - Add stage support
>   - Use @sample
>   while here
>   - Use @owner and @group
>   
>   PR:		ports/191521
>   Submitted by:	bsd at dino.sk
> 
> Modified:
>   head/mail/courier-pythonfilter/Makefile
>   head/mail/courier-pythonfilter/pkg-plist
> 
> Modified: head/mail/courier-pythonfilter/Makefile
> ==============================================================================
> --- head/mail/courier-pythonfilter/Makefile	Thu Jul 10 20:30:29 2014	(r361488)
> +++ head/mail/courier-pythonfilter/Makefile	Thu Jul 10 20:33:34 2014	(r361489)
> @@ -20,11 +20,16 @@ MAILUID=	465
>  MAILGID=	465
>  
>  LOCALSTATEDIR=	/var/spool/courier
> -SCRIPTSDIR=	${PREFIX}/libexec/filters
> +PYSCRIPTSDIR=	${PREFIX}/libexec/filters
> +
> +PLIST_SUB+=	MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
> +		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
> +		LOCALSTATEDIR="${LOCALSTATEDIR}"
> +SUB_LIST+=	${PLIST_SUB}
>  
>  OPTIONS_DEFINE=	DEBUG NODUPLICATES LOCALSENDERS SPAMASSASSIN AUTO_WHITELIST WHITELIST_RELAY WHITELIST_AUTH \
>  		WHITELIST_BLOCK WHITELIST_DNSWL WHITELIST_DNSWL DELIVEREDTO PRIVATEADDR SPFCHECK NOSUCCESSDSN \
> -		COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA
> +		COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA WHITELIST_SPF
>  
>  DEBUG_DESC=	debug module
>  NODUPLICATES_DESC=	noduplicates module
> @@ -37,7 +42,7 @@ WHITELIST_RELAY_DESC=	whitelist_relaycli
>  WHITELIST_AUTH_DESC=	whitelist_auth module
>  WHITELIST_BLOCK_DESC=	whitelist_block module
>  WHITELIST_DNSWL_DESC=	whitelist_dnswl module
> -WHITELIST_SP_DESC=	Fwhitelist_spf module
> +WHITELIST_SP_DESC=	whitelist_spf module
>  DELIVEREDTO_DESC=	deliveredto module
>  PRIVATEADDR_DESC=	privateaddr module
>  SPFCHECK_DESC=	spfcheck module
> @@ -55,10 +60,9 @@ RG1_DESC=	ClamAV Filter Option
>  
>  OPTIONS_DEFAULT=	DEBUG WHITELIST_RELAY WHITELIST_AUTH
>  
> -NO_STAGE=	yes
>  .include <bsd.port.pre.mk>
>  
> -PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${SCRIPTSDIR}
> +PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR}
>  
>  .if ${PORT_OPTIONS:MCLAMAV_CLAMD} && ! ${PORT_OPTIONS:MCLAMAV_LIB}
>  RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pyclamd.py:${PORTSDIR}/security/py-pyclamd
> @@ -143,9 +147,6 @@ post-patch:
>  	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pythonfilter
>  
>  post-install:
> -	${MKDIR} ${LOCALSTATEDIR}/pythonfilter
> -	${CHOWN} ${MAILOWN}:${MAILGRP} ${LOCALSTATEDIR}/pythonfilter
> -	@if [ ! -f ${PREFIX}/etc/pythonfilter.conf ]; then cp -p ${PREFIX}/etc/pythonfilter.conf.sample ${PREFIX}/etc/pythonfilter.conf; fi
> -	@if [ ! -f ${PREFIX}/etc/pythonfilter-modules.conf ]; then cp -p ${PREFIX}/etc/pythonfilter-modules.conf.sample ${PREFIX}/etc/pythonfilter-modules.conf; fi
> +	@${MKDIR} ${STAGEDIR}${LOCALSTATEDIR}/pythonfilter
>  
>  .include <bsd.port.post.mk>
> 
> Modified: head/mail/courier-pythonfilter/pkg-plist
> ==============================================================================
> --- head/mail/courier-pythonfilter/pkg-plist	Thu Jul 10 20:30:29 2014	(r361488)
> +++ head/mail/courier-pythonfilter/pkg-plist	Thu Jul 10 20:33:34 2014	(r361489)
> @@ -1,9 +1,5 @@
> - at unexec if cmp -s %D/etc/pythonfilter.conf %D/etc/pythonfilter.conf.sample; then rm -f %D/etc/pythonfilter.conf; fi
> -etc/pythonfilter.conf.sample
> - at exec if [ ! -f %D/etc/pythonfilter.conf ]; then cp -p %D/etc/pythonfilter.conf.sample %D/etc/pythonfilter.conf; fi
> - at unexec if cmp -s %D/etc/pythonfilter-modules.conf %D/etc/pythonfilter-modules.conf.sample; then rm -f %D/etc/pythonfilter-modules.conf; fi
> -etc/pythonfilter-modules.conf.sample
> - at exec if [ ! -f %D/etc/pythonfilter-modules.conf ]; then cp -p %D/etc/pythonfilter-modules.conf.sample %D/etc/pythonfilter-modules.conf; fi
> + at sample etc/pythonfilter.conf.sample
> + at sample etc/pythonfilter-modules.conf.sample
>  libexec/filters/pythonfilter
>  libexec/filters/pythonfilter-quarantine
>  %%PYTHON_SITELIBDIR%%/courier/__init__.py
> @@ -102,5 +98,17 @@ libexec/filters/pythonfilter-quarantine
>  %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.py
>  %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyc
>  %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyo
> +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/PKG-INFO
> +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/SOURCES.txt
> +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/dependency_links.txt
> +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/top_level.txt
> + at owner courier
> + at group courier
> + at dirrmtry %%LOCALSTATEDIR%%/pythonfilter
> + at group courier
> + at owner courier
> + at dirrmtry %%LOCALSTATEDIR%%
>  @dirrm %%PYTHON_SITELIBDIR%%/courier
>  @dirrm %%PYTHON_SITELIBDIR%%/pythonfilter
> + at dirrm %%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info
> + at dirrmtry libexec/filters
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20140715/d4808801/attachment.sig>