[gentoo-commits] repo/gentoo:master commit in: net-libs/rustls-ffi/, net-libs/rustls-ffi/files/

2024-03-28 Thread Sam James 
commit: 37f3e05310f4c0cb460f7b691c19c59939aecab5
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 29 04:05:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 29 04:05:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f3e053

net-libs/rustls-ffi: drop nightly use (again)

Signed-off-by: Sam James  gentoo.org>

 .../files/rustls-ffi-0.12.1-no-rust-nightly.patch  | 48 ++
 12.1-r1.ebuild => rustls-ffi-0.12.1-r2.ebuild} |  7 ++--
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch 
b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch
new file mode 100644
index ..c6349e37ddba
--- /dev/null
+++ b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch
@@ -0,0 +1,48 @@
+https://github.com/rustls/rustls-ffi/issues/397
+https://github.com/rustls/rustls-ffi/pull/398
+
+From 9890aff0f0b1cc69f86c24b217a2515525e57056 Mon Sep 17 00:00:00 2001
+From: Daniel McCarney 
+Date: Wed, 27 Mar 2024 21:08:16 -0400
+Subject: [PATCH] Cargo: configure cargo-c to use vendored .h
+
+Presently we pre-generate the rustls.h header file using `cbindgen`,
+commit the result to `src/rustls.h`, and check that the generated result
+matches the checked-in result in CI.
+
+The new experimental cargo-c build regenerates its own header file using
+`cbindgen` by default unless told to do otherwise. We'd prefer it didn't
+do this because we're using a `cbindgen` feature that requires nightly
+rust.
+
+This commit updates the `Cargo.toml` capi metadata to tell cargo-c to
+skip generation of its own header file. We then configure the
+pre-generated checked-in header file as an asset to be copied into the
+install include directory.
+
+This better matches how the `Makefile` build allowed building the static
+lib without needing nightly rust or `cbindgen`.
+---
+ Cargo.toml | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 7a910a9d..d601c7f8 100644
+--- a/Cargo.toml
 b/Cargo.toml
+@@ -41,6 +41,7 @@ regex = "1.9.6"
+ [package.metadata.capi.header]
+ name = "rustls"
+ subdirectory = false
++generation = false # Prefer a vendored .h
+ 
+ [package.metadata.capi.library]
+ name = "rustls"
+@@ -50,3 +51,6 @@ rustflags = "-Cmetadata=rustls-ffi"
+ [package.metadata.capi.pkg_config]
+ name = "rustls"
+ filename = "rustls"
++
++[package.metadata.capi.install.include]
++asset = [{from = "src/rustls.h", to = "" }]
+

diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r1.ebuild 
b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild
similarity index 96%
rename from net-libs/rustls-ffi/rustls-ffi-0.12.1-r1.ebuild
rename to net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild
index 999355fd18f4..962808494628 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild
@@ -56,6 +56,10 @@ BDEPEND="dev-util/cargo-c"
 
 QA_FLAGS_IGNORED="usr/lib.*/librustls.*"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.12.1-no-rust-nightly.patch
+)
+
 src_prepare() {
default
 
@@ -70,9 +74,6 @@ src_configure() {
# Hopefully fixed with https://github.com/rustls/rustls-ffi/pull/389
export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-Wl,-z,notext"
 
-   # https://github.com/rustls/rustls-ffi/issues/397
-   export RUSTC_BOOTSTRAP=1
-
multilib-minimal_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/rustls-ffi/, net-libs/rustls-ffi/files/

2024-03-27 Thread Sam James 
commit: 5f34085acefc46c97581d47817157fc8ce3762af
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 28 01:47:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 28 01:47:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f34085a

net-libs/rustls-ffi: drop nightly Rust flag

Backport an upstream PR to allow us to drop RUSTC_BOOTSTRAP.

Signed-off-by: Sam James  gentoo.org>

 .../files/rustls-ffi-0.12.1-no-rust-nightly.patch  | 48 ++
 net-libs/rustls-ffi/rustls-ffi-0.12.1.ebuild   |  7 ++--
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch 
b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch
new file mode 100644
index ..dd8d582d4a84
--- /dev/null
+++ b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch
@@ -0,0 +1,48 @@
+https://github.com/rustls/rustls-ffi/issues/397
+https://github.com/rustls/rustls-ffi/pull/398
+
+From 68b7153018647baec43ea950f28b2f84e87f5296 Mon Sep 17 00:00:00 2001
+From: Daniel McCarney 
+Date: Wed, 27 Mar 2024 21:08:16 -0400
+Subject: [PATCH] Cargo: configure cargo-c to use vendored .h
+
+Presently we pre-generate the rustls.h header file using `cbindgen`,
+commit the result to `src/rustls.h`, and check that the generated result
+matches the checked-in result in CI.
+
+The new experimental cargo-c build regenerates its own header file using
+`cbindgen` by default unless told to do otherwise. We'd prefer it didn't
+do this because we're using a `cbindgen` feature that requires nightly
+rust.
+
+This commit updates the `Cargo.toml` capi metadata to tell cargo-c to
+skip generation of its own header file. We then configure the
+pre-generated checked-in header file as an asset to be copied into the
+install include directory.
+
+This better matches how the `Makefile` build allowed building the static
+lib without needing nightly rust or `cbindgen`.
+---
+ Cargo.toml | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 7a910a9d..4c2b2e94 100644
+--- a/Cargo.toml
 b/Cargo.toml
+@@ -41,6 +41,7 @@ regex = "1.9.6"
+ [package.metadata.capi.header]
+ name = "rustls"
+ subdirectory = false
++generation = false # Prefer a vendored .h
+ 
+ [package.metadata.capi.library]
+ name = "rustls"
+@@ -50,3 +51,6 @@ rustflags = "-Cmetadata=rustls-ffi"
+ [package.metadata.capi.pkg_config]
+ name = "rustls"
+ filename = "rustls"
++
++[package.metadata.capi.install]
++asset = [{ from = "src/rustls.h", to = "include" }]
+

diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1.ebuild 
b/net-libs/rustls-ffi/rustls-ffi-0.12.1.ebuild
index 999355fd18f4..b9e9e999f6a9 100644
--- a/net-libs/rustls-ffi/rustls-ffi-0.12.1.ebuild
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1.ebuild
@@ -56,6 +56,10 @@ BDEPEND="dev-util/cargo-c"
 
 QA_FLAGS_IGNORED="usr/lib.*/librustls.*"
 
+PATCHES=(
+   "${FILESDIR}"/rustls-ffi-0.12.1-no-rust-nightly.patch
+)
+
 src_prepare() {
default
 
@@ -70,9 +74,6 @@ src_configure() {
# Hopefully fixed with https://github.com/rustls/rustls-ffi/pull/389
export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-Wl,-z,notext"
 
-   # https://github.com/rustls/rustls-ffi/issues/397
-   export RUSTC_BOOTSTRAP=1
-
multilib-minimal_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: net-libs/rustls-ffi/, net-libs/rustls-ffi/files/

2023-04-02 Thread Sam James 
commit: cc489ad0cbcf7a3ca56aa0664deda5d50c0b9133
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  2 20:31:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  2 20:43:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc489ad0

net-libs/rustls-ffi: add 0.10.0

Signed-off-by: Sam James  gentoo.org>

 net-libs/rustls-ffi/Manifest   |  27 ++
 .../files/rustls-ffi-0.10.0-cargo-c.patch  |  75 +++
 net-libs/rustls-ffi/rustls-ffi-0.10.0.ebuild   | 104 +
 3 files changed, 206 insertions(+)

diff --git a/net-libs/rustls-ffi/Manifest b/net-libs/rustls-ffi/Manifest
index 1607e04746ec..65e689ca8593 100644
--- a/net-libs/rustls-ffi/Manifest
+++ b/net-libs/rustls-ffi/Manifest
@@ -4,8 +4,10 @@ DIST autocfg-1.1.0.crate 13272 BLAKE2B 
7724055c337d562103f191f4e36cab469e578f0c5
 DIST base64-0.13.1.crate 61002 BLAKE2B 
3b3a5b26e2ef18e9b4f1ede72b1bd160a1494751878e8441d463f8a514e6cb9ac859231536989e19fb1261fd864617fe31440df1b5855a0ec625521fc6fcef91
 SHA512 
1eb76aff9a84057f2ccb7082e9c57b015c2d71a28173089b02e7aacd09a7d311bedf0a943529611ada29f8d7b536d7ae4de256d98eee8450003a3a9a652bda4b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B 
eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda
 SHA512 
3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bumpalo-3.11.1.crate 81207 BLAKE2B 
ba76008fb5a975aca12b6f893779e18dd353a22a42cbbeecd5870622a7cbc0cd7e37036af600c570b8a55f26ea8d07f44a9aa1a8373d977b6f75bd4276730292
 SHA512 
70e90bee1fa4e783ff5a3b18f192b9347bafab7daaa907e74913a415a66c29acfb073fcfb46150801aa7649ab0d2ec8a610de239551565dd167bac72ab13a9bc
+DIST bumpalo-3.12.0.crate 81604 BLAKE2B 
2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7
 SHA512 
37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4
 DIST cbindgen-0.19.0.crate 181286 BLAKE2B 
e09931704cfe0f0f777e67c66fdfd08820e8185a7ad475521eca2d6819d1d0a92791d5cd5dfb2b2199e911da9e8a92dfa09ec20d2912f1073d456f7932944438
 SHA512 
dc31896c75d43fa7efb6256b861b7d4a51b9b0e4dc605bcaf769b32cba2dc0b7a5c49b01f0ff48ada08488ad8c020c3bbb645d6796046caf0bd7d9eaae25a962
 DIST cc-1.0.77.crate 60723 BLAKE2B 
93720cee6c5721ec43b3f502b0879043afc44049e2ce528addebd8b6cf182a8e370143d67e32a965f1ef4fc07e55c87aaf95c0b1b5f9b85eb4e743a95b17bdf5
 SHA512 
38a421818bbb22fa6a6bd871a7d69add88932db68683ec91d1b4ce1ba68ea2b9272c42c35f437030614cb522f43db964e3a8f1223dcdef9158090b00d17afe2b
+DIST cc-1.0.79.crate 62624 BLAKE2B 
b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db
 SHA512 
cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B 
e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b
 SHA512 
0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST clap-2.34.0.crate 202210 BLAKE2B 
f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c
 SHA512 
c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
 DIST fastrand-1.8.0.crate 11369 BLAKE2B 
93e911ffcec559e30b2fefa44c4d74d1ffa9b8ef1904ace608b8576210bcd41a2b4c7adffc00cd3bb40996110d07316cf8068f4754a879c6cb47e3d41304d406
 SHA512 
82cbc2b29b97fa3fa2c9372d3e8c390586a7b39f6c7d8c45f9b779bdfdaa2e8a3b44bc7bfcb3367c18120726facc753c9827cf63a8fb4ddc2667509b16333cb1
@@ -13,23 +15,37 @@ DIST hashbrown-0.12.3.crate 102968 BLAKE2B 
492072f27eaec45abd2c5d7405c614c0c6a82
 DIST heck-0.3.3.crate 10260 BLAKE2B 
dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f
 SHA512 
b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 
801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1
 SHA512 
1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632fd5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
 DIST indexmap-1.9.2.crate 54627 BLAKE2B 
dbfa551d33305db06b59d07c1b4bf8d4596a67ff1caa03062d07f6d78b4604ac0533d1c1fe3c371702dd7e65a012bfb960d79c76db37e264d0b44be576969285
 SHA512 
946c54881a347892dfcb55648a2b881d3a4d113424b8c76d8957980a834895318d11336dc438a04601916cca787420708ad7e271f965c38bfeae511ec1dedf85