public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycares/files/
Date: Wed, 27 Jul 2022 00:24:51 +0000 (UTC)	[thread overview]
Message-ID: <1658881489.2decb9c5af6e1b5a82c49b1665de969eea06e95e.zmedico@gentoo> (raw)

commit:     2decb9c5af6e1b5a82c49b1665de969eea06e95e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 26 16:50:31 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 00:24:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2decb9c5

dev-python/pycares: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/26606
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 .../pycares/files/pycares-4.2.0-c-ares-1.18.patch  | 37 ----------------------
 1 file changed, 37 deletions(-)

diff --git a/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch b/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch
deleted file mode 100644
index 2e094a2b2f1c..000000000000
--- a/dev-python/pycares/files/pycares-4.2.0-c-ares-1.18.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 72202e0bc135e360102371708e83334856d485cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 22 Jun 2022 07:38:33 +0200
-Subject: [PATCH] core: add flexible member to ares_addrinfo to fix c-ares 1.18
-
-Add a flexible member to account for c-ares 1.18 adding an additional
-`name` member to `struct ares_addrinfo`.  This fixes the following
-exception from cffi, and the resulting test_getaddrinfo* failures:
-
-```
-Exception ignored from cffi callback <function _addrinfo_cb at 0x7f5fa890d040>:
-Traceback (most recent call last):
-  File "/tmp/pycares/.tox/py39/lib/python3.9/site-packages/pycares/__init__.py", line 162, in _addrinfo_cb
-    result = ares_addrinfo_result(res)
-  File "/tmp/pycares/.tox/py39/lib/python3.9/site-packages/pycares/__init__.py", line 841, in __init__
-    cname_ptr = ares_addrinfo.cnames
-ffi.error: struct ares_addrinfo: wrong total size (cdef says 16, but C compiler says 24). fix it or use "...;" as the last field in the cdef for struct ares_addrinfo to make it flexible
-```
----
- src/_cffi_src/build_cares.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/_cffi_src/build_cares.py b/src/_cffi_src/build_cares.py
-index 77f03aa..dec42c9 100644
---- a/src/_cffi_src/build_cares.py
-+++ b/src/_cffi_src/build_cares.py
-@@ -337,6 +337,7 @@ struct ares_addrinfo_cname {
- struct ares_addrinfo {
-   struct ares_addrinfo_cname *cnames;
-   struct ares_addrinfo_node  *nodes;
-+  ...;
- };
- 
- struct ares_addrinfo_hints {
--- 
-2.35.1
-


                 reply	other threads:[~2022-07-27  0:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1658881489.2decb9c5af6e1b5a82c49b1665de969eea06e95e.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox