From 8b1b6caedf14039c042443390628007d5a85f1cd Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 9 Aug 2022 23:30:41 +0200 Subject: [PATCH 1/2] php8: add sodium extensions (refs #18997) Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 2b2d60479..8aed59802 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=8.1.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Michael Heimpold PKG_LICENSE:=PHP-3.01 @@ -33,7 +33,7 @@ PHP8_MODULES= \ mbstring mysqli mysqlnd \ opcache openssl \ pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql phar \ - session shmop simplexml snmp soap sockets sqlite3 sysvmsg sysvsem sysvshm \ + session shmop simplexml snmp soap sockets sodium sqlite3 sysvmsg sysvsem sysvshm \ tokenizer \ xml xmlreader xmlwriter \ zip @@ -415,6 +415,12 @@ else CONFIGURE_ARGS+= --disable-sockets endif +ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sodium),) + CONFIGURE_ARGS+= --with-sodium=shared,"$(STAGING_DIR)/usr" +else + CONFIGURE_ARGS+= --without-sodium +endif + ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sqlite3),) CONFIGURE_ARGS+= --with-sqlite3=shared else @@ -658,6 +664,7 @@ $(eval $(call BuildModule,simplexml,SimpleXML,+@PHP8_LIBXML +PACKAGE_php8-mod-si $(eval $(call BuildModule,snmp,SNMP,+PACKAGE_php8-mod-snmp:libnetsnmp +PACKAGE_php8-mod-snmp:libopenssl)) $(eval $(call BuildModule,soap,SOAP,+@PHP8_LIBXML +PACKAGE_php8-mod-soap:libxml2)) $(eval $(call BuildModule,sockets,Sockets)) +$(eval $(call BuildModule,sodium,Sodium,+PACKAGE_php8-mod-sodium:libsodium,30)) $(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php8-mod-sqlite3:libsqlite3)) $(eval $(call BuildModule,sysvmsg,System V messages)) $(eval $(call BuildModule,sysvsem,System V shared memory)) From 91462f903495209e7986f27f7c3ec8c9ef7f5dec Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Tue, 23 Aug 2022 18:19:56 +0200 Subject: [PATCH 2/2] php8-pecl-sodium: drop package, replaced by php8-mod-sodium (refs #18997) Signed-off-by: Michael Heimpold --- lang/php8-pecl-sodium/Makefile | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 lang/php8-pecl-sodium/Makefile diff --git a/lang/php8-pecl-sodium/Makefile b/lang/php8-pecl-sodium/Makefile deleted file mode 100644 index 8f8473f04..000000000 --- a/lang/php8-pecl-sodium/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PECL_NAME:=sodium -PECL_LONGNAME:=Bindings for libsodium - -PKG_VERSION:=2.0.23 -PKG_RELEASE:=$(AUTORELEASE) -PKG_HASH:=f8c04533de8e4b48077f65de61b187e195c0919c41d4543e2263604fa0c50379 - -PKG_NAME:=php8-pecl-sodium -PKG_SOURCE:=lib$(PECL_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://pecl.php.net/get/ - -PKG_MAINTAINER:=W. Michael Petullo - -PKG_LICENSE:=ISC -PKG_LICENSE_FILES:=LICENSE - -PKG_BUILD_DEPENDS:=php8 -PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/lib$(PECL_NAME)-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -include ../php8/pecl.mk - -$(eval $(call PHP8PECLPackage,sodium,$(PECL_LONGNAME),+libsodium,30)) -$(eval $(call BuildPackage,$(PKG_NAME)))