[Python-modules-commits] [python-getdns] 03/04: Update patches for 0.6.0 release

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository python-getdns.

commit 0f0a18d0bab87eea78c1088956babac73820f007
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jan 27 10:44:49 2016 +0100

    Update patches for 0.6.0 release
---
 debian/patches/0001-remove-rpath.patch             | 10 +++---
 .../patches/0002-Back-out-STARTTLS-support.patch   | 41 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/debian/patches/0001-remove-rpath.patch b/debian/patches/0001-remove-rpath.patch
index b037cb6..d1c2ae5 100644
--- a/debian/patches/0001-remove-rpath.patch
+++ b/debian/patches/0001-remove-rpath.patch
@@ -9,16 +9,14 @@ Patch-Name: 0001-remove-rpath.patch
  setup.py | 3 ---
  1 file changed, 3 deletions(-)
 
-diff --git a/setup.py b/setup.py
-index cc64e8c..19ffdf4 100644
---- a/setup.py
-+++ b/setup.py
-@@ -55,13 +55,10 @@ if not ((platform_version[0] == '3') or (platform_version == ['2', '7'])):
+--- python-getdns.orig/setup.py
++++ python-getdns/setup.py
+@@ -51,13 +51,10 @@ if not ((platform_version[0] == '3') or
      os._exit(1)
  
  getdns_module = Extension('getdns',
 -                    include_dirs = [ '/usr/local/include', ],
-                     libraries = [ 'ldns', 'getdns', 'getdns_ext_event', 'event' ],
+                     libraries = [ 'getdns', 'getdns_ext_event', 'event' ],
 -                    library_dirs = [ '/usr/local/lib', lib_dir ],
                      sources = [ 'getdns.c', 'pygetdns_util.c', 'context.c',
                                  'context_util.c', 'result.c' ],
diff --git a/debian/patches/0002-Back-out-STARTTLS-support.patch b/debian/patches/0002-Back-out-STARTTLS-support.patch
deleted file mode 100644
index b16164e..0000000
--- a/debian/patches/0002-Back-out-STARTTLS-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a9f0647cd4cadf91bba1be4a6ff6bad51b9aaa52 Mon Sep 17 00:00:00 2001
-From: Scott Kitterman <scott at kitterman.com>
-Date: Fri, 15 Jan 2016 15:19:39 -0500
-Subject: Back out STARTTLS support
-
-From 32dfd91e45420774ffe4384383322eedea77f931 Mon Sep 17 00:00:00 2001
-From: Melinda Shore <melinda.shore at nomountain.net>
-Date: Wed, 30 Dec 2015 16:39:13 -0900
-Subject: [PATCH] Backed out STARTTLS support
-
----
----
- context.c | 2 +-
- getdns.c  | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/context.c b/context.c
-index b31859e..294885c 100644
---- a/context.c
-+++ b/context.c
-@@ -875,7 +875,7 @@ context_set_dns_transport_list(getdns_context *context, PyObject *py_value)
-         long transport;
-         if ((py_transport = PyList_GetItem(py_value, (Py_ssize_t)i)) != NULL)  {
-             transport = PyLong_AsLong(py_transport);
--            if ((transport < GETDNS_TRANSPORT_UDP) || (transport > GETDNS_TRANSPORT_STARTTLS))  {
-+            if ((transport < GETDNS_TRANSPORT_UDP) || (transport > GETDNS_TRANSPORT_TLS))  {
-                 PyErr_SetString(getdns_error, GETDNS_RETURN_INVALID_PARAMETER_TEXT);
-                 return -1;
-             }
-diff --git a/getdns.c b/getdns.c
-index 0f009c5..f7c812e 100644
---- a/getdns.c
-+++ b/getdns.c
-@@ -488,7 +488,6 @@ add_getdns_constants(PyObject *g)
-     PyModule_AddIntConstant(g, "TRANSPORT_UDP", 1200);
-     PyModule_AddIntConstant(g, "TRANSPORT_TCP", 1201);
-     PyModule_AddIntConstant(g, "TRANSPORT_TLS", 1202);
--    PyModule_AddIntConstant(g, "TRANSPORT_STARTTLS", 1203);
- 
- /*
-  * suffix appending methods
diff --git a/debian/patches/series b/debian/patches/series
index 31ddde0..204e1b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-remove-rpath.patch
-0002-Back-out-STARTTLS-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-getdns.git