* [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x
@ 2023-07-31 20:49 Bernd Kuhls
2023-07-31 20:49 ` [Buildroot] [PATCH 2/2] package/sentry-cli: bump version to 2.20.3 Bernd Kuhls
2023-08-06 14:27 ` [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Thomas Petazzoni via buildroot
0 siblings, 2 replies; 6+ messages in thread
From: Bernd Kuhls @ 2023-07-31 20:49 UTC (permalink / raw)
To: buildroot; +Cc: Joseph Kogut
Fixes:
http://autobuild.buildroot.net/results/4e2/4e24cb67402bad35ab57833d72e6c857b3eb4e07/
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
...able-SSL-support-for-the-curl-module.patch | 62 +++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
diff --git a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
new file mode 100644
index 0000000000..e68401da78
--- /dev/null
+++ b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
@@ -0,0 +1,62 @@
+From a3754088b4cf7d19ff4f9a98412dd132d5baf1c1 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Mon, 31 Jul 2023 22:34:04 +0200
+Subject: [PATCH] Disable SSL support for the curl module
+
+Fixes build with OpenSSL v3.
+
+Downloaded Cargo.toml patch from
+https://cgit.freebsd.org/ports/tree/devel/sentry-cli/files/patch-Cargo.toml
+
+Upstream: https://github.com/getsentry/sentry-cli/issues/1706
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ Cargo.lock | 10 ----------
+ Cargo.toml | 2 +-
+ 2 files changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 75e1c8c..5121211 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1557,15 +1557,6 @@ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+-[[package]]
+-name = "openssl-src"
+-version = "111.22.0+1.1.1q"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+-dependencies = [
+- "cc",
+-]
+-
+ [[package]]
+ name = "openssl-sys"
+ version = "0.9.74"
+@@ -1575,7 +1566,6 @@ dependencies = [
+ "autocfg",
+ "cc",
+ "libc",
+- "openssl-src",
+ "pkg-config",
+ "vcpkg",
+ ]
+diff --git a/Cargo.toml b/Cargo.toml
+index abd6839..ddc141f 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -19,7 +19,7 @@ clap = { version = "3.2.22", default-features = false, features = [
+ "wrap_help",
+ ] }
+ console = "0.15.2"
+-curl = { version = "0.4.44", features = ["static-curl", "static-ssl"] }
++curl = { version = "0.4.44" }
+ dirs = "4.0.0"
+ dotenv = "0.15.0"
+ elementtree = "1.2.2"
+--
+2.39.2
+
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/sentry-cli: bump version to 2.20.3
2023-07-31 20:49 [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Bernd Kuhls
@ 2023-07-31 20:49 ` Bernd Kuhls
2023-08-06 14:27 ` Thomas Petazzoni via buildroot
2023-08-06 14:27 ` [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Thomas Petazzoni via buildroot
1 sibling, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2023-07-31 20:49 UTC (permalink / raw)
To: buildroot; +Cc: Joseph Kogut
Changelog:
https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md
Rebased patch 0001.
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
...able-SSL-support-for-the-curl-module.patch | 24 +++++++++----------
package/sentry-cli/sentry-cli.hash | 2 +-
package/sentry-cli/sentry-cli.mk | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
index e68401da78..819d8016ae 100644
--- a/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
+++ b/package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
@@ -1,4 +1,4 @@
-From a3754088b4cf7d19ff4f9a98412dd132d5baf1c1 Mon Sep 17 00:00:00 2001
+From 5b4179af15b435a476c006260718d4f6e22ea2ab Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd@kuhls.net>
Date: Mon, 31 Jul 2023 22:34:04 +0200
Subject: [PATCH] Disable SSL support for the curl module
@@ -17,26 +17,26 @@ Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
-index 75e1c8c..5121211 100644
+index e5031db..7357215 100644
--- a/Cargo.lock
+++ b/Cargo.lock
-@@ -1557,15 +1557,6 @@ version = "0.1.5"
+@@ -1521,15 +1521,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-[[package]]
-name = "openssl-src"
--version = "111.22.0+1.1.1q"
+-version = "111.25.0+1.1.1t"
-source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
+-checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "openssl-sys"
- version = "0.9.74"
-@@ -1575,7 +1566,6 @@ dependencies = [
+ version = "0.9.80"
+@@ -1539,7 +1530,6 @@ dependencies = [
"autocfg",
"cc",
"libc",
@@ -45,18 +45,18 @@ index 75e1c8c..5121211 100644
"vcpkg",
]
diff --git a/Cargo.toml b/Cargo.toml
-index abd6839..ddc141f 100644
+index c8c9ca9..117e77d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -19,7 +19,7 @@ clap = { version = "3.2.22", default-features = false, features = [
- "wrap_help",
+@@ -25,7 +25,7 @@ clap = { version = "4.1.6", default-features = false, features = [
+ "error-context",
] }
- console = "0.15.2"
+ console = "0.15.5"
-curl = { version = "0.4.44", features = ["static-curl", "static-ssl"] }
+curl = { version = "0.4.44" }
dirs = "4.0.0"
dotenv = "0.15.0"
- elementtree = "1.2.2"
+ elementtree = "1.2.3"
--
2.39.2
diff --git a/package/sentry-cli/sentry-cli.hash b/package/sentry-cli/sentry-cli.hash
index 3562199a82..78f137da3a 100644
--- a/package/sentry-cli/sentry-cli.hash
+++ b/package/sentry-cli/sentry-cli.hash
@@ -1,3 +1,3 @@
# locally calculated
-sha256 fa06f9f47782713eef8a4f10b674e2375b9439360ab34b37558ec4b30ec84861 sentry-cli-2.8.0.tar.gz
+sha256 2188b8eead4f2b6543725b23852427bea164e8dd76bf1ce33f41ca0c03cfeee7 sentry-cli-2.20.3.tar.gz
sha256 9503def7b54ceb6e3cd182fd59bc05d3a30d7eae481e65aaba4b495133c83c14 LICENSE
diff --git a/package/sentry-cli/sentry-cli.mk b/package/sentry-cli/sentry-cli.mk
index 15094c2d01..df419f81e1 100644
--- a/package/sentry-cli/sentry-cli.mk
+++ b/package/sentry-cli/sentry-cli.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SENTRY_CLI_VERSION = 2.8.0
+SENTRY_CLI_VERSION = 2.20.3
SENTRY_CLI_SITE = $(call github,getsentry,sentry-cli,$(SENTRY_CLI_VERSION))
SENTRY_CLI_LICENSE = BSD-3-clause
SENTRY_CLI_LICENSE_FILES = LICENSE
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x
2023-07-31 20:49 [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Bernd Kuhls
2023-07-31 20:49 ` [Buildroot] [PATCH 2/2] package/sentry-cli: bump version to 2.20.3 Bernd Kuhls
@ 2023-08-06 14:27 ` Thomas Petazzoni via buildroot
2023-08-21 19:32 ` Yann E. MORIN
[not found] ` <20230821193233.GW1778688__23363.0892865889$1692646387$gmane$org@scaer>
1 sibling, 2 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-08-06 14:27 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Joseph Kogut, buildroot
On Mon, 31 Jul 2023 22:49:46 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> Fixes:
> http://autobuild.buildroot.net/results/4e2/4e24cb67402bad35ab57833d72e6c857b3eb4e07/
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> ...able-SSL-support-for-the-curl-module.patch | 62 +++++++++++++++++++
> 1 file changed, 62 insertions(+)
> create mode 100644 package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
Applied to both master and next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/2] package/sentry-cli: bump version to 2.20.3
2023-07-31 20:49 ` [Buildroot] [PATCH 2/2] package/sentry-cli: bump version to 2.20.3 Bernd Kuhls
@ 2023-08-06 14:27 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-08-06 14:27 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Joseph Kogut, buildroot
On Mon, 31 Jul 2023 22:49:47 +0200
Bernd Kuhls <bernd@kuhls.net> wrote:
> Changelog:
> https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md
>
> Rebased patch 0001.
>
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> ---
> ...able-SSL-support-for-the-curl-module.patch | 24 +++++++++----------
> package/sentry-cli/sentry-cli.hash | 2 +-
> package/sentry-cli/sentry-cli.mk | 2 +-
> 3 files changed, 14 insertions(+), 14 deletions(-)
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x
2023-08-06 14:27 ` [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Thomas Petazzoni via buildroot
@ 2023-08-21 19:32 ` Yann E. MORIN
[not found] ` <20230821193233.GW1778688__23363.0892865889$1692646387$gmane$org@scaer>
1 sibling, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2023-08-21 19:32 UTC (permalink / raw)
To: Thomas Petazzoni; +Cc: Joseph Kogut, Bernd Kuhls, buildroot
Bernd, Thomas, All,
On 2023-08-06 16:27 +0200, Thomas Petazzoni via buildroot spake thusly:
> On Mon, 31 Jul 2023 22:49:46 +0200
> Bernd Kuhls <bernd@kuhls.net> wrote:
>
> > Fixes:
> > http://autobuild.buildroot.net/results/4e2/4e24cb67402bad35ab57833d72e6c857b3eb4e07/
> >
> > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
> > ---
> > ...able-SSL-support-for-the-curl-module.patch | 62 +++++++++++++++++++
> > 1 file changed, 62 insertions(+)
> > create mode 100644 package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch
>
> Applied to both master and next, thanks.
next still fails to build:
error: failed to run custom build command for `openssl-sys v0.9.80`
Caused by:
process didn't exit successfully: `/home/ymorin/dev/buildroot/O/next/build/host-sentry-cli-2.20.3/target/release/build/openssl-sys-a33e7c852d3bd3b4/build-script-main` (exit status: 101)
--- stdout
cargo:rustc-cfg=const_fn
cargo:rustc-cfg=openssl
cargo:rerun-if-env-changed=X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR
X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR unset
cargo:rerun-if-env-changed=OPENSSL_LIB_DIR
OPENSSL_LIB_DIR unset
cargo:rerun-if-env-changed=X86_64_UNKNOWN_LINUX_GNU_OPENSSL_INCLUDE_DIR
X86_64_UNKNOWN_LINUX_GNU_OPENSSL_INCLUDE_DIR unset
cargo:rerun-if-env-changed=OPENSSL_INCLUDE_DIR
OPENSSL_INCLUDE_DIR unset
cargo:rerun-if-env-changed=X86_64_UNKNOWN_LINUX_GNU_OPENSSL_DIR
X86_64_UNKNOWN_LINUX_GNU_OPENSSL_DIR unset
cargo:rerun-if-env-changed=OPENSSL_DIR
OPENSSL_DIR unset
cargo:rerun-if-env-changed=OPENSSL_NO_PKG_CONFIG
cargo:rerun-if-env-changed=PKG_CONFIG_x86_64-unknown-linux-gnu
cargo:rerun-if-env-changed=PKG_CONFIG_x86_64_unknown_linux_gnu
cargo:rerun-if-env-changed=HOST_PKG_CONFIG
cargo:rerun-if-env-changed=PKG_CONFIG
cargo:rerun-if-env-changed=OPENSSL_STATIC
cargo:rerun-if-env-changed=OPENSSL_DYNAMIC
cargo:rerun-if-env-changed=PKG_CONFIG_ALL_STATIC
cargo:rerun-if-env-changed=PKG_CONFIG_ALL_DYNAMIC
cargo:rerun-if-env-changed=PKG_CONFIG_PATH_x86_64-unknown-linux-gnu
cargo:rerun-if-env-changed=PKG_CONFIG_PATH_x86_64_unknown_linux_gnu
cargo:rerun-if-env-changed=HOST_PKG_CONFIG_PATH
cargo:rerun-if-env-changed=PKG_CONFIG_PATH
cargo:rerun-if-env-changed=PKG_CONFIG_LIBDIR_x86_64-unknown-linux-gnu
cargo:rerun-if-env-changed=PKG_CONFIG_LIBDIR_x86_64_unknown_linux_gnu
cargo:rerun-if-env-changed=HOST_PKG_CONFIG_LIBDIR
cargo:rerun-if-env-changed=PKG_CONFIG_LIBDIR
cargo:rerun-if-env-changed=PKG_CONFIG_SYSROOT_DIR_x86_64-unknown-linux-gnu
cargo:rerun-if-env-changed=PKG_CONFIG_SYSROOT_DIR_x86_64_unknown_linux_gnu
cargo:rerun-if-env-changed=HOST_PKG_CONFIG_SYSROOT_DIR
cargo:rerun-if-env-changed=PKG_CONFIG_SYSROOT_DIR
run pkg_config fail: "Could not run `PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=\"1\" PKG_CONFIG_LIBDIR=\"/home/ymorin/dev/buildroot/O/next/host/lib/pkgconfig:/home/ymorin/dev/buildroot/O/next/host/share/pkgconfig\" PKG_CONFIG_SYSROOT_DIR=\"/\" \"/home/ymorin/dev/buildroot/O/next/host/bin/pkg-config\" \"--libs\" \"--cflags\" \"openssl\"`\nThe pkg-config command could not be found.\n\nMost likely, you need to install a pkg-config package for your OS.\nTry `apt install pkg-config`, or `yum install pkg-config`,\nor `pkg install pkg-config`, or `apk add pkgconfig` depending on your distribution.\n\nIf you've already installed it, ensure the pkg-config command is one of the\ndirectories in the PATH environment variable.\n\nIf you did not expect this build to link to a pre-installed system library,\nthen check documentation of the openssl-sys crate for an option to\nbuild the library from source, or disable features or dependencies\nthat require pkg-config."
--- stderr
thread 'main' panicked at '
Could not find directory of OpenSSL installation, and this `-sys` crate cannot
proceed without this knowledge. If OpenSSL is installed and this crate had
trouble finding it, you can set the `OPENSSL_DIR` environment variable for the
compilation process.
Make sure you also have the development packages of openssl installed.
For example, `libssl-dev` on Ubuntu or `openssl-devel` on Fedora.
If you're in a situation where you think the directory *should* be found
automatically, please open a bug at https://github.com/sfackler/rust-openssl
and include information about your system as well as this message.
$HOST = x86_64-unknown-linux-gnu
$TARGET = x86_64-unknown-linux-gnu
openssl-sys = 0.9.80
', /home/ymorin/dev/buildroot/O/next/build/host-sentry-cli-2.20.3/VENDOR/openssl-sys/build/find_normal.rs:191:5
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
warning: build failed, waiting for other jobs to finish...
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x
[not found] ` <20230821193233.GW1778688__23363.0892865889$1692646387$gmane$org@scaer>
@ 2023-08-25 16:18 ` Bernd Kuhls
0 siblings, 0 replies; 6+ messages in thread
From: Bernd Kuhls @ 2023-08-25 16:18 UTC (permalink / raw)
To: buildroot
Am Mon, 21 Aug 2023 21:32:33 +0200 schrieb Yann E. MORIN:
> next still fails to build:
Hi Yann,
please try https://patchwork.ozlabs.org/project/buildroot/patch/
20230825161754.398783-1-bernd@kuhls.net/
Regards, Bernd
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-25 16:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-31 20:49 [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Bernd Kuhls
2023-07-31 20:49 ` [Buildroot] [PATCH 2/2] package/sentry-cli: bump version to 2.20.3 Bernd Kuhls
2023-08-06 14:27 ` Thomas Petazzoni via buildroot
2023-08-06 14:27 ` [Buildroot] [PATCH 1/2] package/sentry-cli: fix build with OpenSSL 3.x Thomas Petazzoni via buildroot
2023-08-21 19:32 ` Yann E. MORIN
[not found] ` <20230821193233.GW1778688__23363.0892865889$1692646387$gmane$org@scaer>
2023-08-25 16:18 ` Bernd Kuhls
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox