[v83] bump 0.0.7 with fixes for curl, opcache, remove runkit and sockets

juicyfx · Oct 19, 2024 · 2847efb · 2847efb
1 parent 7a65f3e
commit 2847efb
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 6 deletions.
diff --git a/libs/amazon-linux-2-v83/Makefile b/libs/amazon-linux-2-v83/Makefile
@@ -76,7 +76,7 @@ dist: build
 	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/msgpack.so > ${DIST_PHP_MODULES_PATH}/msgpack.so
 	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/mysqli.so > ${DIST_PHP_MODULES_PATH}/mysqli.so
 	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/mysqlnd.so > ${DIST_PHP_MODULES_PATH}/mysqlnd.so
-	# docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/opcache.so > ${DIST_PHP_MODULES_PATH}/opcache.so
+	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/opcache.so > ${DIST_PHP_MODULES_PATH}/opcache.so
 	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/pdo.so > ${DIST_PHP_MODULES_PATH}/pdo.so
 	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/pdo_mysql.so > ${DIST_PHP_MODULES_PATH}/pdo_mysql.so
 	docker exec ${DOCKER_CONTAINER} /bin/cat /opt/remi/php${DIST_PHP}/root/usr/lib64/php/modules/pdo_pgsql.so > ${DIST_PHP_MODULES_PATH}/pdo_pgsql.so
@@ -160,6 +160,10 @@ dist: build
 	# docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libcares.so.2 > ${DIST_LIB_PATH}/libcares.so.2
 	docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libzip.so.5 > ${DIST_LIB_PATH}/libzip.so.5
 	docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libGeoIP.so.1 > ${DIST_LIB_PATH}/libGeoIP.so.1
+	docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libplds4.so > ${DIST_LIB_PATH}/libplds4.so
+	docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libutf8proc.so.1 > ${DIST_LIB_PATH}/libutf8proc.so.1
+	docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libpsl.so.5 > ${DIST_LIB_PATH}/libpsl.so.5
+	docker exec ${DOCKER_CONTAINER} /bin/cat /usr/lib64/libcapstone.so.4 > ${DIST_LIB_PATH}/libcapstone.so.4
 
 	# Remove temporary PHP container
 	docker rm --force ${DOCKER_CONTAINER} || true

diff --git a/libs/amazon-linux-2-v83/build/Dockerfile b/libs/amazon-linux-2-v83/build/Dockerfile
@@ -52,6 +52,16 @@ RUN yum install -y \
         ${PHP}-php-xmlrpc \
         ${PHP}-php-zip
 
+RUN amazon-linux-extras enable python3 && \
+    yum clean metadata && \
+    yum install -y python3-3.6.* --disablerepo=amzn2-core
+
+RUN curl -L http://mirrors.20i.com/pub/fedora/epel/7/x86_64/Packages/c/capstone-4.0.2-5.el7.x86_64.rpm -o /tmp/capstone.rpm && \
+    rpm -Uvh /tmp/capstone.rpm && \
+    yum install -y python36-capstone
+
+RUN yum install -y ${PHP}-php-opcache --skip-broken
+
 RUN amazon-linux-extras install postgresql14
 
 RUN curl -sS https://getcomposer.org/installer | ${PHP} -- --install-dir=/usr/bin --filename=composer

diff --git a/libs/amazon-linux-2-v83/build/conf/php.ini b/libs/amazon-linux-2-v83/build/conf/php.ini
@@ -27,7 +27,7 @@ extension=pgsql
 extension=phar
 extension=simplexml
 extension=soap
-extension=sockets
+; extension=sockets
 extension=sodium
 extension=sqlite3
 extension=tokenizer
@@ -50,7 +50,7 @@ extension=brotli
 extension=grpc
 ; extension=lua
 ; extension=protobuf
-extension=runkit7
+; extension=runkit7
 ; extension=timecop
 extension=uuid
 extension=mongodb

diff --git a/libs/amazon-linux-2-v83/native/lib/libcapstone.so.4 b/libs/amazon-linux-2-v83/native/lib/libcapstone.so.4
diff --git a/libs/amazon-linux-2-v83/native/lib/libcrypto.so.10 b/libs/amazon-linux-2-v83/native/lib/libcrypto.so.10
diff --git a/libs/amazon-linux-2-v83/native/lib/libplds4.so b/libs/amazon-linux-2-v83/native/lib/libplds4.so
diff --git a/libs/amazon-linux-2-v83/native/lib/libpq.so.5 b/libs/amazon-linux-2-v83/native/lib/libpq.so.5
diff --git a/libs/amazon-linux-2-v83/native/lib/libpsl.so.5 b/libs/amazon-linux-2-v83/native/lib/libpsl.so.5
diff --git a/libs/amazon-linux-2-v83/native/lib/libutf8proc.so.1 b/libs/amazon-linux-2-v83/native/lib/libutf8proc.so.1
diff --git a/libs/amazon-linux-2-v83/native/php/composer b/libs/amazon-linux-2-v83/native/php/composer
diff --git a/libs/amazon-linux-2-v83/native/php/modules/opcache.so b/libs/amazon-linux-2-v83/native/php/modules/opcache.so
diff --git a/libs/amazon-linux-2-v83/native/php/php.ini b/libs/amazon-linux-2-v83/native/php/php.ini
@@ -27,7 +27,7 @@ extension=pgsql
 extension=phar
 extension=simplexml
 extension=soap
-extension=sockets
+; extension=sockets
 extension=sodium
 extension=sqlite3
 extension=tokenizer
@@ -50,7 +50,7 @@ extension=brotli
 extension=grpc
 ; extension=lua
 ; extension=protobuf
-extension=runkit7
+; extension=runkit7
 ; extension=timecop
 extension=uuid
 extension=mongodb

diff --git a/libs/amazon-linux-2-v83/package.json b/libs/amazon-linux-2-v83/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@libphp/amazon-linux-2-v83",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "license": "MIT",
   "main": "./dist/index.js",
   "homepage": "https://github.com/juicyfx/libphp",