From nick@muffin.acquirer.com  Thu Mar 11 11:15:42 2010
Return-Path: <nick@muffin.acquirer.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0AF3E1065686
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Mar 2010 11:15:42 +0000 (UTC)
	(envelope-from nick@muffin.acquirer.com)
Received: from mail.acquirer.com (unknown [IPv6:2001:1bb8:2004:150::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F6698FC2C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 11 Mar 2010 11:15:40 +0000 (UTC)
Received: from muffin.acquirer.com (localhost [127.0.0.1])
	by mail.acquirer.com (8.14.4/8.14.3) with ESMTP id o2BBFZt7088074
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 11 Mar 2010 11:15:35 GMT
	(envelope-from nick@muffin.acquirer.com)
Received: (from root@localhost)
	by muffin.acquirer.com (8.14.4/8.13.8/Submit) id o2BBFZkx069946;
	Thu, 11 Mar 2010 11:15:35 GMT
	(envelope-from nick)
Message-Id: <201003111115.o2BBFZkx069946@muffin.acquirer.com>
Date: Thu, 11 Mar 2010 11:15:35 GMT
From: Nick Hilliard <nick@foobar.org>
Reply-To: Nick Hilliard <nick@foobar.org>
To: FreeBSD-gnats-submit@freebsd.org
Subject: port update: drupal5-tinymce -> 5.x-1.11
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         144651
>Category:       ports
>Synopsis:       port update: drupal5-tinymce -> 5.x-1.11
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 11 11:20:01 UTC 2010
>Closed-Date:    Sun May 09 11:23:25 UTC 2010
>Last-Modified:  Sun May  9 11:30:54 UTC 2010
>Originator:     Nick Hilliard
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
Network Ability Ltd
>Environment:
System: FreeBSD 7.2-RELEASE

>Description:

XSS security fix for drupal5-tinymce

>How-To-Repeat:
>Fix:

diff -ur drupal5-tinymce.orig/Makefile drupal5-tinymce/Makefile
--- drupal5-tinymce.orig/Makefile	2010-03-11 10:56:53.000000000 +0000
+++ drupal5-tinymce/Makefile	2010-03-11 11:15:06.000000000 +0000
@@ -6,38 +6,48 @@
 #
 
 PORTNAME=	tinymce
-DISTVERSION=	5.x-1.x-dev
-PORTREVISION=	20070333
+DISTVERSION=	5.x-1.11
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	pav/drupal
 
 MAINTAINER=	nick@foobar.org
-COMMENT=	A Drupal module which implements the TinyMCE WYSIWYG editor for content editing
+COMMENT=	A Drupal module which implements the TinyMCE WYSIWYG content editor
 
 TINYMCEDIR=	www/tinymce
 TINYMCE_MODDIR=	${PORTNAME:C|^|${DRUPAL_MODDIR}/|}
 
-RUN_DEPENDS+=	${PREFIX}/${TINYMCEDIR}/jscripts/tiny_mce/tiny_mce.js:${PORTSDIR}/www/tinymce
+RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}/jscripts/tiny_mce/tiny_mce.js:${PORTSDIR}/www/tinymce
 
 PLIST_FILES+=	${DRUPAL_MODDIR}/tinymce
 
 DRUPAL5_MODULE=	yes
 
 MODULE_DIRS=	plugins/drupalbreak/images plugins/drupalbreak/langs \
-		plugins/drupalbreak plugins themes
+		plugins/drupalbreak plugins po themes
 
-MODULE_FILES=	plugins/drupalbreak/images/drupalbreak.gif \
-		plugins/drupalbreak/images/drupalbreaktext.gif \
-		plugins/drupalbreak/images/drupalpagebreak.gif \
-		plugins/drupalbreak/images/drupalpagebreaktext.gif \
+MODULE_FILES=	plugin_reg.php \
 		plugins/drupalbreak/README.txt \
 		plugins/drupalbreak/drupalbreak.css \
 		plugins/drupalbreak/editor_plugin.js \
 		plugins/drupalbreak/editor_plugin_src.js \
-		plugins/drupalbreak/langs/en.js themes/tinymce_compact.js \
-		themes/tinymce_full.js themes/tinymce_simple.js \
-		plugin_reg.php tinymce.info tinymce.install tinymce.module
+		plugins/drupalbreak/images/drupalbreak.gif \
+		plugins/drupalbreak/images/drupalbreaktext.gif \
+		plugins/drupalbreak/images/drupalpagebreak.gif \
+		plugins/drupalbreak/images/drupalpagebreaktext.gif \
+		plugins/drupalbreak/langs/en.js \
+		po/da.po \
+		po/de.po \
+		po/el.po \
+		po/fr.po \
+		po/hu.po \
+		po/tinymce.pot \
+		po/tr.po \
+		themes/tinymce_compact.js \
+		themes/tinymce_full.js \
+		themes/tinymce_simple.js \
+		tinymce.info \
+		tinymce.install \
+		tinymce.module
+
 DOC_FILES=	CHANGELOG.TXT INSTALL.txt LICENSE.txt README.TXT
 
 post-install:
diff -ur drupal5-tinymce.orig/distinfo drupal5-tinymce/distinfo
--- drupal5-tinymce.orig/distinfo	2010-03-11 10:56:53.000000000 +0000
+++ drupal5-tinymce/distinfo	2010-03-11 10:57:40.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (drupal/tinymce-5.x-1.x-dev.tar.gz) = 16d5182bfee65aa2ff3dd3ca9652409c
-SHA256 (drupal/tinymce-5.x-1.x-dev.tar.gz) = cc08e4649c0ffc5c6b1493b10c17a708f9a49389cef86c6be49f58abddf4f8e2
-SIZE (drupal/tinymce-5.x-1.x-dev.tar.gz) = 29726
+MD5 (drupal/tinymce-5.x-1.11.tar.gz) = 2feb133ea0d85d655a686c014c439155
+SHA256 (drupal/tinymce-5.x-1.11.tar.gz) = b7d4a916fdb9b9d8873326d11bc39788f1768970e03703d581cbc6187f10205a
+SIZE (drupal/tinymce-5.x-1.11.tar.gz) = 45278
diff -ur drupal5-tinymce.orig/pkg-descr drupal5-tinymce/pkg-descr
--- drupal5-tinymce.orig/pkg-descr	2010-03-11 10:56:53.000000000 +0000
+++ drupal5-tinymce/pkg-descr	2010-03-11 11:12:40.000000000 +0000
@@ -1,8 +1,5 @@
 TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor
-control released as Open Source under LGPL by Moxiecode Systems AB. It has
-the ability to convert HTML TEXTAREA fields or other HTML elements to editor
-instances. TinyMCE is very easy to integrate into other Content Management
-Systems.
+control released as Open Source under LGPL by Moxiecode Systems AB.
 
 This module integrates the TinyMCE WYSIWYG editor into a Drupal site for
 editing advanced site content.
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Mar 11 16:13:25 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144651 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun May 9 11:23:23 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=144651 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/144651: commit references a PR
Date: Sun,  9 May 2010 11:25:54 +0000 (UTC)

 miwi        2010-05-09 11:23:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/drupal5-tinymce  Makefile distinfo pkg-descr 
   Log:
   - Update to 5.x-1.11
   
   PR:             144651
   Submitted by:   Nick Hilliard <nick@foobar.org> (maintainer)
   
   Revision  Changes    Path
   1.5       +24 -14    ports/www/drupal5-tinymce/Makefile
   1.3       +3 -3      ports/www/drupal5-tinymce/distinfo
   1.2       +1 -4      ports/www/drupal5-tinymce/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
