This commit was manufactured by cvs2svn to create tag 'RELEASE_4_11_0'.release/4.11.0

author: cvs2svn <cvs2svn@FreeBSD.org> 2005-01-21 15:36:45 +0000
committer: cvs2svn <cvs2svn@FreeBSD.org> 2005-01-21 15:36:45 +0000
commit: 7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 (patch)
tree: 22c0efaf2b6bb5b461389f9bac9542c7e3a5909a /devel/viewvc/files
parent: Now buildable on 4.x, still broken on >= 5.x. (diff)
3 files changed, 0 insertions, 177 deletions
diff --git a/devel/viewvc/files/patch-CAN-2004-0915 b/devel/viewvc/files/patch-CAN-2004-0915
deleted file mode 100644
index 6e150bc53438..000000000000
--- a/devel/viewvc/files/patch-CAN-2004-0915
+++ /dev/null
@@ -1,37 +0,0 @@
---- lib/viewcvs.py.orig	2004-10-20 15:03:41.000000000 +0200
-+++ lib/viewcvs.py	2004-10-20 16:37:35.000000000 +0200
-@@ -2455,10 +2455,17 @@ def generate_tarball_header(out, name, s
- def generate_tarball(out, relative, directory, tag, stack=[]):
-   subdirs = [ ]
-   rcs_files = [ ]
-+  if relative == 'CVSROOT' and cfg.options.hide_cvsroot:
-+    return
-+
-   for file, pathname, isdir in get_file_data(directory):
-     if pathname == _UNREADABLE_MARKER:
-       continue
-     if isdir:
-+      if file == 'CVSROOT' and relative.find('/') == -1 and cfg.options.hide_cvsroot:
-+        continue
-+      if relative.find('/') == -1 and cfg.is_forbidden(file):
-+        continue
-       subdirs.append(file)
-     else:
-       rcs_files.append(file)
-@@ -2583,6 +2590,16 @@ def main():
-            '</body></html>\n')
-     return
- 
-+  if where == 'CVSROOT' and cfg.options.hide_cvsroot:
-+    print "Status: 400"
-+    http_header()
-+    print ('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">\n'
-+           '<html><head>\n<title>400 Bad Request</title>\n'
-+           '</head><body>\n'
-+           '<H1>Bad Request</H1>\n Listing of CVSROOT is disallowed.<p>\n'
-+           '</body></html>\n')
-+    return
-+
-   ### look for GZIP binary
- 
-   # if we have a directory and the request didn't end in "/", then redirect
diff --git a/devel/viewvc/files/patch-lib::viewcvs.py b/devel/viewvc/files/patch-lib::viewcvs.py
deleted file mode 100644
index 0e1123ec43a1..000000000000
--- a/devel/viewvc/files/patch-lib::viewcvs.py
+++ /dev/null
@@ -1,91 +0,0 @@
---- lib/viewcvs.py.orig        Tue Jan 15 10:35:55 2002
-+++ lib/viewcvs.py     Fri Apr 25 19:18:22 2003
-@@ -174,6 +174,10 @@
-     # parse the query params into a dictionary (and use defaults)
-     query_dict = default_settings.copy()
-     for name, values in cgi.parse().items():
-+      # validate the parameter
-+      _validate_param(name, values[0])
-+
-+      # if we're here, then the parameter is okay
-       query_dict[name] = values[0]
- 
-     # set up query strings, prefixed by question marks and ampersands
-@@ -228,6 +232,77 @@
-     self.branch = branch
-     self.taginfo = taginfo
- 
-+
-+def _validate_param(name, value):
-+  """Validate whether the given value is acceptable for the param name.
-+
-+  If the value is not allowed, then an error response is generated, and
-+  this function throws an exception. Otherwise, it simply returns None.
-+  """
-+
-+  try:
-+    validator = _legal_params[name]
-+  except KeyError:
-+    error('An illegal parameter name ("%s") was passed.' % cgi.escape(name))
-+
-+  # is the validator a regex?
-+  if hasattr(validator, 'match'):
-+    if not validator.match(value):
-+      error('An illegal value ("%s") was passed as a parameter.' %
-+            cgi.escape(value))
-+    return
-+
-+  # the validator must be a function
-+  validator(value)
-+
-+def _validate_cvsroot(value):
-+  if not cfg.general.cvs_roots.has_key(value):
-+    error('The CVS root "%s" is unknown.' % cgi.escape(value))
-+
-+def _validate_regex(value):
-+  # hmm. there isn't anything that we can do here.
-+
-+  ### we need to watch the flow of these parameters through the system
-+  ### to ensure they don't hit the page unescaped. otherwise, these
-+  ### parameters could constitute a CSS attack.
-+  pass
-+
-+# obvious things here. note that we don't need uppercase for alpha.
-+_re_validate_alpha = re.compile('^[a-z]+$')
-+_re_validate_number = re.compile('^[0-9]+$')
-+
-+# when comparing two revs, we sometimes construct REV:SYMBOL, so ':' is needed
-+_re_validate_revnum = re.compile('^[-_.a-zA-Z0-9:]+$')
-+
-+# it appears that RFC 2045 also says these chars are legal: !#$%&'*+^{|}~`
-+# but woah... I'll just leave them out for now
-+_re_validate_mimetype = re.compile('^[-_.a-zA-Z0-9/]+$')
-+
-+# the legal query parameters and their validation functions
-+_legal_params = {
-+  'cvsroot'       : _validate_cvsroot,
-+  'search'        : _validate_regex,
-+
-+  'hideattic'     : _re_validate_number,
-+  'sortby'        : _re_validate_alpha,
-+  'sortdir'       : _re_validate_alpha,
-+  'logsort'       : _re_validate_alpha,
-+  'diff_format'   : _re_validate_alpha,
-+  'only_with_tag' : _re_validate_revnum,
-+  'dir_pagestart' : _re_validate_number,
-+  'log_pagestart' : _re_validate_number,
-+  'hidecvsroot'   : _re_validate_number,
-+  'annotate'      : _re_validate_revnum,
-+  'graph'         : _re_validate_revnum,
-+  'makeimage'     : _re_validate_number,
-+  'tarball'       : _re_validate_number,
-+  'r1'            : _re_validate_revnum,
-+  'tr1'           : _re_validate_revnum,
-+  'r2'            : _re_validate_revnum,
-+  'tr2'           : _re_validate_revnum,
-+  'rev'           : _re_validate_revnum,
-+  'content-type'  : _re_validate_mimetype,
-+  }
- 
- class LogEntry:
-   "Hold state for each revision entry in an 'rlog' output."
diff --git a/devel/viewvc/files/patch-viewcvs-install b/devel/viewvc/files/patch-viewcvs-install
deleted file mode 100644
index aeab05b698ff..000000000000
--- a/devel/viewvc/files/patch-viewcvs-install
+++ /dev/null
@@ -1,49 +0,0 @@
---- viewcvs-install.orig	Fri Dec 21 03:59:45 2001
-+++ viewcvs-install	Sun Aug 24 05:38:29 2003
-@@ -51,7 +51,7 @@
- """ % version
- 
- ## installer defaults
--ROOT_DIR = "/usr/local/viewcvs-" + version
-+ROOT_DIR = os.environ['INSTDIR']
- 
- 
- ## list of files for installation
-@@ -65,11 +65,11 @@
-     ("cgi/query.cgi", "cgi/query.cgi", 0755, 1, 0, 0),
-     ("standalone.py", "standalone.py", 0755, 1, 0, 0),
- 
--    ("cgi/viewcvs.conf.dist", "viewcvs.conf", 0644, 1,
-+    ("cgi/viewcvs.conf.dist", "viewcvs.conf.dist", 0644, 1,
- 	     """Note: If you are upgrading from viewcvs-0.7 or earlier: 
- The section [text] has been removed from viewcvs.conf.  The functionality
- went into the new files in subdirectory templates.""", 0),
--    ("cgi/cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0),
-+    ("cgi/cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 1, 0),
- 
-     ("lib/PyFontify.py", "lib/PyFontify.py", 0644, 0, 0, 1),
-     ("lib/blame.py", "lib/blame.py", 0644, 0, 0, 1),
-@@ -192,7 +192,7 @@
-     if type(prompt_replace) == type(""):
-       print prompt_replace
-     while 1:
--      temp = raw_input("\n    File %s\n    exists and is different from source file.\n      DO YOU WANT TO,\n        overwrite [o]\n        do not overwrite [d]\n        view differences [v]: " % (dest_path))
-+      temp = 'o'
-       print
- 
-       temp = string.lower(temp[0])
-@@ -245,10 +245,10 @@
-     print INFO_TEXT
-     
-     ## get the install path
--    temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
--    temp = string.strip(temp)
--    if len(temp):
--        ROOT_DIR = temp
-+    #temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
-+    #temp = string.strip(temp)
-+    #if len(temp):
-+    #    ROOT_DIR = temp
-         
-     ## install the files
-     print
author	cvs2svn <cvs2svn@FreeBSD.org>	2005-01-21 15:36:45 +0000
committer	cvs2svn <cvs2svn@FreeBSD.org>	2005-01-21 15:36:45 +0000
commit	7011c19a8c96a2f8fb7c04d61cb28cdc507584a6 (patch)
tree	22c0efaf2b6bb5b461389f9bac9542c7e3a5909a /devel/viewvc/files
parent	Now buildable on 4.x, still broken on >= 5.x. (diff)