Merge pull request #243336 from LeSuisse/rustls-ffi-0.10.0 (0c8447e1) · Commits · nix / nixpkgs

pkgs/development/libraries/rustls-ffi/Cargo.lock

+75 −57

Original line number	Diff line number	Diff line
		@@ -2,12 +2,6 @@
		# It is not intended for manual editing.
		version = 3

		[[package]]
		name = "autocfg"
		version = "1.1.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

		[[package]]
		name = "base64"
		version = "0.13.1"
		@@ -16,9 +10,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

		[[package]]
		name = "bumpalo"
		version = "3.12.0"
		version = "3.13.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
		checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"

		[[package]]
		name = "cc"
		@@ -32,45 +26,48 @@ version = "1.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

		[[package]]
		name = "equivalent"
		version = "1.0.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

		[[package]]
		name = "hashbrown"
		version = "0.12.3"
		version = "0.14.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
		checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"

		[[package]]
		name = "indexmap"
		version = "1.9.3"
		version = "2.0.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
		checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
		dependencies = [
		"autocfg",
		"equivalent",
		"hashbrown",
		]

		[[package]]
		name = "js-sys"
		version = "0.3.61"
		version = "0.3.64"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
		checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
		dependencies = [
		"wasm-bindgen",
		]

		[[package]]
		name = "libc"
		version = "0.2.140"
		version = "0.2.147"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
		checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"

		[[package]]
		name = "log"
		version = "0.4.17"
		version = "0.4.19"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
		dependencies = [
		"cfg-if",
		]
		checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"

		[[package]]
		name = "memchr"
		@@ -96,14 +93,14 @@ dependencies = [
		"proc-macro-crate",
		"proc-macro2",
		"quote",
		"syn",
		"syn 1.0.109",
		]

		[[package]]
		name = "once_cell"
		version = "1.17.1"
		version = "1.18.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
		checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

		[[package]]
		name = "proc-macro-crate"
		@@ -117,18 +114,18 @@ dependencies = [

		[[package]]
		name = "proc-macro2"
		version = "1.0.53"
		version = "1.0.64"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ba466839c78239c09faf015484e5cc04860f88242cff4d03eb038f04b4699b73"
		checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
		dependencies = [
		"unicode-ident",
		]

		[[package]]
		name = "quote"
		version = "1.0.26"
		version = "1.0.29"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
		checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
		dependencies = [
		"proc-macro2",
		]
		@@ -150,20 +147,20 @@ dependencies = [

		[[package]]
		name = "rustls"
		version = "0.20.8"
		version = "0.21.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
		checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d"
		dependencies = [
		"log",
		"ring",
		"rustls-webpki",
		"rustversion",
		"sct",
		"webpki",
		]

		[[package]]
		name = "rustls-ffi"
		version = "0.9.2"
		version = "0.10.0"
		dependencies = [
		"libc",
		"log",
		@@ -183,11 +180,21 @@ dependencies = [
		"base64",
		]

		[[package]]
		name = "rustls-webpki"
		version = "0.100.1"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b"
		dependencies = [
		"ring",
		"untrusted",
		]

		[[package]]
		name = "rustversion"
		version = "1.0.12"
		version = "1.0.13"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
		checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f"

		[[package]]
		name = "sct"
		@@ -216,17 +223,28 @@ dependencies = [
		"unicode-ident",
		]

		[[package]]
		name = "syn"
		version = "2.0.25"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
		dependencies = [
		"proc-macro2",
		"quote",
		"unicode-ident",
		]

		[[package]]
		name = "toml_datetime"
		version = "0.6.1"
		version = "0.6.3"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
		checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"

		[[package]]
		name = "toml_edit"
		version = "0.19.8"
		version = "0.19.12"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
		checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
		dependencies = [
		"indexmap",
		"toml_datetime",
		@@ -235,9 +253,9 @@ dependencies = [

		[[package]]
		name = "unicode-ident"
		version = "1.0.8"
		version = "1.0.10"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
		checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"

		[[package]]
		name = "untrusted"
		@@ -247,9 +265,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

		[[package]]
		name = "wasm-bindgen"
		version = "0.2.84"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
		checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
		dependencies = [
		"cfg-if",
		"wasm-bindgen-macro",
		@@ -257,24 +275,24 @@ dependencies = [

		[[package]]
		name = "wasm-bindgen-backend"
		version = "0.2.84"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
		checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
		dependencies = [
		"bumpalo",
		"log",
		"once_cell",
		"proc-macro2",
		"quote",
		"syn",
		"syn 2.0.25",
		"wasm-bindgen-shared",
		]

		[[package]]
		name = "wasm-bindgen-macro"
		version = "0.2.84"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
		checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
		dependencies = [
		"quote",
		"wasm-bindgen-macro-support",
		@@ -282,28 +300,28 @@ dependencies = [

		[[package]]
		name = "wasm-bindgen-macro-support"
		version = "0.2.84"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
		checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
		dependencies = [
		"proc-macro2",
		"quote",
		"syn",
		"syn 2.0.25",
		"wasm-bindgen-backend",
		"wasm-bindgen-shared",
		]

		[[package]]
		name = "wasm-bindgen-shared"
		version = "0.2.84"
		version = "0.2.87"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
		checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"

		[[package]]
		name = "web-sys"
		version = "0.3.61"
		version = "0.3.64"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
		checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
		dependencies = [
		"js-sys",
		"wasm-bindgen",
		@@ -343,9 +361,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

		[[package]]
		name = "winnow"
		version = "0.4.1"
		version = "0.4.9"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28"
		checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529"
		dependencies = [
		"memchr",
		]

pkgs/development/libraries/rustls-ffi/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,13 +2,13 @@

		rustPlatform.buildRustPackage rec {
		pname = "rustls-ffi";
		version = "0.9.2";
		version = "0.10.0";

		src = fetchFromGitHub {
		owner = "rustls";
		repo = pname;
		rev = "v${version}";
		hash = "sha256-urDC/Tm+ZwEbf0orZzKSET5ljQGVcKPGxscctKOM/FU=";
		hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc=";
		};

		propagatedBuildInputs = lib.optionals stdenv.isDarwin [ Security ];

pkgs/servers/http/apache-httpd/2.4.nix

+9 −0

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl, perl, zlib, apr, aprutil, pcre2, libiconv, lynx, which, libxcrypt
		, fetchpatch
		, nixosTests
		, proxySupport ? true
		, sslSupport ? true, openssl
		@@ -35,6 +36,14 @@ stdenv.mkDerivation rec {
		lib.optional http2Support nghttp2 ++
		lib.optional stdenv.isDarwin libiconv;

		patches = lib.optionals modTlsSupport [
		(fetchpatch {
		name = "compat-with-rustls-ffi-0.10.0.patch";
		url = "https://github.com/apache/httpd/commit/918620a183d843fb393ed939423a25d42c1044ec.patch";
		hash = "sha256-YZi3t++hjM0skisax2xuh9DifZVZjCjVn6XQr6QKGEs=";
		})
		];

		postPatch = ''
		sed -i config.layout -e "s\|installbuilddir:.*\|installbuilddir: $dev/share/build\|"
		sed -i support/apachectl.in -e 's\|@LYNX_PATH@\|${lynx}/bin/lynx\|'

Admin message