From 08625dda4a2538b8c4e71d4aa91f736e09e087ce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Aug 2019 14:57:55 +0200 Subject: [PATCH 1/3] update to 4.0.1 add patch for 7.4 from https://github.com/sabre-io/dav/pull/1187 (cherry picked from commit 20fea0da81bc1c89e4547953f1502d23193203d3) --- .gitignore | 1 + 1187.patch | 23 +++++++++++++++++++++++ php-sabre-dav4.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 1187.patch diff --git a/.gitignore b/.gitignore index ccc2452..7ed9373 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-sabre-dav4-4.0.0-a4959bf.tar.gz +/php-sabre-dav4-4.0.1-e06e620.tar.gz diff --git a/1187.patch b/1187.patch new file mode 100644 index 0000000..c61fc7f --- /dev/null +++ b/1187.patch @@ -0,0 +1,23 @@ +From f3c91ec654abe9774570ca0602a0e4916e3bf5b5 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 20 Aug 2019 11:44:24 +0200 +Subject: [PATCH] fix Trying to access array offset on value of type null in + 7.4 + +--- + lib/DAV/Xml/Property/Href.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/DAV/Xml/Property/Href.php b/lib/DAV/Xml/Property/Href.php +index 2d55e0ace5..d60bd15887 100644 +--- a/lib/DAV/Xml/Property/Href.php ++++ b/lib/DAV/Xml/Property/Href.php +@@ -59,7 +59,7 @@ public function __construct($hrefs) + */ + public function getHref() + { +- return $this->hrefs[0]; ++ return $this->hrefs[0] ?? null; + } + + /** diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 0fc7f8b..f951464 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit a4959bf2b9b175aef6fd91c9006b1ca7a56f9bb0 +%global gh_commit e06e6202768babaab053e7ab260d1e43139a7753 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -22,7 +22,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.0.0 +Version: 4.0.1 Release: 2%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -33,6 +33,7 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # replace composer autoloader Patch0: %{name}-autoload.patch +Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/dav/pull/1187.patch BuildArch: noarch %if %{with_tests} @@ -145,6 +146,7 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php mv lib/DAV/Browser/assets/openiconic/ICON-LICENSE . %patch0 -p1 -b .rpm +%patch1 -p1 : relocate for dir in CalDAV CardDAV DAV DAVACL; do @@ -215,6 +217,11 @@ exit $ret %changelog +* Tue Aug 20 2019 Remi Collet - 4.0.1-2 +- update to 4.0.1 +- add patch for 7.4 from + https://github.com/sabre-io/dav/pull/1187 + * Mon Jul 15 2019 Remi Collet - 4.0.0-2 - fix LICENSE for assets/openiconic diff --git a/sources b/sources index 8d5914f..6ac3867 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.0.0-a4959bf.tar.gz) = 666c1f92a405c4ae385fa624716c8e9e2c7f6fcffbdde82dca9fe6596fd776de820c4dfb4b51f5b803c5b68234305b2044946204534c470084d5f4e4d00c187f +SHA512 (php-sabre-dav4-4.0.1-e06e620.tar.gz) = 4e01ad00d237d7d8298d64e0bd3575933ebccdd254e568e144393c946647a5353b5a202bd5b4790f4e0d6a8df62dbd393d1be49d673b85d8697f2e9c6610542b From 6e0c64cef176ad4c13d99e342940d4dbe68ca49e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Oct 2019 09:33:47 +0200 Subject: [PATCH 2/3] update to 4.0.2 drop patch merged upstream (cherry picked from commit db992c424327685b99626c819ce1ea2df846e1a7) --- .gitignore | 1 + 1187.patch | 23 ----------------------- php-sabre-dav4.spec | 12 +++++++----- sources | 2 +- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 1187.patch diff --git a/.gitignore b/.gitignore index 7ed9373..6007312 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-sabre-dav4-4.0.0-a4959bf.tar.gz /php-sabre-dav4-4.0.1-e06e620.tar.gz +/php-sabre-dav4-4.0.2-fd0234d.tar.gz diff --git a/1187.patch b/1187.patch deleted file mode 100644 index c61fc7f..0000000 --- a/1187.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f3c91ec654abe9774570ca0602a0e4916e3bf5b5 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Tue, 20 Aug 2019 11:44:24 +0200 -Subject: [PATCH] fix Trying to access array offset on value of type null in - 7.4 - ---- - lib/DAV/Xml/Property/Href.php | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/DAV/Xml/Property/Href.php b/lib/DAV/Xml/Property/Href.php -index 2d55e0ace5..d60bd15887 100644 ---- a/lib/DAV/Xml/Property/Href.php -+++ b/lib/DAV/Xml/Property/Href.php -@@ -59,7 +59,7 @@ public function __construct($hrefs) - */ - public function getHref() - { -- return $this->hrefs[0]; -+ return $this->hrefs[0] ?? null; - } - - /** diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index f951464..290227f 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # # Github -%global gh_commit e06e6202768babaab053e7ab260d1e43139a7753 +%global gh_commit fd0234d46c045fc9b35ec06bd2e7b490240e6ade %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -22,8 +22,8 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.0.1 -Release: 2%{?dist} +Version: 4.0.2 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} # sabre is BSD @@ -33,7 +33,6 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit # replace composer autoloader Patch0: %{name}-autoload.patch -Patch1: https://patch-diff.githubusercontent.com/raw/sabre-io/dav/pull/1187.patch BuildArch: noarch %if %{with_tests} @@ -146,7 +145,6 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php mv lib/DAV/Browser/assets/openiconic/ICON-LICENSE . %patch0 -p1 -b .rpm -%patch1 -p1 : relocate for dir in CalDAV CardDAV DAV DAVACL; do @@ -217,6 +215,10 @@ exit $ret %changelog +* Mon Oct 21 2019 Remi Collet - 4.0.2-1 +- update to 4.0.2 +- drop patch merged upstream + * Tue Aug 20 2019 Remi Collet - 4.0.1-2 - update to 4.0.1 - add patch for 7.4 from diff --git a/sources b/sources index 6ac3867..5a297e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.0.1-e06e620.tar.gz) = 4e01ad00d237d7d8298d64e0bd3575933ebccdd254e568e144393c946647a5353b5a202bd5b4790f4e0d6a8df62dbd393d1be49d673b85d8697f2e9c6610542b +SHA512 (php-sabre-dav4-4.0.2-fd0234d.tar.gz) = 15d99e832899542b4303f3caa45f09ee81174d01739ecaed1c493b417580607127afcab017590f9d76e49e00a8ec60dcf756b2a61e16af81852f643d752ea29e From 20f0dcc26ed79c98d79e71af67ead30d736c84a0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jan 2020 11:22:13 +0100 Subject: [PATCH 3/3] v4.0.3 (cherry picked from commit 4ad2274c025326f274fae9a5539c55bb16e613ce) --- .gitignore | 1 + php-sabre-dav4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6007312..60ecf68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-sabre-dav4-4.0.0-a4959bf.tar.gz /php-sabre-dav4-4.0.1-e06e620.tar.gz /php-sabre-dav4-4.0.2-fd0234d.tar.gz +/php-sabre-dav4-4.0.3-b793fb4.tar.gz diff --git a/php-sabre-dav4.spec b/php-sabre-dav4.spec index 290227f..e5d6ad1 100644 --- a/php-sabre-dav4.spec +++ b/php-sabre-dav4.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sabre-dav4 # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2020 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit fd0234d46c045fc9b35ec06bd2e7b490240e6ade +%global gh_commit b793fb4ce27cf0f981b540ad771281c430ffe818 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project dav @@ -22,7 +22,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: WebDAV Framework for PHP -Version: 4.0.2 +Version: 4.0.3 Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} @@ -215,6 +215,9 @@ exit $ret %changelog +* Fri Jan 10 2020 Remi Collet - 4.0.3-1 +- update to 4.0.3 + * Mon Oct 21 2019 Remi Collet - 4.0.2-1 - update to 4.0.2 - drop patch merged upstream diff --git a/sources b/sources index 5a297e9..1e05498 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-dav4-4.0.2-fd0234d.tar.gz) = 15d99e832899542b4303f3caa45f09ee81174d01739ecaed1c493b417580607127afcab017590f9d76e49e00a8ec60dcf756b2a61e16af81852f643d752ea29e +SHA512 (php-sabre-dav4-4.0.3-b793fb4.tar.gz) = 838e278fdfc8583817aac1a6fe9dc1119098618cfc83fc1232fd3135036a219d59b24ac7d821ccd8e35d731a9a9290c9084f8f0b6c7b8880110ba5b2e8f70126