Hello community,

here is the log from the commit of package php5 for openSUSE:Factory checked in 
at 2014-10-14 08:59:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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        2014-08-30 
18:55:54.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes   2014-10-14 
08:59:04.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Oct  2 20:27:56 UTC 2014 - [email protected]
+
+- php5-crypto-checks.patch: Fix broken libcrypto checks 
+  DSA_get_default_method is in -lcrypto not -lssl
+- DO not use xorg-x11-devel, just pkgconfig(xpm) and xft
+- Support WEBP in the gd extension by buildrequiring libvpx-devel
+
+-------------------------------------------------------------------

New:
----
  php5-crypto-checks.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ php5.spec ++++++
--- /var/tmp/diff_new_pack.vtRjk5/_old  2014-10-14 08:59:06.000000000 +0200
+++ /var/tmp/diff_new_pack.vtRjk5/_new  2014-10-14 08:59:06.000000000 +0200
@@ -70,7 +70,10 @@
 BuildRequires:  tcpd-devel
 BuildRequires:  unixODBC-devel
 BuildRequires:  update-alternatives
-BuildRequires:  xorg-x11-devel
+BuildRequires:  xz
+BuildRequires:  pkgconfig(vpx)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xpm)
 %if 0%{suse_version} > 1110
 BuildRequires:  freetds-devel
 %endif
@@ -172,6 +175,7 @@
 Patch16:        php5-format-string-issues.patch
 Patch17:        php5-per-mod-log.patch
 Patch18:        php5-apache24-updates.patch
+Patch19:        php5-crypto-checks.patch
 Url:            http://www.php.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        PHP5 Core Files
@@ -1319,6 +1323,7 @@
 %patch16
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 # Safety check for API version change.
 vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h`
 if test "x${vapi}" != "x%{apiver}"; then
@@ -1491,6 +1496,7 @@
         --with-png-dir=%{_usr} \
         --with-jpeg-dir=%{_usr} \
         --with-zlib-dir=%{_usr} \
+        --with-vpx-dir=%{_usr} \
     --with-gettext=shared \
     --with-gmp=shared \
     --with-iconv=shared \

++++++ php5-crypto-checks.patch ++++++
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index 78e1bf1..98eb2be 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -34,7 +34,7 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" 
= "yes"; then
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
 
   if test "$PHP_OPENSSL" != "no" || test "$PHP_OPENSSL_DIR" != "no"; then
-    AC_CHECK_LIB(ssl, DSA_get_default_method, 
AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
+    AC_CHECK_LIB(crypto, DSA_get_default_method, 
AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
     AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, 
[OpenSSL 0.9.7 or later]))
 
     PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, 
[AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL 
directly])])
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
index 701e488..383ed2f 100644
--- a/ext/openssl/config0.m4
+++ b/ext/openssl/config0.m4
@@ -19,7 +19,7 @@ if test "$PHP_OPENSSL" != "no"; then
     PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
   fi
 
-  AC_CHECK_LIB(ssl, DSA_get_default_method, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 
1, [OpenSSL 0.9.7 or later]))
+  AC_CHECK_LIB(crypto, DSA_get_default_method, 
AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, [OpenSSL 0.9.7 or later]))
   AC_CHECK_LIB(crypto, X509_free, AC_DEFINE(HAVE_DSA_DEFAULT_METHOD, 1, 
[OpenSSL 0.9.7 or later]))
 
   PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, 
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to