$ git diff --patch-with-stat --summary 6a6a7eab8821b4c22539ed081501cc47668cbd23..6ac8b242ba6f81455b53b7634023b4efc12b71c7

 .abf.yml                        |   2 +-
 php-fpm-socket-activation.patch | 118 ++++++++++++++++++++++++++++++++++++++++
 php-fpm.service                 |  13 -----
 php.spec                        |  47 +++++++++++-----
 4 files changed, 153 insertions(+), 27 deletions(-)
 create mode 100644 php-fpm-socket-activation.patch
 delete mode 100644 php-fpm.service

diff --git a/.abf.yml b/.abf.yml
index afd44f8..12fe41c 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  php-8.2.0RC4.tar.gz: 4a651abfe6f0aaef1974bd3df0f2e4f7927c17bf
+  php-8.2.0.tar.xz: 275357f08a07614deaf6649c106ca5e1259c403b
diff --git a/php-fpm-socket-activation.patch b/php-fpm-socket-activation.patch
new file mode 100644
index 0000000..abdc80e
--- /dev/null
+++ b/php-fpm-socket-activation.patch
@@ -0,0 +1,118 @@
+diff -up php-8.2.0/sapi/fpm/fpm/fpm_sockets.c.omv~ php-8.2.0/sapi/fpm/fpm/fpm_sockets.c
+--- php-8.2.0/sapi/fpm/fpm/fpm_sockets.c.omv~	2023-01-04 21:49:31.521304136 +0100
++++ php-8.2.0/sapi/fpm/fpm/fpm_sockets.c	2023-01-04 21:57:30.857518530 +0100
+@@ -17,6 +17,8 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <systemd/sd-daemon.h>
++#include <systemd/sd-journal.h>
+ 
+ #include "zlog.h"
+ #include "fpm_arrays.h"
+@@ -32,6 +34,7 @@ struct listening_socket_s {
+ 	int refcount;
+ 	int sock;
+ 	int type;
++	int preserve;
+ 	char *key;
+ };
+ 
+@@ -66,7 +69,7 @@ static void fpm_sockets_cleanup(int whic
+ 
+ 	for (i = 0; i < sockets_list.used; i++, ls++) {
+ 		if (which != FPM_CLEANUP_PARENT_EXEC) {
+-			close(ls->sock);
++			if (ls->preserve != 1) close(ls->sock); /* avoid close if systemd-provided socket */
+ 		} else { /* on PARENT EXEC we want socket fds to be inherited through environment variable */
+ 			char fd[32];
+ 			char *tmpenv_value;
+@@ -96,7 +99,7 @@ static void fpm_sockets_cleanup(int whic
+ 
+ 		if (which == FPM_CLEANUP_PARENT_EXIT_MAIN) {
+ 			if (ls->type == FPM_AF_UNIX) {
+-				unlink(ls->key);
++				if (ls->preserve != 1) unlink(ls->key); /* avoid unlink if systemd-provided socket */
+ 			}
+ 		}
+ 		free(ls->key);
+@@ -136,7 +139,7 @@ static int fpm_get_in_port(struct sockad
+ }
+ /* }}} */
+ 
+-static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op) /* {{{ */
++static int fpm_sockets_hash_op(int sock, struct sockaddr *sa, char *key, int type, int op, int preserve) /* {{{ */
+ {
+ 	if (key == NULL) {
+ 		switch (type) {
+@@ -193,6 +196,7 @@ static int fpm_sockets_hash_op(int sock,
+ 			ls->type = type;
+ 			ls->sock = sock;
+ 			ls->key = strdup(key);
++			ls->preserve = preserve;
+ 
+ 			return 0;
+ 		}
+@@ -276,13 +280,13 @@ static int fpm_sockets_get_listening_soc
+ {
+ 	int sock;
+ 
+-	sock = fpm_sockets_hash_op(0, sa, 0, wp->listen_address_domain, FPM_GET_USE_SOCKET);
++	sock = fpm_sockets_hash_op(0, sa, 0, wp->listen_address_domain, FPM_GET_USE_SOCKET, /* (systemd) preserve= */ 0);
+ 	if (sock >= 0) {
+ 		return sock;
+ 	}
+ 
+ 	sock = fpm_sockets_new_listening_socket(wp, sa, socklen);
+-	fpm_sockets_hash_op(sock, sa, 0, wp->listen_address_domain, FPM_STORE_USE_SOCKET);
++	fpm_sockets_hash_op(sock, sa, 0, wp->listen_address_domain, FPM_STORE_USE_SOCKET, /* (systemd) preserve= */ 0);
+ 
+ 	return sock;
+ }
+@@ -420,7 +424,10 @@ static zend_result fpm_socket_setfib_ini
+ 
+ int fpm_sockets_init_main(void)
+ {
++	int sd_sock_count;
+ 	unsigned i, lq_len;
++	struct sockaddr_un address;
++	socklen_t address_len;
+ 	struct fpm_worker_pool_s *wp;
+ 	char envname[32];
+ 	char sockpath[256];
+@@ -437,6 +444,26 @@ int fpm_sockets_init_main(void)
+ 	}
+ #endif
+ 
++	/* Is systemd providing any sockets? */
++	sd_sock_count = sd_listen_fds(0);
++	if (sd_sock_count < 0) sd_sock_count = 0; /* can return -errno, so set to zero */
++
++	/* For each systemd-provided socket, get type and address and store it */
++	for (i = SD_LISTEN_FDS_START; i < SD_LISTEN_FDS_START + sd_sock_count; i++) {
++		int type, fd_no;
++
++		fd_no = i;
++		address_len = sizeof(struct sockaddr_un);
++		if (getsockname(fd_no, (struct sockaddr *)&address, &address_len)) {
++			zlog(ZLOG_ERROR, "error getting sockname from systemd-provided socket: fd=%d", fd_no);
++			continue;
++		}
++
++		type = fpm_sockets_domain_from_address(((struct sockaddr *)&address)->sa_data);
++		zlog(ZLOG_NOTICE, "using systemd-provided socket fd=%d, \"%s\"", fd_no, ((struct sockaddr *)&address)->sa_data);
++		fpm_sockets_hash_op(fd_no, (struct sockaddr *)&address, 0, type, FPM_STORE_SOCKET, /* (systemd) preserve= */ 1);
++	}
++
+ 	/* import inherited sockets */
+ 	for (i = 0; i < FPM_ENV_SOCKET_SET_MAX; i++) {
+ 		fpm_sockets_get_env_name(envname, i);
+@@ -466,7 +493,7 @@ int fpm_sockets_init_main(void)
+ 				fd_no = atoi(eq + 1);
+ 				type = fpm_sockets_domain_from_address(sockpath);
+ 				zlog(ZLOG_NOTICE, "using inherited socket fd=%d, \"%s\"", fd_no, sockpath);
+-				fpm_sockets_hash_op(fd_no, 0, sockpath, type, FPM_STORE_SOCKET);
++				fpm_sockets_hash_op(fd_no, 0, sockpath, type, FPM_STORE_SOCKET, /* (systemd) preserve= */ 0);
+ 			}
+ 
+ 			if (comma) {
diff --git a/php-fpm.service b/php-fpm.service
deleted file mode 100644
index 546a7ff..0000000
--- a/php-fpm.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=The PHP FastCGI Process Manager
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/php-fpm/php-fpm.pid
-EnvironmentFile=/etc/sysconfig/php-fpm
-ExecStart=/usr/sbin/php-fpm --daemonize --fpm-config /etc/php-fpm.conf $PHP_FPM_OPTIONS
-ExecReload=/bin/kill -USR2 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/php.spec b/php.spec
index 858698a..2689939 100644
--- a/php.spec
+++ b/php.spec
@@ -22,7 +22,7 @@
 %global optflags %{optflags} -fuse-ld=bfd
 %endif
 
-%define beta RC4
+#define beta RC4
 
 Summary:	The PHP scripting language
 Name:		php
@@ -31,7 +31,7 @@ Version:	8.2.0
 Release:	0.%{beta}.1
 Source0:	https://github.com/php/php-src/archive/refs/tags/php-%{version}%{beta}.tar.gz
 %else
-Release:	1
+Release:	2
 Source0:	http://ch1.php.net/distributions/php-%{version}.tar.xz
 %endif
 Group:		Development/PHP
@@ -39,7 +39,6 @@ License:	PHP License
 URL:		http://www.php.net
 Source2:	maxlifetime
 Source3:	php.crond
-Source4:	php-fpm.service
 Source5:	php-fpm.sysconf
 Source6:	php-fpm.logrotate
 Source9:	php-fpm-tmpfiles.conf
@@ -47,6 +46,8 @@ Source10:	php.ini
 Patch0:		php-8.0.0-rc1-allow-newer-bdb.patch
 Patch1:		php-8.1.0-systzdata-v21.patch
 #Patch2:		php-8.0.0-rc1-libtool-2.4.6.patch
+# Based on https://wiki.php.net/rfc/socketactivation
+Patch3:		php-fpm-socket-activation.patch
 
 BuildRequires:	autoconf
 BuildRequires:	autoconf-archive
@@ -225,8 +226,6 @@ Requires:	php-xmlwriter >= %{EVRD}
 Requires:	php-zlib >= %{EVRD}
 Requires:	php-xml >= %{EVRD}
 Provides:	php = %{EVRD}
-Provides:	php-fcgi = %{EVRD}
-Obsoletes:	php-fcgi < %{EVRD}
 Obsoletes:	php-json < %{EVRD}
 
 %description	cgi
@@ -1072,6 +1071,7 @@ Requires:	php-xmlwriter >= %{EVRD}
 Requires:	php-zlib >= %{EVRD}
 Requires:	php-xml >= %{EVRD}
 Provides:	php = %{EVRD}
+%rename php-fcgi
 
 %description	fpm
 PHP is an HTML-embeddable scripting language. PHP offers built-in database
@@ -1489,9 +1489,29 @@ install -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/cron.d/php
 sed -i -e "s|/usr/lib|%{_libdir}|" %{buildroot}%{_sysconfdir}/cron.d/php
 %endif
 
-cp %{SOURCE4} %{buildroot}/lib/systemd/system/php-fpm.service
+mkdir -p %{buildroot}%{_unitdir}
+cp build-fpm/sapi/fpm/php-fpm.service %{buildroot}%{_unitdir}/php-fpm.service
 cp %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/php-fpm
 cp %{SOURCE6} %{buildroot}%{_sysconfdir}/logrotate.d/php-fpm
+mkdir -p %{buildroot}%{_tmpfilesdir}
+cp %{SOURCE9} %{buildroot}%{_tmpfilesdir}/php-fpm.conf
+
+cp %{buildroot}%{_sysconfdir}/php-fpm.conf.default %{buildroot}%{_sysconfdir}/php-fpm.conf
+cp %{buildroot}%{_sysconfdir}/php-fpm.d/www.conf.default %{buildroot}%{_sysconfdir}/php-fpm.d/www.conf
+
+# /var/lib/log is too weird to exist
+mkdir -p %{buildroot}%{_localstatedir}/log/php-fpm
+sed -i -e 's,;error_log.*,error_log = %{_localstatedir}/log/php-fpm/php-fpm.log,' %{buildroot}%{_sysconfdir}/php-fpm.conf*
+
+# And a UNIX socket tends to be more secure
+sed -i -e 's,^listen.*,listen = /run/php-fpm/php.sock,' %{buildroot}%{_sysconfdir}/php-fpm.d/*.conf*
+
+# Let's try to reduce overhead too...
+cat >>%{buildroot}%{_unitdir}/php-fpm.service <<EOF
+
+[Socket]
+ListenStream = /run/php-fpm/php.sock
+EOF
 
 %post bcmath
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -1953,7 +1973,7 @@ if [ "$1" = "0" ]; then
 fi
 
 %post fpm
-%tmpfiles_create php-fpm
+%tmpfiles_create_package php-fpm %{S:9}
 %_post_service php-fpm
 if [ $1 = 1 ]; then
 	# Initial installation
@@ -2243,19 +2263,20 @@ fi
 
 %files fpm
 %doc sapi/fpm/LICENSE
-/lib/systemd/system/php-fpm.service
+%{_unitdir}/php-fpm.service
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php-fpm.conf.default
-%{_sysconfdir}/php-fpm.d
+%attr(0644,root,root) %config %{_sysconfdir}/php-fpm.conf
+%dir %{_sysconfdir}/php-fpm.d
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php-fpm.d/www.conf.default
+%attr(0644,root,root) %config %{_sysconfdir}/php-fpm.d/www.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/php-fpm
 %attr(0644,root,root) %{_sysconfdir}/logrotate.d/php-fpm
-#%attr(0755,root,root) %dir %{_sysconfdir}/php-fpm.d
-#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/php-fpm.d/default.conf
 %attr(0755,root,root) %{_sbindir}/php-fpm
 %attr(0644,root,root) %{_mandir}/man8/php-fpm.8*
 #%attr(0711,apache,apache) %dir /var/lib/php-fpm
-#%attr(0711,apache,apache) %dir /var/log/php-fpm
+%attr(0711,apache,apache) %dir %{_localstatedir}/log/php-fpm
 #%attr(0711,apache,apache) %dir /run/php-fpm
-#%{_tmpfilesdir}/php-fpm.conf
+%{_tmpfilesdir}/php-fpm.conf
 %{_datadir}/fpm
 
 %files -n apache-mod_php