diff --git a/README.md b/README.md index ec25bb4..8d4cb98 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,11 @@ Dockerfile to test MT. |bullseye|debian:bullseye-slim|*5.32.1*|*7.4.33*|*MariaDB 10.5.29*|1.1.1w|2024-08| |fedora35|fedora:35|*5.34.1*|*8.0.26*|8.0.31|1.1.1q|2022-12| |fedora37|fedora:37|*5.36.1*|*8.1.25*|*8.0.35*|3.0.9|2023-12| -|fedora40|fedora:40|*5.38.4*|*8.2.31*|*MariaDB 10.11.11*|3.2.4|-| -|fedora42|fedora:42|*5.40.4*|*8.4.20*|*9.7.0*|3.2.6|-| -|fedora43|fedora:43|*5.42.2*|8.4.20|*8.4.9*|3.5.4|-| -|fedora44|fedora:44|5.42.2|*8.5.6*|*MariaDB 11.8.6*|3.5.5|-| +|fedora40|fedora:40|*5.38.4*|*8.2.32*|*MariaDB 10.11.11*|3.2.4|-| +|fedora41|fedora:41|5.40.3|8.3.27|8.4.7|3.2.6|-| +|fedora42|fedora:42|*5.40.4*|*8.4.21*|*9.7.0*|3.2.6|-| +|fedora43|fedora:43|*5.42.2*|8.4.23|*8.4.10*|3.5.7|-| +|fedora44|fedora:44|5.42.2|*8.5.8*|*MariaDB 11.8.8*|3.5.7|-| |cloud7 (\*1)|rockylinux/rockylinux:9.8|*5.38.2*|*8.3.32*|MariaDB 10.5.29|3.5.5|-| \*1 This image is not used in the MT cloud, but the well-known modules should have the same versions (except for those used only in tests). @@ -25,9 +26,9 @@ Dockerfile to test MT. |image name|base image|Perl|PHP|MySQL|OpenSSL|End of Life| |-|-|-|-|-|-|-| -|noble|ubuntu:noble|5.38.2|8.3.6|8.4.9|3.0.13|-| +|noble|ubuntu:noble|5.38.2|8.3.6|8.4.10|3.0.13|-| |plucky|ubuntu:plucky|5.40.1|8.4.5|8.4.7|3.4.1|-| -|questing|ubuntu:questing|5.42.0|8.4.21|8.4.8|3.5.3|-| +|questing|ubuntu:questing|5.42.0|8.4.23|8.4.10|3.5.3|-| ## Environment list (only for manual testing) @@ -36,15 +37,14 @@ Dockerfile to test MT. |buster (\*2)|debian:buster-slim|*5.28.1*|*7.3.31*|*MariaDB 10.3.39*|1.1.1n|2022-01| |centos6 (\*2)|centos:6|*5.10.1*|*5.3.3*|*5.1.73*|1.0.1e|2020-11| |fedora39 (\*2)|fedora:39|5.38.2|8.2.25|8.0.39|3.1.4|2024-11| -|fedora41 (\*2)|fedora:41|5.40.3|8.3.27|8.4.7|3.2.6|-| -|rawhide|fedora:rawhide|5.42.2|8.5.6|8.4.9|3.5.6|-| +|rawhide|fedora:rawhide|5.42.2|8.5.9|8.4.9|4.0.1|-| |rockylinux|rockylinux/rockylinux:9.8|5.32.1|8.1.34|8.0.46|3.5.5|-| -|bookworm|debian:bookworm-slim|5.36.0|8.2.31|MariaDB 10.11.14|3.0.19|2028-06| +|bookworm|debian:bookworm-slim|5.36.0|8.2.32|MariaDB 10.11.18|3.0.20|2028-06| |sid|debian:sid|5.40.1|8.4.21|MariaDB 11.8.6|3.6.2|-| |amazonlinux2023|amazonlinux:2023|5.32.1|8.5.4|MariaDB 10.11.15|3.5.5|-| |postgresql|fedora:41|5.40.3|8.3.27|Postgres 16.11|3.2.6|-| -|oracle (\*3)|oraclelinux:9-slim|5.32.1|8.3.31|MariaDB 10.5.29|3.5.1|-| -|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.31|MariaDB 10.3.39|1.1.1k|-| +|oracle (\*3)|oraclelinux:9-slim|5.32.1|8.3.32|MariaDB 10.5.29|3.5.5|-| +|oracle8 (\*3)|oraclelinux:8-slim|5.26.3|8.2.32|MariaDB 10.3.39|1.1.1k|-| \*2 These images were used to test older versions of MT. \*3 with DBD::Oracle 1.80 + OracleInstantClient 26 @@ -55,7 +55,7 @@ Dockerfile to test MT. |-|-|-| |addons8|movabletype/test:cloud7|vsftpd 3.0.5, proftpd 1.3.8b, pureftpd 1.0.50, slapd 2.6.8| |chromiumdriver|movabletype/test:bullseye|chromedriver 120.0.6099.224| -|playwright|movabletype/test:bookworm|node 24.15.0, playwright 1.59.1| +|playwright|movabletype/test:bookworm|node 24.18.0, playwright 1.61.1| ## How to update diff --git a/amazonlinux2023/Dockerfile b/amazonlinux2023/Dockerfile index aab7829..a574eae 100644 --- a/amazonlinux2023/Dockerfile +++ b/amazonlinux2023/Dockerfile @@ -35,7 +35,9 @@ RUN dnf -y --allowerasing install\ mv cpm /usr/local/bin/ &&\ cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/bin/update_dockerfile.pl b/bin/update_dockerfile.pl index 3f15d3a..e581e07 100755 --- a/bin/update_dockerfile.pl +++ b/bin/update_dockerfile.pl @@ -98,6 +98,7 @@ sub Mojo::Template::Sandbox::_wrap { my $guard = File::pushd::pushd("$name/patch"); print STDERR "Extracting $target.tar.gz\n"; system("tar xf $target.tar.gz") and die "Failed to extract $target"; + system("chmod -R +w $target") and die "Failed to chmod"; chdir $target or die "Failed to chdir to $name/patch/$target"; for my $patch_file (@patch_files) { print STDERR "Applying $patch_file\n"; @@ -173,7 +174,7 @@ sub merge_conf { } { my @versions = grep /^$im_version\b/, map { m!refs/tags/([0-9\.-]+)!; $1 } split /\n/, path('./tmp/imagemagick')->slurp; - my @identifiers = grep /^[0-9]$/, map {my ($v, $i) = split /\-/, $_; $i} @versions; + my @identifiers = grep /^[0-9]+$/, map {my ($v, $i) = split /\-/, $_; $i} @versions; my ($biggest) = sort {$b <=> $a} @identifiers; $conf{make}{ImageMagick} = "$im_version-$biggest"; } @@ -315,6 +316,7 @@ sub _find_php_package { ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \\ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \\ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\\ % } % if ($conf->{make}{ImageMagick}) { @@ -565,6 +567,7 @@ sub _find_php_package { ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \\ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \\ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\\ % } % if ($conf->{make}{ImageMagick}) { diff --git a/bookworm/Dockerfile b/bookworm/Dockerfile index 1b6981a..7995aae 100644 --- a/bookworm/Dockerfile +++ b/bookworm/Dockerfile @@ -37,7 +37,9 @@ RUN \ mv cpm /usr/local/bin/ &&\ cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/bullseye/Dockerfile b/bullseye/Dockerfile index 8b73343..4455341 100644 --- a/bullseye/Dockerfile +++ b/bullseye/Dockerfile @@ -37,7 +37,9 @@ RUN \ mv cpm /usr/local/bin/ &&\ cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/buster/Dockerfile b/buster/Dockerfile index 6017547..6fe6781 100644 --- a/buster/Dockerfile +++ b/buster/Dockerfile @@ -43,7 +43,9 @@ RUN \ mv cpm /usr/local/bin/ &&\ cpm install -g --show-build-log-on-failure XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/centos7/Dockerfile b/centos7/Dockerfile index c3a3f02..34ae6e0 100644 --- a/centos7/Dockerfile +++ b/centos7/Dockerfile @@ -80,7 +80,9 @@ RUN sed -i -e "s/^mirrorlist=http:\/\/mirrorlist.centos.org/#mirrorlist=http:\/ mv cpm /usr/local/bin/ &&\ cpanm -n Net::SSH::Perl XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v SQL::Translator@1.63 Data::MessagePack::Stream@1.04 Archive::Zip@1.65 DBD::mysql@4.052 &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/cloud7/Dockerfile b/cloud7/Dockerfile index 0049de5..a0b4d9a 100644 --- a/cloud7/Dockerfile +++ b/cloud7/Dockerfile @@ -67,6 +67,7 @@ RUN dnf -y --allowerasing install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ curl -LO https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-27/ImageMagick-7.1.2-27.tar.xz &&\ tar xf ImageMagick-7.1.2-27.tar.xz && cd ImageMagick-7.1.2-27 &&\ @@ -93,7 +94,9 @@ RUN dnf -y --allowerasing install\ cpanm -n Starman XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ Net::LibIDN AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid\ diff --git a/conf/dockerfile/base_centos.pl b/conf/dockerfile/base_centos.pl index 544257c..df8426e 100644 --- a/conf/dockerfile/base_centos.pl +++ b/conf/dockerfile/base_centos.pl @@ -33,8 +33,7 @@ make_mt => [qw( JavaScript::Minifier CSS::Minifier )], temp => [qw( Fluent::Logger )], }, - # cf. https://github.com/Perl/perl5/issues/22353 - patch => [qw(EV-4.36)], + patch => [qw(IO-Socket-SSL-2.099 Test-MockTime-HiRes-0.08 Net-IDN-Encode-2.500)], gem => { fluentd => [qw(fluentd:1.18.0)], }, diff --git a/conf/dockerfile/base_debian.pl b/conf/dockerfile/base_debian.pl index a52e906..97599e8 100644 --- a/conf/dockerfile/base_debian.pl +++ b/conf/dockerfile/base_debian.pl @@ -33,8 +33,8 @@ make_mt => [qw( JavaScript::Minifier CSS::Minifier )], temp => [qw( Fluent::Logger )], }, - # cf. https://github.com/Perl/perl5/issues/22353 - patch => [qw(EV-4.36)], + # cf https://github.com/cfaerber/Net-IDN-Encode/pull/11 + patch => [qw(IO-Socket-SSL-2.099 Test-MockTime-HiRes-0.08 Net-IDN-Encode-2.500)], gem => { fluentd => [qw(fluentd:1.18.0)], }, diff --git a/conf/dockerfile/questing.pl b/conf/dockerfile/questing.pl index 4a38100..9303e43 100644 --- a/conf/dockerfile/questing.pl +++ b/conf/dockerfile/questing.pl @@ -21,7 +21,7 @@ patch => ['Test-mysqld-1.0030', 'Crypt-DES-2.07'], plenv => '5.42.0', make => { - ImageMagick => '7.1.2-12', + ImageMagick => '7.1.2', GraphicsMagick => '1.3.46', }, php_build => { diff --git a/fedora35/Dockerfile b/fedora35/Dockerfile index ab28bc0..9d54c9f 100644 --- a/fedora35/Dockerfile +++ b/fedora35/Dockerfile @@ -37,7 +37,9 @@ RUN dnf -y install\ cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora37/Dockerfile b/fedora37/Dockerfile index 05f6ca0..1b4240e 100644 --- a/fedora37/Dockerfile +++ b/fedora37/Dockerfile @@ -38,7 +38,9 @@ RUN dnf -y install\ cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora39/Dockerfile b/fedora39/Dockerfile index 1e9eacc..14277c1 100644 --- a/fedora39/Dockerfile +++ b/fedora39/Dockerfile @@ -24,6 +24,7 @@ RUN dnf -y install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ setcap -r /usr/libexec/mysqld &&\ @@ -44,7 +45,9 @@ RUN dnf -y install\ cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora40/Dockerfile b/fedora40/Dockerfile index 08541e5..f909149 100644 --- a/fedora40/Dockerfile +++ b/fedora40/Dockerfile @@ -46,7 +46,7 @@ RUN dnf -y install\ echo "--with-jpeg" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-webp" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-pear" >> /usr/local/share/php-build/default_configure_options &&\ - echo 'install_package "https://www.php.net/distributions/php-8.2.31.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ + echo 'install_package "https://www.php.net/distributions/php-8.2.32.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ php-build --verbose my_php /usr &&\ yes | pecl install memcache &&\ echo "extension=memcache.so" >> /usr/etc/php.ini &&\ @@ -56,9 +56,10 @@ RUN dnf -y install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ - curl -LO https://imagemagick.org/archive/releases/ImageMagick-7.1.2-9.tar.xz &&\ - tar xf ImageMagick-7.1.2-9.tar.xz && cd ImageMagick-7.1.2-9 &&\ + curl -LO https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-27/ImageMagick-7.1.2-27.tar.xz &&\ + tar xf ImageMagick-7.1.2-27.tar.xz && cd ImageMagick-7.1.2-27 &&\ ./configure --prefix=/usr --enable-shared --with-perl --disable-dependency-tracking --disable-cipher --disable-assert \ --without-x --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps \ --without-djvu --without-fftw --without-fpx --without-fontconfig --without-freetype --without-jbig --without-lcms \ @@ -84,7 +85,9 @@ RUN dnf -y install\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora41/Dockerfile b/fedora41/Dockerfile index 56b1a8b..4bc60e2 100644 --- a/fedora41/Dockerfile +++ b/fedora41/Dockerfile @@ -16,7 +16,7 @@ RUN dnf -y install\ mod_ssl vsftpd ftp memcached\ &&\ dnf -y install https://dev.mysql.com/get/mysql84-community-release-fc41-1.noarch.rpm &&\ - dnf config-manager setopt mysql-8.4-lts-community.enabled=1 &&\ + dnf config-manager setopt mysql-8.4-lts-community.enabled=1 &&\ dnf -y --enablerepo=mysql-8.4-lts-community install\ mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel\ && dnf clean --enablerepo=mysql-8.4-lts-community all &&\ @@ -28,9 +28,10 @@ RUN dnf -y install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ - curl -LO https://imagemagick.org/archive/releases/ImageMagick-7.1.2-9.tar.xz &&\ - tar xf ImageMagick-7.1.2-9.tar.xz && cd ImageMagick-7.1.2-9 &&\ + curl -LO https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-27/ImageMagick-7.1.2-27.tar.xz &&\ + tar xf ImageMagick-7.1.2-27.tar.xz && cd ImageMagick-7.1.2-27 &&\ ./configure --prefix=/usr --enable-shared --with-perl --disable-dependency-tracking --disable-cipher --disable-assert \ --without-x --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps \ --without-djvu --without-fftw --without-fpx --without-fontconfig --without-freetype --without-jbig --without-lcms \ @@ -55,7 +56,9 @@ RUN dnf -y install\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora42/Dockerfile b/fedora42/Dockerfile index 8e6a7f6..36aa227 100644 --- a/fedora42/Dockerfile +++ b/fedora42/Dockerfile @@ -16,9 +16,9 @@ RUN dnf --setopt=ip_resolve=4 -y install\ mod_ssl vsftpd ftp memcached\ &&\ dnf -y install https://dev.mysql.com/get/mysql84-community-release-fc42-4.noarch.rpm &&\ - dnf config-manager setopt mysql-8.4-lts-community.enabled=0 &&\ - dnf config-manager setopt mysql-innovation-community.enabled=1 &&\ - dnf -y --enablerepo=mysql-innovation-community --setopt=install_weak_deps=false install\ + dnf config-manager setopt mysql-8.4-lts-community.enabled=0 &&\ + dnf config-manager setopt mysql-innovation-community.enabled=1 &&\ + dnf -y --enablerepo=mysql-innovation-community --disablerepo=mysql-8.4-lts-community --setopt=install_weak_deps=false install\ mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel\ && dnf clean --enablerepo=mysql-innovation-community all &&\ dnf -y update --skip-unavailable &&\ @@ -29,6 +29,7 @@ RUN dnf --setopt=ip_resolve=4 -y install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ curl -sL https://phar.phpunit.de/phpunit-12.phar > phpunit && chmod +x phpunit &&\ @@ -48,7 +49,9 @@ RUN dnf --setopt=ip_resolve=4 -y install\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora43/Dockerfile b/fedora43/Dockerfile index 52540fa..7d42323 100644 --- a/fedora43/Dockerfile +++ b/fedora43/Dockerfile @@ -16,9 +16,9 @@ RUN dnf -y --nogpgcheck install\ mod_ssl vsftpd ftp memcached\ &&\ dnf -y --nogpgcheck install https://dev.mysql.com/get/mysql84-community-release-fc43-2.noarch.rpm &&\ - dnf config-manager setopt mysql-9.7-lts-community.enabled=0 &&\ - dnf config-manager setopt mysql-8.4-lts-community.enabled=1 &&\ - dnf -y --nogpgcheck --enablerepo=mysql-8.4-lts-community --setopt=install_weak_deps=false install\ + dnf config-manager setopt mysql-9.7-lts-community.enabled=0 &&\ + dnf config-manager setopt mysql-8.4-lts-community.enabled=1 &&\ + dnf -y --nogpgcheck --enablerepo=mysql-8.4-lts-community --disablerepo=mysql-9.7-lts-community --setopt=install_weak_deps=false install\ mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel\ && dnf clean --enablerepo=mysql-8.4-lts-community all &&\ dnf -y --nogpgcheck update --skip-unavailable &&\ @@ -30,6 +30,7 @@ RUN dnf -y --nogpgcheck install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ curl -sL https://phar.phpunit.de/phpunit-12.phar > phpunit && chmod +x phpunit &&\ @@ -49,7 +50,9 @@ RUN dnf -y --nogpgcheck install\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/fedora44/Dockerfile b/fedora44/Dockerfile index 066d36b..1cc4a41 100644 --- a/fedora44/Dockerfile +++ b/fedora44/Dockerfile @@ -25,6 +25,7 @@ RUN dnf -y --nogpgcheck install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ curl -sL https://phar.phpunit.de/phpunit-12.phar > phpunit && chmod +x phpunit &&\ @@ -44,7 +45,9 @@ RUN dnf -y --nogpgcheck install\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/noble/Dockerfile b/noble/Dockerfile index 2940c47..8dec3a6 100644 --- a/noble/Dockerfile +++ b/noble/Dockerfile @@ -44,7 +44,9 @@ RUN \ cpm install -g --show-build-log-on-failure GD XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/oracle/Dockerfile b/oracle/Dockerfile index 96c8a22..cdd3c12 100644 --- a/oracle/Dockerfile +++ b/oracle/Dockerfile @@ -57,7 +57,7 @@ RUN microdnf -y install dnf &&\ echo "--with-jpeg" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-webp" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-pear" >> /usr/local/share/php-build/default_configure_options &&\ - echo 'install_package "https://www.php.net/distributions/php-8.3.31.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ + echo 'install_package "https://www.php.net/distributions/php-8.3.32.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ php-build --verbose my_php /usr &&\ yes | pecl install memcache &&\ echo "extension=memcache.so" >> /usr/etc/php.ini &&\ @@ -82,7 +82,9 @@ RUN microdnf -y install dnf &&\ cpanm -n DBI Test::NoWarnings XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/oracle8/Dockerfile b/oracle8/Dockerfile index ddf134a..1c3e420 100644 --- a/oracle8/Dockerfile +++ b/oracle8/Dockerfile @@ -58,7 +58,7 @@ RUN microdnf -y install dnf &&\ echo "--with-jpeg" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-webp" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-pear" >> /usr/local/share/php-build/default_configure_options &&\ - echo 'install_package "https://www.php.net/distributions/php-8.2.31.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ + echo 'install_package "https://www.php.net/distributions/php-8.2.32.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ php-build --verbose my_php /usr &&\ yes | pecl install memcache &&\ echo "extension=memcache.so" >> /usr/etc/php.ini &&\ @@ -82,7 +82,9 @@ RUN microdnf -y install dnf &&\ mv cpm /usr/local/bin/ &&\ cpanm -n DBI Test::NoWarnings XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/patch/EV-4.36/typemap.patch b/patch/EV-4.36/typemap.patch deleted file mode 100644 index 4fd1606..0000000 --- a/patch/EV-4.36/typemap.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/typemap b/typemap -index 670bc52..e3a2ad1 100644 ---- a/typemap -+++ b/typemap -@@ -37,9 +37,9 @@ T_LOOP - - T_WATCHER - if (!(SvROK ($arg) && SvOBJECT (SvRV ($arg)) -- && (SvSTASH (SvRV ($arg)) == stash_${ \($type =~ /ev_(\S+)/, \"$1\") } -- || sv_derived_from ($arg, \"EV::${ \($type =~ /ev_(\S+)/, ucfirst \"$1\") }\")))) -- croak (\"object is not of type EV::${ \($type =~ /ev_(\S+)/, ucfirst \"$1\") }\"); -+ && (SvSTASH (SvRV ($arg)) == stash_${ ($type =~ /ev_(\S+)/, \qq{$1}) } -+ || sv_derived_from ($arg, \"EV::${ ($type =~ /ev_(\S+)/, \ucfirst qq{$1}) }\")))) -+ croak (\"object is not of type EV::${ ($type =~ /ev_(\S+)/, \ucfirst qq{$1}) }\"); - $var = ($type)SvPVX (SvRV ($arg)); - - OUTPUT diff --git a/patch/IO-Socket-SSL-2.099/original_class.patch b/patch/IO-Socket-SSL-2.099/original_class.patch new file mode 100644 index 0000000..e69de29 diff --git a/patch/Net-IDN-Encode-2.500/uvchr_to_utf8_flag.patch b/patch/Net-IDN-Encode-2.500/uvchr_to_utf8_flag.patch new file mode 100644 index 0000000..b390c66 --- /dev/null +++ b/patch/Net-IDN-Encode-2.500/uvchr_to_utf8_flag.patch @@ -0,0 +1,24 @@ +diff --git a/lib/Net/IDN/Punycode.xs b/lib/Net/IDN/Punycode.xs +index 211ef9c..36530dd 100644 +--- a/lib/Net/IDN/Punycode.xs ++++ b/lib/Net/IDN/Punycode.xs +@@ -24,6 +24,10 @@ + #define utf8_to_uvchr_buf(in_p,in_e,u8) utf8_to_uvchr(in_p,u8); + #endif + ++#ifndef uvchr_to_utf8_flags ++#define uvchr_to_utf8_flags(d, uv, flags) uvuni_to_utf8_flags(d, uv, flags); ++#endif ++ + static char enc_digit[BASE] = { + 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', + 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', +@@ -253,7 +257,7 @@ decode_punycode(input) + if(skip_p < re_p) /* move succeeding chars */ + Move(skip_p, skip_p + u8, re_p - skip_p, char); + re_p += u8; +- uvuni_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY); ++ uvchr_to_utf8_flags((U8*)skip_p, n, UNICODE_ALLOW_ANY); + } + + if(!first) SvUTF8_on(RETVAL); /* UTF-8 chars have been inserted */ diff --git a/patch/README b/patch/README new file mode 100644 index 0000000..0183b3e --- /dev/null +++ b/patch/README @@ -0,0 +1,4 @@ +* https://github.com/cfaerber/Net-IDN-Encode/pull/11 +* https://github.com/tarao/perl5-Test-MockTime-HiRes/pull/13 +* https://github.com/noxxi/p5-io-socket-ssl/pull/181 +* https://rt.cpan.org/Public/Bug/Display.html?id=133363 (Crypt::DES) diff --git a/patch/Test-MockTime-HiRes-0.08/sleep_prototype.patch b/patch/Test-MockTime-HiRes-0.08/sleep_prototype.patch new file mode 100644 index 0000000..e69de29 diff --git a/plucky/Dockerfile b/plucky/Dockerfile index b12e55d..c080740 100644 --- a/plucky/Dockerfile +++ b/plucky/Dockerfile @@ -39,7 +39,9 @@ RUN \ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile index e47af8c..952a97d 100644 --- a/postgresql/Dockerfile +++ b/postgresql/Dockerfile @@ -24,6 +24,7 @@ RUN dnf -y install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ curl -sL https://phar.phpunit.de/phpunit-12.phar > phpunit && chmod +x phpunit &&\ @@ -42,7 +43,9 @@ RUN dnf -y install\ cpanm -n XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/questing/Dockerfile b/questing/Dockerfile index 899f581..615cc08 100644 --- a/questing/Dockerfile +++ b/questing/Dockerfile @@ -54,7 +54,7 @@ RUN \ echo "--with-jpeg" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-webp" >> /usr/local/share/php-build/default_configure_options &&\ echo "--with-pear" >> /usr/local/share/php-build/default_configure_options &&\ - echo 'install_package "https://www.php.net/distributions/php-8.4.21.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ + echo 'install_package "https://www.php.net/distributions/php-8.4.23.tar.bz2"' > /usr/local/share/php-build/definitions/my_php &&\ php-build --verbose my_php /usr &&\ yes | pecl install memcache &&\ echo "extension=memcache.so" >> /usr/etc/php.ini &&\ @@ -65,9 +65,10 @@ RUN \ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ - curl -LO https://imagemagick.org/archive/releases/ImageMagick-7.1.2-12.tar.xz &&\ - tar xf ImageMagick-7.1.2-12.tar.xz && cd ImageMagick-7.1.2-12 &&\ + curl -LO https://github.com/ImageMagick/ImageMagick/releases/download/7.1.2-27/ImageMagick-7.1.2-27.tar.xz &&\ + tar xf ImageMagick-7.1.2-27.tar.xz && cd ImageMagick-7.1.2-27 &&\ ./configure --prefix=/usr --enable-shared --with-perl --disable-dependency-tracking --disable-cipher --disable-assert \ --without-x --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps \ --without-djvu --without-fftw --without-fpx --without-fontconfig --without-freetype --without-jbig --without-lcms \ @@ -92,7 +93,9 @@ RUN \ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/rawhide/Dockerfile b/rawhide/Dockerfile index c60b2e6..8adb17d 100644 --- a/rawhide/Dockerfile +++ b/rawhide/Dockerfile @@ -17,7 +17,7 @@ RUN dnf -y --nogpgcheck install\ &&\ dnf -y --nogpgcheck install https://dev.mysql.com/get/mysql84-community-release-fc42-1.noarch.rpm &&\ sed -i -e 's/\$releasever/42/' /etc/yum.repos.d/mysql-community.repo &&\ - dnf config-manager setopt mysql-8.4-lts-community.enabled=1 &&\ + dnf config-manager setopt mysql-8.4-lts-community.enabled=1 &&\ dnf -y --nogpgcheck --enablerepo=mysql-8.4-lts-community --setopt=install_weak_deps=false install\ mysql-community-server mysql-community-client mysql-community-libs-compat mysql-community-libs mysql-community-devel\ && dnf clean --enablerepo=mysql-8.4-lts-community all &&\ @@ -30,6 +30,7 @@ RUN dnf -y --nogpgcheck install\ ./configure --prefix=/usr --enable-shared --with-perl --disable-opencl --disable-dependency-tracking --without-x \ --without-ttf --without-wmf --without-magick-plus-plus --without-bzlib --without-zlib --without-dps --without-fpx \ --without-jpig --without-lcms2 --without-lzma --without-xml --with-quantum-depth=16 && make && make install &&\ + sed -i -E 's/(InitializeMagick\(PackageName\);)/\1 Perl_call_atexit(aTHX_ (ATEXIT_t)DestroyMagick, NULL);/' PerlMagick/Magick.xs &&\ cd PerlMagick && perl Makefile.PL && make install && cd ../.. &&\ cd .. && rm -rf src && ldconfig /usr/local/lib &&\ curl -sL https://phar.phpunit.de/phpunit-12.phar > phpunit && chmod +x phpunit &&\ @@ -49,7 +50,9 @@ RUN dnf -y --nogpgcheck install\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/rockylinux/Dockerfile b/rockylinux/Dockerfile index a916b3b..3abb43c 100644 --- a/rockylinux/Dockerfile +++ b/rockylinux/Dockerfile @@ -76,7 +76,9 @@ RUN dnf -y --allowerasing install\ cpanm -n indirect Starman XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpanm -v Archive::Zip@1.65 DBD::mysql@4.052 &&\ cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\ diff --git a/sid/Dockerfile b/sid/Dockerfile index 40e4c00..92361c8 100644 --- a/sid/Dockerfile +++ b/sid/Dockerfile @@ -37,8 +37,11 @@ RUN \ mv cpm /usr/local/bin/ &&\ cpm install -g --show-build-log-on-failure GD XML::LibXML Web::Query XMLRPC::Lite XML::Atom Net::Server Perl::Critic::Pulp Selenium::Remote::Driver &&\ cpm install -g --test --show-build-log-on-failure Archive::Zip@1.65 DBD::mysql@4.052 &&\ + cd /root/patch/Test-mysqld-1.0030 && cpanm --installdeps . && cpanm . && cd /root &&\ cd /root/patch/Crypt-DES-2.07 && cpanm --installdeps . && cpanm . && cd /root &&\ - cd /root/patch/EV-4.36 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/IO-Socket-SSL-2.099 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Test-MockTime-HiRes-0.08 && cpanm --installdeps . && cpanm . && cd /root &&\ + cd /root/patch/Net-IDN-Encode-2.500 && cpanm --installdeps . && cpanm . && cd /root &&\ rm -rf /root/patch &&\ cpanm -v \ AnyEvent::FTP::Server Class::Method::Modifiers Capture::Tiny Moo File::chdir Net::LDAP Linux::Pid Data::Section::Simple\