Control: tags 955095 + patch Control: tags 955095 + pending
Dear maintainer, I've prepared an NMU for cyrus-sasl2 (versioned as 2.1.27+dfsg-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru cyrus-sasl2-2.1.27+dfsg/debian/changelog cyrus-sasl2-2.1.27+dfsg/debian/changelog --- cyrus-sasl2-2.1.27+dfsg/debian/changelog 2019-12-26 15:48:32.000000000 +0100 +++ cyrus-sasl2-2.1.27+dfsg/debian/changelog 2021-02-07 10:43:14.000000000 +0100 @@ -1,3 +1,10 @@ +cyrus-sasl2 (2.1.27+dfsg-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix Sphinx errors (Closes: #955095) + + -- Jochen Sprickerhof <[email protected]> Sun, 07 Feb 2021 10:43:14 +0100 + cyrus-sasl2 (2.1.27+dfsg-2) unstable; urgency=medium [ Salvatore Bonaccorso ] diff -Nru cyrus-sasl2-2.1.27+dfsg/debian/patches/0022-Fix-sphinx-error.patch cyrus-sasl2-2.1.27+dfsg/debian/patches/0022-Fix-sphinx-error.patch --- cyrus-sasl2-2.1.27+dfsg/debian/patches/0022-Fix-sphinx-error.patch 1970-01-01 01:00:00.000000000 +0100 +++ cyrus-sasl2-2.1.27+dfsg/debian/patches/0022-Fix-sphinx-error.patch 2021-02-07 10:43:04.000000000 +0100 @@ -0,0 +1,74 @@ +From: Andreas Hasenack <[email protected]> +Date: Sun, 7 Feb 2021 10:32:30 +0100 +Subject: Fix sphinx error + +--- + docsrc/exts/sphinxlocal/builders/manpage.py | 1 - + docsrc/exts/sphinxlocal/roles/saslman.py | 1 - + docsrc/exts/sphinxlocal/writers/manpage.py | 9 +++------ + 3 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/docsrc/exts/sphinxlocal/builders/manpage.py b/docsrc/exts/sphinxlocal/builders/manpage.py +index a6281f7..126839e 100644 +--- a/docsrc/exts/sphinxlocal/builders/manpage.py ++++ b/docsrc/exts/sphinxlocal/builders/manpage.py +@@ -21,7 +21,6 @@ from docutils.frontend import OptionParser + from sphinx import addnodes + from sphinx.errors import SphinxError + from sphinx.builders import Builder +-from sphinx.environment import NoUri + from sphinx.util.nodes import inline_all_toctrees + from sphinx.util.console import bold, darkgreen + from sphinx.writers.manpage import ManualPageWriter +diff --git a/docsrc/exts/sphinxlocal/roles/saslman.py b/docsrc/exts/sphinxlocal/roles/saslman.py +index f881d98..bcafeec 100644 +--- a/docsrc/exts/sphinxlocal/roles/saslman.py ++++ b/docsrc/exts/sphinxlocal/roles/saslman.py +@@ -18,7 +18,6 @@ from string import Template + import re + + def setup(app): +- app.info('Initializing saslman plugin') + app.add_crossref_type('saslman', 'saslman', '%s', nodes.generated) + return + +diff --git a/docsrc/exts/sphinxlocal/writers/manpage.py b/docsrc/exts/sphinxlocal/writers/manpage.py +index 13864e0..e8e9c3a 100644 +--- a/docsrc/exts/sphinxlocal/writers/manpage.py ++++ b/docsrc/exts/sphinxlocal/writers/manpage.py +@@ -13,8 +13,9 @@ + """ + + from docutils import nodes ++from time import strftime ++ + from sphinx.writers.manpage import ( +- MACRO_DEF, + ManualPageWriter, + ManualPageTranslator as BaseTranslator + ) +@@ -22,7 +23,6 @@ from sphinx.writers.manpage import ( + + from sphinx import addnodes + from sphinx.locale import admonitionlabels, _ +-from sphinx.util.osutil import ustrftime + + class CyrusManualPageWriter(ManualPageWriter): + +@@ -67,15 +67,12 @@ class CyrusManualPageTranslator(BaseTranslator): + if builder.config.today: + self._docinfo['date'] = builder.config.today + else: +- self._docinfo['date'] = ustrftime(builder.config.today_fmt ++ self._docinfo['date'] = strftime(builder.config.today_fmt + or _('%B %d, %Y')) + self._docinfo['copyright'] = builder.config.copyright + self._docinfo['version'] = builder.config.version + self._docinfo['manual_group'] = builder.config.project + +- # since self.append_header() is never called, need to do this here +- self.body.append(MACRO_DEF) +- + # overwritten -- don't wrap literal_block with font calls + self.defs['literal_block'] = ('.sp\n.nf\n', '\n.fi\n') + diff -Nru cyrus-sasl2-2.1.27+dfsg/debian/patches/0023-Fix-more-sphinx-errors.patch cyrus-sasl2-2.1.27+dfsg/debian/patches/0023-Fix-more-sphinx-errors.patch --- cyrus-sasl2-2.1.27+dfsg/debian/patches/0023-Fix-more-sphinx-errors.patch 1970-01-01 01:00:00.000000000 +0100 +++ cyrus-sasl2-2.1.27+dfsg/debian/patches/0023-Fix-more-sphinx-errors.patch 2021-02-07 10:43:07.000000000 +0100 @@ -0,0 +1,59 @@ +From: Jochen Sprickerhof <[email protected]> +Date: Sun, 7 Feb 2021 10:33:45 +0100 +Subject: Fix more sphinx errors + +--- + docsrc/conf.py | 2 +- + docsrc/exts/sphinxlocal/builders/manpage.py | 5 ----- + 2 files changed, 1 insertion(+), 6 deletions(-) + +diff --git a/docsrc/conf.py b/docsrc/conf.py +index ba1833c..b22ac3b 100644 +--- a/docsrc/conf.py ++++ b/docsrc/conf.py +@@ -294,7 +294,7 @@ for tuple in pathset: + except OSError as e: + continue + for rstfile in glob.glob("*.rst"): +- author = [("The Cyrus Team")] ++ author = "The Cyrus Team" + orphan = 'False'; + with io.open(rstfile,'r',encoding="utf8") as f: + for line in f: +diff --git a/docsrc/exts/sphinxlocal/builders/manpage.py b/docsrc/exts/sphinxlocal/builders/manpage.py +index 126839e..c558f73 100644 +--- a/docsrc/exts/sphinxlocal/builders/manpage.py ++++ b/docsrc/exts/sphinxlocal/builders/manpage.py +@@ -55,8 +55,6 @@ class CyrusManualPageBuilder(ManualPageBuilder): + components=(docwriter,), + read_config_files=True).get_default_values() + +- self.info(bold('writing... '), nonl=True) +- + for info in self.config.man_pages: + docname, name, description, authors, section = info + if isinstance(authors, string_types): +@@ -66,7 +64,6 @@ class CyrusManualPageBuilder(ManualPageBuilder): + authors = [] + + targetname = '%s.%s' % (name, section) +- self.info(darkgreen(targetname) + ' { ', nonl=True) + destination = FileOutput( + destination_path=path.join(self.outdir, targetname), + encoding='utf-8') +@@ -75,7 +72,6 @@ class CyrusManualPageBuilder(ManualPageBuilder): + docnames = set() + largetree = inline_all_toctrees(self, docnames, docname, tree, + darkgreen, [docname]) +- self.info('} ', nonl=True) + self.env.resolve_references(largetree, docname, self) + # remove pending_xref nodes + for pendingnode in largetree.traverse(addnodes.pending_xref): +@@ -88,7 +84,6 @@ class CyrusManualPageBuilder(ManualPageBuilder): + largetree.settings.section = section + + docwriter.write(largetree, destination) +- self.info() + + def setup(app): + app.add_builder(CyrusManualPageBuilder) diff -Nru cyrus-sasl2-2.1.27+dfsg/debian/patches/series cyrus-sasl2-2.1.27+dfsg/debian/patches/series --- cyrus-sasl2-2.1.27+dfsg/debian/patches/series 2019-12-26 15:48:32.000000000 +0100 +++ cyrus-sasl2-2.1.27+dfsg/debian/patches/series 2021-02-07 10:43:11.000000000 +0100 @@ -19,3 +19,5 @@ 0019-Stop-importing-docutils_version-in-sphinx-build-manp.patch 0020-Restore-LIBS-after-checking-gss_inquire_sec_context_.patch 0034-CVE-2019-19906.patch +0022-Fix-sphinx-error.patch +0023-Fix-more-sphinx-errors.patch
signature.asc
Description: PGP signature
