diff --git a/bzr-2.5b5-fix_sphinx11_texinfo.patch b/bzr-2.5b5-fix_sphinx11_texinfo.patch deleted file mode 100644 index 84dba06..0000000 --- a/bzr-2.5b5-fix_sphinx11_texinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bzr-2.5b5/bzrlib/doc_generate/builders/texinfo.py.fix_sphinx11_texinfo 2012-01-16 15:59:43.000000000 +0100 -+++ bzr-2.5b5/bzrlib/doc_generate/builders/texinfo.py 2012-02-05 05:17:23.560672966 +0100 -@@ -25,7 +25,7 @@ - - class TexinfoBuilder(_text_builder.TextBuilder): - -- name = 'texinfo' -+ name = 'bzr_texinfo' - format = 'texinfo' - out_suffix = '.texi' - diff --git a/bzr-gpg-no-agent-error.patch b/bzr-gpg-no-agent-error.patch new file mode 100644 index 0000000..8ed6f4e --- /dev/null +++ b/bzr-gpg-no-agent-error.patch @@ -0,0 +1,44 @@ +Index: bzr-2.5.1/bzrlib/gpg.py +=================================================================== +--- bzr-2.5.1.orig/bzrlib/gpg.py ++++ bzr-2.5.1/bzrlib/gpg.py +@@ -190,7 +190,7 @@ class GPGStrategy(object): + # use the user email address + key = config.extract_email_address(self._config_stack.get('email')) + return [self._config_stack.get('gpg_signing_command'), '--clearsign', +- '-u', key, '--no-tty'] ++ '-u', key] + + def sign(self, content): + if isinstance(content, unicode): +Index: bzr-2.5.1/bzrlib/tests/test_gpg.py +=================================================================== +--- bzr-2.5.1.orig/bzrlib/tests/test_gpg.py ++++ bzr-2.5.1/bzrlib/tests/test_gpg.py +@@ -51,7 +51,7 @@ class TestCommandLine(tests.TestCase): + self.my_gpg = gpg.GPGStrategy(FakeConfig()) + + def test_signing_command_line(self): +- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'], ++ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'], + self.my_gpg._command_line()) + + def test_signing_command_line_from_default(self): +@@ -60,7 +60,7 @@ class TestCommandLine(tests.TestCase): + email=Amy + gpg_signing_key=default + gpg_signing_command=false''')) +- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'], ++ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'], + my_gpg._command_line()) + + def test_signing_command_line_from_email(self): +@@ -68,7 +68,7 @@ gpg_signing_command=false''')) + my_gpg = gpg.GPGStrategy(FakeConfig(''' + email=Amy + gpg_signing_command=false''')) +- self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com', '--no-tty'], ++ self.assertEqual(['false', '--clearsign', '-u', 'amy@example.com'], + my_gpg._command_line()) + + def test_checks_return_code(self): diff --git a/bzr.dev-5439-python27.patch b/bzr.dev-5439-python27.patch deleted file mode 100644 index d72fa74..0000000 --- a/bzr.dev-5439-python27.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py.5439 bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py ---- bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py.5439 2010-09-18 02:37:55.000000000 +0200 -+++ bzr-2.2.1/bzrlib/transport/http/_urllib2_wrappers.py 2010-09-21 14:14:21.000000000 +0200 -@@ -75,6 +75,26 @@ from bzrlib import ( - ) - - -+class addinfourl(urllib2.addinfourl): -+ '''Replacement addinfourl class compatible with python-2.7's xmlrpclib -+ -+ In python-2.7, xmlrpclib expects that the response object that it receives -+ has a getheader method. httplib.HTTPResponse provides this but -+ urllib2.addinfourl does not. Add the necessary functions here, ported to -+ use the internal data structures of addinfourl. -+ ''' -+ -+ def getheader(self, name, default=None): -+ if self.headers is None: -+ raise httplib.ResponseNotReady() -+ return self.headers.getheader(name, default) -+ -+ def getheaders(self): -+ if self.headers is None: -+ raise httplib.ResponseNotReady() -+ return self.headers.items() -+ -+ - class _ReportingFileSocket(object): - - def __init__(self, filesock, report_activity=None): -@@ -656,7 +676,7 @@ class AbstractHTTPHandler(urllib2.Abstra - r = response - r.recv = r.read - fp = socket._fileobject(r, bufsize=65536) -- resp = urllib2.addinfourl(fp, r.msg, req.get_full_url()) -+ resp = addinfourl(fp, r.msg, req.get_full_url()) - resp.code = r.status - resp.msg = r.reason - resp.version = r.version -diff -up bzr-2.2.1/NEWS.5439 bzr-2.2.1/NEWS ---- bzr-2.2.1/NEWS.5439 2010-09-18 02:37:55.000000000 +0200 -+++ bzr-2.2.1/NEWS 2010-09-21 14:16:02.000000000 +0200 -@@ -17,6 +17,12 @@ earlier 2.2 releases. - Compatibility Breaks - ******************** - -+Fedora Backported Bug Fixes -+*************************** -+ -+* Fix traceback with python-2.7's xmlrpclib -+ (Toshio Kuratomi, #612096) -+ - Bug Fixes - ********* - diff --git a/bzr.spec b/bzr.spec index 69108fd..92801bb 100644 --- a/bzr.spec +++ b/bzr.spec @@ -28,6 +28,9 @@ Source1: https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+d Source2: bzr-icon-64.png # Fixed upstream here: https://bugs.launchpad.net/bzr/+bug/1182124 Patch0: bzr-cve2013-2099.patch +# Fix for gpg signing when no gpg agent is present: +# https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/1014570 +Patch1: bzr-gpg-no-agent-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python2-devel zlib-devel @@ -65,6 +68,7 @@ This package contains the documentation for the Bazaar version control system. %prep %setup -q -n %{name}-%{version}%{?bzrrc} %patch0 -p1 +%patch1 -p1 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py @@ -147,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_defaultdocdir}/%{name}-doc-%{version}/* %changelog +* Tue May 28 2013 Toshio Kuratomi - 2.5.1-12 +- Patch for failure to gpg sign commits with no gpg-agent + https://bugzilla.redhat.com/show_bug.cgi?id=905087 + * Tue May 28 2013 Toshio Kuratomi - 2.5.1-11 - BuildRequires Cython so that the C extensions are built from their original sources.