php8.1: use pcre2 backport

Use component/pcre2 containing the bookworm-to-bullseye backport.

As noted in cli/Dockerfile.template, libpcre2-8-0 must be explicitly
listed in the set of installed packages in order to upgrade.

Bug: T386006
Change-Id: Ied47089db8013c058c2fed8055e06f6b9ecf1dd8

Author: Scott French

images/php/8.1/cli/Dockerfile.template

@@ -19,8 +19,12 @@ ENV PHP__date__timezone=UTC \
     ENTRY_POINT_SCRIPT=/bin/entrypoint.php
 
 # Install all the php packages we need, and configure them.
+# NOTE: libpcre2-8-0 is already installed in the base bullseye image, so we
+# need to explicitly request installation again here in order to upgrade to
+# that from component/pcre2.
 {% set packages|replace('\n', ' ') -%}
 ca-certificates
+libpcre2-8-0
 php8.1-cli
 php8.1-bcmath
 php8.1-bz2
@@ -41,6 +45,7 @@ php8.1-redis
 php8.1-uuid
 {%- endset -%}
 RUN echo 'deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/php81' > /etc/apt/sources.list.d/php81.list &&\
+    echo 'deb http://apt.wikimedia.org/wikimedia bullseye-wikimedia component/pcre2' > /etc/apt/sources.list.d/pcre2.list &&\
     {{ packages | apt_install }} && \
     echo 'memcached.store_retry_count=0' >> /etc/php/8.1/mods-available/memcached.ini && \
     sed -i"" s/compact_strings=On/compact_strings=Off/ /etc/php/8.1/mods-available/igbinary.ini && \

images/php/8.1/cli/changelog

@@ -1,3 +1,9 @@
+php8.1-cli (8.1.34-1-s1) wikimedia; urgency=medium
+
+  * Add component/pcre2 to use backport from bookworm
+
+ -- Scott French <[email protected]>  Mon, 24 Feb 2025 08:40:32 -0800
+
 php8.1-cli (8.1.34-1-20250223) wikimedia; urgency=medium
 
   * Weekly rebuild.

images/php/8.1/fpm-multiversion-base/changelog

@@ -1,3 +1,9 @@
+php8.1-fpm-multiversion-base (8.1.34-1-s1) wikimedia; urgency=medium
+
+  * Rebuild to pick up pcre2 backport
+
+ -- Scott French <[email protected]>  Mon, 24 Feb 2025 08:40:48 -0800
+
 php8.1-fpm-multiversion-base (8.1.34-1-20250223) wikimedia; urgency=medium
 
   * Weekly rebuild.

images/php/8.1/fpm/changelog

@@ -1,3 +1,9 @@
+php8.1-fpm (8.1.34-1-s1) wikimedia; urgency=medium
+
+  * Rebuild to pick up pcre2 backport
+
+ -- Scott French <[email protected]>  Mon, 24 Feb 2025 08:40:37 -0800
+
 php8.1-fpm (8.1.34-1-20250223) wikimedia; urgency=medium
 
   * Weekly rebuild.