From a9d62c1d6a3070d54d978a1f238a332eac773181 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sun, 19 Oct 2025 20:32:00 -0400
Subject: [PATCH] darwin.libresolv: 83 -> 91

https://github.com/apple-oss-distributions/libresolv/compare/libresolv-83...libresolv-91
---
 .../darwin/apple-source-releases/libresolv/meson.build.in | 6 ++++--
 .../darwin/apple-source-releases/libresolv/package.nix    | 8 +++++---
 .../darwin/apple-source-releases/versions.json            | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
index 2d96b556bbc8..0c1adce503a5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
@@ -26,8 +26,8 @@ libresolv = library(
         'dns_async.c',
         'dns_util.c',
         'dst_api.c',
-        'dst_hmac_link.c',
-        'dst_support.c',
+        'hmac_link.c',
+        'mtctxres.c',
         'ns_date.c',
         'ns_name.c',
         'ns_netint.c',
@@ -47,7 +47,9 @@ libresolv = library(
         'res_query.c',
         'res_send.c',
         'res_sendsigned.c',
+        'res_state.c',
         'res_update.c',
+        'support.c',
     ],
     soversion : '9'
 )
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
index 9e63efb55228..56c38bcece53 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
@@ -38,12 +38,14 @@ mkAppleDerivation {
   ];
 
   postPatch = ''
-    mkdir arpa
     cp ${Libc}/include/arpa/nameser_compat.h arpa/nameser_compat.h
-    cp nameser.h arpa
+
+    # Use CommonCrypto’s implementation of MD5. The upstream build appears to use corecrypto, which we can’t use.
+    substituteInPlace hmac_link.c \
+      --replace-fail '<md5.h>' '<CommonCrypto/CommonDigest.h>'
   '';
 
-  xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY=";
+  xcodeHash = "sha256-Q5jHee9rxge6HJtf9/sFK15FsS02GQmx7L0BBDiyGIs=";
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json
index 886f26d16f92..d5f2afc10029 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/versions.json
+++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json
@@ -68,8 +68,8 @@
     "version": "140"
   },
   "libresolv": {
-    "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=",
-    "version": "83"
+    "hash": "sha256-GtPVlL1mD58um5hOFd3HQKQ7pqutBe9jZKgQw8pOkPE=",
+    "version": "91"
   },
   "libutil": {
     "hash": "sha256-tUsl22Z0HUVSkSoohFXkhicNFCW+RARvpTS0q6yaQFk=",