From a43b4123c8571a97e31067318ccc46ef7a7cd3f4 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 12 Nov 2024 11:22:55 +0100
Subject: [PATCH] Switch back to regular prometheus, as the 32bit fix has been
 merged

---
 Cargo.lock | 28 +++++++++++++++++++---------
 Cargo.toml |  4 ++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa94c99..9fa50ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -271,7 +271,7 @@ dependencies = [
  "mimalloc",
  "parking_lot",
  "privdrop",
- "prometheus-32bitfix",
+ "prometheus",
  "rand",
  "rlimit",
  "rustc-hash",
@@ -1039,22 +1039,32 @@ dependencies = [
 
 [[package]]
 name = "procfs"
-version = "0.12.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0941606b9934e2d98a3677759a971756eb821f75764d0e0d26946d08e74d9104"
+checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4"
 dependencies = [
- "bitflags 1.3.2",
- "byteorder",
+ "bitflags 2.6.0",
  "hex",
  "lazy_static",
- "libc",
+ "procfs-core",
+ "rustix 0.38.40",
 ]
 
 [[package]]
-name = "prometheus-32bitfix"
-version = "0.13.1"
+name = "procfs-core"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+dependencies = [
+ "bitflags 2.6.0",
+ "hex",
+]
+
+[[package]]
+name = "prometheus"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f9e5edd4759df44a4bee93f41efe74292407663832c3e44bf70f94ff745022"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
diff --git a/Cargo.toml b/Cargo.toml
index c80fcde..a3d92c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,8 +61,8 @@ privdrop = "0.5.4"
 
 [dependencies.prometheus]
 optional = true
-package = "prometheus-32bitfix"
-version = "0.13.1"
+package = "prometheus"
+version = "0.13.4"
 default-features = false
 features = ["process"]