diff options
| author | jperkin <jperkin@pkgsrc.org> | 2022-07-29 20:33:38 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2022-07-29 20:33:38 +0000 |
| commit | 79bd1c4b25f58614a1b8fdfa62b9c78125f03e66 (patch) | |
| tree | fb6198e5ec156d9f3bbd972302370e2afb6d29c5 /net/samba4/patches | |
| parent | acb16725e60a49c864c461c3063fd88451c1b016 (diff) | |
| download | pkgsrc-79bd1c4b25f58614a1b8fdfa62b9c78125f03e66.tar.gz | |
samba4: Add support for mit-krb5.
The builtin heimdal no longer builds and it's unclear how it can possibly
work as it uses functions that do not exist anywhere. Also fix some SunOS
build issues.
I'm not convinced this won't break builds that use heimdal but will keep an
eye out for failures.
Diffstat (limited to 'net/samba4/patches')
| -rw-r--r-- | net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c | 55 | ||||
| -rw-r--r-- | net/samba4/patches/patch-third__party_heimdal_lib_roken_getauxval.h | 15 |
2 files changed, 70 insertions, 0 deletions
diff --git a/net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c b/net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c new file mode 100644 index 00000000000..4dcba53d45e --- /dev/null +++ b/net/samba4/patches/patch-lib_tsocket_tsocket__bsd.c @@ -0,0 +1,55 @@ +$NetBSD: patch-lib_tsocket_tsocket__bsd.c,v 1.3 2022/07/29 20:33:38 jperkin Exp $ + +Avoid s_addr macro. + +--- lib/tsocket/tsocket_bsd.c.orig 2022-01-24 10:26:58.933306500 +0000 ++++ lib/tsocket/tsocket_bsd.c +@@ -457,7 +457,7 @@ int _tsocket_address_inet_from_hostport_ + char *buf = NULL; + uint64_t port = 0; + int ret; +- char *s_addr = NULL; ++ char *sun_addr = NULL; + uint16_t s_port = default_port; + bool conv_ret; + bool is_ipv6_by_squares = false; +@@ -486,7 +486,7 @@ int _tsocket_address_inet_from_hostport_ + /* IPv6 possibly with port - squares detected */ + port_sep = pr_sq + 1; + if (*port_sep == '\0') { +- s_addr = pl_sq + 1; ++ sun_addr = pl_sq + 1; + *pr_sq = 0; + s_port = default_port; + goto get_addr; +@@ -508,7 +508,7 @@ int _tsocket_address_inet_from_hostport_ + s_port = (uint16_t)port; + *port_sep = 0; + *pr_sq = 0; +- s_addr = pl_sq + 1; ++ sun_addr = pl_sq + 1; + *pl_sq = 0; + goto get_addr; + } else if (pl_period != NULL && port_sep != NULL) { +@@ -525,18 +525,18 @@ int _tsocket_address_inet_from_hostport_ + } + s_port = (uint16_t)port; + *port_sep = 0; +- s_addr = buf; ++ sun_addr = buf; + goto get_addr; + } else { + /* Everything else, let tsocket_address_inet_from string() */ + /* find parsing errors */ +- s_addr = buf; ++ sun_addr = buf; + s_port = default_port; + goto get_addr; + } + get_addr: + ret = _tsocket_address_inet_from_strings( +- mem_ctx, fam, s_addr, s_port, _addr, location); ++ mem_ctx, fam, sun_addr, s_port, _addr, location); + + return ret; + } diff --git a/net/samba4/patches/patch-third__party_heimdal_lib_roken_getauxval.h b/net/samba4/patches/patch-third__party_heimdal_lib_roken_getauxval.h new file mode 100644 index 00000000000..871a74861f2 --- /dev/null +++ b/net/samba4/patches/patch-third__party_heimdal_lib_roken_getauxval.h @@ -0,0 +1,15 @@ +$NetBSD: patch-third__party_heimdal_lib_roken_getauxval.h,v 1.1 2022/07/29 20:33:38 jperkin Exp $ + +Avoid auxv_t conflict on SunOS. + +--- third_party/heimdal/lib/roken/getauxval.h.orig 2022-01-24 10:27:00.525315000 +0000 ++++ third_party/heimdal/lib/roken/getauxval.h +@@ -44,7 +44,7 @@ + #include <sys/exec_elf.h> + #endif + +-#ifndef HAVE_AUXV_T ++#if !defined(HAVE_AUXV_T) && !defined(__sun) + /* + * Illumos defines auxv_t per the ABI standards, but all other OSes seem + * to use { long; long; } instead, depends on sizeof(long) == |