From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1112713933E for ; Thu, 15 Jul 2021 20:22:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 602DDE0A62; Thu, 15 Jul 2021 20:22:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43B88E0A62 for ; Thu, 15 Jul 2021 20:22:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF2F4340B25 for ; Thu, 15 Jul 2021 20:22:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 792777BC for ; Thu, 15 Jul 2021 20:22:01 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1626380512.cba7f8228328b339b8f6090406c26fc14d4e39d9.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/metadata.xml dev-lang/php/php-8.0.8-r1.ebuild dev-lang/php/php-8.0.8-r2.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: cba7f8228328b339b8f6090406c26fc14d4e39d9 X-VCS-Branch: master Date: Thu, 15 Jul 2021 20:22:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb758693-b801-4053-8fae-f686791f35f4 X-Archives-Hash: 1dafbfea7d073e2ef89dbc1bf69a3d07 commit: cba7f8228328b339b8f6090406c26fc14d4e39d9 Author: Michael Orlitzky gentoo org> AuthorDate: Thu Jul 15 19:06:24 2021 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Thu Jul 15 20:21:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba7f822 dev-lang/php: support USE=apparmor in php-8.x. Earlier versions of dev-lang/php[fpm] have an "automagic" dependency on libapparmor when the latter is installed. The 8.x versions of PHP, however support a --with-fpm-apparmor flag that determines whether or not php-fpm makes use of libapparmor. This commit adds USE=apparmor to the php-8.x series to control that behavior. When USE=fpm is unset, the new USE=apparmor flag is a no-op. That seems slightly less annoying for users than forcing them to make the "fpm" and "apparmor" USE flags consistent. Closes: https://bugs.gentoo.org/637402 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Michael Orlitzky gentoo.org> dev-lang/php/metadata.xml | 1 + dev-lang/php/{php-8.0.8-r1.ebuild => php-8.0.8-r2.ebuild} | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml index 7f13fad9d81..cd64929baa6 100644 --- a/dev-lang/php/metadata.xml +++ b/dev-lang/php/metadata.xml @@ -10,6 +10,7 @@ Michael Orlitzky + Support FPM application confinement through sys-libs/libapparmor Enable password hashing algorithm from app-crypt/argon2 Add support for libbcmath Enable CLI SAPI diff --git a/dev-lang/php/php-8.0.8-r1.ebuild b/dev-lang/php/php-8.0.8-r2.ebuild similarity index 99% rename from dev-lang/php/php-8.0.8-r1.ebuild rename to dev-lang/php/php-8.0.8-r2.ebuild index c0414dd262a..b602cca1312 100644 --- a/dev-lang/php/php-8.0.8-r1.ebuild +++ b/dev-lang/php/php-8.0.8-r2.ebuild @@ -33,7 +33,7 @@ IUSE="${IUSE} ${SAPIS/cli/+cli} threads" -IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk +IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile @@ -79,7 +79,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] - fpm? ( acl? ( sys-apps/acl ) ) + fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) berkdb? ( || ( sys-libs/db:5.3 @@ -248,6 +248,7 @@ src_configure() { ) our_conf+=( + $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") $(use_enable bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr")