From ac791096397d1395e9f2ec1474591d3ff7d57775 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 2 Sep 2024 19:27:03 -0400
Subject: [PATCH] darwin.configd: remove and replace with stubs (including
 configdHeaders)

---
 .../apple-source-releases/configd/default.nix | 200 ------------------
 .../darwin/apple-source-releases/default.nix  |   9 -
 .../apple-source-releases/macos-11.0.1.nix    |   1 -
 pkgs/top-level/darwin-packages.nix            |   2 +
 4 files changed, 2 insertions(+), 210 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/configd/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
deleted file mode 100644
index b46cf7628c8c..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ /dev/null
@@ -1,200 +0,0 @@
-{ lib, stdenv, stdenvNoCC, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security
-, headersOnly ? false }:
-
-let
-  # Copy the headers out of CF instead of building it to avoid an infinite recursion.
-  privateHeaders = stdenvNoCC.mkDerivation {
-    pname = "swift-corelibs-foundation-private";
-    inherit (swift-corelibs-foundation) version src;
-
-    buildCommand = ''
-      unpackFile "$src"
-
-      mkdir -p "$out/include/CoreFoundation"
-
-      declare -a privateHeaders=(
-        Base.subproj/CFRuntime.h
-        PlugIn.subproj/CFBundlePriv.h
-        RunLoop.subproj/CFRunLoop.h
-        String.subproj/CFStringDefaultEncoding.h
-      )
-
-      for header in "''${privateHeaders[@]}"; do
-        cp source/CoreFoundation/$header $out/include/CoreFoundation
-      done
-    '';
-  };
-in
-appleDerivation' stdenv {
-  meta.broken = stdenv.cc.nativeLibc;
-
-  nativeBuildInputs = lib.optionals (!headersOnly) [ bootstrap_cmds ];
-  buildInputs = lib.optionals (!headersOnly) [ privateHeaders launchd ppp xpc IOKit eap8021x ];
-
-  propagatedBuildInputs = lib.optionals (!headersOnly) [ Security ];
-
-  env = lib.optionalAttrs (!headersOnly) {
-    NIX_CFLAGS_COMPILE = toString [
-      "-ISystemConfiguration.framework/Headers"
-      "-I${xnu}/Library/Frameworks/System.framework/Versions/B/PrivateHeaders"
-    ];
-  };
-
-  patchPhase = lib.optionalString (!headersOnly) ''
-    substituteInPlace SystemConfiguration.fproj/reachability/SCNetworkReachabilityServer_client.c \
-      --replace '#include <xpc/private.h>' ""
-
-    substituteInPlace SystemConfiguration.fproj/SCNetworkReachability.c \
-      --replace ''$'#define\tHAVE_VPN_STATUS' ""
-  '';
-
-  dontBuild = headersOnly;
-
-  buildPhase = ''
-    pushd SystemConfiguration.fproj >/dev/null
-
-    mkdir -p SystemConfiguration.framework/Resources
-    cp ../get-mobility-info       SystemConfiguration.framework/Resources
-    cp Info.plist                 SystemConfiguration.framework/Resources
-    cp -r English.lproj           SystemConfiguration.framework/Resources
-    cp NetworkConfiguration.plist SystemConfiguration.framework/Resources
-
-    mkdir -p SystemConfiguration.framework/Headers
-    mkdir -p SystemConfiguration.framework/PrivateHeaders
-
-    # The standard public headers
-    cp SCSchemaDefinitions.h        SystemConfiguration.framework/Headers
-    cp SystemConfiguration.h        SystemConfiguration.framework/Headers
-    cp SCDynamicStore.h             SystemConfiguration.framework/Headers
-    cp SCDynamicStoreCopySpecific.h SystemConfiguration.framework/Headers
-    cp SCPreferences.h              SystemConfiguration.framework/Headers
-    cp CaptiveNetwork.h             SystemConfiguration.framework/Headers
-    cp SCPreferencesPath.h          SystemConfiguration.framework/Headers
-    cp SCDynamicStoreKey.h          SystemConfiguration.framework/Headers
-    cp SCPreferencesSetSpecific.h   SystemConfiguration.framework/Headers
-    cp SCNetworkConfiguration.h     SystemConfiguration.framework/Headers
-    cp SCNetworkConnection.h        SystemConfiguration.framework/Headers
-    cp SCNetworkReachability.h      SystemConfiguration.framework/Headers
-    cp DHCPClientPreferences.h      SystemConfiguration.framework/Headers
-    cp SCNetwork.h                  SystemConfiguration.framework/Headers
-    cp SCDynamicStoreCopyDHCPInfo.h SystemConfiguration.framework/Headers
-
-    # TODO: Do we want to preserve private headers or just make them public?
-    cp SCDPlugin.h                         SystemConfiguration.framework/PrivateHeaders
-    cp SCPrivate.h                         SystemConfiguration.framework/PrivateHeaders
-    cp SCDynamicStorePrivate.h             SystemConfiguration.framework/PrivateHeaders
-    cp SCDynamicStoreCopySpecificPrivate.h SystemConfiguration.framework/PrivateHeaders
-    cp SCDynamicStoreSetSpecificPrivate.h  SystemConfiguration.framework/PrivateHeaders
-    cp SCValidation.h                      SystemConfiguration.framework/PrivateHeaders
-    cp SCPreferencesPrivate.h              SystemConfiguration.framework/PrivateHeaders
-    cp DeviceOnHold.h                      SystemConfiguration.framework/PrivateHeaders
-    cp LinkConfiguration.h                 SystemConfiguration.framework/PrivateHeaders
-    cp SCPreferencesPathKey.h              SystemConfiguration.framework/PrivateHeaders
-    cp SCPreferencesSetSpecificPrivate.h   SystemConfiguration.framework/PrivateHeaders
-    cp SCNetworkConnectionPrivate.h        SystemConfiguration.framework/PrivateHeaders
-    cp SCPreferencesGetSpecificPrivate.h   SystemConfiguration.framework/PrivateHeaders
-    cp SCSchemaDefinitionsPrivate.h        SystemConfiguration.framework/PrivateHeaders
-    cp SCNetworkConfigurationPrivate.h     SystemConfiguration.framework/PrivateHeaders
-    cp SCPreferencesKeychainPrivate.h      SystemConfiguration.framework/PrivateHeaders
-    cp SCNetworkSignature.h                SystemConfiguration.framework/PrivateHeaders
-    cp SCNetworkSignaturePrivate.h         SystemConfiguration.framework/PrivateHeaders
-    cp VPNPrivate.h                        SystemConfiguration.framework/PrivateHeaders
-    cp VPNConfiguration.h                  SystemConfiguration.framework/PrivateHeaders
-    cp VPNTunnelPrivate.h                  SystemConfiguration.framework/PrivateHeaders
-    cp VPNTunnel.h                         SystemConfiguration.framework/PrivateHeaders
-
-    mkdir derived
-
-    cat >derived/SystemConfiguration_vers.c <<EOF
-    const unsigned char SystemConfigurationVersionString[] __attribute__ ((used)) = "@(#)PROGRAM:SystemConfiguration  PROJECT:configd-" "\n"; const double SystemConfigurationVersionNumber __attribute__ ((used)) = (double)0.;
-    EOF
-
-    mig -arch x86_64 -header derived/shared_dns_info.h -user derived/shared_dns_infoUser.c -sheader /dev/null -server /dev/null ../dnsinfo/shared_dns_info.defs
-    mig -arch x86_64 -header derived/config.h          -user derived/configUser.c          -sheader /dev/null -server /dev/null config.defs
-    mig -arch x86_64 -header derived/helper.h          -user derived/helperUser.c          -sheader /dev/null -server /dev/null helper/helper.defs
-    mig -arch x86_64 -header derived/pppcontroller.h   -user derived/pppcontrollerUser.c   -sheader /dev/null -server /dev/null pppcontroller.defs
-
-    $CC -I. -Ihelper -Iderived -F. -c SCSchemaDefinitions.c -o SCSchemaDefinitions.o
-    $CC -I. -Ihelper -Iderived -F. -c SCD.c -o SCD.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDKeys.c -o SCDKeys.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDPrivate.c -o SCDPrivate.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDPlugin.c -o SCDPlugin.o
-    $CC -I. -Ihelper -Iderived -F. -c CaptiveNetwork.c -o CaptiveNetwork.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDOpen.c -o SCDOpen.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDList.c -o SCDList.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDAdd.c -o SCDAdd.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDGet.c -o SCDGet.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDSet.c -o SCDSet.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDRemove.c -o SCDRemove.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotify.c -o SCDNotify.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierSetKeys.c -o SCDNotifierSetKeys.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierAdd.c -o SCDNotifierAdd.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierRemove.c -o SCDNotifierRemove.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierGetChanges.c -o SCDNotifierGetChanges.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierWait.c -o SCDNotifierWait.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierInformViaCallback.c -o SCDNotifierInformViaCallback.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierInformViaFD.c -o SCDNotifierInformViaFD.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierInformViaSignal.c -o SCDNotifierInformViaSignal.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDNotifierCancel.c -o SCDNotifierCancel.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDSnapshot.c -o SCDSnapshot.o
-    $CC -I. -Ihelper -Iderived -F. -c SCP.c -o SCP.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPOpen.c -o SCPOpen.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPLock.c -o SCPLock.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPUnlock.c -o SCPUnlock.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPList.c -o SCPList.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPGet.c -o SCPGet.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPAdd.c -o SCPAdd.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPSet.c -o SCPSet.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPRemove.c -o SCPRemove.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPCommit.c -o SCPCommit.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPApply.c -o SCPApply.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPPath.c -o SCPPath.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDConsoleUser.c -o SCDConsoleUser.o
-    $CC -I. -Ihelper -Iderived -F. -c SCDHostName.c -o SCDHostName.o
-    $CC -I. -Ihelper -Iderived -F. -c SCLocation.c -o SCLocation.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetwork.c -o SCNetwork.o
-    $CC -I. -Ihelper -Iderived -F. -c derived/pppcontrollerUser.c -o pppcontrollerUser.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkConnection.c -o SCNetworkConnection.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkConnectionPrivate.c -o SCNetworkConnectionPrivate.o
-    $CC -I. -Ihelper -Iderived -I../dnsinfo -F. -c SCNetworkReachability.c -o SCNetworkReachability.o
-    $CC -I. -Ihelper -Iderived -F. -c SCProxies.c -o SCProxies.o
-    $CC -I. -Ihelper -Iderived -F. -c DHCP.c -o DHCP.o
-    $CC -I. -Ihelper -Iderived -F. -c moh.c -o moh.o
-    $CC -I. -Ihelper -Iderived -F. -c DeviceOnHold.c -o DeviceOnHold.o
-    $CC -I. -Ihelper -Iderived -F. -c LinkConfiguration.c -o LinkConfiguration.o
-    $CC -I. -Ihelper -Iderived -F. -c dy_framework.c -o dy_framework.o
-    $CC -I. -Ihelper -Iderived -F. -c VLANConfiguration.c -o VLANConfiguration.o
-    $CC -I. -Ihelper -Iderived -F. -c derived/configUser.c -o configUser.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPreferencesPathKey.c -o SCPreferencesPathKey.o
-    $CC -I. -Ihelper -Iderived -I../dnsinfo -F. -c derived/shared_dns_infoUser.c -o shared_dns_infoUser.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkConfigurationInternal.c -o SCNetworkConfigurationInternal.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkInterface.c -o SCNetworkInterface.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkProtocol.c -o SCNetworkProtocol.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkService.c -o SCNetworkService.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkSet.c -o SCNetworkSet.o
-    $CC -I. -Ihelper -Iderived -F. -c BondConfiguration.c -o BondConfiguration.o
-    $CC -I. -Ihelper -Iderived -F. -c BridgeConfiguration.c -o BridgeConfiguration.o
-    $CC -I. -Ihelper -Iderived -F. -c helper/SCHelper_client.c -o SCHelper_client.o
-    $CC -I. -Ihelper -Iderived -F. -c SCPreferencesKeychainPrivate.c -o SCPreferencesKeychainPrivate.o
-    $CC -I. -Ihelper -Iderived -F. -c SCNetworkSignature.c -o SCNetworkSignature.o
-    $CC -I. -Ihelper -Iderived -F. -c VPNPrivate.c -o VPNPrivate.o
-    $CC -I. -Ihelper -Iderived -F. -c VPNConfiguration.c -o VPNConfiguration.o
-    $CC -I. -Ihelper -Iderived -F. -c VPNTunnel.c -o VPNTunnel.o
-    $CC -I. -Ihelper -Iderived -F. -c derived/helperUser.c -o helperUser.o
-    $CC -I. -Ihelper -Iderived -F. -c reachability/SCNetworkReachabilityServer_client.c -o SCNetworkReachabilityServer_client.o
-    $CC -I. -Ihelper -Iderived -F. -c reachability/rb.c -o rb.o
-    $CC -I. -Ihelper -Iderived -F. -c derived/SystemConfiguration_vers.c -o SystemConfiguration_vers.o
-
-    $CC -dynamiclib *.o -install_name $out/Library/Frameworks/SystemConfiguration.framework/SystemConfiguration -dead_strip -framework CoreFoundation -single_module -o SystemConfiguration.framework/SystemConfiguration
-
-    popd >/dev/null
-  '';
-
-  installPhase = ''
-    mkdir -p $out/include
-    cp dnsinfo/*.h $out/include/
-  '' + lib.optionalString (!headersOnly) ''
-    mkdir -p $out/Library/Frameworks/
-    mv SystemConfiguration.fproj/SystemConfiguration.framework $out/Library/Frameworks
-  '';
-}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index b89dffe1ec49..948c74b897b7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -260,10 +260,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
 
     inherit (self.adv_cmds) ps locale;
     AvailabilityVersions = callPackage ./AvailabilityVersions/package.nix { };
-    configd         = applePackage "configd"           "osx-10.8.5"      "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" {
-      Security      = applePackage "Security/boot.nix" "osx-10.9.5"      "sha256-7qr0IamjCXCobIJ6V9KtvbMBkJDfRCy4C5eqpHJlQLI=" {};
-      inherit (pkgs.darwin.apple_sdk.libs) xpc;
-    };
     copyfile        = callPackage ./copyfile/package.nix { };
     Csu             = callPackage ./Csu/package.nix { };
     dtrace          = applePackage "dtrace"            "osx-10.12.6"     "sha256-Icr22ozixHquI0kRB2XZ+LlxD6V46sJHsHy4L/tDXZg=" {};
@@ -304,11 +300,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
 
     # `configdHeaders` can’t use an override because `pkgs.darwin.configd` on aarch64-darwin will
     # be replaced by SystemConfiguration.framework from the macOS SDK.
-    configdHeaders  = applePackage "configd"           "osx-10.8.5"      "sha256-6I3FWNjTgds5abEcZrD++s9b+P9a2+qUf8KFAb72DwI=" {
-      headersOnly = true;
-      Security    = null;
-      xpc         = null;
-    };
     libutilHeaders  = lib.getDev self.libutil;
     hfsHeaders      = pkgs.darwin.hfs.override { headersOnly = true; };
     libresolvHeaders= lib.getDev self.libresolv;
diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix
index 9faaac8d93e2..718784b7b804 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix
@@ -9,7 +9,6 @@ PowerManagement = applePackage' "PowerManagement" "1132.50.3" "macos-11.0.1" "1s
 adv_cmds = applePackage' "adv_cmds" "176" "macos-11.0.1" "0sskwl3jc7llbrlyd1i7qlb03yhm1xkbxd1k9xhh7f9wqhlzq31j" {};
 basic_cmds = applePackage' "basic_cmds" "55" "macos-11.0.1" "1913pzk376zfap2fwmrb233rkn4h4l2c65nd7s8ixvrz1r7cz0q5" {};
 bootstrap_cmds = callPackage ./bootstrap_cmds/package.nix { };
-configd = applePackage' "configd" "1109.40.9" "macos-11.0.1" "024ny63lpwzgnm8g28hh8dldvmmislmrl298n721rm0blqjhahz5" {};
 copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "1j20909inn2iw8n51b8vk551wznfi3bhfziy8nbv08qj5lk50m04" {};
 diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "0wr60vyvgkbc4wyldnsqas0xss2k1fgmbdk3vnhj6v6jqa98l1ny" {};
 dtrace = applePackage' "dtrace" "370.40.1" "macos-11.0.1" "1qj74mix1x3drffr1qpafm57aby42bc61kynba5q0ppbcf0lrbp1" {};
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 434ac7e73f3c..b3628c831fc1 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -82,6 +82,8 @@ makeScopeWithSplicing' {
     "LibsystemCross"
     "Security"
     "architecture"
+    "configd"
+    "configdHeaders"
   ] (mkStub apple_sdk.version);
 in
 impure-cmds // appleSourcePackages // stubs // {