From 49f64eb76af553a3221b298c050a07d65a9f21d5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 28 Feb 2017 11:22:49 +0100
Subject: [PATCH] Update to 7.1.3RC1

---
 .gitignore                                     |  1 +
 ....0.0-dlopen.patch => php-7.1.3-dlopen.patch | 18 +++++++++---------
 php.spec                                       | 15 +++++++--------
 sources                                        |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)
 rename php-7.0.0-dlopen.patch => php-7.1.3-dlopen.patch (63%)

diff --git a/.gitignore b/.gitignore
index e0379c0..3ae79e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ php-5.6.*.xz
 /php-7.1.1.tar.xz
 /php-7.1.2RC1.tar.xz
 /php-7.1.2.tar.xz
+/php-7.1.3RC1.tar.xz
diff --git a/php-7.0.0-dlopen.patch b/php-7.1.3-dlopen.patch
similarity index 63%
rename from php-7.0.0-dlopen.patch
rename to php-7.1.3-dlopen.patch
index 4047460..cd35dc0 100644
--- a/php-7.0.0-dlopen.patch
+++ b/php-7.1.3-dlopen.patch
@@ -1,7 +1,7 @@
-diff -up php-7.0.0RC1/sapi/litespeed/lsapilib.c.dlopen php-7.0.0RC1/sapi/litespeed/lsapilib.c
---- php-7.0.0RC1/sapi/litespeed/lsapilib.c.dlopen	2015-08-18 23:39:17.000000000 +0200
-+++ php-7.0.0RC1/sapi/litespeed/lsapilib.c	2015-08-22 07:46:31.729721983 +0200
-@@ -582,7 +582,7 @@ static int (*fp_lve_leave)(struct liblve
+diff -up php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen php-7.1.3RC1/sapi/litespeed/lsapilib.c
+--- php-7.1.3RC1/sapi/litespeed/lsapilib.c.dlopen	2017-02-28 10:12:34.000000000 +0100
++++ php-7.1.3RC1/sapi/litespeed/lsapilib.c	2017-02-28 10:23:11.384521740 +0100
+@@ -616,7 +616,7 @@ static int (*fp_lve_leave)(struct liblve
  static int (*fp_lve_jail)( struct passwd *, char *) = NULL;
  static int lsapi_load_lve_lib()
  {
@@ -10,16 +10,16 @@ diff -up php-7.0.0RC1/sapi/litespeed/lsapilib.c.dlopen php-7.0.0RC1/sapi/litespe
      if (s_liblve)
      {
          fp_lve_is_available = dlsym(s_liblve, "lve_is_available");
-diff -up php-7.0.0RC1/Zend/zend_portability.h.dlopen php-7.0.0RC1/Zend/zend_portability.h
---- php-7.0.0RC1/Zend/zend_portability.h.dlopen	2015-08-18 23:39:16.000000000 +0200
-+++ php-7.0.0RC1/Zend/zend_portability.h	2015-08-22 07:46:31.729721983 +0200
-@@ -136,11 +136,11 @@
+diff -up php-7.1.3RC1/Zend/zend_portability.h.dlopen php-7.1.3RC1/Zend/zend_portability.h
+--- php-7.1.3RC1/Zend/zend_portability.h.dlopen	2017-02-28 10:23:11.384521740 +0100
++++ php-7.1.3RC1/Zend/zend_portability.h	2017-02-28 10:26:08.960308560 +0100
+@@ -146,11 +146,11 @@
  # endif
  
  # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 +#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW  | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
- # elif defined(RTLD_DEEPBIND)
+ # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__)
 -#  define DL_LOAD(libname)			dlopen(libname, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)
 +#  define DL_LOAD(libname)			dlopen(libname, RTLD_NOW  | RTLD_GLOBAL | RTLD_DEEPBIND)
  # else
diff --git a/php.spec b/php.spec
index f909a45..531b750 100644
--- a/php.spec
+++ b/php.spec
@@ -61,17 +61,13 @@
 %global db_devel  libdb-devel
 %endif
 
-#global rcver  RC1
+%global rcver  RC1
 %global rpmrel 1
 
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 7.1.2
-%if 0%{?rcver:1}
-Release: 0.%{rpmrel}.%{rcver}%{?dist}.1
-%else
-Release: %{rpmrel}%{?dist}.1
-%endif
+Version: 7.1.3
+Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -102,7 +98,7 @@ Patch7: php-5.3.0-recode.patch
 Patch8: php-7.0.2-libdb.patch
 
 # Functional changes
-Patch40: php-7.0.0-dlopen.patch
+Patch40: php-7.1.3-dlopen.patch
 Patch42: php-7.1.0-systzdata-v14.patch
 # See http://bugs.php.net/53436
 Patch43: php-5.4.0-phpize.patch
@@ -1506,6 +1502,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
 
 
 %changelog
+* Tue Feb 28 2017 Remi Collet <remi@fedoraproject.org> 7.1.3-0.1.RC1
+- Update to 7.1.3RC1
+
 * Wed Feb 15 2017 Remi Collet <remi@fedoraproject.org> - 7.1.2-1
 - Update to 7.1.2 - http://www.php.net/releases/7_1_2.php
 
diff --git a/sources b/sources
index 8807a43..e28d12f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-7.1.2.tar.xz) = d1cc387e8817ecbdf5ec80dc01ab0363d1f71347b1ea71f335210df2760dc419e0dc4087c7f45d2f2e9874b555bd7813c36a0d75f5c8e6f2a322693b134087a3
+SHA512 (php-7.1.3RC1.tar.xz) = 708911e46a70e6a67f7f0f695997bf4a6ea42913035face15ec7183f6ae969c5295b05bb40d9492f2f6f320f7b97fa6f4cdba3a452349a07d268655a503b5993