Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2013-10-15 10:43:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2013-09-26 19:42:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2013-10-15 10:43:23.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Oct 13 21:24:58 UTC 2013 - crrodrig...@opensuse.org + +- build with --with-fpm-systemd and install systemd unit +- php5-systemd-unit.patch: tweak systemd unit for openSUSE requirements +- php5-openssl.patch: only openSSL_config() is really needed. +- Recommended for 13.1 and Factory + +------------------------------------------------------------------- New: ---- php5-systemd-unit.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.SWrkTi/_old 2013-10-15 10:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.SWrkTi/_new 2013-10-15 10:43:24.000000000 +0200 @@ -173,6 +173,7 @@ Patch19: php5-64-bit-post-large-files.patch Patch20: php5-per-mod-log.patch Patch21: php5-apache24-updates.patch +Patch22: php5-systemd-unit.patch Url: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: PHP5 Core Files @@ -337,6 +338,7 @@ Provides: php-simplexml Provides: php-spl Provides: php-xml +BuildRequires: pkgconfig(libsystemd-daemon) %description fpm PHP is a server-side, cross-platform HTML embedded scripting language. @@ -1303,6 +1305,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` @@ -1431,6 +1434,7 @@ --disable-all \ Build fpm \ + --with-fpm-systemd \ --enable-fpm \ --bindir=%{_bindir} \ --disable-cli \ @@ -1630,6 +1634,7 @@ install -d %{buildroot}%{_sysconfdir}/init.d install -m 755 -c %{S:8} %{buildroot}%{_sysconfdir}/init.d/php-fpm chmod 644 README.namespaces UPGRADING +install -D -m 0644 ./build-fpm/sapi/fpm/php-fpm.service %{buildroot}%{_unitdir}/php-fpm.service %post -n apache2-mod_php5 #some distro versions does not have this tool. @@ -1652,14 +1657,20 @@ fi fi +%pre fpm +%service_add_pre php-fpm.service + %postun fpm +%service_del_postun php-fpm.service %restart_on_update php-fpm %insserv_cleanup %preun fpm +%service_del_preun php-fpm.service %stop_on_removal php-fpm %post fpm +%service_add_post php-fpm.service %{fillup_and_insserv -f php-fpm} %files @@ -1710,6 +1721,7 @@ %config /etc/init.d/php-fpm %dir /usr/share/php5/fpm /usr/share/php5/fpm/status.html +%{_unitdir}/php-fpm.service %files -n apache2-mod_php5 %defattr(644,root,root,755) ++++++ php5-openssl.patch ++++++ --- /var/tmp/diff_new_pack.SWrkTi/_old 2013-10-15 10:43:24.000000000 +0200 +++ /var/tmp/diff_new_pack.SWrkTi/_new 2013-10-15 10:43:24.000000000 +0200 @@ -1,34 +1,13 @@ -Index: ext/openssl/openssl.c -=================================================================== --- ext/openssl/openssl.c.orig +++ ext/openssl/openssl.c -@@ -51,6 +51,7 @@ - #include <openssl/rand.h> - #include <openssl/ssl.h> - #include <openssl/pkcs12.h> -+#include <openssl/engine.h> - - /* Common */ - #include <time.h> -@@ -1015,10 +1016,16 @@ PHP_MINIT_FUNCTION(openssl) - le_x509 = zend_register_list_destructors_ex(php_x509_free, NULL, "OpenSSL X.509", module_number); - le_csr = zend_register_list_destructors_ex(php_csr_free, NULL, "OpenSSL X.509 CSR", module_number); - -+ OPENSSL_config(NULL); - SSL_library_init(); +@@ -1031,6 +1031,7 @@ PHP_MINIT_FUNCTION(openssl) OpenSSL_add_all_ciphers(); OpenSSL_add_all_digests(); OpenSSL_add_all_algorithms(); -+/* Load all bundled ENGINEs into memory and make them visible */ -+ ENGINE_load_builtin_engines(); -+ /* Register all of them for every algorithm they collectively implement */ -+ ENGINE_register_all_complete(); -+ ++ OPENSSL_config(NULL); SSL_load_error_strings(); -Index: ext/openssl/xp_ssl.c -=================================================================== --- ext/openssl/xp_ssl.c.orig +++ ext/openssl/xp_ssl.c @@ -378,6 +378,10 @@ static inline int php_openssl_setup_cryp ++++++ php5-systemd-unit.patch ++++++ --- sapi/fpm/php-fpm.service.in.orig +++ sapi/fpm/php-fpm.service.in @@ -1,12 +1,14 @@ [Unit] Description=The PHP FastCGI Process Manager After=syslog.target network.target +Before=apache2.service nginx.service lighttpd.service [Service] Type=@php_fpm_systemd@ -PIDFile=@localstatedir@/run/php-fpm.pid -ExecStart=@sbindir@/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf +ExecStart=/usr/sbin/php-fpm --nodaemonize --fpm-config @sysconfdir@/php-fpm.conf ExecReload=/bin/kill -USR2 $MAINPID +ExecStop=/bin/kill -QUIT $MAINPID +PrivateTmp=true [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
