Date: Sun, 6 Aug 2023 18:30:52 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9a58cf055742 - main - multimedia/oscam: Fix build with openssl3 Message-ID: <202308061830.376IUqrR034281@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a58cf0557425841e453a3cd8dd4509be88eed62 commit 9a58cf0557425841e453a3cd8dd4509be88eed62 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-08-06 18:26:04 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-08-06 18:30:39 +0000 multimedia/oscam: Fix build with openssl3 - Refresh patches Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- multimedia/oscam/files/patch-config.h | 4 ++-- multimedia/oscam/files/patch-oscam.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/multimedia/oscam/files/patch-config.h b/multimedia/oscam/files/patch-config.h index 0fdea68c5732..a8b8a7c0e27b 100644 --- a/multimedia/oscam/files/patch-config.h +++ b/multimedia/oscam/files/patch-config.h @@ -1,6 +1,6 @@ ---- config.h.orig 2020-03-14 17:14:49 UTC +--- config.h.orig 2021-07-28 22:04:49 UTC +++ config.h -@@ -34,7 +34,7 @@ +@@ -35,7 +35,7 @@ //#define MODULE_SERIAL 1 //#define MODULE_CONSTCW 1 //#define MODULE_PANDORA 1 diff --git a/multimedia/oscam/files/patch-oscam.c b/multimedia/oscam/files/patch-oscam.c new file mode 100644 index 000000000000..b4571e7ccfe8 --- /dev/null +++ b/multimedia/oscam/files/patch-oscam.c @@ -0,0 +1,30 @@ +--- oscam.c.orig 2023-08-06 18:22:04 UTC ++++ oscam.c +@@ -49,7 +49,9 @@ + static void ssl_init(void) + { + SSL_load_error_strings(); ++#if OPENSSL_VERSION_NUMBER < 0x30000000L + ERR_load_BIO_strings(); ++#endif + ERR_load_SSL_strings(); + SSL_library_init(); + } +@@ -1807,7 +1809,7 @@ int32_t main(int32_t argc, char *argv[]) + #ifdef CS_CACHEEX_AIO + init_cw_cache(); + init_ecm_cache(); +-#endif ++#endif + cs_init_log(); + init_machine_info(); + init_check(); +@@ -1899,7 +1901,7 @@ int32_t main(int32_t argc, char *argv[]) + led_status_starting(); + + ac_init(); +- ++ + gbox_send_init_hello(); + + start_thread("card poll", (void *) &card_poll, NULL, NULL, 1, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308061830.376IUqrR034281>