From nobody Sat Feb 12 20:46:59 2022 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 1473C194F7D4; Sat, 12 Feb 2022 20:47:00 +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 4Jx2bR72xnz3lmX; Sat, 12 Feb 2022 20:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644698820; 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=LMCb1OowW55ClyGaLQRYpbQ2LoQu3PgcOlF8KEfHv/I=; b=BhOPsYehO/HGqw08C/pT6oBlWhHrSCvHQRSzXIMaAJTdlMerfivcS+53BPEfpV3YrmhA46 bjKqd0LrKEAX4tQRoQfJ9OpWcFk/hstrjpu+xjQhWskS8n7dfJ3nokCa1py9S0F/6762sv nnZYwlrX9Bk6VcgTtkRdIjo0a4tw6AZOVxvF+vvtPtxuDPyBFs6rwLuHPJeQdxem8WIMzh 71F6jJWnR9HQ6Bmo5KUnlJUocWVphxOaJKE7P8IofsSuNrgTSXsY74J38XoU9KrDvAixbd MVDacAvigO9tjQYelm0muAHQvcaCpNifG23YbDSP+pAOnXdDzs9IdUO6kRyyGA== 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 D1D4962D6; Sat, 12 Feb 2022 20:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21CKkxIB063925; Sat, 12 Feb 2022 20:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21CKkxlM063924; Sat, 12 Feb 2022 20:46:59 GMT (envelope-from git) Date: Sat, 12 Feb 2022 20:46:59 GMT Message-Id: <202202122046.21CKkxlM063924@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: b904062e277f - main - lang/php8[01]: Unbreak with libressl* 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: b904062e277f750c3a12b9a8cd8af97c3230fbe4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644698820; 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=LMCb1OowW55ClyGaLQRYpbQ2LoQu3PgcOlF8KEfHv/I=; b=DFIEvF4SBH8mwiohqP3vUs0Qo3FPMAL7Ln96DzortcL8uoxwm/BbGSXjd8bPPbE4vP8Jt+ X6T7ViekzYMTTjpFYvysJO/sj1Hs8GJDgsVmwaNLoZ6QxhvpvGuIz6s5YUDaLsAszacJvG LOt3QiI+yWvtVFZJZVbRw3IXHSlHY2uP2j6anepnXIrZ8thH13KB94cqYuQWH8vF50KGmP ysZlCrBM6Y79QB0Y+KRZRRITD4mVzSKW2q/lT7Z5+ulvMEQmkUN3gLzHSyqyFMEtIlx7wD 2r/vnxgqskBCzqbwVMmmeSUcjRpogsivJp+Ub5B8vPzHMGgU9eHIWOwHCPeUyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644698820; a=rsa-sha256; cv=none; b=HsyoU8RGTXmlTPWJt6GKd2+oVJ9RnXFk1MXRg79S7RwxwS82xD7D0hpSEkAAhDVJSGuLc9 YslMr7yoAtqY4q2lwJNnqdnzMt1GaujB1LObO4bSXk6J1zTkM9YtTEd2CaDkDj2Q24TX7n zCk1EuJN1aNx/r7R4FgQ+1/fjvewsdcHcm5HA+2ASysLb/VvfuGQP33pC6LjyKd5jm4Dc4 QuZKwaFbe+1hkSDpR4hSgAWI6BoiwEn979wD92TyEB1dikoHoYp21xqmHV21UcJV1yPV00 c+XwIAfdlUqYBMkFy7X+c1oApw7KqtJaxlQGSZZGdXMaUt5tpJsAZG0NtR2omg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=b904062e277f750c3a12b9a8cd8af97c3230fbe4 commit b904062e277f750c3a12b9a8cd8af97c3230fbe4 Author: Muhammad Moinur Rahman AuthorDate: 2022-02-12 20:43:26 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-02-12 20:46:51 +0000 lang/php8[01]: Unbreak with libressl* lang/php8[01] builds fine with libressl*. Reverting previous partial commit. Although it takes minor tweaking on unsetting TLS_SRP on ftp/curl. PR: 261903 Reported by: vishwin rozhuk.im@gmail.com Approved by: tz (private email) Sponsored by: Bounce Experts --- lang/php80/Makefile | 4 ---- lang/php81/Makefile | 4 ---- 2 files changed, 8 deletions(-) diff --git a/lang/php80/Makefile b/lang/php80/Makefile index 6049b8ee56c0..0c20d67563ce 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -12,10 +12,6 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 USES+= compiler:c11 tar:xz cpe gnome pkgconfig -# Although php builds fine with libressl* but most of the php modules -# require curl which fails to build with libressl*. So do an early -# check and prevent php from being built with libressl* -IGNORE_SSL= libressl libressl-devel CPE_PRODUCT= php CONFLICTS_INSTALL?= php[0-9][0-9]${PKGNAMESUFFIX} diff --git a/lang/php81/Makefile b/lang/php81/Makefile index e0d59649dad0..497986cc220f 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -11,10 +11,6 @@ COMMENT= PHP Scripting Language (8.1.X branch) LICENSE= PHP301 USES+= compiler:c11 cpe gnome pkgconfig tar:xz -# Although php builds fine with libressl* but most of the php modules -# require curl which fails to build with libressl*. So do an early -# check and prevent php from being built with libressl* -IGNORE_SSL= libressl libressl-devel CPE_PRODUCT= php PHP_VER= 81