Pkgsrc changes:

---------------

- /usr/bin/env police

Upstream Changes:
-----------------

Version 1.9.6:

  SECURITY HINT: make sure you have allow_xslt = False (or just do not use
  allow_xslt at all in your wiki configs, False is the internal default).
  Allowing XSLT/4suite is very dangerous, see HelpOnConfiguration wiki page.

  HINT: Python >= 2.5 is maybe required! See docs/REQUIREMENTS for details.

  Fixes:
  * fix remote code execution vulnerability in twikidraw/anywikidraw action
  * fix path traversal vulnerability in AttachFile action
  * fix XSS issue, escape page name in rss link
  * escape user- or admin-defined css url
  * make taintfilename more secure
  * use a constant time str comparison function to prevent timing attacks
  * Attachment handler: catch all Zip-related errors

Version 1.9.5:

  Fixes:
   * Security fix: fix virtual group bug in ACL evaluation.
   * Avoid crash if #refresh processing instruction is used without arguments.
   * Fix issue with non-ASCII textchas.
   * Xapian indexing: remove copy.copy() that crashed on Windows/IIS/isapi-wsgi
     after page save.
   * Fix dictionary file reading crash under Windows.
   * Work around crash of AdvancedSearch macro rendering caused by non-ascii
     mimetypes.types_map entries.
   * Added migration script for moin 1.8.9.
   * rss_rc: Fix diffs added in RSS with diffs=1 (now they correspond to item
     listed in feed and not just last page diffs). Links generated with ddiffs=1
     also fixed.
   * rss_rc: fix double escaping issue.
   * rss_rc: respect show_names configuration option.
   * rss_rc: proper support of rename, revert, page creation.
   * modern/modernized theme: fix padding/width for editor preview
   * group/pagelinks formatters: avoid to create unnecessary output, redirect
     output of send_page call with the groups formatter, it must not be written
     to the output stream
   * rst parser: fix include and macro directives
   * wikisync: fix unicode pagename sending for python 2.7 httplib

  New features:
   * add a comment_required config option (default: False) to require a
     non-empty comment when saving a page
   * when a save error happens, show the editor again and highlight the error
   * rss_rc: several new options added: lines parameter gives ability to set
     maximum size of diffs showed in RSS. show_att parameter gives ability
     to show information aboout attachment-related items in RSS. page parameter
     gives ability to specify set of pages for which changes RSS feed should be
     generated. Configuration of defaults and limits can now be done via wiki
     configuration mechanism.
   * As soon as it is now possible to provide RSS for page change history,
     appropriate alternate link is now added for every page (controlled by
     rss_show_page_history_link configuration parameter).
   * Search: "no_highlight:" search query option provided for suppressing
     highlighting search results.
   * Search macros: new options for FullSearch, FullSearchCached and PageList
     available:
     * highlight_titles option controls highlighting of matches in search
       results provided by these macros. Default value is set in
       search_macro_highlight_titles configuration option)
     * highlight_pages option controls adding of highlight URL parameter to
       page links (so search term is highlighted when user goes to one of
       these pages via provided link) in search results. Default value is set
       in search_macro_highlight_pages configuration option.
     Usage of these options is disabled (via search_macro_parse_args
     configuration option) by default due to behavioural changes introduced
     in macro parameter parsing mechanism to support them. Related to
     http://moinmo.in/FeatureRequests/FullSearchResultsWithoutHighlight .

  Other changes:
   * Remove 4suite dependency for docbook formatter, use minidom (included in
     Python).
   * Upgraded FCKeditor to 2.6.8.

3 files changed, 41 insertions, 14 deletions

diff --git a/www/py-moin/Makefile b/www/py-moin/Makefile
index 086e95d37ae..05cd8e59b07 100644
--- a/www/py-moin/Makefile
+++ b/www/py-moin/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2012/10/28 06:31:01 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/01/03 18:54:38 gls Exp $
 #
 
-VER=		1.9.4
+VER=		1.9.6
 DISTNAME=	moin-${VER}
 PKGNAME=	${PYPKGPREFIX}-moin-${VER}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://static.moinmo.in/files/
 
@@ -15,13 +15,31 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
 
-REPLACE_PYTHON=	MoinMoin/i18n/tools/markup15to16.py \
-		MoinMoin/i18n/tools/po2wiki.py \
-		MoinMoin/i18n/tools/prepend.py \
-		MoinMoin/i18n/tools/wiki2po.py \
-		wiki/server/moin*
+REPLACE_PYTHON=	jabberbot/bot.py \
+		MoinMoin/version.py \
+		MoinMoin/filter/EXIF.py \
+		MoinMoin/i18n/msgfmt.py \
+		MoinMoin/i18n/tools/*.py \
+		MoinMoin/script/moin.py \
+		MoinMoin/script/old/*.py \
+		MoinMoin/script/old/xmlrpc-tools/*.py \
+		MoinMoin/script/migration/1050800.py \
+		MoinMoin/script/migration/1059997.py \
+		MoinMoin/script/migration/1059998.py \
+		MoinMoin/script/migration/1059999.py \
+		MoinMoin/script/migration/1089999.py \
+		MoinMoin/script/old/migration/*.py \
+		MoinMoin/support/difflib.py \
+		MoinMoin/support/tarfile.py \
+		MoinMoin/support/parsedatetime/*.py \
+		MoinMoin/support/xappy/*.py \
+		MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/py/*.py \
+		wiki/server/moin* \
+		wiki/server/test.wsgi
 
-REPLACE_PERL=	MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
+REPLACE_PERL=	MoinMoin/web/static/htdocs/applets/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl \
+		MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/connector.cgi \
+		MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/upload.cgi
 
 PYTHON_SELF_CONFLICT=	yes
 
diff --git a/www/py-moin/PLIST b/www/py-moin/PLIST
index 6013eccc4d5..478b2cf77b1 100644
--- a/www/py-moin/PLIST
+++ b/www/py-moin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2012/06/03 22:49:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2013/01/03 18:54:38 gls Exp $
 bin/moin
 ${PYSITELIB}/MoinMoin/Page.py
 ${PYSITELIB}/MoinMoin/Page.pyc
@@ -848,6 +848,9 @@ ${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/1080900.py
+${PYSITELIB}/MoinMoin/script/migration/1080900.pyc
+${PYSITELIB}/MoinMoin/script/migration/1080900.pyo
 ${PYSITELIB}/MoinMoin/script/migration/1089999.py
 ${PYSITELIB}/MoinMoin/script/migration/1089999.pyc
 ${PYSITELIB}/MoinMoin/script/migration/1089999.pyo
@@ -866,6 +869,12 @@ ${PYSITELIB}/MoinMoin/script/migration/1090300.pyo
 ${PYSITELIB}/MoinMoin/script/migration/1090400.py
 ${PYSITELIB}/MoinMoin/script/migration/1090400.pyc
 ${PYSITELIB}/MoinMoin/script/migration/1090400.pyo
+${PYSITELIB}/MoinMoin/script/migration/1090500.py
+${PYSITELIB}/MoinMoin/script/migration/1090500.pyc
+${PYSITELIB}/MoinMoin/script/migration/1090500.pyo
+${PYSITELIB}/MoinMoin/script/migration/1090600.py
+${PYSITELIB}/MoinMoin/script/migration/1090600.pyc
+${PYSITELIB}/MoinMoin/script/migration/1090600.pyo
 ${PYSITELIB}/MoinMoin/script/migration/__init__.py
 ${PYSITELIB}/MoinMoin/script/migration/__init__.pyc
 ${PYSITELIB}/MoinMoin/script/migration/__init__.pyo
diff --git a/www/py-moin/distinfo b/www/py-moin/distinfo
index e1f40aad5c8..d309f89ae74 100644
--- a/www/py-moin/distinfo
+++ b/www/py-moin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2012/06/03 22:49:25 wiz Exp $
+$NetBSD: distinfo,v 1.10 2013/01/03 18:54:38 gls Exp $
 
-SHA1 (moin-1.9.4.tar.gz) = f5dfef5512cfae36c71eefbcbafde6857f1790b9
-RMD160 (moin-1.9.4.tar.gz) = 3c74f0b8d226780aedca628d8d1e0b03e4d28224
-Size (moin-1.9.4.tar.gz) = 36718571 bytes
+SHA1 (moin-1.9.6.tar.gz) = 9dd10fb5a095c1783f0d3e6c04568e9910380608
+RMD160 (moin-1.9.6.tar.gz) = 83512fabf9cd47dca9da33babf365e336fdb5106
+Size (moin-1.9.6.tar.gz) = 36754215 bytes