Hello community, here is the log from the commit of package viewvc checked in at Fri Feb 29 15:55:46 CET 2008. -------- --- viewvc/viewvc.changes 2007-08-03 10:24:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/viewvc/viewvc.changes 2008-02-29 14:25:40.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Feb 29 14:24:18 CET 2008 - olh@suse.de + +- update viewvc to 1.0.5 + * omit commits of all-forbidden files from query results + * disallow direct URL navigation to hidden CVSROOT folder + * strip forbidden paths from revision view + * don't traverse log history thru forbidden locations + * honor forbiddenness via diff view path parameters + * new 'forbiddenre' regexp-based path authorization feature + * fix root name conflict resolution inconsistencies (issue #287) + * fix an oversight in the CVS 1.12.9 loginfo-handler support + * fix RSS feed content type to be more specific (issue #306) + * fix entity escaping problems in RSS feed data (issue #238) + * fix bug in tarball generation for remote Subversion repositories + * fix query interface file-count-limiting logic + * fix query results plus/minus count to ignore forbidden files + * fix blame error caused by 'svn' unable to create runtime config dir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ viewvc.spec ++++++ --- /var/tmp/diff_new_pack.D30931/_old 2008-02-29 15:55:39.000000000 +0100 +++ /var/tmp/diff_new_pack.D30931/_new 2008-02-29 15:55:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package viewvc (Version 1.0.4) +# spec file for package viewvc (Version 1.0.5) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,10 +10,11 @@ # norootforbuild + Name: viewvc BuildRequires: apache2-devel python-devel -Version: 1.0.4 -Release: 6 +Version: 1.0.5 +Release: 1 # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -27,11 +28,11 @@ Provides: subversion-viewcvs viewcvs Obsoletes: subversion-viewcvs viewcvs Group: Development/Tools/Version Control -URL: http://www.viewvc.org/ +Url: http://www.viewvc.org/ Summary: ViewVC - Browse a Subversion Repository with a Web Browser # BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: BSD 3-Clause, http://subversion.tigris.org/license-1.html +License: BSD 3-Clause Source0: viewvc-1.0.x.tar.bz2 Source1: viewvc.conf Patch0: viewvc-buglink.patch @@ -42,8 +43,8 @@ directory, revision, and change log listings. It can display specific versions of files as well as diffs between those versions. Basically, ViewVC provides the bulk of the report-like functionality you expect -out of your version control tool, but much more prettily than the -average textual command-line program output. +out of your version control tool, but much prettier than the average +textual command-line program output. ViewVC is the successor of ViewCVS. @@ -60,7 +61,7 @@ %prep %setup -q -n %{viewvc_src_dir} -%patch0 +%patch0 -p1 %build ++++++ viewvc-1.0.x.tar.bz2 ++++++ ++++ 13214 lines of diff (skipped) ++++++ viewvc-buglink.patch ++++++ --- /var/tmp/diff_new_pack.D30931/_old 2008-02-29 15:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.D30931/_new 2008-02-29 15:55:40.000000000 +0100 @@ -2,53 +2,23 @@ http://sourceforge.net/tracker/index.php?func=detail&aid=986023&group_id=18760&atid=318760 lib/config.py | 1 + - lib/viewvc.py | 22 +++++++++++++--------- + lib/viewvc.py | 21 ++++++++++++--------- viewvc.conf.dist | 15 +++++++++++++++ - 3 files changed, 29 insertions(+), 9 deletions(-) + 3 files changed, 28 insertions(+), 9 deletions(-) -Index: viewvc.conf.dist -=================================================================== ---- viewvc.conf.dist.orig -+++ viewvc.conf.dist -@@ -257,6 +257,21 @@ languages = en-us - #--------------------------------------------------------------------------- - [options] - -+# The 'buglink_base' value is a string that can be used to form a URL -+# by appending a bug number. If viewvc sees something that looks -+# like a bug number in a log message (eg. "bug 12345" or "#12345"), it -+# will be displayed as a link to the bug in your bug tracking system. -+# -+# For a Bugzilla installation, you probably want to set this to -+# something like "http://hostname/show_bug.cgi?id=". For the Debian -+# bug tracker, you might use -+# "http://hostname/cgi-bin/bugreport.cgi?bug=". -+# -+# If 'buglink_base' is not set, then bug tracker links won't be -+# generated. -+# -+# buglink_base = http://example.com/show_bug.cgi?id= -+ - # root_as_url_component: Interpret the first path component in the URL - # after the script location as the root to use. This is an - # alternative to using the "root=" query key. If ViewVC is configured -Index: lib/config.py -=================================================================== ---- lib/config.py.orig -+++ lib/config.py -@@ -221,6 +221,7 @@ class Config: +--- a/lib/config.py ++++ b/lib/config.py +@@ -224,6 +224,7 @@ class Config: self.options.use_localtime = 0 self.options.http_expiration_time = 600 self.options.generate_etags = 1 + self.options.buglink_base = None - def is_forbidden(self, module): - if not module: -Index: lib/viewvc.py -=================================================================== ---- lib/viewvc.py.orig -+++ lib/viewvc.py -@@ -970,14 +970,18 @@ def get_file_view_info(request, where, r + def is_forbidden(self, root, path_parts, pathtype): + # If we don't have a root and path to check, get outta here. +--- a/lib/viewvc.py ++++ b/lib/viewvc.py +@@ -982,17 +982,20 @@ def get_file_view_info(request, where, r # addresses. Note that the regexps assume the text is already HTML-encoded. _re_rewrite_url = re.compile('((http|https|ftp|file|svn|svn\+ssh)(://[-a-zA-Z0-9%.~:_/]+)((\?|\&)([-a-zA-Z0-9%.~:_]+)=([-a-zA-Z0-9%.~:_])+)*(#([-a-zA-Z0-9%.~:_]+)?)?)') _re_rewrite_email = re.compile('([-a-zA-Z0-9_.\+]+)@(([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})') @@ -62,14 +32,16 @@ + html = re.sub(_re_rewrite_bug, r'<a href="%s\2">\1</a>' % buglink, html) return html -+ - def format_log(log, cfg): -- s = htmlify(log[:cfg.options.short_log_len]) -+ s = htmlify(log[:cfg.options.short_log_len], cfg.options.buglink_base) + def format_log(log, cfg, htmlize=1): + if not log: + return log + if htmlize: +- s = htmlify(log[:cfg.options.short_log_len]) ++ s = htmlify(log[:cfg.options.short_log_len], cfg.options.buglink_base) + else: + s = cgi.escape(log[:cfg.options.short_log_len]) if len(log) > cfg.options.short_log_len: - s = s + '...' - return s -@@ -1394,7 +1398,7 @@ def view_markup(request): +@@ -1412,7 +1415,7 @@ def view_markup(request): 'date' : make_time_string(entry.date, cfg), 'author' : entry.author, 'changed' : entry.changed, @@ -78,7 +50,7 @@ 'size' : entry.size, }) -@@ -1651,7 +1655,7 @@ def view_directory(request): +@@ -1673,7 +1676,7 @@ def view_directory(request): 'sortby' : sortby, 'sortdir' : sortdir, 'tarball_href' : None, @@ -87,7 +59,7 @@ 'dir_pagestart' : None, 'sortby_file_href' : request.get_url(params={'sortby': 'file', 'sortdir': None}, -@@ -1897,7 +1901,7 @@ def view_log(request): +@@ -1921,7 +1924,7 @@ def view_log(request): entry.ago = None if rev.date is not None: entry.ago = html_time(request, rev.date, 1) @@ -96,7 +68,7 @@ entry.size = rev.size entry.branch_point = None entry.next_main = None -@@ -2359,7 +2363,7 @@ def spaced_html_text(text, cfg): +@@ -2395,7 +2398,7 @@ def spaced_html_text(text, cfg): text = string.replace(text, ' ', ' \x01nbsp;') else: text = string.replace(text, ' ', '\x01nbsp;') @@ -105,7 +77,7 @@ text = string.replace(text, '\x01', '&') text = string.replace(text, '\x02', '<span style="color:red">\</span><br />') return text -@@ -2767,7 +2771,7 @@ def view_diff(request): +@@ -2815,7 +2818,7 @@ def view_diff(request): else: changes = DiffSource(fp, cfg) else: @@ -114,7 +86,7 @@ data.update({ 'date_left' : rcsdiff_date_reformat(date1, cfg), -@@ -3051,7 +3055,7 @@ def view_revision(request): +@@ -3139,7 +3142,7 @@ def view_revision(request): 'rev' : str(rev), 'author' : author, 'date' : date_str, @@ -123,12 +95,36 @@ 'ago' : None, 'changes' : changes, 'prev_href' : prev_rev_href, -@@ -3202,7 +3206,7 @@ def build_commit(request, files, limited - commit = _item(num_files=len(files), files=[]) - commit.limited_files = ezt.boolean(limited_files) - desc = files[0].GetDescription() +@@ -3401,7 +3404,7 @@ def build_commit(request, files, max_fil + commit = _item(num_files=len(commit_files), files=commit_files, + plus=plus_count, minus=minus_count) + commit.limited_files = ezt.boolean(num_allowed > len(commit_files)) - commit.log = htmlify(desc) + commit.log = htmlify(desc, request.cfg.options.buglink_base) - commit.short_log = format_log(desc, request.cfg) - commit.author = htmlify(files[0].GetAuthor()) - commit.rss_date = make_rss_time_string(files[0].GetTime(), request.cfg) + commit.short_log = format_log(desc, request.cfg, format != 'rss') + commit.author = request.server.escape(author) + commit.rss_date = make_rss_time_string(date, request.cfg) +--- a/viewvc.conf.dist ++++ b/viewvc.conf.dist +@@ -293,6 +293,21 @@ languages = en-us + #--------------------------------------------------------------------------- + [options] + ++# The 'buglink_base' value is a string that can be used to form a URL ++# by appending a bug number. If viewvc sees something that looks ++# like a bug number in a log message (eg. "bug 12345" or "#12345"), it ++# will be displayed as a link to the bug in your bug tracking system. ++# ++# For a Bugzilla installation, you probably want to set this to ++# something like "http://hostname/show_bug.cgi?id=". For the Debian ++# bug tracker, you might use ++# "http://hostname/cgi-bin/bugreport.cgi?bug=". ++# ++# If 'buglink_base' is not set, then bug tracker links won't be ++# generated. ++# ++# buglink_base = http://example.com/show_bug.cgi?id= ++ + # root_as_url_component: Interpret the first path component in the URL + # after the script location as the root to use. This is an + # alternative to using the "root=" query key. If ViewVC is configured ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org