Hello community, here is the log from the commit of package php7 for openSUSE:Factory checked in at 2020-12-09 22:11:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7 (Old) and /work/SRC/openSUSE:Factory/.php7.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7" Wed Dec 9 22:11:12 2020 rev:89 rq:853525 version:7.4.13 Changes: -------- --- /work/SRC/openSUSE:Factory/php7/php7.changes 2020-12-02 13:57:36.961762865 +0100 +++ /work/SRC/openSUSE:Factory/.php7.new.2328/php7.changes 2020-12-09 22:11:13.815055417 +0100 @@ -1,0 +2,9 @@ +Fri Dec 4 20:10:10 UTC 2020 - Arjen de Korte <[email protected]> + +- do not add mod_php to httpd.conf during %install (better fix for + new apache2 from Apache development repo) + + php-install-mod_php.patch +- do not build php-cgi when not needed +- only build extensions in cli + +------------------------------------------------------------------- New: ---- php-install-mod_php.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7.spec ++++++ --- /var/tmp/diff_new_pack.2dUxUw/_old 2020-12-09 22:11:14.791056407 +0100 +++ /var/tmp/diff_new_pack.2dUxUw/_new 2020-12-09 22:11:14.791056407 +0100 @@ -63,6 +63,7 @@ Patch6: php-openssl.patch Patch7: php-systzdata-v19.patch Patch8: php-systemd-unit.patch +Patch9: php-install-mod_php.patch Patch10: php-embed.patch ## Bugfix patches # following patch is to fix configure tests for crypt; the aim is to have php @@ -82,6 +83,7 @@ BuildRequires: apache-rpm-macros BuildRequires: apache-rpm-macros-control BuildRequires: apache2-devel +BuildRequires: apache2-prefork BuildRequires: autoconf BuildRequires: bison BuildRequires: curl @@ -222,7 +224,8 @@ Requires: %{apache_mmn} Requires: %{name} = %{version} Requires: apache2-prefork -Requires(pre): apache2 +Requires(post): %{_sbindir}/a2enmod +Requires(preun): %{_sbindir}/a2enmod Provides: mod_php_any = %{version} Provides: php-date = %{version} Provides: php-filter = %{version} @@ -913,6 +916,7 @@ %patch6 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch10 -p1 %patch12 -p1 %patch14 -p1 @@ -1015,10 +1019,6 @@ --with-system-tzdata=%{_datadir}/zoneinfo \ --with-mhash \ --disable-phpdbg \ -%if %{build_sodium} - --with-sodium=shared \ -%endif - --with-zip=shared \ %if %{build_argon2} --with-password-argon2=%{_usr} \ %endif @@ -1052,13 +1052,15 @@ Build apache2 \ --with-apxs2=%{apache_apxs} \ --disable-all \ + --disable-cgi \ --disable-cli # fast-cgi sapi Build fastcgi \ --bindir=%{_bindir} \ - --disable-cli \ - --disable-all + --disable-all \ + --enable-cgi \ + --disable-cli Build fpm \ --with-fpm-systemd \ @@ -1066,14 +1068,16 @@ --with-fpm-user=wwwrun \ --with-fpm-group=www \ --bindir=%{_bindir} \ - --disable-cli \ --disable-all \ + --disable-cgi \ + --disable-cli \ --localstatedir=%{_localstatedir} Build embed \ --enable-embed=shared \ - --disable-cli \ - --disable-all + --disable-all \ + --disable-cgi \ + --disable-cli Build cli \ --enable-cli \ @@ -1138,6 +1142,10 @@ %endif --with-pdo-pgsql=shared,%{_usr} \ --with-pdo-odbc=shared,unixODBC,%{_usr} \ +%if %{build_sodium} + --with-sodium=shared \ +%endif + --enable-opcache=shared \ --with-zip=shared \ --enable-intl=shared \ --disable-cgi @@ -1268,17 +1276,17 @@ %post -n apache2-mod_%{name} #some distro versions does not have this tool. if [ -x %{_sbindir}/a2enmod ]; then - if a2enmod -q php5 && ! a2enmod -q php7; then - a2dismod php5 - a2enmod php7 + if %{_sbindir}/a2enmod -q php5 && ! %{_sbindir}/a2enmod -q php7; then + %{_sbindir}/a2enmod -d php5 + %{_sbindir}/a2enmod php7 fi fi %preun -n apache2-mod_%{name} if [ "$1" = "0" ]; then if [ -x %{_sbindir}/a2enmod ]; then - if a2enmod -q php7; then - a2dismod php7 + if %{_sbindir}/a2enmod -q php7; then + %{_sbindir}/a2enmod -d php7 fi fi fi @@ -1298,6 +1306,7 @@ %post embed -p /sbin/ldconfig %postun embed -p /sbin/ldconfig + %postun -n apache2-mod_%{name} # request restart apache instanaces (which loaded php7) after apache2-mod_%{name} package update if [ $1 -eq 1 ]; then ++++++ php-install-mod_php.patch ++++++ Don't attempt to add the module with a LoadModule line to the httpd.conf file. This won't work in the buildroot and also is not how modules are loaded in Apache in (open)SUSE. Index: php-7.4.13/sapi/apache2handler/config.m4 =================================================================== --- php-7.4.13.orig/sapi/apache2handler/config.m4 2020-11-24 11:03:34.000000000 +0100 +++ php-7.4.13/sapi/apache2handler/config.m4 2020-12-04 17:45:39.679663555 +0100 @@ -64,18 +64,9 @@ if test "$PHP_APXS2" != "no"; then fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -i -n php7" - else - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ - -i -a -n php7" - fi case $host_alias in *aix*) _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
