[Python-modules-commits] [python-getdns] 02/03: Backport upstream fix to back out STARTTLS support to align to upstream getdns changes (Closes: #810260)
Scott Kitterman
kitterman at moszumanska.debian.org
Fri Jan 15 20:38:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
kitterman pushed a commit to branch master
in repository python-getdns.
commit 5b8ed9840321eed6bcbe4c27778de7e97b55c7d9
Merge: dd1ccc0 a9f0647
Author: Scott Kitterman <scott at kitterman.com>
Date: Fri Jan 15 15:22:11 2016 -0500
Backport upstream fix to back out STARTTLS support to align to
upstream getdns changes (Closes: #810260)
context.c | 2 +-
debian/.git-dpm | 4 +--
debian/changelog | 7 ++++
.../patches/0002-Back-out-STARTTLS-support.patch | 41 ++++++++++++++++++++++
debian/patches/series | 1 +
getdns.c | 1 -
6 files changed, 52 insertions(+), 4 deletions(-)
diff --cc debian/.git-dpm
index 71ab999,0000000..3bea159
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 2b45a40f340ed639e8e5d0218266b533001f3ab3
- 2b45a40f340ed639e8e5d0218266b533001f3ab3
++a9f0647cd4cadf91bba1be4a6ff6bad51b9aaa52
++a9f0647cd4cadf91bba1be4a6ff6bad51b9aaa52
+36ce53646b7ea9e52b4696eff090b7cc183ce259
+36ce53646b7ea9e52b4696eff090b7cc183ce259
+python-getdns_0.5.0.orig.tar.gz
+c377dc61dba66ce61b4bdb7e90f02ea6f38878e6
+48973
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 617e217,0000000..8c2b9dd
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,58 -1,0 +1,65 @@@
++python-getdns (0.5.0-2) UNRELEASED; urgency=medium
++
++ * Backport upstream fix to back out STARTTLS support to align to
++ upstream getdns changes (Closes: #810260)
++
++ -- Scott Kitterman <scott at kitterman.com> Fri, 15 Jan 2016 15:22:12 -0500
++
+python-getdns (0.5.0-1) unstable; urgency=medium
+
+ [ SVN-Git Migration ]
+ * Migrate packaging to git with git-dpm
+
+ [ Scott Kitterman ]
+ * New upstream release
+ * Agreed maintainer change to DPMT
+ - Update maintainer/uploaders and point to DPMT git repository in debian/
+ control
+ * Add support for python3
+ - Create new python3-getdns binary
+ - Split documentation and examples into separate python-getdns-doc package
+ so they are not duplicated
+ - Adjust debian/rules and install files
+ * Update copyright year in debian/copyright
+
+ -- Scott Kitterman <scott at kitterman.com> Tue, 29 Dec 2015 12:52:27 -0500
+
+python-getdns (0.3.1-2) unstable; urgency=medium
+
+ * import upstream fix for segfault from Context.run()
+ * fix package description
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Wed, 17 Jun 2015 14:38:10 -0400
+
+python-getdns (0.3.1-1) unstable; urgency=medium
+
+ * New Upstream version (Closes: #783786)
+ * joined the packaging team, adding myself to uploaders.
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Thu, 30 Apr 2015 00:55:28 -0400
+
+python-getdns (0.2.1-2) unstable; urgency=medium
+
+ * Merge extra Scott Kitterman's changes from 0.2.0-2 into the repository
+ + Adjust build-depends to fix FTBFS:
+ - Change python-all (>= 2.6.6-3) build-dep to python-all-dev (>= 2.6.6-3)
+ + Add Build-depend on dh-python to ensure the latest version is used
+ * Add Vcs-* to debian/control
+ * No DPMT maintenance
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 26 Feb 2015 09:35:43 +0100
+
+python-getdns (0.2.1-1) unstable; urgency=medium
+
+ * New upstream version 0.2.1
+ * Depend on getdns >= 0.1.6
+ * Update patches for 0.2.1 release
+
+ -- Ondřej Surý <ondrej at debian.org> Wed, 25 Feb 2015 11:04:29 +0100
+
+python-getdns (0.2.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #767890)
+ * Build-Depend on fixed version of libgetdns-dev
+
+ -- Ondřej Surý <ondrej at debian.org> Mon, 03 Nov 2014 11:21:39 +0100
diff --cc debian/patches/0002-Back-out-STARTTLS-support.patch
index 0000000,0000000..b16164e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Back-out-STARTTLS-support.patch
@@@ -1,0 -1,0 +1,41 @@@
++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 --cc debian/patches/series
index 204e1b7,0000000..31ddde0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
+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
More information about the Python-modules-commits
mailing list