ports/144773: [patch] port devel/viewvc update to 1.1.4

[olli hauer]

>Number:         144773
>Category:       ports
>Synopsis:       [patch] port devel/viewvc update to 1.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 15 22:50:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     olli hauer <ohauer at gmx.de>
>Release:        
>Organization:
>Environment:


>Description:
Version 1.1.4 (released 10-Mar-2010)

  * security fix: escape user-provided query form input to avoid XSS attack
  * fix standalone.py failure (when per-root options aren't used) (issue #445)
  * fix annotate failure caused by ignored svn_config_dir (issue #447)


files removed from port:
==========================
 * files/patch-lib-config.py (patch is included in 1.1.4)


>How-To-Repeat:
>Fix:
--- patch_devel_viewvc.txt begins here ---
--- Makefile
+++ Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	viewvc
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES=	devel python
-MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/47194/
+MASTER_SITES=	http://viewvc.tigris.org/files/documents/3330/47426/
 
 MAINTAINER=	pgollucci at FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
--- distinfo
+++ distinfo
@@ -1,3 +1,3 @@
-MD5 (viewvc-1.1.3.tar.gz) = e74127b9193e2bfc48f6242049701d91
-SHA256 (viewvc-1.1.3.tar.gz) = d1a1d0602198fd0f38379c7c0e647532e8f8a1d267236d293227c125f39a001f
-SIZE (viewvc-1.1.3.tar.gz) = 593173
+MD5 (viewvc-1.1.4.tar.gz) = af1057d9128b983f4e905615b84486a3
+SHA256 (viewvc-1.1.4.tar.gz) = 2aa36028e484f6419aa8f1a7bc161d88bcfc89e46ea4eef6d8294e52e69311b2
+SIZE (viewvc-1.1.4.tar.gz) = 593549
--- files/patch-lib-config.py
+++ files/patch-lib-config.py
@@ -1,31 +0,0 @@
---- lib/config.py.orig	2010-01-07 10:44:45.000000000 -0800
-+++ lib/config.py	2010-01-07 10:44:50.000000000 -0800
-@@ -274,9 +274,7 @@
-     """Overlay per-root options for ROOTNAME atop the existing option
-     set.  This is a destructive change to the configuration."""
- 
--    # We can only deal with this happening once!
--    assert(self.root_options_overlayed == 0)
--    self.root_options_overlayed = 1
-+    did_overlay = 0
-     
-     if not self.conf_path:
-       return
-@@ -285,7 +283,17 @@
-       base_section = self._is_allowed_override(self.parser, 'root',
-                                                rootname, section)
-       if base_section:
-+        # We can currently only deal with root overlays happening
-+        # once, so check that we've not yet done any overlaying of
-+        # per-root options.
-+        assert(self.root_options_overlayed == 0)
-         self._process_section(self.parser, section, base_section)
-+        did_overlay = 1
-+
-+    # If we actually did any overlaying, remember this fact so we
-+    # don't do it again later.
-+    if did_overlay:
-+      self.root_options_overlayed = 1
- 
-   def _get_parser_items(self, parser, section):
-     """Basically implement ConfigParser.items() for pre-Python-2.3 versions."""
--- patch_devel_viewvc.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: