[Python-modules-commits] r30169 - in packages/pyopenssl/trunk/debian (5 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Sat Aug 16 18:26:42 UTC 2014
Date: Saturday, August 16, 2014 @ 18:26:41
Author: morph
Revision: 30169
* debian/patches/*
- removed no longer applyable patches, refresh the remaining one
Modified:
packages/pyopenssl/trunk/debian/changelog
packages/pyopenssl/trunk/debian/patches/disable_test_set_default_verify_paths.patch
packages/pyopenssl/trunk/debian/patches/series
Deleted:
packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.patch
packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch
Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog 2014-08-16 13:29:13 UTC (rev 30168)
+++ packages/pyopenssl/trunk/debian/changelog 2014-08-16 18:26:41 UTC (rev 30169)
@@ -8,8 +8,10 @@
- updated to new upsteam release
* debian/rules
- install RATIONALE as doc
+ * debian/patches/*
+ - removed no longer applyable patches, refresh the remaining one
- -- Sandro Tosi <morph at debian.org> Sat, 16 Aug 2014 14:26:33 +0100
+ -- Sandro Tosi <morph at debian.org> Sat, 16 Aug 2014 19:26:20 +0100
pyopenssl (0.13.1-2) unstable; urgency=medium
Deleted: packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.patch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.patch 2014-08-16 13:29:13 UTC (rev 30168)
+++ packages/pyopenssl/trunk/debian/patches/10_fix_doc_buildsystem.patch 2014-08-16 18:26:41 UTC (rev 30169)
@@ -1,157 +0,0 @@
-Author: Sandro Tosi <morph at 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:
Deleted: packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch 2014-08-16 13:29:13 UTC (rev 30168)
+++ packages/pyopenssl/trunk/debian/patches/bts733366_make_symbol_optional.patch 2014-08-16 18:26:41 UTC (rev 30169)
@@ -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 <sileht at 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);
Modified: packages/pyopenssl/trunk/debian/patches/disable_test_set_default_verify_paths.patch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/disable_test_set_default_verify_paths.patch 2014-08-16 13:29:13 UTC (rev 30168)
+++ packages/pyopenssl/trunk/debian/patches/disable_test_set_default_verify_paths.patch 2014-08-16 18:26:41 UTC (rev 30169)
@@ -1,10 +1,8 @@
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 @@
+--- a/OpenSSL/test/test_ssl.py
++++ b/OpenSSL/test/test_ssl.py
+@@ -918,21 +918,22 @@ class ContextTests(TestCase, _LoopbackMi
# 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
@@ -22,7 +20,7 @@
- clientSSL = Connection(context, client)
- clientSSL.set_connect_state()
- clientSSL.do_handshake()
-- clientSSL.send('GET / HTTP/1.0\r\n\r\n')
+- clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
- self.assertTrue(clientSSL.recv(1024))
+ #context = Context(SSLv3_METHOD)
+ #context.set_default_verify_paths()
@@ -35,7 +33,7 @@
+ #clientSSL = Connection(context, client)
+ #clientSSL.set_connect_state()
+ #clientSSL.do_handshake()
-+ #clientSSL.send('GET / HTTP/1.0\r\n\r\n')
++ #clientSSL.send(b"GET / HTTP/1.0\r\n\r\n")
+ #self.assertTrue(clientSSL.recv(1024))
Modified: packages/pyopenssl/trunk/debian/patches/series
===================================================================
--- packages/pyopenssl/trunk/debian/patches/series 2014-08-16 13:29:13 UTC (rev 30168)
+++ packages/pyopenssl/trunk/debian/patches/series 2014-08-16 18:26:41 UTC (rev 30169)
@@ -1,3 +1 @@
-10_fix_doc_buildsystem.patch
disable_test_set_default_verify_paths.patch
-bts733366_make_symbol_optional.patch
More information about the Python-modules-commits
mailing list