From 8bb99b1adf55c6142f927912cb3eec48145361e5 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Mon, 27 Feb 2012 15:21:03 +0100
Subject: [PATCH] Update Archive_Tar to 1.3.9

---
 .gitignore                     |  1 +
 php-pear-1.9.4-restcache.patch | 21 +++++++++++++++++++++
 php-pear.spec                  | 18 +++++++++++++-----
 sources                        |  2 +-
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 php-pear-1.9.4-restcache.patch

diff --git a/.gitignore b/.gitignore
index 384baa7..b7b4489 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /PEAR-1.9.4.tgz
 /XML_RPC-1.5.5.tgz
 /Archive_Tar-1.3.8.tgz
+/Archive_Tar-1.3.9.tgz
diff --git a/php-pear-1.9.4-restcache.patch b/php-pear-1.9.4-restcache.patch
new file mode 100644
index 0000000..361309b
--- /dev/null
+++ b/php-pear-1.9.4-restcache.patch
@@ -0,0 +1,21 @@
+
+Workaround for:
+
+ https://bugzilla.redhat.com/show_bug.cgi?id=747361
+
+--- REST.php.restcache
++++ REST.php
+@@ -234,6 +234,13 @@
+             }
+         }
+ 
++        if (!is_writeable($cache_dir)) {
++            // If writing to the cache dir is not going to work, silently do nothing.
++            // An ugly hack, but retains compat with PEAR 1.9.1 where many commands
++            // work fine as non-root user (w/out write access to default cache dir).
++            return true;
++        }
++
+         if ($cacheid === null && $nochange) {
+             $cacheid = unserialize(implode('', file($cacheidfile)));
+         }
diff --git a/php-pear.spec b/php-pear.spec
index 3756ab3..fca7147 100644
--- a/php-pear.spec
+++ b/php-pear.spec
@@ -2,7 +2,7 @@
 
 %global xmlrpcver 1.5.5
 %global getoptver 1.3.1
-%global arctarver 1.3.8
+%global arctarver 1.3.9
 %global structver 1.0.4
 %global xmlutil   1.2.1
 
@@ -13,7 +13,7 @@
 Summary: PHP Extension and Application Repository framework
 Name: php-pear
 Version: 1.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 # PEAR, Archive_Tar, XML_Util are BSD
 # XML-RPC, Console_Getopt are PHP
@@ -22,8 +22,7 @@ License: BSD and PHP and LGPLv2+
 Group: Development/Languages
 URL: http://pear.php.net/package/PEAR
 Source0: http://download.pear.php.net/package/PEAR-%{version}.tgz
-# wget 'http://svn.php.net/viewvc/pear/pear-core/trunk/install-pear.php?revision=308763&view=co' -O install-pear.php
-# see http://pear.php.net/bugs/18367 - doc_dir relocation
+# wget https://raw.github.com/pear/pear-core/master/install-pear.php
 Source1: install-pear.php
 Source2: relocate.php
 Source3: strip.php
@@ -37,6 +36,8 @@ Source21: http://pear.php.net/get/Archive_Tar-%{arctarver}.tgz
 Source22: http://pear.php.net/get/Console_Getopt-%{getoptver}.tgz
 Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz
 Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz
+# From RHEL: ignore REST cache creation failures as non-root user (#747361)
+Patch0: php-pear-1.9.4-restcache.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -132,7 +133,9 @@ install -m 644 -c %{SOURCE13} \
 
 # apply patches on installed PEAR tree
 pushd $RPM_BUILD_ROOT%{peardir} 
-# -- no patch
+ pushd PEAR
+  %__patch -s --no-backup --fuzz 0 -p0 < %{PATCH0}
+ popd
 popd
 
 # Why this file here ?
@@ -194,6 +197,11 @@ rm new-pear.conf
 
 
 %changelog
+* Mon Feb 27 2012 Remi Collet <remi@fedoraproject.org> 1:1.9.4-5
+- Update Archive_Tar to 1.3.9
+- add patch from RHEL (Joe Orton)
+- fix install-pear.php URL (with our patch for doc_dir applied)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.9.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 55deafe..878ef1f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-1ee2c475803ca37e7f3354a76e3223a4  Archive_Tar-1.3.8.tgz
+9987830b771699b84eadc921a4e12407  Archive_Tar-1.3.9.tgz
 310b39cf091b9a0abf398bead60f3f8d  Console_Getopt-1.3.1.tgz
 c52b09758e851235e6a93a2c1e1a8ee9  PEAR-1.9.4.tgz
 b99c5e9ac348a2e81515ba16deb7ded3  Structures_Graph-1.0.4.tgz