Pullup ticket #3160 - requested by obache

www/py-moin: security update

Revisions pulled up:
- www/py-moin/Makefile		1.14
- www/py-moin/PLIST		1.7
- www/py-moin/distinfo		1.6
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Fri Jul  9 11:38:36 UTC 2010

Modified Files:
	pkgsrc/www/py-moin: Makefile PLIST distinfo

Log Message:
Update py-moin to 1.9.3.
PR#43524 by Wen Heping.

Known main issues:

   * The GUI WYSIWYG editor has still some issues and limitations.
     If you can't live with those, you can simply switch it off by using:
     editor_force = True
     editor_default = 'text'  # internal default, just for completeness

Version 1.9.3:
   Fixes:
   * Fix XSS in Despam action (CVE-2010-0828).
   * Fix XSS issues (see MoinMoinBugs/1.9.2UnescapedInputForThemeAddMsg):
     * by escaping template name in messages
     * by fixing other places that had similar issues
   * Make moin compatible to werkzeug 0.5 .. 0.6.2 (1.9.2 had issues
     with xmlrpc when used with werkzeug 0.6.x).
   * MoinMoin.util.filesys: disable usage of dircache, deprecate dc* functions,
     because the dircache stdlib module can't work correctly for fast updates of
     directories.
   * rss_rc and sisterpages actions: fix Content-Type header (mimetype)
   * Fix associating OpenID identity with user, wasn't adapted to werkzeug yet.
   * openidrp auth: fix undefined _ (gettext)
   * Fix auth.cas and userprefs.oidserv request object usage.
   * highlight parser: fixed MoinMoinBugs/LineNumberSpansForProcessInstructionsMissed
   * Pygments syntax highlighting: add missing code files
   * Notifications: use same email subject format for every notification
   * Fix docbook formatter crashing, see MoinMoinPatch/IncludeMacroWithDocBookFormatter
   * Fix regex content search for xapian search.
   * Get rid of the empty line at the end of code highlights.
   * GUI editor: compute editor height like the text editor does.
   * Added help texts for: standalone server and moin migration.
   * script.maint.cleancache: clean also i18n cache files
   * Improved formatter.text_plain, see FeatureRequests/TextPlainFormatterRewrite
     (fixes many issues of this formatter).
   * text_html_text_moin_wiki: fixed index error for width="", see also:
     MoinMoinBugs/GUI_convertor_list_index_out_of_range
   * xmlrpc: disable editor backup for putPage, renamePage and revertPage
     because if pages get uploaded by xmlrpc then the draft cache file can
     rapidly increase in size, causing high memory usage because it needs to
     get loaded into memory for updating/processing.
   * Emit Content-Type header (with charset) for SlideShow action and many other
     actions that just call send_title().
   * ActionBase: better compatibility to moin 1.8, use request.values by
     default, optionally use request.form data only

   New features:
   * RenamePage action: added ability to create redirect pages when renaming
     (turned off by default, see show_rename_redirect config option).
   * formatter/text_html: Added line number links to code blocks.
   * diff action:
     * Fixed whitespace in generated (html) diff view table so white-space: pre
       can be used (and whitespace in diffs preserved).
     * Added links to first/last revision.
   * MoinMoin.widget.browser: introduced feature for sorting tables, see:
     http://moinmo.in/FeatureRequests/SortableTables
   * SystemAdmin user and attachment browsers: sorting feature used there now
   * Scrolling the text editor to the double clicked line.
   * Enable double-click-editing by default.
   * WikiConfigHelp macro: make heading and description display optional,
     heading level as a parameter (default 2)
   * If edit ticket check fails, send the editor with the current content.
   * moin import wikipage - use this script to import local files as a wiki page

   Other changes:
   * upgraded pygments from 1.2.2 to 1.3.1
   * upgraded FCKeditor from 2.6.4.1 to 2.6.6
   * added configuration snippet for ldap authentication against 2 servers
   * improved script help output

3 files changed, 33 insertions, 7 deletions

diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index ebc23499d06..1d200f86f31 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2010/03/20 21:12:03 pettai Exp $
+# $NetBSD: Makefile,v 1.13.4.1 2010/07/10 12:07:35 tron Exp $
 #
 
-VER=		1.9.2
+VER=		1.9.3
 DISTNAME=	moin-${VER}
 PKGNAME=	${PYPKGPREFIX}-moin-${VER}
 CATEGORIES=	www python
diff --git a/www/py-moin/PLIST b/www/py-moin/PLIST
index 9d14449509c..edd1227b120 100644
--- a/www/py-moin/PLIST
+++ b/www/py-moin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2010/03/20 21:12:03 pettai Exp $
+@comment $NetBSD: PLIST,v 1.6.4.1 2010/07/10 12:07:35 tron Exp $
 bin/moin
 ${PYSITELIB}/MoinMoin/Page.py
 ${PYSITELIB}/MoinMoin/Page.pyc
@@ -710,6 +710,9 @@ ${PYSITELIB}/MoinMoin/script/import/__init__.pyo
 ${PYSITELIB}/MoinMoin/script/import/irclog.py
 ${PYSITELIB}/MoinMoin/script/import/irclog.pyc
 ${PYSITELIB}/MoinMoin/script/import/irclog.pyo
+${PYSITELIB}/MoinMoin/script/import/wikipage.py
+${PYSITELIB}/MoinMoin/script/import/wikipage.pyc
+${PYSITELIB}/MoinMoin/script/import/wikipage.pyo
 ${PYSITELIB}/MoinMoin/script/index/__init__.py
 ${PYSITELIB}/MoinMoin/script/index/__init__.pyc
 ${PYSITELIB}/MoinMoin/script/index/__init__.pyo
@@ -842,6 +845,9 @@ ${PYSITELIB}/MoinMoin/script/migration/1080600.pyo
 ${PYSITELIB}/MoinMoin/script/migration/1080700.py
 ${PYSITELIB}/MoinMoin/script/migration/1080700.pyc
 ${PYSITELIB}/MoinMoin/script/migration/1080700.pyo
+${PYSITELIB}/MoinMoin/script/migration/1080800.py
+${PYSITELIB}/MoinMoin/script/migration/1080800.pyc
+${PYSITELIB}/MoinMoin/script/migration/1080800.pyo
 ${PYSITELIB}/MoinMoin/script/migration/1089999.py
 ${PYSITELIB}/MoinMoin/script/migration/1089999.pyc
 ${PYSITELIB}/MoinMoin/script/migration/1089999.pyo
@@ -854,6 +860,9 @@ ${PYSITELIB}/MoinMoin/script/migration/1090100.pyo
 ${PYSITELIB}/MoinMoin/script/migration/1090200.py
 ${PYSITELIB}/MoinMoin/script/migration/1090200.pyc
 ${PYSITELIB}/MoinMoin/script/migration/1090200.pyo
+${PYSITELIB}/MoinMoin/script/migration/1090300.py
+${PYSITELIB}/MoinMoin/script/migration/1090300.pyc
+${PYSITELIB}/MoinMoin/script/migration/1090300.pyo
 ${PYSITELIB}/MoinMoin/script/migration/__init__.py
 ${PYSITELIB}/MoinMoin/script/migration/__init__.pyc
 ${PYSITELIB}/MoinMoin/script/migration/__init__.pyo
@@ -1166,6 +1175,9 @@ ${PYSITELIB}/MoinMoin/support/pygments/lexer.pyo
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/__init__.py
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/__init__.pyc
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/__init__.pyo
+${PYSITELIB}/MoinMoin/support/pygments/lexers/_asybuiltins.py
+${PYSITELIB}/MoinMoin/support/pygments/lexers/_asybuiltins.pyc
+${PYSITELIB}/MoinMoin/support/pygments/lexers/_asybuiltins.pyo
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/_clbuiltins.py
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/_clbuiltins.pyc
 ${PYSITELIB}/MoinMoin/support/pygments/lexers/_clbuiltins.pyo
@@ -1256,6 +1268,9 @@ ${PYSITELIB}/MoinMoin/support/pygments/styles/fruity.pyo
 ${PYSITELIB}/MoinMoin/support/pygments/styles/manni.py
 ${PYSITELIB}/MoinMoin/support/pygments/styles/manni.pyc
 ${PYSITELIB}/MoinMoin/support/pygments/styles/manni.pyo
+${PYSITELIB}/MoinMoin/support/pygments/styles/monokai.py
+${PYSITELIB}/MoinMoin/support/pygments/styles/monokai.pyc
+${PYSITELIB}/MoinMoin/support/pygments/styles/monokai.pyo
 ${PYSITELIB}/MoinMoin/support/pygments/styles/murphy.py
 ${PYSITELIB}/MoinMoin/support/pygments/styles/murphy.pyc
 ${PYSITELIB}/MoinMoin/support/pygments/styles/murphy.pyo
@@ -1674,6 +1689,7 @@ ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/interna
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fcklistslib.js
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fckplugins.js
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fckregexlib.js
+${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fckscayt.js
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fckselection.js
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fckselection_gecko.js
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/_source/internals/fckselection_ie.js
@@ -1743,6 +1759,8 @@ ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_list
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_paste.html
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_radiobutton.html
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_replace.html
+${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_scayt.html
+${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_scayt/scayt_dialog.css
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_select.html
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_select/fck_select.js
 ${PYSITELIB}/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_smiley.html
@@ -2500,6 +2518,7 @@ share/moin/config/more_samples/auth_wikiconfig_snippet
 share/moin/config/more_samples/dicts_wikiconfig_snippet
 share/moin/config/more_samples/groups_wikiconfig_snippet
 share/moin/config/more_samples/jabber_wikiconfig_snippet
+share/moin/config/more_samples/ldap_2servers_wikiconfig_snippet
 share/moin/config/more_samples/ldap_wikiconfig_snippet
 share/moin/config/more_samples/mail_wikiconfig_snippet
 share/moin/config/more_samples/mailimportconf.py
@@ -2559,10 +2578,14 @@ share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--option
 share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--optional_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Brazilian_Portuguese--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--all_template_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--essential_template_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Bulgarian--translated_system_pages.zip
@@ -2582,10 +2605,13 @@ share/moin/underlay/pages/LanguageSetup/attachments/Croatian--essential_system_p
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Croatian--translated_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--all_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--essential_system_pages.zip
+share/moin/underlay/pages/LanguageSetup/attachments/Czech--optional_help_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--optional_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--optional_system_pages.zip
 share/moin/underlay/pages/LanguageSetup/attachments/Czech--translated_system_pages.zip
diff --git a/www/py-moin/distinfo b/www/py-moin/distinfo
index e1c3f028f1a..a5fd3666a04 100644
--- a/www/py-moin/distinfo
+++ b/www/py-moin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2010/03/20 21:12:03 pettai Exp $
+$NetBSD: distinfo,v 1.5.4.1 2010/07/10 12:07:35 tron Exp $
 
-SHA1 (moin-1.9.2.tar.gz) = fec7131ac679be160b8ff27a6ad1a74b6208bd3b
-RMD160 (moin-1.9.2.tar.gz) = 31b84bf219d44e79fcc0cfef8a9372c0e45d1f56
-Size (moin-1.9.2.tar.gz) = 30111807 bytes
+SHA1 (moin-1.9.3.tar.gz) = e019c2742f42d4d1f32b0f86f985ce938b821f1b
+RMD160 (moin-1.9.3.tar.gz) = c8679c9440768906c47048f2544a26b77b1ca061
+Size (moin-1.9.3.tar.gz) = 30514897 bytes