Date: Sun, 20 Apr 2014 17:26:52 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351626 - in head/devel: bugzilla40 bugzilla42 bugzilla44 Message-ID: <201404201726.s3KHQqxf049393@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sun Apr 20 17:26:52 2014 New Revision: 351626 URL: http://svnweb.freebsd.org/changeset/ports/351626 QAT: https://qat.redports.org/buildarchive/r351626/ Log: - update bugzilla to 4.4.4, 4.2.9, 4.0.13 - minor Makefile cleanup This release fixes one regression introduced in Bugzilla by security bug 968576: URLs in bug comments are displayed correctly again. (Bug 998323) Release Notes & Changes ======================= Before installing or upgrading, you should read the Release Notes for the new version of Bugzilla: 4.4.4: http://www.bugzilla.org/releases/4.4.4/release-notes.html 4.2.9: http://www.bugzilla.org/releases/4.2.9/release-notes.html 4.0.13: http://www.bugzilla.org/releases/4.0.13/release-notes.html MFH: 2014Q2 Modified: head/devel/bugzilla40/Makefile head/devel/bugzilla40/distinfo head/devel/bugzilla42/Makefile head/devel/bugzilla42/distinfo head/devel/bugzilla44/Makefile head/devel/bugzilla44/distinfo Modified: head/devel/bugzilla40/Makefile ============================================================================== --- head/devel/bugzilla40/Makefile Sun Apr 20 15:54:11 2014 (r351625) +++ head/devel/bugzilla40/Makefile Sun Apr 20 17:26:52 2014 (r351626) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.0.12 -PORTREVISION= 1 +PORTVERSION= 4.0.13 CATEGORIES= devel MASTER_SITES= BUGZILLA MASTER_SITE_SUBDIR= webtools webtools/archived @@ -30,7 +29,7 @@ FORBIDDEN= no upstream fixes for CVE-201 EXPIRATION_DATE=2014-06-21 USES= perl5 -USE_PERL5= patch run build +USE_PERL5= patch build run SUB_FILES= pkg-message @@ -65,7 +64,7 @@ RUN_DEPENDS+= p5-GD>=1.20:${PORTSDIR}/gr .endif .if ${PORT_OPTIONS:MCHARTING_MODULES} -RUN_DEPENDS+= p5-Chart>=2.1:${PORTSDIR}/graphics/p5-Chart +RUN_DEPENDS+= p5-Chart>=2.1.0:${PORTSDIR}/graphics/p5-Chart .endif .if ${PORT_OPTIONS:MPATCH_VIEWER} @@ -138,6 +137,11 @@ RUN_DEPENDS+= p5-perl-ldap>=0:${PORTSDIR RUN_DEPENDS+= p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius .endif +post-extract: + @${RM} -rf ${WRKSRC}/.bzr + @${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \ + ${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc + post-patch: @${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \ ${WRKSRC}/Bugzilla/Install/Localconfig.pm @@ -150,8 +154,9 @@ post-patch: -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!g; s=/usr/bin/perl=${PERL}=g' {} \+ @${FIND} ${WRKSRC}/docs -type f | \ ${XARGS} ${REINPLACE_CMD} -i '' -e "s!/var/www/html/bugzilla!${WWWDIR}!" - @${FIND} ${WRKSRC} \( -name ".git*" -or -name "*.orig" -or -name "*.bak" \ - -or -name ".bzr*" -or -name "README.docs" \) | ${XARGS} ${RM} -rf + +pre-install: + @${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete do-install: .SILENT ${MKDIR} ${STAGEDIR}${WWWDIR} @@ -163,16 +168,13 @@ do-install: .SILENT .endfor ${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - @${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!} - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/) -.endif .if ${PORT_OPTIONS:MCONTRIB} - @cd ${WRKSRC}/contrib && \ + @(cd ${WRKSRC}/contrib && \ ${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \ - ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \; + ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;) .endif .include <bsd.port.mk> Modified: head/devel/bugzilla40/distinfo ============================================================================== --- head/devel/bugzilla40/distinfo Sun Apr 20 15:54:11 2014 (r351625) +++ head/devel/bugzilla40/distinfo Sun Apr 20 17:26:52 2014 (r351626) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-4.0.12.tar.gz) = 596dbfbf22b77017412901965fc57b6cf01e59fbdc44cd2d1bfc27041605d66a -SIZE (bugzilla/bugzilla-4.0.12.tar.gz) = 2876584 +SHA256 (bugzilla/bugzilla-4.0.13.tar.gz) = 7f430de5cc4c5394b8f762962d01f082e9dda1e92f774d091af707ed1b40cc9a +SIZE (bugzilla/bugzilla-4.0.13.tar.gz) = 2876605 Modified: head/devel/bugzilla42/Makefile ============================================================================== --- head/devel/bugzilla42/Makefile Sun Apr 20 15:54:11 2014 (r351625) +++ head/devel/bugzilla42/Makefile Sun Apr 20 17:26:52 2014 (r351626) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.2.8 -PORTREVISION= 1 +PORTVERSION= 4.2.9 CATEGORIES= devel MASTER_SITES= BUGZILLA MASTER_SITE_SUBDIR= webtools webtools/archived @@ -31,7 +30,7 @@ FORBIDDEN= no upstream fixes for CVE-201 EXPIRATION_DATE=2014-06-21 USES= perl5 -USE_PERL5= patch run build +USE_PERL5= patch build run SUB_FILES= pkg-message @@ -72,7 +71,7 @@ RUN_DEPENDS+= p5-GD>=1.20:${PORTSDIR}/gr .endif .if ${PORT_OPTIONS:MCHARTING_MODULES} -RUN_DEPENDS+= p5-Chart>=2.1:${PORTSDIR}/graphics/p5-Chart +RUN_DEPENDS+= p5-Chart>=2.1.0:${PORTSDIR}/graphics/p5-Chart .endif .if ${PORT_OPTIONS:MPATCH_VIEWER} @@ -145,6 +144,11 @@ RUN_DEPENDS+= p5-perl-ldap>=0:${PORTSDIR RUN_DEPENDS+= p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius .endif +post-extract: + @${RM} -rf ${WRKSRC}/.bzr + @${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \ + ${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc + post-patch: @${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \ ${WRKSRC}/Bugzilla/Install/Localconfig.pm @@ -157,8 +161,9 @@ post-patch: -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!g; s=/usr/bin/perl=${PERL}=g' {} \+ @${FIND} ${WRKSRC}/docs -type f | \ ${XARGS} ${REINPLACE_CMD} -i '' -e "s!/var/www/html/bugzilla!${WWWDIR}!" - @${FIND} ${WRKSRC} \( -name ".git*" -or -name "*.orig" -or -name "*.bak" \ - -or -name ".bzr*" -or -name "README.docs" \) | ${XARGS} ${RM} -rf + +pre-install: + @${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete do-install: .SILENT ${MKDIR} ${STAGEDIR}${WWWDIR} @@ -170,16 +175,13 @@ do-install: .SILENT .endfor ${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - @${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!} - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/) -.endif .if ${PORT_OPTIONS:MCONTRIB} - @cd ${WRKSRC}/contrib && \ + @(cd ${WRKSRC}/contrib && \ ${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \ - ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \; + ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;) .endif .include <bsd.port.mk> Modified: head/devel/bugzilla42/distinfo ============================================================================== --- head/devel/bugzilla42/distinfo Sun Apr 20 15:54:11 2014 (r351625) +++ head/devel/bugzilla42/distinfo Sun Apr 20 17:26:52 2014 (r351626) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-4.2.8.tar.gz) = 429e5e0c4404e700033cc9aa3f82b07c279758714e89f3015822206b89018306 -SIZE (bugzilla/bugzilla-4.2.8.tar.gz) = 2955591 +SHA256 (bugzilla/bugzilla-4.2.9.tar.gz) = d8837acce2d7adb03e32dfeffeab1cc098ccfa0a4c8fdca91eae4cba4813e76a +SIZE (bugzilla/bugzilla-4.2.9.tar.gz) = 2956550 Modified: head/devel/bugzilla44/Makefile ============================================================================== --- head/devel/bugzilla44/Makefile Sun Apr 20 15:54:11 2014 (r351625) +++ head/devel/bugzilla44/Makefile Sun Apr 20 17:26:52 2014 (r351626) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= bugzilla -PORTVERSION= 4.4.3 -PORTREVISION= 1 +PORTVERSION= 4.4.4 CATEGORIES= devel MASTER_SITES= BUGZILLA MASTER_SITE_SUBDIR= webtools webtools/archived @@ -155,6 +154,11 @@ RUN_DEPENDS+= p5-File-MimeInfo>=0.16:${P p5-IO-stringy>=2.110:${PORTSDIR}/devel/p5-IO-stringy .endif +post-extract: + @${RM} -rf ${WRKSRC}/.bzr + @${RM} -f ${WRKSRC}/.bzrignore ${WRKSRC}/.gitignore ${WRKSRC}/.gitrev \ + ${WRKSRC}/docs/en/README.docs ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc + post-patch: @${PERL} -pi -e 's/(default => ON_WINDOWS.+)apache/$$1www/' \ ${WRKSRC}/Bugzilla/Install/Localconfig.pm @@ -167,10 +171,9 @@ post-patch: -e 's!/usr/lib/sendmail!/usr/sbin/sendmail!g; s=/usr/bin/perl=${PERL}=g' {} \+ @${FIND} ${WRKSRC}/docs -type f | \ ${XARGS} ${REINPLACE_CMD} -i '' -e "s!/var/www/html/bugzilla!${WWWDIR}!" - @${FIND} ${WRKSRC} \( -name ".git*" -or -name "*.orig" -or -name "*.bak" \ - -or -name ".bzr*" -or -name "README.docs" \) | ${XARGS} ${RM} -rf -# empty leftover - @${RM} ${WRKSRC}/docs/en/html/Bugzilla-Guide.proc + +pre-install: + @${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bak" \) -delete do-install: .SILENT ${MKDIR} ${STAGEDIR}${WWWDIR} @@ -182,16 +185,13 @@ do-install: .SILENT .endfor ${TAR} -C ${WRKSRC} -cf - Bugzilla template | ${TAR} --unlink -C ${STAGEDIR}${WWWDIR} -xf - @${MKDIR} ${EMPTY_DIRS_LIST:S!^!${STAGEDIR}${WWWDIR}/!} - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/) -.endif .if ${PORT_OPTIONS:MCONTRIB} - @cd ${WRKSRC}/contrib && \ + @(cd ${WRKSRC}/contrib && \ ${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${WWWDIR}/contrib/{}" \; && \ - ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \; + ${FIND} . -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${WWWDIR}/contrib/{}" \;) .endif .include <bsd.port.mk> Modified: head/devel/bugzilla44/distinfo ============================================================================== --- head/devel/bugzilla44/distinfo Sun Apr 20 15:54:11 2014 (r351625) +++ head/devel/bugzilla44/distinfo Sun Apr 20 17:26:52 2014 (r351626) @@ -1,2 +1,2 @@ -SHA256 (bugzilla/bugzilla-4.4.3.tar.gz) = a3cbaac493eafa819528c43c710217aa92d0af4be719df6395f28d71eea07498 -SIZE (bugzilla/bugzilla-4.4.3.tar.gz) = 2956859 +SHA256 (bugzilla/bugzilla-4.4.4.tar.gz) = c799da664c8b3ca8acf993026021249f12f2dd6c3604837bc3ebacf11927d2d1 +SIZE (bugzilla/bugzilla-4.4.4.tar.gz) = 2957476
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404201726.s3KHQqxf049393>