Add rdkafka support and update to PHP 8.3.3

Author: donhardman

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
 env:
   APP_NAME: 'manticore-executor'
   DOCKER_TAG: 'manticoresearch/manticore-executor'
-  PHP_VERSION: '8.2.12'
+  PHP_VERSION: '8.3.3'
   MAINTAINER: 'Manticore'
   DESC: 'Custom built PHP executor for Manticore.'
   EXTRA_NAME: 'manticore-extra'
@@ -111,7 +111,7 @@ jobs:
         run: |
           echo "app_version=$(echo ${{ github.ref_name }} | cut -dv -f2)" >> $GITHUB_OUTPUT
       - name: Build manticore-executor-dev
-        run: ./build-linux 8.2.12 0 1
+        run: ./build-linux 8.3.3 0 1
         shell: bash
       - name: Create artifact
         run: |

.github/workflows/test.yml

@@ -7,7 +7,7 @@ on:
 
 env:
   APP_NAME: 'manticore-executor'
-  PHP_VERSION: '8.2.12'
+  PHP_VERSION: '8.3.3'
   MAINTAINER: 'Manticore'
   DESC: 'Custom built PHP executor for Manticore.'
 

Dockerfile-dist

@@ -6,7 +6,7 @@ RUN apt-get update -y && \
 COPY ./build-linux ./build-linux
 COPY ./build-bash-base.sh ./build-bash-base.sh
 COPY ./helper.sh ./helper.sh
-RUN ./build-linux 8.2.12 0 0 && \
+RUN ./build-linux 8.2.16 0 0 && \
   cp build/dist/bin/php /usr/bin/manticore-executor && \
   rm -fr build
 

README.md

@@ -28,7 +28,7 @@ Manticore Executor is a custom built PHP binary which:
 
 By default, we disable all extensions and enable only those required to run our scripts.
 
-We build executor from `PHP 8.2.12` with the following extensions enabled and compiled into the executable statically:
+We build executor from `PHP 8.3.3` with the following extensions enabled and compiled into the executable statically:
 
 * pcntl
 * posix
@@ -83,20 +83,20 @@ Several scripts used to build the final package:
 * `build-linux`
 * `build-osx`
 
-The scripts accept a version of PHP as a parameter. The current version is `8.2.12`. To build the binary, you should run the following example:
+The scripts accept a version of PHP as a parameter. The current version is `8.3.3`. To build the binary, you should run the following example:
 
 ```bash
-./build-linux "8.2.12"
+./build-linux "8.3.3"
 ```
 
-The command above will build the package on Linux with **PHP** `8.2.12`. Once it's done, you can find your binary in folder `dist/bin`.
+The command above will build the package on Linux with **PHP** `8.3.3`. Once it's done, you can find your binary in folder `dist/bin`.
 
 ### Build for MacOS arm64
 
 Build and collect assets, after we can put the assets to the repo.
 
 ```bash
-./build-osx "8.2.12"
+./build-osx "8.3.3"
 git checkout 0.7.6
 git tag v0.7.6
 APP_ARCH=$(arch) APP_NAME=manticore-executor APP_VERSION=$(git describe --tags | cut -dv -f2) GITHUB_SHA=$(git rev-parse HEAD) RUNNER_OS=macos ./collect-assets

build-alpine

@@ -27,6 +27,10 @@ install_deps() {
   install_curl
 
   install_libzip
+
+  install_zlib
+
+  install_rdkafka
 }
 
 install_dev_deps() {
@@ -54,6 +58,7 @@ ENABLE_STATIC=yes
   --enable-sockets \
   --enable-ds \
   --enable-swoole \
+  --with-rdkafka \
   --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \

build-bash-base.sh

@@ -11,6 +11,7 @@ PHP_VERSION="$1"
 ZSTD_REV="2dfcd6524ccdcef6dfdaa97d7f3716b866885093"
 DS_REV="d42750d69beb684ec3ef7b3da48fba769ce57ffc"
 SWOOLE_REV="b72d22ad65dbcc0a5cf75b4d6a483b73c9f32157"
+RDKAFKA_REV="bcd5004f461d1d3a5f879bb21280bdde6f6800c2"
 SKIP_SYSTEM_DEPS="$2"
 BUILD_DEV="$3"
 BUILD_STATIC=1 # Always build static but dev
@@ -53,6 +54,12 @@ git clone https://github.com/swoole/swoole-src.git swoole
 cd swoole && git checkout "$SWOOLE_REV"
 cd ..
 
+# rdkafka
+git clone https://github.com/arnaud-lb/php-rdkafka.git
+mv php-rdkafka rdkafka
+cd rdkafka && git checkout "$RDKAFKA_REV"
+cd ..
+
 cd ..
 
 BUILD_EXTRA=()

build-linux

@@ -17,7 +17,7 @@ set -xe
 
 install_deps() {
   sudo apt-get update -y
-  sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake libcurl4-openssl-dev libzip-dev
+  sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake libcurl4-openssl-dev libzip-dev librdkafka-dev
 }
 
 install_dev_deps() {
@@ -44,6 +44,7 @@ ENABLE_STATIC=yes
   --enable-sockets \
   --enable-ds \
   --enable-swoole \
+  --with-rdkafka \
   --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \

build-osx

@@ -8,15 +8,17 @@
 
 set -e
 install_deps() {
-  brew install bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip
+  brew install bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip librdkafka
 
   OPENSSL_PREFIX="$(brew --prefix openssl)"
+  LIBRDKAFKA_PREFIX="$(brew --prefix librdkafka)"
   OPENSSL_CFLAGS="-I${OPENSSL_PREFIX}/include"
   OPENSSL_LIBS="-L${OPENSSL_PREFIX}/lib -lcrypto -lssl"
   export OPENSSL_PREFIX OPENSSL_CFLAGS OPENSSL_LIBS
   export PATH="${OPENSSL_PREFIX}/bin:${PATH}"
-  export LDFLAGS="-L${OPENSSL_PREFIX}@1.1/lib"
-  export CPPFLAGS="-I${OPENSSL_PREFIX}/include"
+  export LDFLAGS="-L${OPENSSL_PREFIX}/lib -L${LIBRDKAFKA_PREFIX}/lib"
+  export CPPFLAGS="-I${OPENSSL_PREFIX}/include -I${LIBRDKAFKA_PREFIX}/include"
+
   export PKG_CONFIG_PATH="${OPENSSL_PREFIX}/lib/pkgconfig"
 }
 
@@ -74,14 +76,22 @@ if [[ "$bison_ver" =~ ^2\.[0-9]+$ ]]; then
   export YACC="$bison/bin/bison"
 fi
 
+# Fix the path for the librdkafka
+kafka_prefix=$(brew --prefix librdkafka)
+sed "s|SEARCH_PATH=\"/usr/local /usr\"|SEARCH_PATH=\"${kafka_prefix}\"|" configure > configure-new
+mv configure-new configure
+chmod +x configure
+
 ./configure \
-  CFLAGS="-O3" --prefix="$BUILD_PREFIX" --disable-all \
+  CFLAGS="-O3 -lresolv -Wno-implicit-function-declaration" \
+  --prefix="$BUILD_PREFIX" --disable-all \
   --enable-shared=$ENABLE_SHARED --enable-static=$ENABLE_STATIC --with-layout=GNU \
   --with-pear=no --disable-cgi --disable-phpdbg \
   --with-pcre-jit --enable-zstd --with-libzstd  \
   --enable-pcntl --enable-posix \
   --enable-sockets \
   --enable-swoole \
+  --with-rdkafka \
   --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \

helper.sh

@@ -9,18 +9,44 @@ install_curl() {
 	make -j8
 	make install
 	cd ..
+	rm -fr curl-8.0.0
 }
 
 install_libzip() {
 	test -d libzip-1.9.2 && rm -fr "$_"
 	curl -sSL https://github.com/nih-at/libzip/releases/download/v1.9.2/libzip-1.9.2.tar.gz | tar -xzf -
 	cd libzip-1.9.2 && mkdir -p build && cd build
-	cmake -DBUILD_SHARED_LIBS=OFF -DENABLE_LZMA=OFF -DENABLE_BZIP2=OFF ..
+	cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_LZMA=OFF -DENABLE_BZIP2=OFF ..
 	make -j4 && make install
 	cd ../..
 	rm -fr libzip-1.9.2
 }
 
+install_zlib() {
+	test -d zlib-1.3.1 && rm -fr "$_"
+	curl -sSL https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz | tar -xzf -
+	cd zlib-1.3.1
+	export CFLAGS="-O3 -fPIC"
+	./configure --prefix=/usr --static
+	make -j4 && make install
+	cd ..
+	rm -fr zlib-1.3.1
+}
+
+install_rdkafka() {
+	test -d librdkafka-2.3.0 && rm -fr "$_"
+	curl -sSL https://github.com/confluentinc/librdkafka/archive/refs/tags/v2.3.0.tar.gz | tar -xzf -
+	cd librdkafka-2.3.0
+	./configure --prefix=/usr --enable-static --disable-shared \
+		--disable-debug-symbols --enable-strip \
+		--disable-sasl --enable-lz4 --enable-zstd \
+		--enable-zlib --enable-curl \
+		--disable-regex-ext
+	make -j4 && make install
+	cd ..
+	rm -fr librdkafka-2.3.0
+}
+
 install_libxml2() {
   test -d libxml2-2.10.3 && rm -fr libxml2-2.10.3
   curl -sSL https://github.com/GNOME/libxml2/archive/refs/tags/v2.10.3.tar.gz | tar -xzf -