libwebsock: Fix openssl reporting in header
PATCH 1/1 libwebsock: Fix openssl reporting in header
The websock_config.h file currently ends up being installed into the sysroot with a #include "config.h" line but the config.h file does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using the config.h file.
Patch has been submitted upstream but may never be merged.
https://github.com/payden/libwebsock/pull/38
--- package/libwebsock/0002-fix-ssl.patch | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
package/libwebsock/0002-fix-ssl.patch +8 -13
@@ -1,26 +1,21 @@ config: fix SSL detection -The @WEBSOCK_HAVE_SSL@ is not replaced at configure time, and even if -it was, it would be replaced by an empty string if openssl is disabled, -thus still defining WEBSOCK_HAVE_SSL when we would not want it. +The @WEBSOCK_HAVE_SSL@ is replaced at configure time with either a 1 or 0. +The rest of the code is simply checking to see if WEBSOCK_HAVE_SSL is +defined at all. Using a #undef WEBSOCK_HAVE_SSL will cause configure +to either comment it out or change the line to +"#define WEBSOCK_HAVE_SSL 1". -Instead, rely on config.h, which is properly generated by ./configure, -to provide the information about whether openssl is enabled or not. - -Signed-off-by: "Yann E. MORIN" <[email protected]> +Signed-off-by: Clayton Shotwell <[email protected]> diff -durN a/src/websock_config.h.in b/src/websock_config.h.in --- a/src/websock_config.h.in +++ b/src/websock_config.h.in -@@ -1,9 +1,10 @@ - #ifndef WEBSOCK_CONFIG_H - #define WEBSOCK_CONFIG_H 1 - -+#include "config.h" -+ +@@ -4,6 +4,6 @@ #define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@ #define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@ #define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@ -#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@ ++#undef WEBSOCK_HAVE_SSL #endif
Signature · 1 line
1.9.1
Arnout Vandecappelle
AppliedPATCH 1/1 libwebsock: Fix openssl reporting in header
Quoted 10 lines · Clayton Shotwell
The
websock_config.hfile currently ends up being installed into the sysroot with a #include "config.h" line but theconfig.hfile does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using theconfig.hfile.Patch has been submitted upstream but may never be merged.
https://github.com/payden/libwebsock/pull/38Signed-off-by Clayton Shotwell <[email protected]>
Applied to master, thanks.
Regards,
Arnout
PATCH 1/1 libwebsock: Fix openssl reporting in header
In reply to Clayton ShotwellQuoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Clayton" == Clayton Shotwell <[email protected]> writes:
The
websock_config.hfile currently ends up being installed into the sysroot with a #include "config.h" line but theconfig.hfile does not get copied into the sysroot. Refactoring the original patch to have the configure script properly report whether or not SSL support is enabled without using theconfig.hfile.
Quoted 4 lines
Patch has been submitted upstream but may never be merged.
https://github.com/payden/libwebsock/pull/38Signed-off-by Clayton Shotwell <[email protected]>
Committed to 2018.02.x and 2018.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard