Revert "build krb5 with bazel (#44326)"

deps/repos.MODULE.bazel

@@ -57,7 +57,6 @@ single_version_override(
     patch_strip = 1,
     patches = [
         "//bazel/patches:rules_foreign_cc/0000-expose-pc-files.patch",
-        "//bazel/patches:rules_foreign_cc/0001-include-out_data_dirs-to-the-output-groups.patch",
     ],
 )
 
@@ -315,13 +314,3 @@ http_archive(
         "license_file": "//deps:lua/license",
     },
 )
-
-http_archive(
-    name = "krb5",
-    url = "https://kerberos.org/dist/krb5/1.21/krb5-1.21.3.tar.gz",
-    sha256 = "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35",
-    strip_prefix = "krb5-1.21.3",
-    files = {
-        "BUILD.bazel": "//deps:krb5/krb5.BUILD.bazel",
-    },
-)

omnibus/config/software/libkrb5.rb

@@ -1,41 +1,33 @@
 name "libkrb5"
 default_version "1.21.3"
 
+dependency "openssl3"
+
+version "1.21.3" do
+  source url: "https://kerberos.org/dist/krb5/1.21/krb5-1.21.3.tar.gz"
+  source sha256: "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35"
+end
+
+relative_path "krb5-#{version}/src"
+
+reconf_env = { "PATH" => "#{install_dir}/embedded/bin:#{ENV["PATH"]}" }
+
 build do
-  pc_files = [
-    'gssrpc.pc',
-    'kadm-client.pc',
-    'kadm-server.pc',
-    'kdb.pc',
-    'krb5-gssapi.pc',
-    'krb5.pc',
-    'mit-krb5-gssapi.pc',
-    'mit-krb5.pc',
-  ]
-  lib_files = [
-    'krb5/plugins/tls/k5tls.so',
-    'krb5/plugins/kdb/db2.so',
-    'krb5/plugins/preauth/test.so',
-    'krb5/plugins/preauth/spake.so',
-    'krb5/plugins/preauth/pkinit.so',
-    'krb5/plugins/preauth/otp.so',
-    'libkadm5clnt_mit.so',
-    'libkrad.so',
-    'libverto.so',
-    'libk5crypto.so',
-    'libcom_err.so',
-    'libkadm5srv.so',
-    'libkrb5support.so',
-    'libgssrpc.so',
-    'libkrb5.so',
-    'libkadm5srv_mit.so',
-    'libkdb5.so',
-    'libgssapi_krb5.so',
-    'libkadm5clnt.so',
+  license "BSD-style"
+  license_file "https://raw.githubusercontent.com/krb5/krb5/master/NOTICE"
+
+  configure_options = ["--without-keyutils", # this would require additional deps/system deps, disable it
+         "--without-system-verto", # do not prefer libverto from the system, if installed
+         "--without-libedit", # we don't want to link with libraries outside of the install dir
+         "--disable-static"
   ]
-  command_on_repo_root "bazelisk run -- @krb5//:install --destdir='#{install_dir}/embedded'"
-  command_on_repo_root "bazelisk run -- //bazel/rules:replace_prefix --prefix '#{install_dir}/embedded' " \
-    + lib_files.map{ |l| "#{install_dir}/embedded/lib/#{l}" }.join(' ') \
-    + " " \
-    + pc_files.map{ |pc| "#{install_dir}/embedded/lib/pkgconfig/#{pc}" }.join(' ')
+  env = with_standard_compiler_flags(with_embedded_path)
+  configure(*configure_options, :env => env)
+  command "make -j #{workers}", :env => { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
+  command "make install", :env => { "LD_RUN_PATH" => "#{install_dir}/embedded/lib" }
+
+  # FIXME: CONDA libs appear to confuse the health checker - manually checked file
+  # are properly linked. Must whitelist for build to succeed.
+  whitelist_file "#{install_dir}/embedded/lib/krb5/plugins/tls/k5tls.so"
+  whitelist_file "#{install_dir}/embedded/lib/krb5/plugins/preauth/pkinit.so"
 end

test/static/static_quality_gates.yml

@@ -1,51 +1,51 @@
 static_quality_gate_agent_deb_amd64:
-  max_on_disk_size: 707.24 MiB
-  max_on_wire_size: 174.02 MiB
+  max_on_disk_size: 708.37 MiB
+  max_on_wire_size: 174.5 MiB
 static_quality_gate_agent_deb_amd64_fips:
-  max_on_disk_size: 702.86 MiB
-  max_on_wire_size: 173.5 MiB
+  max_on_disk_size: 703.97 MiB
+  max_on_wire_size: 173.77 MiB
 static_quality_gate_agent_heroku_amd64:
   max_on_disk_size: 329.53 MiB
   max_on_wire_size: 88.43 MiB
 static_quality_gate_agent_msi:
   max_on_disk_size: 982.08 MiB
   max_on_wire_size: 143.02 MiB
 static_quality_gate_agent_rpm_amd64:
-  max_on_disk_size: 707.23 MiB
-  max_on_wire_size: 177.24 MiB
+  max_on_disk_size: 708.35 MiB
+  max_on_wire_size: 177.66 MiB
 static_quality_gate_agent_rpm_amd64_fips:
-  max_on_disk_size: 702.85 MiB
-  max_on_wire_size: 176.32 MiB
+  max_on_disk_size: 703.96 MiB
+  max_on_wire_size: 176.63 MiB
 static_quality_gate_agent_rpm_arm64:
-  max_on_disk_size: 692.59 MiB
-  max_on_wire_size: 160.9 MiB
+  max_on_disk_size: 693.49 MiB
+  max_on_wire_size: 161.21 MiB
 static_quality_gate_agent_rpm_arm64_fips:
-  max_on_disk_size: 687.54 MiB
-  max_on_wire_size: 160.11 MiB
+  max_on_disk_size: 688.44 MiB
+  max_on_wire_size: 160.46 MiB
 static_quality_gate_agent_suse_amd64:
-  max_on_disk_size: 707.23 MiB
-  max_on_wire_size: 177.24 MiB
+  max_on_disk_size: 708.35 MiB
+  max_on_wire_size: 177.66 MiB
 static_quality_gate_agent_suse_amd64_fips:
-  max_on_disk_size: 702.85 MiB
-  max_on_wire_size: 176.32 MiB
+  max_on_disk_size: 703.96 MiB
+  max_on_wire_size: 176.63 MiB
 static_quality_gate_agent_suse_arm64:
-  max_on_disk_size: 692.59 MiB
-  max_on_wire_size: 160.9 MiB
+  max_on_disk_size: 693.49 MiB
+  max_on_wire_size: 161.21 MiB
 static_quality_gate_agent_suse_arm64_fips:
-  max_on_disk_size: 687.54 MiB
-  max_on_wire_size: 160.11 MiB
+  max_on_disk_size: 688.44 MiB
+  max_on_wire_size: 160.46 MiB
 static_quality_gate_docker_agent_amd64:
-  max_on_disk_size: 769.58 MiB
-  max_on_wire_size: 261.89 MiB
+  max_on_disk_size: 770.69 MiB
+  max_on_wire_size: 262.46 MiB
 static_quality_gate_docker_agent_arm64:
-  max_on_disk_size: 779.27 MiB
-  max_on_wire_size: 252.08 MiB
+  max_on_disk_size: 780.17 MiB
+  max_on_wire_size: 252.63 MiB
 static_quality_gate_docker_agent_jmx_amd64:
-  max_on_disk_size: 960.46 MiB
-  max_on_wire_size: 330.53 MiB
+  max_on_disk_size: 961.57 MiB
+  max_on_wire_size: 331.09 MiB
 static_quality_gate_docker_agent_jmx_arm64:
-  max_on_disk_size: 958.87 MiB
-  max_on_wire_size: 316.71 MiB
+  max_on_disk_size: 959.77 MiB
+  max_on_wire_size: 317.26 MiB
 static_quality_gate_docker_cluster_agent_amd64:
   max_on_disk_size: 181.08 MiB
   max_on_wire_size: 64.49 MiB