From cc74d7c49627aeef0de4cc8a85dff2504bf9c95f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 29 2020 07:05:53 +0000
Subject: import php-pear-1.9.4-22.el7


---

diff --git a/.gitignore b/.gitignore
index 4381a85..abd0799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-SOURCES/Console_Getopt-1.3.1.tgz
 SOURCES/Archive_Tar-1.3.11.tgz
-SOURCES/Structures_Graph-1.0.4.tgz
+SOURCES/Console_Getopt-1.3.1.tgz
 SOURCES/PEAR-1.9.4.tgz
+SOURCES/Structures_Graph-1.0.4.tgz
 SOURCES/XML_Util-1.2.1.tgz
diff --git a/.php-pear.metadata b/.php-pear.metadata
index 08feae6..6203890 100644
--- a/.php-pear.metadata
+++ b/.php-pear.metadata
@@ -1,5 +1,5 @@
-8f9ac495728ee9ba87edd109c3946f11ee72bc08 SOURCES/Console_Getopt-1.3.1.tgz
 a07ecdacdb180816be941550a8c4dbeeb4bbb110 SOURCES/Archive_Tar-1.3.11.tgz
-00f5c2aefad0c3f6490e5ca95da87828e64ebc57 SOURCES/Structures_Graph-1.0.4.tgz
+8f9ac495728ee9ba87edd109c3946f11ee72bc08 SOURCES/Console_Getopt-1.3.1.tgz
 7c4e88ae5064827507b2c9ae0108eb5972d900db SOURCES/PEAR-1.9.4.tgz
+00f5c2aefad0c3f6490e5ca95da87828e64ebc57 SOURCES/Structures_Graph-1.0.4.tgz
 8072216577fb9ad684f15e0388ab0b1c0b57e2d4 SOURCES/XML_Util-1.2.1.tgz
diff --git a/SOURCES/php-pear-1.9.4-glibc.patch b/SOURCES/php-pear-1.9.4-glibc.patch
new file mode 100644
index 0000000..3d2226b
--- /dev/null
+++ b/SOURCES/php-pear-1.9.4-glibc.patch
@@ -0,0 +1,56 @@
+From 5ec93aff2ad01f269669a12f45aeb8abaa853062 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 19 Jul 2019 10:33:01 +0200
+Subject: [PATCH] handle "lib64" case for glibc detection
+
+Also move the "simple" way first
+to avoid file parsing or shell call
+
+Notice: it seems that this information if not really used anywhere
+and I'm not aware of any pear/pecl package with constraint on glibc version
+---
+ OS/Guess.php | 22 ++++++++++++++--------
+ 1 file changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/OS/Guess.php b/OS/Guess.php
+index c45e84f15..79d5cfe36 100644
+--- a/OS/Guess.php
++++ b/OS/Guess.php
+@@ -195,9 +195,22 @@ function _detectGlibcVersion()
+         }
+         $major = $minor = 0;
+         include_once "System.php";
++
++        if (@is_link('/lib64/libc.so.6')) {
++            // Let's try reading the libc.so.6 symlink
++            if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib64/libc.so.6')), $matches)) {
++                list($major, $minor) = explode('.', $matches[1]);
++            }
++        } else if (@is_link('/lib/libc.so.6')) {
++            // Let's try reading the libc.so.6 symlink
++            if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib/libc.so.6')), $matches)) {
++                list($major, $minor) = explode('.', $matches[1]);
++            }
++        }
+         // Use glibc's <features.h> header file to
+         // get major and minor version number:
+-        if (@file_exists('/usr/include/features.h') &&
++        if (!($major && $minor) &&
++              @file_exists('/usr/include/features.h') &&
+               @is_readable('/usr/include/features.h')) {
+             if (!@file_exists('/usr/bin/cpp') || !@is_executable('/usr/bin/cpp')) {
+                 $features_file = fopen('/usr/include/features.h', 'rb');
+@@ -252,13 +265,6 @@ function _detectGlibcVersion()
+             unlink($tmpfile);
+         } // features.h
+ 
+-        if (!($major && $minor) && @is_link('/lib/libc.so.6')) {
+-            // Let's try reading the libc.so.6 symlink
+-            if (preg_match('/^libc-(.*)\.so$/', basename(readlink('/lib/libc.so.6')), $matches)) {
+-                list($major, $minor) = explode('.', $matches[1]);
+-            }
+-        }
+-
+         if (!($major && $minor)) {
+             return $glibc = '';
+         }
diff --git a/SPECS/php-pear.spec b/SPECS/php-pear.spec
index 627772a..3a582e6 100644
--- a/SPECS/php-pear.spec
+++ b/SPECS/php-pear.spec
@@ -15,7 +15,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.4
-Release: 21%{?dist}
+Release: 22%{?dist}
 Epoch: 1
 # PEAR, Archive_Tar, XML_Util are BSD
 # Console_Getopt is PHP
@@ -49,6 +49,8 @@ Source33: pear.conf.5
 Patch0: php-pear-1.9.4-restcache.patch
 # Relocate Metadata
 Patch1: php-pear-metadata.patch
+# Fix glibc version detection
+Patch2: php-pear-1.9.4-glibc.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -168,6 +170,7 @@ pushd $RPM_BUILD_ROOT%{peardir}
  pushd PEAR
   %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH0}
  popd
+  %__patch -s --no-backup --fuzz 0 -p1 < %{PATCH2}
   %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH1}
 popd
 
@@ -284,6 +287,9 @@ fi
 
 
 %changelog
+* Wed Apr 15 2020 Remi Collet <rcollet@redhat.com> 1:1.9.4-22
+- fix fatal error: gnu/stubs-64.h: No such file or directory #1720375
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1:1.9.4-21
 - Mass rebuild 2013-12-27