Date: Mon, 07 Jul 2014 12:43:46 +0000 From: bugzilla-noreply@freebsd.org To: freebsd-ports-bugs@FreeBSD.org Subject: [Bug 191695] New: [ staging ] security/amavisd-new Message-ID: <bug-191695-13@https.bugs.freebsd.org/bugzilla/>
next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=191695 Bug ID: 191695 Summary: [ staging ] security/amavisd-new Product: Ports Tree Version: Latest Hardware: Any OS: Any Status: Needs Triage Severity: Affects Many People Priority: Normal Component: Individual Port(s) Assignee: freebsd-ports-bugs@FreeBSD.org Reporter: dan@obluda.cz security/amavisd-new require staging or will be removed Fix: Patch is attached. --- security/amavisd-new/Makefile.orig 2014-07-07 13:59:20.000000000 +0200 +++ security/amavisd-new/Makefile 2014-07-07 14:33:14.000000000 +0200 @@ -81,7 +81,6 @@ PLIST_SUB+= AMAVIS_NOP0F=${AMAVIS_NOP0F} -NO_STAGE= yes .include <bsd.port.options.mk> USE_RC_SUBR+= amavisd @@ -241,34 +240,26 @@ do-install: .if ${PORT_OPTIONS:MP0F} - ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl ${STAGEDIR}${PREFIX}/sbin .endif .for i in amavisd amavisd-agent amavisd-nanny amavisd-release amavisd-snmp-subagent - ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin .endfor - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${PREFIX}/etc/amavisd.conf-dist - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${PREFIX}/etc/amavisd.conf-default - ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${PREFIX}/etc/amavisd-custom.conf-dist -.if !exists(${PREFIX}/etc/amavisd.conf) -# -# This can contain sensitive information, e.g. SQL passwords, so it should be handled -# with care. -# - ${INSTALL} -o root -g ${AMAVISGROUP} -m 640 ${WRKSRC}/amavisd.conf ${PREFIX}/etc -.endif -.if !exists(${PREFIX}/etc/amavisd-custom.conf) - ${INSTALL} -o root -g ${AMAVISGROUP} -m 640 ${WRKSRC}/amavisd-custom.conf ${PREFIX}/etc -.endif + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf ${STAGEDIR}${PREFIX}/etc/amavisd.conf-dist + @${ECHO_CMD} "@exec if [ ! -f %D/etc/amavisd.conf ]; then cp -p %D/etc/amavisd.conf-dist %D/etc/amavisd.conf; fi" >> ${TMPPLIST} + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd.conf-default ${STAGEDIR}${PREFIX}/etc/amavisd.conf-default + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-custom.conf ${STAGEDIR}${PREFIX}/etc/amavisd-custom.conf-dist + @${ECHO_CMD} "@exec if [ ! -f %D/etc/amavisd-custom.conf ]; then cp -p %D/etc/amavisd-custom.conf-dist %D/etc/amavisd-custom.conf; fi" >> ${TMPPLIST} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/images + @${MKDIR} ${STAGEDIR}${DOCSDIR}/images .for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor - @${CP} -pr ${WRKSRC}/README_FILES/images/ ${DOCSDIR}/images + @${CP} -pr ${WRKSRC}/README_FILES/images/ ${STAGEDIR}${DOCSDIR}/images .endif post-install: - ${LN} -s ${PREFIX}/sbin/amavisd-release ${PREFIX}/sbin/amavisd-requeue + ${LN} -s ${PREFIX}/sbin/amavisd-release ${STAGEDIR}${PREFIX}/sbin/amavisd-requeue @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> -- You are receiving this mail because: You are the assignee for the bug.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-191695-13>