Pullup ticket #3907 - requested by

www/typo3_46 security update

Revisions pulled up:
- www/typo3_46/Makefile                                         1.12-1.13
- www/typo3_46/PLIST                                            1.6-1.7
- www/typo3_46/distinfo                                         1.11-1.12

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Sun Aug 12 15:52:21 UTC 2012

   Modified Files:
   	pkgsrc/www/typo3_46: Makefile PLIST distinfo

   Log Message:
   Update typo3_46 to 4.6.11.

   2012-08-08  74fd6bb                  [RELEASE] Release of TYPO3 4.6.11 (TYPO3 Release Team)
   2012-08-08  e809cd3                  [TASK] Raise submodule pointer (TYPO3 Release Team)
   2012-08-07  a5cd4df  #39583          [BUGFIX] Exception "Could not create directory" (Michael Klapper)
   2012-08-05  e96eedc  #39527          [BUGFIX] Pass $fieldName when processing FlexForm DS in t3lib_transferData (Claus Due)
   2012-08-03  b6a6c6d  #39509          [BUGFIX] t3lib_db - expects parameter 1 to be resource, boolean given (Michael Klapper)
   2012-08-01  731d547  #32282          [BUGFIX] unlink issues warnings for lock files (Markus Klein)
   2012-08-01  38ca29a  #38849          [BUGFIX] IRRE childs don't expand in Internet Explorer (Stefan Aebischer)
   2012-08-01  fef9743  #39417          [BUGFIX] t3lib_db::exec_SELECTgetRows method annotation (Nicole Cordes)
   2012-07-31  102d0c8  #33625          [BUGFIX] Properly check disabled versioning within tcemain (Tolleiv Nietsch)
   2012-07-30  aef25cd  #22152          [BUGFIX] PHP warnings may show up in the List module (Dmitry Dulepov)
   2012-07-29  689bb9d  #31278          [BUGFIX] Shell command arguments are not escaped (Dmitry Dulepov)
   2012-07-26  349da10  #26815          [BUGFIX] RTE transformation transforms LF/CR between div and hr into space (Stanislas Rolland)
   2012-07-25  ce5ba95  #35154,#38691   [BUGFIX] Exclude E_STRICT from errors with PHP 5.4 (Philipp Gampe)
   2012-07-25  8affd66  #38604          [TASK] Always return a boolean in t3lib_div::validPathStr (Andy Grunwald)
   2012-07-24  f35b46d  #39220          [BUGFIX] Invalid fallback for non-localized labels (Xavier Perseguers)
   2012-07-24  bde9302  #33082          [TASK] Improve error message of "broken rootline" (Georg Ringer)
   2012-07-23  8621c14  #34152          [BUGFIX] stdWrap numRows fails due to wrong SELECT clause (Ernesto Baschny)
   2012-07-22  612d705  #33895          [BUGFIX] Update extension must invalidate autoloader cache (Philipp Gampe)
   2012-07-21  37ecea2                  [TASK] Raise submodule pointer (TYPO3 Release Team)
   2012-07-20  8851d23  #39026          [BUGFIX] QT movies prefixed abusively in Media CE (Francois Suter)
   2012-07-20  2b103fa  #39052          [BUGFIX] Send sane HTTP response in showpic on error (Christian Kuhn)
   2012-07-15  9a71681  #38104          [BUGFIX] Remove bogus template in template analyzer (Helmut Hummel)
   2012-07-12  3d19540  #24626          [BUGFIX] Drag&Drop inside the root page of the pagetree isn't possible (Stefan Galinski)
   2012-07-12  cdee4ff  #33546          [BUGFIX] Check if user is allowed to paste page to pagetree (Max Roesch)
   2012-07-12  c3e4fcb  #36313          [BUGFIX] Add rootline workspace overlay for backend_layouts. (Timo Webler)
   2012-07-09  2fd0f62  #38791          [BUGFIX] accessibilityWrap ignores simple value (Jigal van Hemert)
   2012-07-07  cb139fe  #18771          [BUG] t3lib_div::getFilesInDir order differs from order in Filelist (Benjamin Mack)
   2012-07-06  d693daa  #36316          [BUGFIX] RTE: Importing google webfonts breaks style sheet parsing (Stanislas Rolland)
   2012-07-05  78a7a0c  #36438          [BUGFIX] RTE spellcheck issue on Windows server (Stanislas Rolland)
   2012-07-05  999624f  #38658          [BUGFIX] RTE 4.6: Force IE9 to use IE8 mode in frontend (Stanislas Rolland)

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Aug 15 13:51:01 UTC 2012

   Modified Files:
   	pkgsrc/www/typo3_46: Makefile PLIST distinfo

   Log Message:
   Update typo3_46 to 4.6.12.

   This release fixes several security problems TYPO3-CORE-SA-2012-004,

   <http://typo3.org/teams/security/security-bulletins/typo3-core/typo3-core-sa-2012-004/>

   2012-08-15  a1e439e                  [RELEASE] Release of TYPO3 4.6.12 (TYPO3 Release Team)
   2012-08-15  7a839a3  #21634          [SECURITY] XSS in install tool (Mario Rimann)
   2012-08-15  2ae69c8  #32653          [SECURITY] Page Link Target vulnerable to XSS (Markus Bucher)
   2012-08-15  1eaebd3  #25052          [SECURITY] XSS in validateForm (Markus Bucher)
   2012-08-15  9b2b8fb  #25356          [SECURITY] XSS in TCE forms (Christian Kuhn)
   2012-08-15  6376643  #30967          [SECURITY] XSS in Scheduler Example Task (Mario Rimann)
   2012-08-15  a4a20e9  #37127          [SECURITY] HTML5 support in RemoveXSS (Franz G. Jahn)
   2012-08-15  829e391  #39345          [SECURITY] Information Disclosure in the Configuration Module (Mario Rimann)
   2012-08-15  dc6529c  #33520          [SECURITY] Untrusted GP data is unserialized in old CSH handling (Helmut Hummel)
   2012-08-15  8c0b4dc  #31927          [SECURITY] XSS in Indexed Search statistics (Steffen Gebert)
   2012-08-15  4c8c0fd  #23226          [SECURITY] t3lib_div::quoteJSvalue allows XSS (Helmut Hummel)

3 files changed, 11 insertions, 11 deletions

diff --git a/www/typo3_46/Makefile b/www/typo3_46/Makefile
index db6f45413d0..755f97b61e1 100644
--- a/www/typo3_46/Makefile
+++ b/www/typo3_46/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9.2.1 2012/07/06 06:29:41 tron Exp $
+# $NetBSD: Makefile,v 1.9.2.2 2012/08/20 09:07:02 sbd Exp $
 #
 
 DISTNAME=	${TYPO3NAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-VER=		4.6.10
+VER=		4.6.12
 NO_BUILD=	yes
 USE_TOOLS=	pax
 
diff --git a/www/typo3_46/PLIST b/www/typo3_46/PLIST
index 7e58b1ed171..e64dd5ed002 100644
--- a/www/typo3_46/PLIST
+++ b/www/typo3_46/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4.2.1 2012/07/06 06:29:41 tron Exp $
+@comment $NetBSD: PLIST,v 1.4.2.2 2012/08/20 09:07:02 sbd Exp $
 ${EGDIR}/localconf.php
-${TYPO3DIR}/${TYPO3NAME}/.travis.yml
 ${TYPO3DIR}/${TYPO3NAME}/ChangeLog
 ${TYPO3DIR}/${TYPO3NAME}/GPL.txt
 ${TYPO3DIR}/${TYPO3NAME}/INSTALL.txt
@@ -117,6 +116,7 @@ ${TYPO3DIR}/${TYPO3NAME}/t3lib/class.t3lib_tstemplate.php
 ${TYPO3DIR}/${TYPO3NAME}/t3lib/class.t3lib_userauth.php
 ${TYPO3DIR}/${TYPO3NAME}/t3lib/class.t3lib_userauthgroup.php
 ${TYPO3DIR}/${TYPO3NAME}/t3lib/class.t3lib_xml.php
+${TYPO3DIR}/${TYPO3NAME}/t3lib/codec/class.t3lib_codec_javascriptencoder.php
 ${TYPO3DIR}/${TYPO3NAME}/t3lib/config_default.php
 ${TYPO3DIR}/${TYPO3NAME}/t3lib/contextmenu/class.t3lib_contextmenu_abstractcontextmenu.php
 ${TYPO3DIR}/${TYPO3NAME}/t3lib/contextmenu/class.t3lib_contextmenu_abstractdataprovider.php
diff --git a/www/typo3_46/distinfo b/www/typo3_46/distinfo
index d4cf2080d5d..f35cf1a9953 100644
--- a/www/typo3_46/distinfo
+++ b/www/typo3_46/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9.2.1 2012/07/06 06:29:41 tron Exp $
+$NetBSD: distinfo,v 1.9.2.2 2012/08/20 09:07:02 sbd Exp $
 
-SHA1 (dummy-4.6.10.tar.gz) = 921ab60dbfc02e8e06c9169fa15c6931e4954f69
-RMD160 (dummy-4.6.10.tar.gz) = 27b7fc4032759228f8606aa203ba760bc525d5da
-Size (dummy-4.6.10.tar.gz) = 10148 bytes
-SHA1 (typo3_src-4.6.10.tar.gz) = 6bc6644c2bf2da45fcc6c6b7780a4ce166c31f11
-RMD160 (typo3_src-4.6.10.tar.gz) = 80c6c449e3a936f1f50f03fb1b0fd2a8e2f11297
-Size (typo3_src-4.6.10.tar.gz) = 21288028 bytes
+SHA1 (dummy-4.6.12.tar.gz) = fac0429f81fc403f90e724333a160974943b1946
+RMD160 (dummy-4.6.12.tar.gz) = 0611f6893d8da543d90dea9aee7fe04227f10ad3
+Size (dummy-4.6.12.tar.gz) = 10143 bytes
+SHA1 (typo3_src-4.6.12.tar.gz) = 5cb0d92656f909fb24af6c6c3df89e46e356c151
+RMD160 (typo3_src-4.6.12.tar.gz) = c5f7dce2a92b4393908715d770c41c328fe234fd
+Size (typo3_src-4.6.12.tar.gz) = 21288826 bytes
 SHA1 (patch-t3lib_config__default.php) = 41dfac4e4cb9ecf20139b3756c6317c852d41327