From 8ff9dc0290e58ed6bd8286e1de868f627be7f71d Mon Sep 17 00:00:00 2001 From: lookshe Date: Wed, 30 Mar 2022 23:55:45 +0200 Subject: fix broken libxml2 package, add openssl to php 8.0 --- php-8.0-opt/build.Dockerfile | 10 +++++++++- php-8.0-opt/copy.Dockerfile | 2 ++ .../out/php-8.0.17-opt-apcu_5.1.20-1_amd64.deb | Bin 52866 -> 52862 bytes php-8.0-opt/out/php-8.0.17-opt-icu_1-1_amd64.deb | Bin 11069130 -> 11069044 bytes .../out/php-8.0.17-opt-imagick_3.5.1-1_amd64.deb | Bin 128356 -> 128346 bytes php-8.0-opt/out/php-8.0.17-opt-krb5_1-1_amd64.deb | Bin 4279138 -> 4279104 bytes .../out/php-8.0.17-opt-libgd_2.1.1-1_amd64.deb | Bin 711006 -> 711026 bytes .../out/php-8.0.17-opt-libjpeg-turbo_1-1_amd64.deb | Bin 600692 -> 600678 bytes .../php-8.0.17-opt-libsodium_1.0.18-1_amd64.deb | Bin 1171236 -> 1171276 bytes .../out/php-8.0.17-opt-libxml2_2.9.10-1_amd64.deb | Bin 0 -> 6842710 bytes .../out/php-8.0.17-opt-libzip_0.11.2-1_amd64.deb | Bin 348454 -> 348466 bytes .../out/php-8.0.17-opt-memcached_3.1.5-1_amd64.deb | Bin 49400 -> 49402 bytes .../out/php-8.0.17-opt-oniguruma_6.9.6-1_amd64.deb | Bin 922642 -> 922640 bytes .../out/php-8.0.17-opt-openssl_1.1.1n-1_amd64.deb | Bin 0 -> 6774850 bytes .../out/php-8.0.17-opt-redis_5.3.4-1_amd64.deb | Bin 210974 -> 210974 bytes php-8.0-opt/out/php-8.0.17-opt_8.0.17-1_amd64.deb | Bin 19277888 -> 19278522 bytes php-8.1-opt/build.Dockerfile | 2 +- php-8.1-opt/copy.Dockerfile | 1 + .../out/php-8.1.4-opt-apcu_5.1.20-1_amd64.deb | Bin 52862 -> 52860 bytes php-8.1-opt/out/php-8.1.4-opt-icu_1-1_amd64.deb | Bin 11069134 -> 11069024 bytes .../out/php-8.1.4-opt-imagick_3.5.1-1_amd64.deb | Bin 128370 -> 128384 bytes php-8.1-opt/out/php-8.1.4-opt-krb5_1-1_amd64.deb | Bin 4279112 -> 4279114 bytes .../out/php-8.1.4-opt-libgd_2.1.1-1_amd64.deb | Bin 710980 -> 711012 bytes .../out/php-8.1.4-opt-libjpeg-turbo_1-1_amd64.deb | Bin 600688 -> 600696 bytes .../out/php-8.1.4-opt-libsodium_1.0.18-1_amd64.deb | Bin 1171246 -> 1171276 bytes .../out/php-8.1.4-opt-libxml2_2.9.10-1_amd64.deb | Bin 0 -> 6842648 bytes .../out/php-8.1.4-opt-libzip_0.11.2-1_amd64.deb | Bin 348452 -> 348478 bytes .../out/php-8.1.4-opt-memcached_3.1.5-1_amd64.deb | Bin 49498 -> 49500 bytes .../out/php-8.1.4-opt-oniguruma_6.9.6-1_amd64.deb | Bin 922630 -> 922656 bytes .../out/php-8.1.4-opt-openssl_1.1.1n-1_amd64.deb | Bin 6774830 -> 6774856 bytes .../out/php-8.1.4-opt-redis_5.3.4-1_amd64.deb | Bin 211002 -> 211004 bytes php-8.1-opt/out/php-8.1.4-opt_8.1.4-1_amd64.deb | Bin 19861986 -> 19861990 bytes 32 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 php-8.0-opt/out/php-8.0.17-opt-libxml2_2.9.10-1_amd64.deb create mode 100644 php-8.0-opt/out/php-8.0.17-opt-openssl_1.1.1n-1_amd64.deb create mode 100644 php-8.1-opt/out/php-8.1.4-opt-libxml2_2.9.10-1_amd64.deb diff --git a/php-8.0-opt/build.Dockerfile b/php-8.0-opt/build.Dockerfile index fad3d41..1c07f0e 100644 --- a/php-8.0-opt/build.Dockerfile +++ b/php-8.0-opt/build.Dockerfile @@ -50,7 +50,7 @@ RUN cd libxml2-v2.9.10 \ && ./autogen.sh --prefix=$DEP_PREFIX \ && make \ && make install \ - && checkinstall -y --pkgname $PACKAGE_NAME-libxml2 + && checkinstall -y --pkgname $PACKAGE_NAME-libxml2 --pkgversion 2.9.10 RUN wget https://cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz RUN tar xzf cmake-2.8.12.1.tar.gz RUN cd cmake-2.8.12.1 \ @@ -105,6 +105,14 @@ RUN cd libsodium-1.0.18 \ && ./configure --prefix=$DEP_PREFIX \ && make \ && checkinstall -y --pkgname $PACKAGE_NAME-libsodium +RUN curl -k "https://www.openssl.org/source/openssl-1.1.1n.tar.gz" > openssl-1.1.1n.tar.gz +RUN tar xzf openssl-1.1.1n.tar.gz +RUN cd openssl-1.1.1n \ + && ./config --prefix=$DEP_PREFIX --openssldir=$DEP_PREFIX no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms enable-ec_nistp_64_gcc_128 \ + && make depend \ + && make all \ + && make test \ + && checkinstall -y --pkgname $PACKAGE_NAME-openssl RUN wget https://www.php.net/distributions/$PHP_VERSION.tar.gz RUN tar xzf $PHP_VERSION.tar.gz RUN cd $PHP_VERSION \ diff --git a/php-8.0-opt/copy.Dockerfile b/php-8.0-opt/copy.Dockerfile index f3d31a1..0d9aee5 100644 --- a/php-8.0-opt/copy.Dockerfile +++ b/php-8.0-opt/copy.Dockerfile @@ -11,6 +11,8 @@ COPY --from=build-stage /krb5-1.17.2/src/php-8.0.17-opt-krb5_1-1_amd64.deb . COPY --from=build-stage /php-8.0.17/ext/imagick-3.5.1/php-8.0.17-opt-imagick_3.5.1-1_amd64.deb . COPY --from=build-stage /php-8.0.17/ext/apcu-5.1.20/php-8.0.17-opt-apcu_5.1.20-1_amd64.deb . COPY --from=build-stage /libsodium-1.0.18/php-8.0.17-opt-libsodium_1.0.18-1_amd64.deb . +COPY --from=build-stage /libxml2-v2.9.10/php-8.0.17-opt-libxml2_2.9.10-1_amd64.deb . +COPY --from=build-stage /openssl-1.1.1n/php-8.0.17-opt-openssl_1.1.1n-1_amd64.deb . COPY --from=build-stage /php-8.0.17/ext/php-memcached-3.1.5/php-8.0.17-opt-memcached_3.1.5-1_amd64.deb . COPY --from=build-stage /php-8.0.17/ext/phpredis-5.3.4/php-8.0.17-opt-redis_5.3.4-1_amd64.deb . diff --git a/php-8.0-opt/out/php-8.0.17-opt-apcu_5.1.20-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-apcu_5.1.20-1_amd64.deb index f22a9a7..5777c46 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-apcu_5.1.20-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-apcu_5.1.20-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-icu_1-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-icu_1-1_amd64.deb index 1853bda..9a824db 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-icu_1-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-icu_1-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-imagick_3.5.1-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-imagick_3.5.1-1_amd64.deb index 8d7884c..1e58b2d 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-imagick_3.5.1-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-imagick_3.5.1-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-krb5_1-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-krb5_1-1_amd64.deb index c7af3d2..34720cd 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-krb5_1-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-krb5_1-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-libgd_2.1.1-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-libgd_2.1.1-1_amd64.deb index fd7e15e..f61c6a6 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-libgd_2.1.1-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-libgd_2.1.1-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-libjpeg-turbo_1-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-libjpeg-turbo_1-1_amd64.deb index ff89e66..7db3d81 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-libjpeg-turbo_1-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-libjpeg-turbo_1-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-libsodium_1.0.18-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-libsodium_1.0.18-1_amd64.deb index 1951bc2..cc335c6 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-libsodium_1.0.18-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-libsodium_1.0.18-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-libxml2_2.9.10-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-libxml2_2.9.10-1_amd64.deb new file mode 100644 index 0000000..24d86dd Binary files /dev/null and b/php-8.0-opt/out/php-8.0.17-opt-libxml2_2.9.10-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-libzip_0.11.2-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-libzip_0.11.2-1_amd64.deb index db88710..57e0420 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-libzip_0.11.2-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-libzip_0.11.2-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-memcached_3.1.5-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-memcached_3.1.5-1_amd64.deb index 00b9959..caad6c1 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-memcached_3.1.5-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-memcached_3.1.5-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-oniguruma_6.9.6-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-oniguruma_6.9.6-1_amd64.deb index 05a2803..3107b7c 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-oniguruma_6.9.6-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-oniguruma_6.9.6-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-openssl_1.1.1n-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-openssl_1.1.1n-1_amd64.deb new file mode 100644 index 0000000..19fa100 Binary files /dev/null and b/php-8.0-opt/out/php-8.0.17-opt-openssl_1.1.1n-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt-redis_5.3.4-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt-redis_5.3.4-1_amd64.deb index 2c31ed0..e3e0de7 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt-redis_5.3.4-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt-redis_5.3.4-1_amd64.deb differ diff --git a/php-8.0-opt/out/php-8.0.17-opt_8.0.17-1_amd64.deb b/php-8.0-opt/out/php-8.0.17-opt_8.0.17-1_amd64.deb index 10fb27a..223d6a1 100644 Binary files a/php-8.0-opt/out/php-8.0.17-opt_8.0.17-1_amd64.deb and b/php-8.0-opt/out/php-8.0.17-opt_8.0.17-1_amd64.deb differ diff --git a/php-8.1-opt/build.Dockerfile b/php-8.1-opt/build.Dockerfile index 7c208c5..54de090 100644 --- a/php-8.1-opt/build.Dockerfile +++ b/php-8.1-opt/build.Dockerfile @@ -50,7 +50,7 @@ RUN cd libxml2-v2.9.10 \ && ./autogen.sh --prefix=$DEP_PREFIX \ && make \ && make install \ - && checkinstall -y --pkgname $PACKAGE_NAME-libxml2 + && checkinstall -y --pkgname $PACKAGE_NAME-libxml2 --pkgversion 2.9.10 RUN wget https://cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz RUN tar xzf cmake-2.8.12.1.tar.gz RUN cd cmake-2.8.12.1 \ diff --git a/php-8.1-opt/copy.Dockerfile b/php-8.1-opt/copy.Dockerfile index 878489e..9bcc26a 100644 --- a/php-8.1-opt/copy.Dockerfile +++ b/php-8.1-opt/copy.Dockerfile @@ -11,6 +11,7 @@ COPY --from=build-stage /krb5-1.17.2/src/php-8.1.4-opt-krb5_1-1_amd64.deb . COPY --from=build-stage /php-8.1.4/ext/imagick-3.5.1/php-8.1.4-opt-imagick_3.5.1-1_amd64.deb . COPY --from=build-stage /php-8.1.4/ext/apcu-5.1.20/php-8.1.4-opt-apcu_5.1.20-1_amd64.deb . COPY --from=build-stage /libsodium-1.0.18/php-8.1.4-opt-libsodium_1.0.18-1_amd64.deb . +COPY --from=build-stage /libxml2-v2.9.10/php-8.1.4-opt-libxml2_2.9.10-1_amd64.deb . COPY --from=build-stage /openssl-1.1.1n/php-8.1.4-opt-openssl_1.1.1n-1_amd64.deb . COPY --from=build-stage /php-8.1.4/ext/php-memcached-3.1.5/php-8.1.4-opt-memcached_3.1.5-1_amd64.deb . COPY --from=build-stage /php-8.1.4/ext/phpredis-5.3.4/php-8.1.4-opt-redis_5.3.4-1_amd64.deb . diff --git a/php-8.1-opt/out/php-8.1.4-opt-apcu_5.1.20-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-apcu_5.1.20-1_amd64.deb index df68cdd..119db7e 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-apcu_5.1.20-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-apcu_5.1.20-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-icu_1-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-icu_1-1_amd64.deb index 128284f..ea71179 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-icu_1-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-icu_1-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-imagick_3.5.1-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-imagick_3.5.1-1_amd64.deb index bc0968d..4602480 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-imagick_3.5.1-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-imagick_3.5.1-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-krb5_1-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-krb5_1-1_amd64.deb index 01191b2..fb080e2 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-krb5_1-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-krb5_1-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-libgd_2.1.1-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-libgd_2.1.1-1_amd64.deb index cebe2c0..01f624a 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-libgd_2.1.1-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-libgd_2.1.1-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-libjpeg-turbo_1-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-libjpeg-turbo_1-1_amd64.deb index bdd8b19..daad6d2 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-libjpeg-turbo_1-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-libjpeg-turbo_1-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-libsodium_1.0.18-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-libsodium_1.0.18-1_amd64.deb index 69b4e26..682df42 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-libsodium_1.0.18-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-libsodium_1.0.18-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-libxml2_2.9.10-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-libxml2_2.9.10-1_amd64.deb new file mode 100644 index 0000000..6a8934d Binary files /dev/null and b/php-8.1-opt/out/php-8.1.4-opt-libxml2_2.9.10-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-libzip_0.11.2-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-libzip_0.11.2-1_amd64.deb index 4ec574d..c9f087f 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-libzip_0.11.2-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-libzip_0.11.2-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-memcached_3.1.5-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-memcached_3.1.5-1_amd64.deb index 862480d..67ee50c 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-memcached_3.1.5-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-memcached_3.1.5-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-oniguruma_6.9.6-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-oniguruma_6.9.6-1_amd64.deb index b44fd02..2a93a61 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-oniguruma_6.9.6-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-oniguruma_6.9.6-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-openssl_1.1.1n-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-openssl_1.1.1n-1_amd64.deb index b8e08e9..c33b4a4 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-openssl_1.1.1n-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-openssl_1.1.1n-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt-redis_5.3.4-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt-redis_5.3.4-1_amd64.deb index 43c1070..817d745 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt-redis_5.3.4-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt-redis_5.3.4-1_amd64.deb differ diff --git a/php-8.1-opt/out/php-8.1.4-opt_8.1.4-1_amd64.deb b/php-8.1-opt/out/php-8.1.4-opt_8.1.4-1_amd64.deb index ea4f85d..f2083ba 100644 Binary files a/php-8.1-opt/out/php-8.1.4-opt_8.1.4-1_amd64.deb and b/php-8.1-opt/out/php-8.1.4-opt_8.1.4-1_amd64.deb differ -- cgit v1.2.3