Index: branches/2014Q4/www/twiki/Makefile
===================================================================
--- branches/2014Q4/www/twiki/Makefile	(revision 372031)
+++ branches/2014Q4/www/twiki/Makefile	(revision 372032)
@@ -1,48 +1,51 @@
 # Created by: Justin Hawkins <justin@hawkins.id.au>
 # $FreeBSD$
 
 PORTNAME=	twiki
 PORTVERSION=	5.1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/TWiki%20for%20all%20Platforms/${DISTNAME} \
 		http://twiki.org/p/pub/Codev/Release/
 DISTNAME=	TWiki-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible, powerful, and easy to use enterprise wiki
 
 RUN_DEPENDS=	\
 		p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 		p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff \
 		p5-Error>=0:${PORTSDIR}/lang/p5-Error \
 		p5-Text-Diff>=0:${PORTSDIR}/textproc/p5-Text-Diff \
 		p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
 		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1 \
 		p5-Locale-Maketext-Lexicon>=0:${PORTSDIR}/devel/p5-Locale-Maketext-Lexicon \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
 		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		twiki-TWikiUserMappingContrib>=0:${PORTSDIR}/www/twiki-TWikiUserMappingContrib
 
 USES=		perl5 tar:tgz
 WRKSRC=	${WRKDIR}/twiki
+
+USES+=		cpe
 
 post-extract:
 	@${RM} -rf ${WRKSRC}/lib/CPAN
 	@${CAT} ${.CURDIR}/../twiki-*/pkg-plist |\
 		${SED} -e 's|%%TWDIR%%|${WRKSRC}|;/^@/d' |\
 		${XARGS} ${RM} -f
 	@${FIND} ${WRKSRC} -name \*,v | while read f; do\
 		[ -e $${f%%,v} ] || ${RM} -f $$f; done
 	@${FIND} ${WRKSRC} -type d -empty -delete
 
 post-patch:
 	${SED} -i "" -e "s|/home/httpd/twiki|${WWWDIR}|g" \
 		${WRKSRC}/lib/TWiki.spec \
 		${WRKSRC}/twiki_httpd_conf.txt
 	${FIND} ${WRKSRC} -name \*.orig -delete
 
 .include "${.CURDIR}/bsd.twiki.mk"
 .include <bsd.port.mk>
Index: branches/2014Q4/www/twiki/files/patch-cve-2014-7236
===================================================================
--- branches/2014Q4/www/twiki/files/patch-cve-2014-7236	(nonexistent)
+++ branches/2014Q4/www/twiki/files/patch-cve-2014-7236	(revision 372032)
@@ -0,0 +1,17 @@
+Obtained-from: http://twiki.org/cgi-bin/view/Codev/SecurityAlert-CVE-2014-7236
+--- lib/TWiki/Plugins.pm.save1   2014-01-09 02:10:56.000000000 -0500
++++ lib/TWiki/Plugins.pm   2014-10-01 20:30:36.000000000 -0400
+@@ -186,8 +186,11 @@
+ 
+     unless( $allDisabled ) {
+         if ( $query && defined( $query->param( 'debugenableplugins' ))) {
+-            @pluginList = split( /[,\s]+/,
+-                                 $query->param( 'debugenableplugins' ));
++            @pluginList =
++              grep { /Plugin$/ }
++              map { s/[^a-zA-Z0-9]//go; $_ } # Item7558: Sanitize parameter
++              split( /[,\s]+/, $query->param( 'debugenableplugins' ));
++
+         } else {
+             if( $TWiki::cfg{PluginsOrder} ) {
+                 foreach my $plugin( split( /[,\s]+/,

Property changes on: branches/2014Q4/www/twiki/files/patch-cve-2014-7236
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 372031)
+++ branches/2014Q4	(revision 372032)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r371858