php80-8.0.13-1

p/php80/php80-vl.spec

@@ -28,12 +28,17 @@
 %define www_group www-data
 %define fpm_user www-data
 %define fpm_group www-data
+%if %{with systemd}
+%global fpm_sockdir /run/php%{majorver}-fpm
+%else
+%global fpm_sockdir /tmp
+%endif
 
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.0.12
-Release: 2%{_dist_release}%{?with_systemd:.systemd}
+Version: 8.0.13
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -53,13 +58,12 @@ Source28: php-fpm.logrotate
 Source29: php_params
 Source31: macros.php.ver
 Source32: php-fpm.service
+Source33: php-fpm.tmpfiles
 
 # upstream patch
 # for libgd >= 2.3.3
 # https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f
 Patch1: php-gd2.3.3.patch
-# https://github.com/php/php-src/pull/7596
-Patch2: php-icu70.patch
 
 # Additional feature
 Patch33: php-5.2.4-phpincludedir.patch
@@ -418,7 +422,6 @@ on each request.
 %setup -q -n %{srcname}
 
 %patch1 -p1
-%patch2 -p1
 
 %patch33 -p1 -b .phpincludedir
 
@@ -533,6 +536,7 @@ popd
 sed \
 	-e 's/@WWWUSER@/%{fpm_user}/' \
 	-e 's/@WWWGROUP@/%{fpm_group}/' \
+	-e 's|@sockdir@|%{fpm_sockdir}|' \
 	-e 's/@majorver@/%{majorver}/' < %{SOURCE27} > default-pool.conf
 
 #----------------------------------------------------------------------
@@ -598,6 +602,12 @@ mkdir -p %{buildroot}%{_unitdir}
 sed -i \
 	-e 's/@majorver@/%{majorver}/g' \
 	%{buildroot}%{_unitdir}/%{_name}-fpm.service
+mkdir -p %{buildroot}%{_tmpfilesdir}
+%{__install} -m 644 %{SOURCE33} \
+	%{buildroot}%{_tmpfilesdir}/%{_name}-fpm.conf
+sed -i \
+	-e 's/@majorver@/%{majorver}/g' \
+	%{buildroot}%{_tmpfilesdir}/%{_name}-fpm.conf
 %else
 %{__install} -m 755 %{SOURCE25} %{buildroot}%{_initdir}/%{_name}-fpm
 sed -i -e 's/@majorver@/%{majorver}/g' %{buildroot}%{_initdir}/%{_name}-fpm
@@ -623,7 +633,9 @@ sed -i \
 # Install the configuration file for Nginx
 mkdir -p %{buildroot}%{_sysconfdir}/nginx
 %{__install} -m 644 %{SOURCE29} %{buildroot}%{_sysconfdir}/nginx/%{_name}_params
-sed -i -e 's/@majorver@/%{majorver}/g' \
+sed -i \
+  -e 's/@majorver@/%{majorver}/g' \
+  -e 's|@sockdir@|%{fpm_sockdir}|g' \
   %{buildroot}%{_sysconfdir}/nginx/%{_name}_params
 
 %{__install} -m 755 -d %{buildroot}%{php_confdir}/php.d
@@ -867,6 +879,7 @@ rm -f files.*
 %{_sbindir}/%{_name}-fpm
 %if %{with systemd}
 %{_unitdir}/%{_name}-fpm.service
+%{_tmpfilesdir}/%{_name}-fpm.conf
 %else
 %{_initdir}/%{_name}-fpm
 %endif
@@ -896,6 +909,10 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Nov 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0.13-1
+- new upstream release.
+- dropped Patch2: fixed in upstream.
+
 * Sat Oct 30 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.0.12-2
 - built with icu-70.1.