Hello community,
here is the log from the commit of package mercurial for openSUSE:Factory
checked in at 2013-09-05 23:21:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mercurial (Old)
and /work/SRC/openSUSE:Factory/.mercurial.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2013-07-16
16:43:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2013-09-05
23:21:31.000000000 +0200
@@ -1,0 +2,60 @@
+Wed Sep 4 19:08:50 UTC 2013 - w...@rosenauer.org
+
+- update to version 2.7.1
+ * shrink-revlog.py was removed from distribution
+ * no upstream changelog available
+- update to version 2.7.0
+ This release contains an important fix for a merge ancestor
+ calculation regression in the 2.6 series.
+ ancestor: decrement ninteresting correctly (issue3984)
+ bookmarks: allow bookmark command to take multiple arguments
+ bookmarks: pull --update updates to active bookmark if it moved (issue4007)
+ bookmarks: update only proper bookmarks on push -r/-B (issue 3973)
+ changegroup: fix fastpath during commit
+ checklink: work around sshfs brain-damage (issue3636)
+ churn: split email aliases from the right
+ commands: add checks for unfinished operations (issue3955)
+ commit: enable --secret option
+ convert: catch empty origpaths in svn gettags (issue3941)
+ convert: fix bad conversion of copies when hg.startrev is specified
+ convert: handle changeset sorting errors without traceback (issue3961)
+ hgweb: fix incorrect way to count revisions in log (issue3977)
+ hgweb: run search instead of showing wrong error for ambigious identifier
+ histedit: don't clobber working copy on --abort if not on histedit cset
+ histedit: refuse to edit history that contains merges (issue3962)
+ import: cut commit messages at --- unconditionally (issue2148)
+ largefiles: overridematch() should replace the file path instead of
extending (issue3934)
+ log: add a log style that is default+phase (issue3436)
+ paper: add line wrapping switch to file source view
+ paper: code selection without line numbers in file source view
+ paper: highlight line which is linked to in source view
+ progress: respect HGPLAIN
+ rebase: allow aborting when descendants detected
+ rebase: continue abort without strip for immutable csets (issue3997)
+ rebase: don't clobber wd on --abort when we've updated away (issue4009)
+ revert: make backup when unforgetting a file (issue3423)
+ revlog: handle hidden revs in _partialmatch (issue3979)
+ rollback: mark as deprecated
+ splicemap: improve error handling when parsing (issue2084)
+ splicemap: support paths with spaces in splicemap (issue3844)
+ sslutil: force SSLv3 on Python 2.6 and later (issue3905)
+ summary: augment output with info from extensions
+ templater: add strip function with chars as an extra argument
+ log: show style list when unknown style specified
+ tip: deprecate the tip command
+ update: add tracking of interrupted updates (issue3113)
+ worker: check problem state correctly (issue3982)
+ worker: properly report errors from worker processes (issue3982)
+
+-------------------------------------------------------------------
+Thu Aug 29 14:41:19 UTC 2013 - w...@rosenauer.org
+
+- bring back cacerts.rc for distributions older than 13.1
+
+-------------------------------------------------------------------
+Mon Aug 26 13:58:17 UTC 2013 - lnus...@suse.de
+
+- don't pass ca_certs to make python use the system's built in path
+ (bnc#836739) (mercurial-2.6.3-ssl.diff) starting from 13.1
+
+-------------------------------------------------------------------
Old:
----
mercurial-2.6.3.tar.gz
New:
----
mercurial-2.6.3-ssl.diff
mercurial-2.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mercurial.spec ++++++
--- /var/tmp/diff_new_pack.uWVnPp/_old 2013-09-05 23:21:32.000000000 +0200
+++ /var/tmp/diff_new_pack.uWVnPp/_new 2013-09-05 23:21:32.000000000 +0200
@@ -17,7 +17,7 @@
Name: mercurial
-Version: 2.6.3
+Version: 2.7.1
Release: 0
Summary: Scalable Distributed SCM
License: GPL-2.0+
@@ -33,6 +33,8 @@
Patch2: mercurial-docutils-compat.diff
# PATCH-FIX-OPENSUSE mercurial-locale-path-fix.patch sasc...@suse.de --
locales are found in /usr/share/locale
Patch3: mercurial-locale-path-fix.patch
+# PATCH-FIX-OPENSUSE mercurial-2.6.3-ssl.diff lnus...@suse.de -- fallback to
system default ca path
+Patch4: mercurial-2.6.3-ssl.diff
# require rcs for 3-way "merge" command.
Requires: rcs
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -89,6 +91,9 @@
%patch2 -p0
%endif
%patch3 -p1
+%if 0%{?suse_version} > 1230
+%patch4 -p1
+%endif
chmod 644 hgweb.cgi
%build
@@ -105,8 +110,6 @@
# Install stuff in contrib
install -m0755 contrib/hgk %{buildroot}%{_bindir}
install -m0755 contrib/convert-repo %{buildroot}%{_bindir}
-sed -i "1i #!/usr/bin/python" contrib/shrink-revlog.py # Add a she-bang line
to executable script
-install -m0755 contrib/shrink-revlog.py %{buildroot}%{_bindir}
install -Dm0644 contrib/bash_completion
%{buildroot}%{_sysconfdir}/bash_completion.d/mercurial.sh
install -Dm0644 contrib/zsh_completion
%{buildroot}%{_datadir}/zsh/site-functions/_mercurial
mkdir -p %{buildroot}%{_datadir}/{x,}emacs/site-lisp
@@ -114,8 +117,10 @@
install -m0644 contrib/*.el %{buildroot}%{_datadir}/xemacs/site-lisp
install -Dm0644 contrib/mergetools.hgrc
%{buildroot}%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
%if 0%{?suse_version} >= 1130
+%if 0%{?suse_version} <= 1230
install -m0644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/mercurial/hgrc.d/cacerts.rc
%endif
+%endif
%if 0%{?suse_version} > 1020
%fdupes -s %{buildroot}%{_prefix}
++++++ mercurial-2.6.3-ssl.diff ++++++
Index: mercurial-2.6.3/mercurial/sslutil.py
===================================================================
--- mercurial-2.6.3.orig/mercurial/sslutil.py
+++ mercurial-2.6.3/mercurial/sslutil.py
@@ -83,12 +83,15 @@ def _verifycert(cert, hostname):
# busted on those versions.
def sslkwargs(ui, host):
- cacerts = ui.config('web', 'cacerts')
hostfingerprint = ui.config('hostfingerprints', host)
- if cacerts and not hostfingerprint:
- cacerts = util.expandpath(cacerts)
- if not os.path.exists(cacerts):
- raise util.Abort(_('could not find web.cacerts: %s') % cacerts)
+ if not hostfingerprint:
+ cacerts = ui.config('web', 'cacerts')
+ # cacerts explicitly set to empty string means to disable
+ # checking. See insecure option in dispatch.py
+ if cacerts is not None and cacerts != '':
+ cacerts = util.expandpath(cacerts)
+ if not os.path.exists(cacerts):
+ raise util.Abort(_('could not find web.cacerts: %s') % cacerts)
return {'ca_certs': cacerts,
'cert_reqs': CERT_REQUIRED,
}
@@ -137,7 +140,7 @@ class validator(object):
hint=_('check hostfingerprint configuration'))
self.ui.debug('%s certificate matched fingerprint %s\n' %
(host, nicefingerprint))
- elif cacerts:
+ elif cacerts is None or cacerts != '':
msg = _verifycert(peercert2, host)
if msg:
raise util.Abort(_('%s certificate error: %s') % (host, msg),
++++++ mercurial-2.6.3.tar.gz -> mercurial-2.7.1.tar.gz ++++++
++++ 23109 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
