-
Notifications
You must be signed in to change notification settings - Fork 3.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
node-mozilla-iot-gateway: add openssl 1.1 compat. #6088
node-mozilla-iot-gateway: add openssl 1.1 compat. #6088
Conversation
@@ -20,6 +20,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz | |||
PKG_MIRROR_HASH:=ba05bc3e93c36768244df922434e7132c2dae85a1ff9e3213beea087a4844d11 | |||
|
|||
PKG_BUILD_DEPENDS:=node/host openzwave | |||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) | |||
PKG_INSTALL_DIR:=$(BUILD_DIR)/$(PKG_NAME)/ipkg-install |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you actually need both of these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. The INSTALL_DIR need to be outside of the build tree to avoid copying the directory to itself during installation--another quirk of building the package using npm. The PKG_BUILD_DIR holds INSTALL_DIR, as well as the build dirs of node-mozilla-iot-gateway and ursa, so they are easily and properly cleaned.
URL:=https://registry.yarnpkg.com/ursa/-/$(FILE) | ||
HASH:=65516fc99958011572ef26ef02a3c84a004e47aabfd5b8aa46abb10481ae7153 | ||
endef | ||
$(eval $(call Download,ursa)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This really looks like it should be a separate package, so it gets all the regular package downloading treatment and all the dependency tracking like normal, instead of the hackjob you've got below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with you. However, there are 1741 packages installed by node-mozilla-iot-gateway in that same situation--if you look at the compile log, there are 2 lines, adding 583 and 1203 packages. It's a 42MB ipk file. It installs an independent copy of the node-serialport package as well. The node-mozilla-iot-gateway package was added to the feed as is. I just wanted was to make it compile with openssl 1.1, and didn't fix anything else.
This package is a bit different than most of openwrt. It downloads its node dependencies at build time. The actual package that needs patching to compile with openssl 1.1.0 is ursa. Signed-off-by: Eneas U de Queiroz <[email protected]>
1b8ffda
to
e0ed5c7
Compare
It seems like the "package has healed itself." Since the package uses npm to build itself and the dependent packages, it picks up updated packages automatically, so no patches are necessary anymore. I'm closing this. |
This release is built with Go 1.15, which deprecates X.509 CommonName in TLS certificates validation. In the unlikely case that you use the gRPC API v2 (which is limited to TSDB admin commands), please note that we will remove this experimental API in the next minor release 2.22. [CHANGE] Disable HTTP/2 because of concerns with the Go HTTP/2 client. openwrt#7588 openwrt#7701 [CHANGE] PromQL: query_log_file path is now relative to the config file. openwrt#7701 [CHANGE] Promtool: Replace the tsdb command line tool by a promtool tsdb subcommand. openwrt#6088 [CHANGE] Rules: Label rule_group_iterations metric with group name. openwrt#7823 [FEATURE] Eureka SD: New service discovery. openwrt#3369 [FEATURE] Hetzner SD: New service discovery. openwrt#7822 [FEATURE] Kubernetes SD: Support Kubernetes EndpointSlices. openwrt#6838 [FEATURE] Scrape: Add per scrape-config targets limit. openwrt#7554 [ENHANCEMENT] Support composite durations in PromQL, config and UI, e.g. 1h30m. openwrt#7713 openwrt#7833 [ENHANCEMENT] DNS SD: Add SRV record target and port meta labels. openwrt#7678 [ENHANCEMENT] Docker Swarm SD: Support tasks and service without published ports. openwrt#7686 [ENHANCEMENT] PromQL: Reduce the amount of data queried by remote read when a subquery has an offset. openwrt#7667 [ENHANCEMENT] Promtool: Add --time option to query instant command. openwrt#7829 [ENHANCEMENT] UI: Respect the --web.page-title parameter in the React UI. openwrt#7607 [ENHANCEMENT] UI: Add duration, labels, annotations to alerts page in the React UI. openwrt#7605 [ENHANCEMENT] UI: Add duration on the React UI rules page, hide annotation and labels if empty. openwrt#7606 [BUGFIX] API: Deduplicate series in /api/v1/series. openwrt#7862 [BUGFIX] PromQL: Drop metric name in bool comparison between two instant vectors. openwrt#7819 [BUGFIX] PromQL: Exit with an error when time parameters can't be parsed. openwrt#7505 [BUGFIX] Remote read: Re-add accidentally removed tracing for remote-read requests. openwrt#7916 [BUGFIX] Rules: Detect extra fields in rule files. openwrt#7767 [BUGFIX] Rules: Disallow overwriting the metric name in the labels section of recording rules. openwrt#7787 [BUGFIX] Rules: Keep evaluation timestamp across reloads. openwrt#7775 [BUGFIX] Scrape: Do not stop scrapes in progress during reload. openwrt#7752 [BUGFIX] TSDB: Fix chunks.HeadReadWriter: maxt of the files are not set error. openwrt#7856 [BUGFIX] TSDB: Delete blocks atomically to prevent corruption when there is a panic/crash during deletion. openwrt#7772 [BUGFIX] Triton SD: Fix a panic when triton_sd_config is nil. openwrt#7671 [BUGFIX] UI: Fix react UI bug with series going on and off. openwrt#7804 [BUGFIX] UI: Fix styling bug for target labels with special names in React UI. openwrt#7902 [BUGFIX] Web: Stop CMUX and GRPC servers even with stale connections, preventing the server to stop on SIGTERM. openwrt#7810 Signed-off-by: Paul Spooren <[email protected]>
This release is built with Go 1.15, which deprecates X.509 CommonName in TLS certificates validation. In the unlikely case that you use the gRPC API v2 (which is limited to TSDB admin commands), please note that we will remove this experimental API in the next minor release 2.22. [CHANGE] Disable HTTP/2 because of concerns with the Go HTTP/2 client. openwrt#7588 openwrt#7701 [CHANGE] PromQL: query_log_file path is now relative to the config file. openwrt#7701 [CHANGE] Promtool: Replace the tsdb command line tool by a promtool tsdb subcommand. openwrt#6088 [CHANGE] Rules: Label rule_group_iterations metric with group name. openwrt#7823 [FEATURE] Eureka SD: New service discovery. openwrt#3369 [FEATURE] Hetzner SD: New service discovery. openwrt#7822 [FEATURE] Kubernetes SD: Support Kubernetes EndpointSlices. openwrt#6838 [FEATURE] Scrape: Add per scrape-config targets limit. openwrt#7554 [ENHANCEMENT] Support composite durations in PromQL, config and UI, e.g. 1h30m. openwrt#7713 openwrt#7833 [ENHANCEMENT] DNS SD: Add SRV record target and port meta labels. openwrt#7678 [ENHANCEMENT] Docker Swarm SD: Support tasks and service without published ports. openwrt#7686 [ENHANCEMENT] PromQL: Reduce the amount of data queried by remote read when a subquery has an offset. openwrt#7667 [ENHANCEMENT] Promtool: Add --time option to query instant command. openwrt#7829 [ENHANCEMENT] UI: Respect the --web.page-title parameter in the React UI. openwrt#7607 [ENHANCEMENT] UI: Add duration, labels, annotations to alerts page in the React UI. openwrt#7605 [ENHANCEMENT] UI: Add duration on the React UI rules page, hide annotation and labels if empty. openwrt#7606 [BUGFIX] API: Deduplicate series in /api/v1/series. openwrt#7862 [BUGFIX] PromQL: Drop metric name in bool comparison between two instant vectors. openwrt#7819 [BUGFIX] PromQL: Exit with an error when time parameters can't be parsed. openwrt#7505 [BUGFIX] Remote read: Re-add accidentally removed tracing for remote-read requests. openwrt#7916 [BUGFIX] Rules: Detect extra fields in rule files. openwrt#7767 [BUGFIX] Rules: Disallow overwriting the metric name in the labels section of recording rules. openwrt#7787 [BUGFIX] Rules: Keep evaluation timestamp across reloads. openwrt#7775 [BUGFIX] Scrape: Do not stop scrapes in progress during reload. openwrt#7752 [BUGFIX] TSDB: Fix chunks.HeadReadWriter: maxt of the files are not set error. openwrt#7856 [BUGFIX] TSDB: Delete blocks atomically to prevent corruption when there is a panic/crash during deletion. openwrt#7772 [BUGFIX] Triton SD: Fix a panic when triton_sd_config is nil. openwrt#7671 [BUGFIX] UI: Fix react UI bug with series going on and off. openwrt#7804 [BUGFIX] UI: Fix styling bug for target labels with special names in React UI. openwrt#7902 [BUGFIX] Web: Stop CMUX and GRPC servers even with stale connections, preventing the server to stop on SIGTERM. openwrt#7810 Signed-off-by: Paul Spooren <[email protected]>
This release is built with Go 1.15, which deprecates X.509 CommonName in TLS certificates validation. In the unlikely case that you use the gRPC API v2 (which is limited to TSDB admin commands), please note that we will remove this experimental API in the next minor release 2.22. [CHANGE] Disable HTTP/2 because of concerns with the Go HTTP/2 client. #7588 #7701 [CHANGE] PromQL: query_log_file path is now relative to the config file. #7701 [CHANGE] Promtool: Replace the tsdb command line tool by a promtool tsdb subcommand. #6088 [CHANGE] Rules: Label rule_group_iterations metric with group name. #7823 [FEATURE] Eureka SD: New service discovery. #3369 [FEATURE] Hetzner SD: New service discovery. #7822 [FEATURE] Kubernetes SD: Support Kubernetes EndpointSlices. #6838 [FEATURE] Scrape: Add per scrape-config targets limit. #7554 [ENHANCEMENT] Support composite durations in PromQL, config and UI, e.g. 1h30m. #7713 #7833 [ENHANCEMENT] DNS SD: Add SRV record target and port meta labels. #7678 [ENHANCEMENT] Docker Swarm SD: Support tasks and service without published ports. #7686 [ENHANCEMENT] PromQL: Reduce the amount of data queried by remote read when a subquery has an offset. #7667 [ENHANCEMENT] Promtool: Add --time option to query instant command. #7829 [ENHANCEMENT] UI: Respect the --web.page-title parameter in the React UI. #7607 [ENHANCEMENT] UI: Add duration, labels, annotations to alerts page in the React UI. #7605 [ENHANCEMENT] UI: Add duration on the React UI rules page, hide annotation and labels if empty. #7606 [BUGFIX] API: Deduplicate series in /api/v1/series. #7862 [BUGFIX] PromQL: Drop metric name in bool comparison between two instant vectors. #7819 [BUGFIX] PromQL: Exit with an error when time parameters can't be parsed. #7505 [BUGFIX] Remote read: Re-add accidentally removed tracing for remote-read requests. #7916 [BUGFIX] Rules: Detect extra fields in rule files. #7767 [BUGFIX] Rules: Disallow overwriting the metric name in the labels section of recording rules. #7787 [BUGFIX] Rules: Keep evaluation timestamp across reloads. #7775 [BUGFIX] Scrape: Do not stop scrapes in progress during reload. #7752 [BUGFIX] TSDB: Fix chunks.HeadReadWriter: maxt of the files are not set error. #7856 [BUGFIX] TSDB: Delete blocks atomically to prevent corruption when there is a panic/crash during deletion. #7772 [BUGFIX] Triton SD: Fix a panic when triton_sd_config is nil. #7671 [BUGFIX] UI: Fix react UI bug with series going on and off. #7804 [BUGFIX] UI: Fix styling bug for target labels with special names in React UI. #7902 [BUGFIX] Web: Stop CMUX and GRPC servers even with stale connections, preventing the server to stop on SIGTERM. #7810 Signed-off-by: Paul Spooren <[email protected]>
This release is built with Go 1.15, which deprecates X.509 CommonName in TLS certificates validation. In the unlikely case that you use the gRPC API v2 (which is limited to TSDB admin commands), please note that we will remove this experimental API in the next minor release 2.22. [CHANGE] Disable HTTP/2 because of concerns with the Go HTTP/2 client. openwrt#7588 openwrt#7701 [CHANGE] PromQL: query_log_file path is now relative to the config file. openwrt#7701 [CHANGE] Promtool: Replace the tsdb command line tool by a promtool tsdb subcommand. openwrt#6088 [CHANGE] Rules: Label rule_group_iterations metric with group name. openwrt#7823 [FEATURE] Eureka SD: New service discovery. openwrt#3369 [FEATURE] Hetzner SD: New service discovery. openwrt#7822 [FEATURE] Kubernetes SD: Support Kubernetes EndpointSlices. openwrt#6838 [FEATURE] Scrape: Add per scrape-config targets limit. openwrt#7554 [ENHANCEMENT] Support composite durations in PromQL, config and UI, e.g. 1h30m. openwrt#7713 openwrt#7833 [ENHANCEMENT] DNS SD: Add SRV record target and port meta labels. openwrt#7678 [ENHANCEMENT] Docker Swarm SD: Support tasks and service without published ports. openwrt#7686 [ENHANCEMENT] PromQL: Reduce the amount of data queried by remote read when a subquery has an offset. openwrt#7667 [ENHANCEMENT] Promtool: Add --time option to query instant command. openwrt#7829 [ENHANCEMENT] UI: Respect the --web.page-title parameter in the React UI. openwrt#7607 [ENHANCEMENT] UI: Add duration, labels, annotations to alerts page in the React UI. openwrt#7605 [ENHANCEMENT] UI: Add duration on the React UI rules page, hide annotation and labels if empty. openwrt#7606 [BUGFIX] API: Deduplicate series in /api/v1/series. openwrt#7862 [BUGFIX] PromQL: Drop metric name in bool comparison between two instant vectors. openwrt#7819 [BUGFIX] PromQL: Exit with an error when time parameters can't be parsed. openwrt#7505 [BUGFIX] Remote read: Re-add accidentally removed tracing for remote-read requests. openwrt#7916 [BUGFIX] Rules: Detect extra fields in rule files. openwrt#7767 [BUGFIX] Rules: Disallow overwriting the metric name in the labels section of recording rules. openwrt#7787 [BUGFIX] Rules: Keep evaluation timestamp across reloads. openwrt#7775 [BUGFIX] Scrape: Do not stop scrapes in progress during reload. openwrt#7752 [BUGFIX] TSDB: Fix chunks.HeadReadWriter: maxt of the files are not set error. openwrt#7856 [BUGFIX] TSDB: Delete blocks atomically to prevent corruption when there is a panic/crash during deletion. openwrt#7772 [BUGFIX] Triton SD: Fix a panic when triton_sd_config is nil. openwrt#7671 [BUGFIX] UI: Fix react UI bug with series going on and off. openwrt#7804 [BUGFIX] UI: Fix styling bug for target labels with special names in React UI. openwrt#7902 [BUGFIX] Web: Stop CMUX and GRPC servers even with stale connections, preventing the server to stop on SIGTERM. openwrt#7810 Signed-off-by: Paul Spooren <[email protected]>
This release is built with Go 1.15, which deprecates X.509 CommonName in TLS certificates validation. In the unlikely case that you use the gRPC API v2 (which is limited to TSDB admin commands), please note that we will remove this experimental API in the next minor release 2.22. [CHANGE] Disable HTTP/2 because of concerns with the Go HTTP/2 client. openwrt#7588 openwrt#7701 [CHANGE] PromQL: query_log_file path is now relative to the config file. openwrt#7701 [CHANGE] Promtool: Replace the tsdb command line tool by a promtool tsdb subcommand. openwrt#6088 [CHANGE] Rules: Label rule_group_iterations metric with group name. openwrt#7823 [FEATURE] Eureka SD: New service discovery. openwrt#3369 [FEATURE] Hetzner SD: New service discovery. openwrt#7822 [FEATURE] Kubernetes SD: Support Kubernetes EndpointSlices. openwrt#6838 [FEATURE] Scrape: Add per scrape-config targets limit. openwrt#7554 [ENHANCEMENT] Support composite durations in PromQL, config and UI, e.g. 1h30m. openwrt#7713 openwrt#7833 [ENHANCEMENT] DNS SD: Add SRV record target and port meta labels. openwrt#7678 [ENHANCEMENT] Docker Swarm SD: Support tasks and service without published ports. openwrt#7686 [ENHANCEMENT] PromQL: Reduce the amount of data queried by remote read when a subquery has an offset. openwrt#7667 [ENHANCEMENT] Promtool: Add --time option to query instant command. openwrt#7829 [ENHANCEMENT] UI: Respect the --web.page-title parameter in the React UI. openwrt#7607 [ENHANCEMENT] UI: Add duration, labels, annotations to alerts page in the React UI. openwrt#7605 [ENHANCEMENT] UI: Add duration on the React UI rules page, hide annotation and labels if empty. openwrt#7606 [BUGFIX] API: Deduplicate series in /api/v1/series. openwrt#7862 [BUGFIX] PromQL: Drop metric name in bool comparison between two instant vectors. openwrt#7819 [BUGFIX] PromQL: Exit with an error when time parameters can't be parsed. openwrt#7505 [BUGFIX] Remote read: Re-add accidentally removed tracing for remote-read requests. openwrt#7916 [BUGFIX] Rules: Detect extra fields in rule files. openwrt#7767 [BUGFIX] Rules: Disallow overwriting the metric name in the labels section of recording rules. openwrt#7787 [BUGFIX] Rules: Keep evaluation timestamp across reloads. openwrt#7775 [BUGFIX] Scrape: Do not stop scrapes in progress during reload. openwrt#7752 [BUGFIX] TSDB: Fix chunks.HeadReadWriter: maxt of the files are not set error. openwrt#7856 [BUGFIX] TSDB: Delete blocks atomically to prevent corruption when there is a panic/crash during deletion. openwrt#7772 [BUGFIX] Triton SD: Fix a panic when triton_sd_config is nil. openwrt#7671 [BUGFIX] UI: Fix react UI bug with series going on and off. openwrt#7804 [BUGFIX] UI: Fix styling bug for target labels with special names in React UI. openwrt#7902 [BUGFIX] Web: Stop CMUX and GRPC servers even with stale connections, preventing the server to stop on SIGTERM. openwrt#7810 Signed-off-by: Paul Spooren <[email protected]>
This package is a bit different than most of openwrt. It downloads its node dependencies at build time. The actual package that needs patching to compile with openssl 1.1.0 is ursa. What I've done was to download ursa, patch it, and generate a tgz file, which then is used instead of fetching it online.
Signed-off-by: Eneas U de Queiroz [email protected]
Maintainer: me / @ratkaj
Compile tested: ramips, mips_24kc
Run tested: none