Patch really attached this time. -- Brian May <br...@microcomaustralia.com.au>
Index: debian/python-openssl-doc.docs =================================================================== --- debian/python-openssl-doc.docs (revision 30137) +++ debian/python-openssl-doc.docs (working copy) @@ -1,3 +1 @@ -doc/pyOpenSSL.ps -doc/pyOpenSSL.txt doc/html Index: debian/copyright =================================================================== --- debian/copyright (revision 30137) +++ debian/copyright (working copy) @@ -1,7 +1,7 @@ This package was debianized by Martin Sjögren <sjog...@debian.org> on Mon, 7 Jan 2002 16:25:58 +0100. -It was downloaded from http://launchpad.net/pyopenssl +It was downloaded from https://github.com/pyca/pyopenssl Upstream Author: Index: debian/control =================================================================== --- debian/control (revision 30137) +++ debian/control (working copy) @@ -3,9 +3,16 @@ Priority: optional Maintainer: Sandro Tosi <mo...@debian.org> Uploaders: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org> -Build-Depends: debhelper (>= 9), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python3-all-dev, python3-all-dbg, dh-python, libssl-dev (>= 0.9.8), tex4ht, w3m, texlive-latex-base, texlive-latex-recommended, openssl, texlive-fonts-recommended + Brian May <b...@debian.org> +Build-Depends: debhelper (>= 9), dh-python, + python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python-setuptools, + python-six, python-cryptography, + python3-all-dev, python3-all-dbg, python3-setuptools, + python3-six, python3-cryptography, python3-sphinx, + libssl-dev (>= 0.9.8), tex4ht, w3m, texlive-latex-base, + texlive-latex-recommended, openssl, texlive-fonts-recommended, Standards-Version: 3.9.5 -Homepage: http://launchpad.net/pyopenssl +Homepage: https://github.com/pyca/pyopenssl Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyopenssl/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyopenssl/trunk/ XS-Python-Version: all Index: debian/changelog =================================================================== --- debian/changelog (revision 30137) +++ debian/changelog (working copy) @@ -1,3 +1,13 @@ +pyopenssl (0.14-1) unstable; urgency=low + + * New upstream. Closes: #751144. + * Update homepage. Closes: #751893. + * Ensure test failures about the build process. + * Build only HTML documentation. + * Wrap build depends and add missing requirements. + + -- Brian May <b...@debian.org> Tue, 12 Aug 2014 16:14:46 +1000 + pyopenssl (0.13.1-2) unstable; urgency=medium * debian/control Index: debian/patches/series =================================================================== --- debian/patches/series (revision 30137) +++ debian/patches/series (working copy) @@ -1,3 +0,0 @@ -10_fix_doc_buildsystem.patch -disable_test_set_default_verify_paths.patch -bts733366_make_symbol_optional.patch Index: debian/patches/10_fix_doc_buildsystem.patch =================================================================== --- debian/patches/10_fix_doc_buildsystem.patch (revision 30137) +++ debian/patches/10_fix_doc_buildsystem.patch (working copy) @@ -1,157 +0,0 @@ -Author: Sandro Tosi <mo...@debian.org> -Description: Fix the doc build system, providing a working clean target and building -the latex doc using htlatex (in main) instead of latex2html ---- pyopenssl-0.12.orig/doc/Makefile -+++ pyopenssl-0.12/doc/Makefile -@@ -10,11 +10,11 @@ - - html: pyOpenSSL.tex - $(MKHOWTO) --html --iconserver . $^ -- -rm -rf html -- mv pyOpenSSL html -+ -rm -rf html/ -+ mkdir html/ -+ mv *.html pyOpenSSL.css html/ - - clean: -- rm -rf html pyOpenSSL.dvi pyOpenSSL.ps pyOpenSSL.txt \ -- pyOpenSSL.l2h pyOpenSSL.how -+ rm -rf html/ *.html pyOpenSSL.[0-9a-su-z]* pyOpenSSL.txt pyOpenSSL.tmp - - .PHONY: default all html dvi ps text clean ---- pyopenssl-0.12.orig/doc/tools/mkhowto -+++ pyopenssl-0.12/doc/tools/mkhowto -@@ -55,8 +55,8 @@ - BIBTEX_BINARY = "bibtex" - DVIPS_BINARY = "dvips" - LATEX_BINARY = "latex" --LATEX2HTML_BINARY = "latex2html" --LYNX_BINARY = "lynx" -+LATEX2HTML_BINARY = "htlatex" -+LYNX_BINARY = "w3m" - MAKEINDEX_BINARY = "makeindex" - PDFLATEX_BINARY = "pdflatex" - PERL_BINARY = "perl" -@@ -232,33 +232,10 @@ - self.build_ps() - if "html" in formats: - self.require_temps() -- self.build_html(self.options.builddir or self.doc) -- if self.options.icon_server == ".": -- pattern = os.path.join(MYDIR, "html", "icons", -- "*." + self.options.image_type) -- imgs = glob.glob(pattern) -- if not imgs: -- self.warning( -- "Could not locate support images of type %s." -- % `self.options.image_type`) -- for fn in imgs: -- new_fn = os.path.join(self.doc, os.path.basename(fn)) -- shutil.copyfile(fn, new_fn) -+ self.build_html() - if "text" in formats: -- self.require_temps() -- tempdir = self.doc -- need_html = "html" not in formats -- if self.options.max_split_depth != 1: -- fp = open(self.l2h_aux_init_file, "a") -- fp.write("# re-hack this file for --text:\n") -- l2hoption(fp, "MAX_SPLIT_DEPTH", "1") -- fp.write("1;\n") -- fp.close() -- tempdir = self.doc + "-temp-html" -- need_html = 1 -- if need_html: -- self.build_html(tempdir, max_split_depth=1) -- self.build_text(tempdir) -+ self.build_html() -+ self.build_text() - if self.options.discard_temps: - self.cleanup() - -@@ -282,6 +259,10 @@ - def build_pdf(self): - self.use_latex(PDFLATEX_BINARY) - -+ def build_html(self): -+ self.setup_texinputs() -+ self.run("%s %s" % (LATEX2HTML_BINARY, self.doc)) -+ - def use_latex(self, binary): - self.require_temps(binary=binary) - if self.latex_runs < 2: -@@ -333,72 +314,8 @@ - def build_ps(self): - self.run("%s -N0 -o %s.ps %s" % (DVIPS_BINARY, self.doc, self.doc)) - -- def build_html(self, builddir=None, max_split_depth=None): -- if builddir is None: -- builddir = self.doc -- if max_split_depth is None: -- max_split_depth = self.options.max_split_depth -- texfile = None -- for p in string.split(os.environ["TEXINPUTS"], os.pathsep): -- fn = os.path.join(p, self.doc + ".tex") -- if os.path.isfile(fn): -- texfile = fn -- break -- if not texfile: -- self.warning("Could not locate %s.tex; aborting." % self.doc) -- sys.exit(1) -- # remove leading ./ (or equiv.); might avoid problems w/ dvips -- if texfile[:2] == os.curdir + os.sep: -- texfile = texfile[2:] -- # build the command line and run LaTeX2HTML: -- if not os.path.isdir(builddir): -- os.mkdir(builddir) -- else: -- for fname in glob.glob(os.path.join(builddir, "*.html")): -- os.unlink(fname) -- args = [LATEX2HTML_BINARY, -- "-init_file", self.l2h_aux_init_file, -- "-dir", builddir, -- texfile -- ] -- self.run(string.join(args)) # XXX need quoting! -- # ... postprocess -- shutil.copyfile(self.options.style_file, -- os.path.join(builddir, self.doc + ".css")) -- shutil.copyfile(os.path.join(builddir, self.doc + ".html"), -- os.path.join(builddir, "index.html")) -- if max_split_depth != 1: -- if self.options.numeric: -- label_file = os.path.join(builddir, "labels.pl") -- fp = open(label_file) -- about_node = None -- target = " = q/about/;\n" -- x = len(target) -- while 1: -- line = fp.readline() -- if not line: -- break -- if line[-x:] == target: -- line = fp.readline() -- m = re.search(r"\|(node\d+\.[a-z]+)\|", line) -- about_node = m.group(1) -- shutil.copyfile(os.path.join(builddir, about_node), -- os.path.join(builddir, "about.html")) -- break -- else: -- pwd = os.getcwd() -- try: -- os.chdir(builddir) -- self.run("%s %s *.html" % (PERL_BINARY, NODE2LABEL_SCRIPT)) -- finally: -- os.chdir(pwd) -- -- def build_text(self, tempdir=None): -- if tempdir is None: -- tempdir = self.doc -- indexfile = os.path.join(tempdir, "index.html") -- self.run("%s -nolist -dump %s >%s.txt" -- % (LYNX_BINARY, indexfile, self.doc)) -+ def build_text(self): -+ self.run("%s -dump %s > %s.txt" % (LYNX_BINARY, "pyOpenSSL.html", self.doc)) - - def require_temps(self, binary=None): - if not self.latex_runs: Index: debian/patches/disable_test_set_default_verify_paths.patch =================================================================== --- debian/patches/disable_test_set_default_verify_paths.patch (revision 30137) +++ debian/patches/disable_test_set_default_verify_paths.patch (working copy) @@ -1,42 +0,0 @@ -Description: disable test_set_default_verify_paths since it tries to access the web - -Index: pyopenssl-0.13~a1/OpenSSL/test/test_ssl.py -=================================================================== ---- pyopenssl-0.13~a1.orig/OpenSSL/test/test_ssl.py 2011-08-15 18:23:31.612351434 +0200 -+++ pyopenssl-0.13~a1/OpenSSL/test/test_ssl.py 2011-08-15 18:24:44.646743564 +0200 -@@ -661,21 +661,22 @@ - # internet which has such a certificate. Connecting to the network - # in a unit test is bad, but it's the only way I can think of to - # really test this. -exarkun -+ pass - - # Arg, verisign.com doesn't speak TLSv1 -- context = Context(SSLv3_METHOD) -- context.set_default_verify_paths() -- context.set_verify( -- VERIFY_PEER, -- lambda conn, cert, errno, depth, preverify_ok: preverify_ok) -- -- client = socket() -- client.connect(('verisign.com', 443)) -- clientSSL = Connection(context, client) -- clientSSL.set_connect_state() -- clientSSL.do_handshake() -- clientSSL.send('GET / HTTP/1.0\r\n\r\n') -- self.assertTrue(clientSSL.recv(1024)) -+ #context = Context(SSLv3_METHOD) -+ #context.set_default_verify_paths() -+ #context.set_verify( -+ # VERIFY_PEER, -+ # lambda conn, cert, errno, depth, preverify_ok: preverify_ok) -+ # -+ #client = socket() -+ #client.connect(('verisign.com', 443)) -+ #clientSSL = Connection(context, client) -+ #clientSSL.set_connect_state() -+ #clientSSL.do_handshake() -+ #clientSSL.send('GET / HTTP/1.0\r\n\r\n') -+ #self.assertTrue(clientSSL.recv(1024)) - - - def test_set_default_verify_paths_signature(self): Index: debian/patches/bts733366_make_symbol_optional.patch =================================================================== --- debian/patches/bts733366_make_symbol_optional.patch (revision 30137) +++ debian/patches/bts733366_make_symbol_optional.patch (working copy) @@ -1,25 +0,0 @@ -Description: Make SSL_OP_MSIE_SSLV2_RSA_PADDING optional - Since 0.9.7h SSL_OP_MSIE_SSLV2_RSA_PADDING has no effect and - it have been removed in version 0.9.8a - . - This patch makes it optional. -Author: Mehdi Abaakouk <sil...@sileht.net> -Origin: https://bugs.launchpad.net/pyopenssl/+bug/1266521 -Bug: https://bugs.launchpad.net/pyopenssl/+bug/1266521 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733366 -Forwarded: not-needed -Last-Update: 2014-01-12 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/OpenSSL/ssl/ssl.c -+++ b/OpenSSL/ssl/ssl.c -@@ -211,7 +211,9 @@ do { - PyModule_AddIntConstant(module, "OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG); - PyModule_AddIntConstant(module, "OP_SSLREF2_REUSE_CERT_TYPE_BUG", SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG); - PyModule_AddIntConstant(module, "OP_MICROSOFT_BIG_SSLV3_BUFFER", SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER); -+#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING - PyModule_AddIntConstant(module, "OP_MSIE_SSLV2_RSA_PADDING", SSL_OP_MSIE_SSLV2_RSA_PADDING); -+#endif - PyModule_AddIntConstant(module, "OP_SSLEAY_080_CLIENT_DH_BUG", SSL_OP_SSLEAY_080_CLIENT_DH_BUG); - PyModule_AddIntConstant(module, "OP_TLS_D5_BUG", SSL_OP_TLS_D5_BUG); - PyModule_AddIntConstant(module, "OP_TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG); Index: debian/rules =================================================================== --- debian/rules (revision 30137) +++ debian/rules (working copy) @@ -17,12 +17,12 @@ python$$py-dbg setup.py build; \ done - $(MAKE) -C doc all + $(MAKE) -C doc html override_dh_auto_test: ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) # run tests - -for py in $(PYVERS); do \ + set -e; for py in $(PYVERS); do \ for test in OpenSSL/test/test*; do \ echo "running $$test for python$$py ..."; \ PYTHONPATH=build/lib.$(DEB_BUILD_ARCH_OS)-$(shell uname -m)-$$py python$$py $$test; \
