component/apache-php: enable libsodium

component/apache-php/buildout.cfg

@@ -28,6 +28,7 @@ extends =
   ../gmp/buildout.cfg
   ../oniguruma/buildout.cfg
   ../xz-utils/buildout.cfg
+  ../libsodium/buildout.cfg
 
 [php-redis]
 recipe = slapos.recipe.cmmi
@@ -65,7 +66,7 @@ environment =
 # apache-php will write in apache folder, so we cannot share apache if apache-php is used.
 shared = false
 
-[apache-php7]
+[apache-php]
 recipe = slapos.recipe.cmmi
 url = https://www.php.net/distributions/php-8.2.11.tar.xz
 md5sum = 8e7f61ff53fd36be68643080c5114df9
@@ -89,6 +90,7 @@ configure-options =
   --with-mysqli=mysqlnd
   --with-openssl=${openssl:location}
   --with-gmp=${gmp:location}
+  --with-sodium=${libsodium:location}
   --with-pdo-mysql=mysqlnd
   --with-zip
   --with-zlib
@@ -97,7 +99,7 @@ configure-options =
 # It will create a pear/temp directory under the SR instead of a shared /tmp/pear/temp.
 # XXX we could mkdir tmp there
 environment =
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${curl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${oniguruma:location}/lib/pkgconfig:${argon2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${mariadb:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libiconv:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig:${sqlite3:location}/lib/pkgconfig:${curl:location}/lib/pkgconfig:${icu:location}/lib/pkgconfig:${oniguruma:location}/lib/pkgconfig:${argon2:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${mariadb:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${libiconv:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig:${libsodium:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${libzip:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib
@@ -108,13 +110,3 @@ environment =
 recipe = slapos.recipe.cmmi
 url = https://github.com/gggeek/phpxmlrpc/releases/download/2.2.2/xmlrpc-2.2.2.tar.gz
 md5sum = 59a644c636c6d98267d0c99b406ae9e8
-
-
-[apache-php8]
-<= apache-php7
-url = https://www.php.net/distributions/php-8.2.2.tar.bz2
-md5sum = 2a45250d2f073aa7698db5c3bc4d6d29
-
-
-[apache-php]
-<= apache-php8