From patchwork Thu Nov 21 08:13:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal de Bruijn X-Patchwork-Id: 1198805 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=unilogic.nl Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=unilogic.nl header.i=@unilogic.nl header.b="HrS78kZ9"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47JXPW5B5Zz9sPT for ; Thu, 21 Nov 2019 19:13:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EAF2E20781; Thu, 21 Nov 2019 08:13:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S8L5biHih5nn; Thu, 21 Nov 2019 08:13:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8FBDA207A1; Thu, 21 Nov 2019 08:13:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2E2811BF277 for ; Thu, 21 Nov 2019 08:13:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E818877C9 for ; Thu, 21 Nov 2019 08:13:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KpXe9r6VnhEN for ; Thu, 21 Nov 2019 08:13:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-out123.unilogicnetworks.net (mail-out123.unilogicnetworks.net [62.133.206.123]) by whitealder.osuosl.org (Postfix) with ESMTPS id 66505877AD for ; Thu, 21 Nov 2019 08:13:11 +0000 (UTC) Received: from mail.unilogic.nl (unknown [62.133.204.111]) by mail.unilogicnetworks.net (Postfix) with ESMTPS id 2DD004A1AE for ; Thu, 21 Nov 2019 09:13:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=unilogic.nl; s=mail; h=from:subject:date:message-id:to:cc; bh=X9cM7QtAofnUd0SKAda0syvTDDzQTciInTy04oYC2gY=; b=HrS78kZ96frQaXp11deiHzLcQDmLe44A956Kedw5WHj6DF8z7XotgbMNC8JHSomnfdSxlW02LokxI YTth77B7TGN+qBs9UV0UNBVvnxro7CqBDnQp3pUecqfl6wPRRiVe20z9sBEMCasClZyMqcYbnxWciQ AmGi7tUbOpQzATNC+PWi8aS3GdgitS9fSh1LA60n7WtfmoW3B5HiXT4GYhta/9MMbMEbSlBxt7KohM 4iRsuzQ9ejpUTk1F8weMmp8LM+E31MXD2qGVEMfrbxvaDk/d+ciJY/ink1VGcIktTzYHgiwFAfgkZe HulSUPKSBhvLm801pY4BFEs3zJ4N6SA== X-Kerio-Anti-Spam: Build: [Engines: 2.15.9.1281, Stamp: 3], Multi: [Enabled, t: (0.000006, 0.002937)], BW: [Enabled, t: (0.000007)], RTDA: [Enabled, t: (0.044908), Hit: No, Details: v2.7.64; Id: 15.1i6i46b.1dq6gbb8l.7rpgs], total: 0(700) X-Footer: dW5pbG9naWMubmw= Received: from localhost ([127.0.0.1]) by mail.unilogic.nl with ESMTPSA (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)); Thu, 21 Nov 2019 09:13:08 +0100 From: Pascal de Bruijn To: buildroot@busybox.net Date: Thu, 21 Nov 2019 09:13:04 +0100 Message-Id: <20191121081304.2932-1-p.debruijn@unilogic.nl> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 2/2] package/php: libargon2 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pascal de Bruijn MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Pascal de Bruijn --- package/php/Config.ext | 6 ++++++ package/php/php.mk | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/package/php/Config.ext b/package/php/Config.ext index 0c6ed4b..d5c723c 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -70,6 +70,12 @@ config BR2_PACKAGE_PHP_EXT_HASH help HASH message digest framework +config BR2_PACKAGE_PHP_EXT_LIBARGON2 + bool "libargon2" + select BR2_PACKAGE_LIBARGON2 + help + libargon2 support + config BR2_PACKAGE_PHP_EXT_LIBSODIUM bool "libsodium" select BR2_PACKAGE_LIBSODIUM diff --git a/package/php/php.mk b/package/php/php.mk index 85bf207..007b8a6 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -122,6 +122,11 @@ PHP_CONF_OPTS += \ $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \ $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar) +ifeq ($(BR2_PACKAGE_PHP_EXT_LIBARGON2),y) +PHP_CONF_OPTS += --with-password-argon2=$(STAGING_DIR)/usr +PHP_DEPENDENCIES += libargon2 +endif + ifeq ($(BR2_PACKAGE_PHP_EXT_LIBSODIUM),y) PHP_CONF_OPTS += --with-sodium=$(STAGING_DIR)/usr PHP_DEPENDENCIES += libsodium