From 7984b2bfe9221dd2ebdb5f91de86c034bac288ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Dec 21 2018 08:12:56 +0000 Subject: update Archive_Tar to 1.4.4 drop PHP 7.2 deprecated option, patch from https://github.com/pear/pear-core/pull/83 --- diff --git a/.gitignore b/.gitignore index e24e180..32064e5 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ clog /XML_Util-1.4.3.tgz /PEAR-1.10.6.tgz /PEAR-1.10.7.tgz +/Archive_Tar-1.4.4.tgz diff --git a/83.patch b/83.patch new file mode 100644 index 0000000..db41ef8 --- /dev/null +++ b/83.patch @@ -0,0 +1,22 @@ +From fe2a8caae5ed69e268d8ff7a3a17c666960a9d04 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 21 Dec 2018 08:19:34 +0100 +Subject: [PATCH] Drop track_errors from options, as this may raise + E_DEPRECATED warning and thus make test suite fail + +--- + PEAR/RunTest.php | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php +index 482beccb3..af9113ab9 100644 +--- a/PEAR/RunTest.php ++++ b/PEAR/RunTest.php +@@ -64,7 +64,6 @@ class PEAR_RunTest + 'display_errors=1', + 'log_errors=0', + 'html_errors=0', +- 'track_errors=1', + 'report_memleaks=0', + 'report_zend_debug=0', + 'docref_root=', diff --git a/php-pear.spec b/php-pear.spec index 2021c4c..84706cb 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -9,7 +9,7 @@ %global metadir %{_localstatedir}/lib/pear %global getoptver 1.4.1 -%global arctarver 1.4.3 +%global arctarver 1.4.4 # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address %global structver 1.1.1 @@ -27,7 +27,7 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.10.7 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 # PEAR, PEAR_Manpages, Archive_Tar, XML_Util, Console_Getopt are BSD # Structures_Graph is LGPLv3+ @@ -48,6 +48,8 @@ Source23: http://pear.php.net/get/Structures_Graph-%{structver}.tgz Source24: http://pear.php.net/get/XML_Util-%{xmlutil}.tgz Source25: http://pear.php.net/get/PEAR_Manpages-%{manpages}.tgz +Patch0: https://patch-diff.githubusercontent.com/raw/pear/pear-core/pull/83.patch + BuildArch: noarch BuildRequires: php(language) > 5.4 BuildRequires: php-cli @@ -220,7 +222,7 @@ install -m 644 -D macros.pear \ # apply patches on installed PEAR tree pushd %{buildroot}%{peardir} -: no patch +patch -p1 <%{PATCH0} popd # Why this file here ? @@ -334,6 +336,11 @@ fi %changelog +* Fri Dec 21 2018 Remi Collet - 1:1.10.7-3 +- update Archive_Tar to 1.4.4 +- drop PHP 7.2 deprecated option, patch from + https://github.com/pear/pear-core/pull/83 + * Thu Dec 6 2018 Remi Collet - 1:1.10.7-1 - update PEAR to 1.10.7 diff --git a/sources b/sources index c700d44..4864800 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (Archive_Tar-1.4.3.tgz) = 62e60d59266c5d19b131f769f4d71d4cee6bf8964b0c6610c4f1381500ced582865bff26c608479b2678dda1e7407ba39a7ec84b31fed13e3875f1947ce5bd6c +SHA512 (Archive_Tar-1.4.4.tgz) = e330eb47dde2c475d7876a52422ca2f1fe6feeded46f62148498259a37c75fdbcdeca8950491879d000b55a8201c2238db63c06866767e5f4fe9554106248b92 SHA512 (Console_Getopt-1.4.1.tgz) = cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd SHA512 (PEAR-1.10.7.tgz) = ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f SHA512 (PEAR_Manpages-1.10.0.tgz) = 41bb2397c381d6315a355d01554c3c0e1ce38f30c25a56044fa8e0955baac04a39cea2bf1b0398a47c56c381c5373d78864862086ebf6958aed693521f822833