-
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
mosquitto: Fix compilation without deprecetated OpenSSL APIs #7772
Conversation
How does this relate to eclipse-mosquitto/mosquitto#1034 or any other patches upstream? |
net/mosquitto/Makefile
Outdated
@@ -146,7 +147,7 @@ endef | |||
define Package/libmosquittopp | |||
SECTION:=libs | |||
CATEGORY:=Libraries | |||
DEPENDS:=libmosquitto +libstdcpp | |||
DEPENDS:=libmosquitto $(CXX_DEPENDS) |
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 appears to be completely unrelated to "compile without openssl deprecated apis"
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 added a note in the commit message.
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'm still not ever going to merge this under the title of "compile without open ssl deprecated apis" this looks by all means a valid fix, btu it's a completely separate commit.
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.
also, does the $(CXX_DEPENDS) work to allow selecting the library directly? or do you now have to go and select a c++ lib first?
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.
Ok. I will place it under a separate commit sometime in the future.
That patch has already been merged. |
Ok, but I see now you're touching different deprecation parts. So, reworded, where's the upstream patch for this? |
I have not submitted. Something about a CLA. |
ok, well, that's just a SoB too, or at least file a ticket with the information, I'm not merging such edge patches without them having even tracked upstream. |
Need to sign up and fill out a form just to submit a patch... I think I'll just open an issue. |
+run tested please |
Fixed OpenSSL 1.0.2 as well. @cshoredaniel there's no change in functionality. Just compilation fixes. |
This also changes the C++ library depending on the user's configuration. |
c9d61e2
to
9797b16
Compare
I still don't see any issue filed for tracking this upstream. I'm not carrying this forever here. |
Done edit: On the libstdcpp change, it has to stay. Domoticz depends on libstdcpp (will not compile with uClibc++) and if mosquitto gets built with uClibc++, there will be a linking error. I will add a comment about this. |
Signed-off-by: Rosen Penev <[email protected]>
Switched to upstream patch. |
@karlp this Ok now? |
Yes, I'm just waiting for the next release upstream. It was meant to be friday, but will be this week instead. |
Should I close this then? |
No, leave it, I'm using it for my own tracking, I'll close it when the issue has been addressed. |
this has now merged thanks. |
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]>
Signed-off-by: Rosen Penev [email protected]
Maintainer: @karlp
Compile tested: ramips