- update to 1.2.1

- set update instruction notes on pkg-message

ChangeLog v1.2.0:
    bumped minimum supported Python version to 2.4
    implemented support for property diffs (Tigris #383)
    allow user-configurable cvsgraph display (Tigris #336)
    allow rNNNN syntax for Subversion revision numbers (Tigris #441)
    display revision numbers in CVS tag/branch selector (Tigris #546)
    allow roots to have optional context (#58)
    use a more secure temporary file generator (#159)
    fix problems with make-database and special characters (#141, #182)
    fix bogus default ci_when value in cvsdb (#200)
    standalone query interface removed (#206)
    GUI support (--gui) removed from standalone.py

ChangeLog v1.2.1:
    security fix: escape subdir lastmod file name

PR:		245728
Submitted by:	Yasuhito FUTATSUKI

devel/viewvc/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	viewvc
-DISTVERSION=	1.1.28
+DISTVERSION=	1.2.1
 PORTREVISION=	0
 CATEGORIES=	devel python
 
@@ -37,7 +37,6 @@ MODPYTHON35_RUN_DEPENDS=${APACHE_PKGNAMEPREFIX}mod_python35>=3.5:www/mod_python3
 MODWSGI_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi4@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
 
-
 .if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == LTS
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
 .elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 19
@@ -67,8 +66,7 @@ post-patch:
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
-		${WRKSRC}/viewvc-install \
-		${WRKSRC}/bin/standalone.py
+		${WRKSRC}/viewvc-install
 # to much files, use own shebangfix
 	${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
 		| ${XARGS} ${SED} -i '' \

devel/viewvc/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1587305824
-SHA256 (viewvc-viewvc-1.1.28_GH0.tar.gz) = 6d53db40ac9f81155060c0af6eadce8b95a0bda7a6f3ae5d3b89a91c625d3711
-SIZE (viewvc-viewvc-1.1.28_GH0.tar.gz) = 661267
+TIMESTAMP = 1587311591
+SHA256 (viewvc-viewvc-1.2.1_GH0.tar.gz) = 5fe1e16f986b51a2800d908683673b880684e90ae1611d98744187f0649634f5
+SIZE (viewvc-viewvc-1.2.1_GH0.tar.gz) = 361031

devel/viewvc/files/pkg-message.in

@@ -57,4 +57,18 @@
  }
 EOM
 }
+{
+  type: upgrade
+  maximum_version: "1.2.1"
+  message: <<EOM
+  Please review your vievc.conf, see viewvc.sample.conf
+  ======================================================
+   - the template path has changed
+   - the vhost notation has changed
+
+  Additional upgrade informations:
+   https://github.com/viewvc/viewvc/blob/master/docs/upgrading-howto.html
+
+EOM
+}
 ]

devel/viewvc/pkg-plist

@@ -1,25 +1,21 @@
-viewvc/bin/cgi/query.cgi
 viewvc/bin/cgi/viewvc.cgi
 viewvc/bin/cvsdbadmin
 viewvc/bin/loginfo-handler
 viewvc/bin/make-database
 viewvc/bin/mod_python/.htaccess
 viewvc/bin/mod_python/handler.py
-viewvc/bin/mod_python/query.py
 viewvc/bin/mod_python/viewvc.py
 viewvc/bin/standalone.py
 viewvc/bin/svndbadmin
-viewvc/bin/wsgi/query.fcgi
-viewvc/bin/wsgi/query.wsgi
 viewvc/bin/wsgi/viewvc.fcgi
 viewvc/bin/wsgi/viewvc.wsgi
 @sample viewvc/cvsgraph.conf.sample
 viewvc/lib/accept.py
 viewvc/lib/accept.pyc
 viewvc/lib/blame.py
 viewvc/lib/blame.pyc
-viewvc/lib/compat.py
-viewvc/lib/compat.pyc
+viewvc/lib/common.py
+viewvc/lib/common.pyc
 viewvc/lib/compat_difflib.py
 viewvc/lib/compat_difflib.pyc
 viewvc/lib/compat_ndiff.py
@@ -38,8 +34,6 @@ viewvc/lib/idiff.py
 viewvc/lib/idiff.pyc
 viewvc/lib/popen.py
 viewvc/lib/popen.pyc
-viewvc/lib/query.py
-viewvc/lib/query.pyc
 viewvc/lib/sapi.py
 viewvc/lib/sapi.pyc
 viewvc/lib/vcauth/__init__.py
@@ -89,155 +83,96 @@ viewvc/lib/viewvc.pyc
 viewvc/lib/win32popen.py
 viewvc/lib/win32popen.pyc
 @sample viewvc/mimetypes.conf.sample
-viewvc/templates-contrib/README
-viewvc/templates-contrib/newvc/README
-viewvc/templates-contrib/newvc/templates/diff.ezt
-viewvc/templates-contrib/newvc/templates/directory.ezt
-viewvc/templates-contrib/newvc/templates/docroot/help.css
-viewvc/templates-contrib/newvc/templates/docroot/help_dirview.html
-viewvc/templates-contrib/newvc/templates/docroot/help_log.html
-viewvc/templates-contrib/newvc/templates/docroot/help_query.html
-viewvc/templates-contrib/newvc/templates/docroot/help_rootview.html
-viewvc/templates-contrib/newvc/templates/docroot/images/back.png
-viewvc/templates-contrib/newvc/templates/docroot/images/back_small.png
-viewvc/templates-contrib/newvc/templates/docroot/images/binary.png
-viewvc/templates-contrib/newvc/templates/docroot/images/broken.png
-viewvc/templates-contrib/newvc/templates/docroot/images/cvs-logo.png
-viewvc/templates-contrib/newvc/templates/docroot/images/dir.png
-viewvc/templates-contrib/newvc/templates/docroot/images/down.png
-viewvc/templates-contrib/newvc/templates/docroot/images/feed-icon-16x16.jpg
-viewvc/templates-contrib/newvc/templates/docroot/images/forward.png
-viewvc/templates-contrib/newvc/templates/docroot/images/image.png
-viewvc/templates-contrib/newvc/templates/docroot/images/svn-logo.png
-viewvc/templates-contrib/newvc/templates/docroot/images/text.png
-viewvc/templates-contrib/newvc/templates/docroot/images/up.png
-viewvc/templates-contrib/newvc/templates/docroot/images/viewvc-logo.png
-viewvc/templates-contrib/newvc/templates/docroot/scripts.js
-viewvc/templates-contrib/newvc/templates/docroot/styles.css
-viewvc/templates-contrib/newvc/templates/error.ezt
-viewvc/templates-contrib/newvc/templates/file.ezt
-viewvc/templates-contrib/newvc/templates/graph.ezt
-viewvc/templates-contrib/newvc/templates/include/diff_form.ezt
-viewvc/templates-contrib/newvc/templates/include/fileview.ezt
-viewvc/templates-contrib/newvc/templates/include/footer.ezt
-viewvc/templates-contrib/newvc/templates/include/header.ezt
-viewvc/templates-contrib/newvc/templates/include/pathrev_form.ezt
-viewvc/templates-contrib/newvc/templates/include/props.ezt
-viewvc/templates-contrib/newvc/templates/log.ezt
-viewvc/templates-contrib/newvc/templates/markup.ezt
-viewvc/templates-contrib/newvc/templates/query.ezt
-viewvc/templates-contrib/newvc/templates/query_form.ezt
-viewvc/templates-contrib/newvc/templates/query_results.ezt
-viewvc/templates-contrib/newvc/templates/revision.ezt
-viewvc/templates-contrib/newvc/templates/roots.ezt
-viewvc/templates-contrib/newvc/templates/rss.ezt
-viewvc/templates-contrib/viewsvn/INSTALL
-viewvc/templates-contrib/viewsvn/README
-viewvc/templates-contrib/viewsvn/extras/svnindex.css
-viewvc/templates-contrib/viewsvn/extras/svnindex.xsl
-viewvc/templates-contrib/viewsvn/screenshots/diff.png
-viewvc/templates-contrib/viewsvn/screenshots/dir.png
-viewvc/templates-contrib/viewsvn/screenshots/log.png
-viewvc/templates-contrib/viewsvn/screenshots/markup.png
-viewvc/templates-contrib/viewsvn/templates/diff.ezt
-viewvc/templates-contrib/viewsvn/templates/directory.ezt
-viewvc/templates-contrib/viewsvn/templates/docroot/images/broken.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/dir.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/down.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/download.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/favicon-svn.ico
-viewvc/templates-contrib/viewsvn/templates/docroot/images/feed-icon-16x16.jpg
-viewvc/templates-contrib/viewsvn/templates/docroot/images/logo-svn.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/logo-viewvc.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/svn.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/text.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/back_small.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/blame.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/checkout.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/diff.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/forward.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/license.txt
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/log.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/patch.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/repos.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/tortoisesvn/tsvn.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/up.png
-viewvc/templates-contrib/viewsvn/templates/docroot/images/viewvc.png
-viewvc/templates-contrib/viewsvn/templates/docroot/styles.css
-viewvc/templates-contrib/viewsvn/templates/error.ezt
-viewvc/templates-contrib/viewsvn/templates/file.ezt
-viewvc/templates-contrib/viewsvn/templates/include/diff_form.ezt
-viewvc/templates-contrib/viewsvn/templates/include/dir_footer.ezt
-viewvc/templates-contrib/viewsvn/templates/include/dir_header.ezt
-viewvc/templates-contrib/viewsvn/templates/include/file_header.ezt
-viewvc/templates-contrib/viewsvn/templates/include/footer.ezt
-viewvc/templates-contrib/viewsvn/templates/include/header.ezt
-viewvc/templates-contrib/viewsvn/templates/include/log_footer.ezt
-viewvc/templates-contrib/viewsvn/templates/include/log_header.ezt
-viewvc/templates-contrib/viewsvn/templates/include/paging.ezt
-viewvc/templates-contrib/viewsvn/templates/include/pathrev_form.ezt
-viewvc/templates-contrib/viewsvn/templates/include/props.ezt
-viewvc/templates-contrib/viewsvn/templates/log.ezt
-viewvc/templates-contrib/viewsvn/templates/query.ezt
-viewvc/templates-contrib/viewsvn/templates/query_form.ezt
-viewvc/templates-contrib/viewsvn/templates/query_results.ezt
-viewvc/templates-contrib/viewsvn/templates/revision.ezt
-viewvc/templates-contrib/viewsvn/templates/roots.ezt
-viewvc/templates-contrib/viewsvn/templates/rss.ezt
-viewvc/templates/diff.ezt
-viewvc/templates/dir_new.ezt
-viewvc/templates/directory.ezt
-viewvc/templates/docroot/help.css
-viewvc/templates/docroot/help_dirview.html
-viewvc/templates/docroot/help_log.html
-viewvc/templates/docroot/help_query.html
-viewvc/templates/docroot/help_rootview.html
-viewvc/templates/docroot/images/annotate.png
-viewvc/templates/docroot/images/back.png
-viewvc/templates/docroot/images/back_small.png
-viewvc/templates/docroot/images/binary.png
-viewvc/templates/docroot/images/broken.png
-viewvc/templates/docroot/images/chalk.jpg
-viewvc/templates/docroot/images/cvsgraph_16x16.png
-viewvc/templates/docroot/images/cvsgraph_32x32.png
-viewvc/templates/docroot/images/diff.png
-viewvc/templates/docroot/images/dir.png
-viewvc/templates/docroot/images/down.png
-viewvc/templates/docroot/images/download.png
-viewvc/templates/docroot/images/favicon.ico
-viewvc/templates/docroot/images/feed-icon-16x16.jpg
-viewvc/templates/docroot/images/forward.png
-viewvc/templates/docroot/images/image.png
-viewvc/templates/docroot/images/list.png
-viewvc/templates/docroot/images/lock.png
-viewvc/templates/docroot/images/log.png
-viewvc/templates/docroot/images/text.png
-viewvc/templates/docroot/images/up.png
-viewvc/templates/docroot/images/view.png
-viewvc/templates/docroot/images/viewvc-logo.png
-viewvc/templates/docroot/styles.css
-viewvc/templates/error.ezt
-viewvc/templates/file.ezt
-viewvc/templates/graph.ezt
-viewvc/templates/include/diff_form.ezt
-viewvc/templates/include/dir_footer.ezt
-viewvc/templates/include/dir_header.ezt
-viewvc/templates/include/file_header.ezt
-viewvc/templates/include/footer.ezt
-viewvc/templates/include/header.ezt
-viewvc/templates/include/log_footer.ezt
-viewvc/templates/include/log_header.ezt
-viewvc/templates/include/paging.ezt
-viewvc/templates/include/pathrev_form.ezt
-viewvc/templates/include/props.ezt
-viewvc/templates/include/sort.ezt
-viewvc/templates/log.ezt
-viewvc/templates/log_table.ezt
-viewvc/templates/query.ezt
-viewvc/templates/query_form.ezt
-viewvc/templates/query_results.ezt
-viewvc/templates/revision.ezt
-viewvc/templates/roots.ezt
-viewvc/templates/rss.ezt
+viewvc/templates/classic/diff.ezt
+viewvc/templates/classic/dir_new.ezt
+viewvc/templates/classic/directory.ezt
+viewvc/templates/classic/docroot/help.css
+viewvc/templates/classic/docroot/help_dirview.html
+viewvc/templates/classic/docroot/help_log.html
+viewvc/templates/classic/docroot/help_rootview.html
+viewvc/templates/classic/docroot/images/annotate.png
+viewvc/templates/classic/docroot/images/back.png
+viewvc/templates/classic/docroot/images/back_small.png
+viewvc/templates/classic/docroot/images/binary.png
+viewvc/templates/classic/docroot/images/broken.png
+viewvc/templates/classic/docroot/images/chalk.jpg
+viewvc/templates/classic/docroot/images/cvsgraph_16x16.png
+viewvc/templates/classic/docroot/images/cvsgraph_32x32.png
+viewvc/templates/classic/docroot/images/diff.png
+viewvc/templates/classic/docroot/images/dir.png
+viewvc/templates/classic/docroot/images/down.png
+viewvc/templates/classic/docroot/images/download.png
+viewvc/templates/classic/docroot/images/favicon.ico
+viewvc/templates/classic/docroot/images/feed-icon-16x16.jpg
+viewvc/templates/classic/docroot/images/forward.png
+viewvc/templates/classic/docroot/images/image.png
+viewvc/templates/classic/docroot/images/list.png
+viewvc/templates/classic/docroot/images/lock.png
+viewvc/templates/classic/docroot/images/log.png
+viewvc/templates/classic/docroot/images/text.png
+viewvc/templates/classic/docroot/images/up.png
+viewvc/templates/classic/docroot/images/view.png
+viewvc/templates/classic/docroot/images/viewvc-logo.png
+viewvc/templates/classic/docroot/styles.css
+viewvc/templates/classic/error.ezt
+viewvc/templates/classic/file.ezt
+viewvc/templates/classic/graph.ezt
+viewvc/templates/classic/include/diff_display.ezt
+viewvc/templates/classic/include/diff_form.ezt
+viewvc/templates/classic/include/dir_footer.ezt
+viewvc/templates/classic/include/dir_header.ezt
+viewvc/templates/classic/include/file_header.ezt
+viewvc/templates/classic/include/footer.ezt
+viewvc/templates/classic/include/header.ezt
+viewvc/templates/classic/include/log_footer.ezt
+viewvc/templates/classic/include/log_header.ezt
+viewvc/templates/classic/include/paging.ezt
+viewvc/templates/classic/include/pathrev_form.ezt
+viewvc/templates/classic/include/props.ezt
+viewvc/templates/classic/include/sort.ezt
+viewvc/templates/classic/log.ezt
+viewvc/templates/classic/log_table.ezt
+viewvc/templates/classic/query_form.ezt
+viewvc/templates/classic/query_results.ezt
+viewvc/templates/classic/revision.ezt
+viewvc/templates/classic/roots.ezt
+viewvc/templates/classic/rss.ezt
+viewvc/templates/default/diff.ezt
+viewvc/templates/default/directory.ezt
+viewvc/templates/default/docroot/help.css
+viewvc/templates/default/docroot/help_dirview.html
+viewvc/templates/default/docroot/help_log.html
+viewvc/templates/default/docroot/help_rootview.html
+viewvc/templates/default/docroot/images/back.png
+viewvc/templates/default/docroot/images/back_small.png
+viewvc/templates/default/docroot/images/binary.png
+viewvc/templates/default/docroot/images/broken.png
+viewvc/templates/default/docroot/images/cvs-logo.png
+viewvc/templates/default/docroot/images/dir.png
+viewvc/templates/default/docroot/images/down.png
+viewvc/templates/default/docroot/images/feed-icon-16x16.jpg
+viewvc/templates/default/docroot/images/forward.png
+viewvc/templates/default/docroot/images/image.png
+viewvc/templates/default/docroot/images/lock-icon.gif
+viewvc/templates/default/docroot/images/svn-logo.png
+viewvc/templates/default/docroot/images/text.png
+viewvc/templates/default/docroot/images/up.png
+viewvc/templates/default/docroot/images/viewvc-logo.png
+viewvc/templates/default/docroot/scripts.js
+viewvc/templates/default/docroot/styles.css
+viewvc/templates/default/error.ezt
+viewvc/templates/default/file.ezt
+viewvc/templates/default/graph.ezt
+viewvc/templates/default/include/diff_display.ezt
+viewvc/templates/default/include/diff_form.ezt
+viewvc/templates/default/include/footer.ezt
+viewvc/templates/default/include/header.ezt
+viewvc/templates/default/include/pathrev_form.ezt
+viewvc/templates/default/include/props.ezt
+viewvc/templates/default/log.ezt
+viewvc/templates/default/query_form.ezt
+viewvc/templates/default/query_results.ezt
+viewvc/templates/default/revision.ezt
+viewvc/templates/default/roots.ezt
+viewvc/templates/default/rss.ezt
 @sample viewvc/viewvc.conf.sample