From nobody Sun Aug 06 18:30:52 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJp1921R0z4mDKR; Sun, 6 Aug 2023 18:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJp191BP2z4N7p; Sun, 6 Aug 2023 18:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691346653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnI7o0XV9LLAY/SGK5rNYzhn1+8CMPdnzfQcss2w4QE=; b=bRCAwAXxlzBQJG1Wql1ypKV2zfX+DCEDro70hJR02oq56nj2PWA0+QncwfnuU0mnoOsFAY C0Jksmm8sn3ral+PbmNkAfxl2AubLbvqL+NtdEw/jlGtnTqLMLLzHY2X63ADJGJwxk12CJ 8NRkNwT3r0Fr3tr6j569RdfH1BcudWKLGAi+RVllBwMbbAq0YBwJNvYo3li2jMGeOdhjvH LE/pkL5Tm2w6DkuMeJA99+vICj/bDe7xQvID5+eEqrBTLTfLjlcA5PIhPLwLR/xv3SHP59 VGnkRKkvoB9ynhdVAEsa7UMTu2RQh8xNjgpukzxng+BPBl9Dboj0wkwx66pSFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691346653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnI7o0XV9LLAY/SGK5rNYzhn1+8CMPdnzfQcss2w4QE=; b=hiVzD5DeJvSTO3BsJQOVfmFByfqeqUpyLruEOXdsWdet+gCjbGLh1kJjiMI8jv+Wnb9p+y Trh4usxIc5Zxt9qkHGh1ae4IROTIhmYredIHc9SIXNxOm74zKnM8CssLZC5yxAXyjPLf7g DoTyI7cYx5xjvpADG7LVyfQnwuDkgUc7qhUUQw976MEi24IbMk+nOlBGcsrwJqFKxL8YY8 XwEIdowAL2YZyajzQ9slM49AO6ast2wH/4yzvsl8KRNs6T2KdWVYYs8FMyNB62yWJWxYBd MSO8Ae3jknAad77Rku76lDqWp4vFQqWgoDuzZgpY1nGx27oZBwaVT6SA2sc6gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691346653; a=rsa-sha256; cv=none; b=MGQ4GPXBse8l2NeNk/gh9/j/Cn5a5EPb9UHMw0RvHBt+t7NUGt42WK8kiHr5z28A1IXu0E LYhWC41FfZ6B/Gbo7PUBqDocqHf5ZMJ57R2f9xhpkGWcIpvSvdusnP67Msg8p23yH7q6mw WlXpELkBtW9D6bFsW46x4QqUS5K3SXYVUHpN8MuVPs1yofB2CeDoAZejfk9W+ndyjbPyui xZi99C8JrTMjzPiRSxp0w1ZvZ6xYcfaleZXhh/vygmNe+l1BkZjBEL1I0sT/FdY/haeRUZ Z9+GWiGv99+bBz8vhSTt992uikFuZ7fMuTnpQeGXBLmmdlTskF7vRFv5hM8qdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJp186pJnz5wq; Sun, 6 Aug 2023 18:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376IUqCM034282; Sun, 6 Aug 2023 18:30:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376IUqrR034281; Sun, 6 Aug 2023 18:30:52 GMT (envelope-from git) Date: Sun, 6 Aug 2023 18:30:52 GMT Message-Id: <202308061830.376IUqrR034281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9a58cf055742 - main - multimedia/oscam: Fix build with openssl3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a58cf0557425841e453a3cd8dd4509be88eed62 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a58cf0557425841e453a3cd8dd4509be88eed62 commit 9a58cf0557425841e453a3cd8dd4509be88eed62 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-06 18:26:04 +0000 Commit: Muhammad Moinur Rahman 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);