From 3043be0c9971ed49181c96182601437b32d168fd Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 10 Feb 2023 18:08:52 +0300 Subject: [PATCH] apr-util ver. bump --- .../files/apr-util-1.6.3-allow-ipv6.patch | 43 +++++++++++++++++++ programming/misc/apr-util/pspec.xml | 3 ++ 2 files changed, 46 insertions(+) create mode 100644 programming/misc/apr-util/files/apr-util-1.6.3-allow-ipv6.patch diff --git a/programming/misc/apr-util/files/apr-util-1.6.3-allow-ipv6.patch b/programming/misc/apr-util/files/apr-util-1.6.3-allow-ipv6.patch new file mode 100644 index 0000000000..c5d1e7cc87 --- /dev/null +++ b/programming/misc/apr-util/files/apr-util-1.6.3-allow-ipv6.patch @@ -0,0 +1,43 @@ +From 828d644c8eba8765843985d9293f033898ed0592 Mon Sep 17 00:00:00 2001 +From: Joe Orton +Date: Fri, 3 Feb 2023 15:12:10 +0000 +Subject: [PATCH] * memcache/apr_memcache.c (conn_connect): Allow use of IPv6 + rather than forcing name resolution to IPv4 only. + +Submitted by: Lubos Uhliarik +Github: closes #39 + + +git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1907242 13f79535-47bb-0310-9956-ffa450edef68 +--- + memcache/apr_memcache.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/memcache/apr_memcache.c b/memcache/apr_memcache.c +index 5f8135c52c..18806281a4 100644 +--- a/memcache/apr_memcache.c ++++ b/memcache/apr_memcache.c +@@ -290,9 +290,9 @@ static apr_status_t conn_connect(apr_memcache_conn_t *conn) + apr_status_t rv = APR_SUCCESS; + apr_sockaddr_t *sa; + #if APR_HAVE_SOCKADDR_UN +- apr_int32_t family = conn->ms->host[0] != '/' ? APR_INET : APR_UNIX; ++ apr_int32_t family = conn->ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX; + #else +- apr_int32_t family = APR_INET; ++ apr_int32_t family = APR_UNSPEC; + #endif + + rv = apr_sockaddr_info_get(&sa, conn->ms->host, family, conn->ms->port, 0, conn->p); +@@ -328,9 +328,9 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool) + apr_pool_t *tp; + apr_memcache_server_t *ms = params; + #if APR_HAVE_SOCKADDR_UN +- apr_int32_t family = ms->host[0] != '/' ? APR_INET : APR_UNIX; ++ apr_int32_t family = ms->host[0] != '/' ? APR_UNSPEC : APR_UNIX; + #else +- apr_int32_t family = APR_INET; ++ apr_int32_t family = APR_UNSPEC; + #endif + + rv = apr_pool_create(&np, pool); diff --git a/programming/misc/apr-util/pspec.xml b/programming/misc/apr-util/pspec.xml index bdf99412f5..14f07888f5 100644 --- a/programming/misc/apr-util/pspec.xml +++ b/programming/misc/apr-util/pspec.xml @@ -27,6 +27,9 @@ cyrus-sasl-devel openldap-client + + apr-util-1.6.3-allow-ipv6.patch +