Request 1880 (accepted)

Overview

Request 1880 (accepted)

Updated php-sabre to sabre-dav 2.1.11, sabre-event 2.0.2, sabre-http 3.0.5 and sabre-vobject 3.5.3. Moved sabre-dav/http/vobject to a new location to be compatible with packages of debian9/ubuntu16.

Roundcube/iRony/chwala have their include paths and/or Dependencies updated

Created by dhoffend almost 8 years ago
In state accepted
Open review for Admin

Submit php-sabre-http

Submit package home:dhoffen...:Winterfell / php-sabre-http to package Kolab:Winterfell / php-sabre-http

0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch Deleted

0001-Use-homemade-autoload.php.patch Added

@@ -0,0 +1,114 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
+Date: Wed, 25 Feb 2015 23:52:46 -0400
+Subject: Use homemade autoload.php
+
+Work around the lack of proper autoload.php from Composer.
+
+Forwarded: not-needed
+---
+ README.md                 | 4 ++--
+ examples/asyncclient.php  | 2 +-
+ examples/basicauth.php    | 1 +
+ examples/client.php       | 1 +
+ examples/reverseproxy.php | 1 +
+ examples/stringify.php    | 1 +
+ tests/bootstrap.php       | 2 +-
+ 7 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/README.md b/README.md
+index a749b6b..3d58e1b 100644
+--- a/README.md
++++ b/README.md
+@@ -75,7 +75,7 @@ instantiate a request object is as follows:
+ ```php
+ use Sabre\HTTP;
+ 
+-include 'vendor/autoload.php';
++include 'sabre21/Sabre/HTTP/autoload.php';
+ 
+ $request = HTTP\Sapi::getRequest();
+ ```
+@@ -98,7 +98,7 @@ A response object you can just create as such:
+ ```php
+ use Sabre\HTTP;
+ 
+-include 'vendor/autoload.php';
++include 'sabre21/Sabre/HTTP/autoload.php';
+ 
+ $response = new HTTP\Response();
+ $response->setStatus(201); // created !
+diff --git a/examples/asyncclient.php b/examples/asyncclient.php
+index ad097ad..f51ab34 100644
+--- a/examples/asyncclient.php
++++ b/examples/asyncclient.php
+@@ -18,10 +18,10 @@ use
+ 
+ // Find the autoloader
+ $paths = [
++    '/usr/share/php/sabre21/Sabre/HTTP/autoload.php';
+     __DIR__ . '/../vendor/autoload.php',
+     __DIR__ . '/../../../autoload.php',
+     __DIR__ . '/vendor/autoload.php',
+-
+ ];
+ 
+ foreach($paths as $path) {
+diff --git a/examples/basicauth.php b/examples/basicauth.php
+index bb0e8d0..bfc70f0 100644
+--- a/examples/basicauth.php
++++ b/examples/basicauth.php
+@@ -21,6 +21,7 @@ use
+ 
+ // Find the autoloader
+ $paths = [
++    '/usr/share/php/sabre21/Sabre/HTTP/autoload.php';
+     __DIR__ . '/../vendor/autoload.php',
+     __DIR__ . '/../../../autoload.php',
+     __DIR__ . '/vendor/autoload.php',
+diff --git a/examples/client.php b/examples/client.php
+index 07aed98..c547873 100644
+--- a/examples/client.php
++++ b/examples/client.php
+@@ -16,6 +16,7 @@ use
+ 
+ // Find the autoloader
+ $paths = [
++    '/usr/share/php/sabre21/Sabre/HTTP/autoload.php';
+     __DIR__ . '/../vendor/autoload.php',
+     __DIR__ . '/../../../autoload.php',
+     __DIR__ . '/vendor/autoload.php',
+diff --git a/examples/reverseproxy.php b/examples/reverseproxy.php
+index 4fe17c2..bfdce6d 100644
+--- a/examples/reverseproxy.php
++++ b/examples/reverseproxy.php
+@@ -17,6 +17,7 @@ use
+ 
+ // Find the autoloader
+ $paths = [
++    '/usr/share/php/sabre21/Sabre/HTTP/autoload.php';
+     __DIR__ . '/../vendor/autoload.php',
+     __DIR__ . '/../../../autoload.php',
+     __DIR__ . '/vendor/autoload.php',
+diff --git a/examples/stringify.php b/examples/stringify.php
+index db3c9b3..50b3463 100644
+--- a/examples/stringify.php
++++ b/examples/stringify.php
+@@ -18,6 +18,7 @@ use
+ 
+ // Find the autoloader
+ $paths = [
++    '/usr/share/php/sabre21/Sabre/HTTP/autoload.php';
+     __DIR__ . '/../vendor/autoload.php',
+     __DIR__ . '/../../../autoload.php',
+     __DIR__ . '/vendor/autoload.php',
+diff --git a/tests/bootstrap.php b/tests/bootstrap.php
+index 0a544fa..cc096af 100644
+--- a/tests/bootstrap.php
++++ b/tests/bootstrap.php
+@@ -5,5 +5,5 @@ date_default_timezone_set('UTC');
+ ini_set('error_reporting', E_ALL | E_STRICT | E_DEPRECATED);
+ 
+ // Composer autoloader
+-include __DIR__ . '/../vendor/autoload.php';
++include 'sabre21/Sabre/HTTP/autoload.php';
+

0002-Fix-upper-limit-after-spurious-upload-of-php-sabre-e.patch Added

0002-composer.json-no-multiple-versions.patch Deleted

debian.changelog Changed

@@ -1,6 +1,183 @@
-php-sabre-http (3.0.5-1) unstable; urgency=low
+php-sabre-http-3 (3.0.5-5) unstable; urgency=medium
+
+  * Updated Packaging for Kolab to be inline with Debian Package
+  * Disabled tests due to phpunit errors (class Text_Template not found)
+
+ -- Daniel Hoffend <dh@dotlan.net>  Thu, 29 Nov 2016 22:26:00 +0100
+
+php-sabre-http-3 (3.0.5-4) unstable; urgency=low
 
   * Initlal Release for Kolab Winterfell
 
  -- hede <kolab983@der-he.de>  Sun, 04 Sep 2016 20:00:00 +0200
 
+php-sabre-http-3 (3.0.5-3) unstable; urgency=medium
+
+  * PHP 7.0 transition:
+    - Revert Workaround
+    - Use now split php-mbstring for the tests
+    - Build with recent pkg-php-tools
+  * Drop ownCloud for Debian maintainers from uploaders
+
+ -- David Prévot <taffit@debian.org>  Sat, 12 Mar 2016 19:30:25 -0400
+
+php-sabre-http-3 (3.0.5-2) unstable; urgency=medium
+
+  * Convert build-dependencies to be PHP 7.0 ready (Closes: #814815)
+  * Workaround the ongoing yet not ready PHP 7.0 transition (#814858):
+    - build-depend on php-cli to use php7.0 at build time;
+    - pkgtools called with -v triggers a segfault;
+
+ -- David Prévot <taffit@debian.org>  Mon, 22 Feb 2016 22:11:41 -0400
+
+php-sabre-http-3 (3.0.5-1) unstable; urgency=medium
+
+  * Simplify CI test handling
+  * Update Standards-Version to 3.9.7
+  * Rename as php-sabre-http-3 so that php-sabre-dav-2.1 will be
+    co-installable with more recent versions of php-sabre-dav.
+
+ -- David Prévot <taffit@debian.org>  Fri, 05 Feb 2016 12:20:47 -0400
+
+php-sabre-http (3.0.5-3) unstable; urgency=medium
+
+  * Adapt patches to sabre21 specific path
+  * Fix upper limit after spurious upload of php-sabre-event 3.0.0~alpha1
+
+ -- David Prévot <taffit@debian.org>  Tue, 27 Oct 2015 13:43:02 -0400
+
+php-sabre-http (3.0.5-2) unstable; urgency=medium
+
+  * Install in a sabre21 specific path.
+    This allow the package to be co-installable with older versions of
+    php-sabre-dav (<< 1.9).
+
+ -- David Prévot <taffit@debian.org>  Sun, 31 May 2015 19:13:33 -0400
+
+php-sabre-http (3.0.5-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * No longer preserving CURLOPT_NOBODY after a HEAD.
+
+ -- David Prévot <taffit@debian.org>  Thu, 14 May 2015 11:12:14 -0400
+
+php-sabre-http (3.0.4-2) unstable; urgency=medium
+
+  * Upload to unstable, as needed by php-sabre-dav 2.1
+  * Track 3.0 branch
+  * Update copyright
+  * Provide homemade autoload.php
+
+ -- David Prévot <taffit@debian.org>  Wed, 15 Apr 2015 23:02:31 -0400
+
+php-sabre-http (3.0.4-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Releasing sabre/http 3.0.4
+
+  [ David Prévot ]
+  * Update watch file
+  * Use php-symfony-class-loader instead of php-symfony-classloader
+
+ -- David Prévot <taffit@debian.org>  Wed, 10 Dec 2014 21:59:34 -0400
+
+php-sabre-http (3.0.2-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Ignoring invalid parts in Accept: headers.
+  * Releasing 3.0.2
+
+ -- David Prévot <taffit@debian.org>  Fri, 10 Oct 2014 10:31:39 -0400
+
+php-sabre-http (3.0.1-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * PHP 5.6 automatically adds a charset parameter.
+  * Bumped version.
+
+ -- David Prévot <taffit@debian.org>  Thu, 02 Oct 2014 18:30:58 -0400
+
+php-sabre-http (3.0.0-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Bumped version.
+  * 100% unittest coverage except the client.
+    hasHeader / getHeaders is in line with psr/http.
+
+  [ David Prévot ]
+  * Bump standards version to 3.9.6
+  * Update tests for PHP 5.6
+
+ -- David Prévot <taffit@debian.org>  Tue, 23 Sep 2014 21:35:16 -0400
+
+php-sabre-http (2.1.0~alpha1-1) experimental; urgency=medium
+
+  [ David Prévot ]
+  * Update packaging to PSR-4
+  * Upload alpha version to experimental
+
+  [ Evert Pot ]
+  * Added a url resolver. Much like nodejs.
+  * Content-negotiation now properly considers parameters.
+  * More compact output for phpcs.
+  * Lots of http-header related updates.
+  * Switched to PSR-4.
+  * 2.1.0 alpha for sabre/http.
+
+  [ Lukas Reschke ]
+  * Only accept HTTP and HTTPS as protocol
+
+ -- David Prévot <taffit@debian.org>  Tue, 16 Sep 2014 21:57:28 -0400
+
+php-sabre-http (2.0.4-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * No longer urlencoding @.
+  * Allowing sabre/event 2.0 to be used as a dependency.
+  * PHPCS
+
+  [ Jia Huang ]
+  * fix $responseBody==false problem in '204 No Content' case
+
+  [ David Prévot ]
+  * No tests if DEB_BUILD_OPTIONS contains nocheck
+  * Run phpcs with other tests
+
+ -- David Prévot <taffit@debian.org>  Thu, 17 Jul 2014 15:43:16 -0400
+
+php-sabre-http (2.0.3-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * Throwing exceptions when incorrectly constructing a request.
+
+ -- David Prévot <taffit@debian.org>  Sun, 20 Apr 2014 09:26:51 -0400
+
+php-sabre-http (2.0.2-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * Fixed a potential security problem.
+
+  [ David Prévot ]
+  * Run the test suite on packaging
+  * Add DEP-8 compliant tests
+
+ -- David Prévot <taffit@debian.org>  Tue, 18 Mar 2014 14:52:32 -0400
+
+php-sabre-http (2.0.1-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- David Prévot <taffit@debian.org>  Fri, 10 Jan 2014 11:01:29 -0400
+
+php-sabre-http (2.0.0~alpha6-1) unstable; urgency=medium
+
+  * Set maintainer to Debian PHP PEAR
+  * Update copyright years
+
+ -- David Prévot <taffit@debian.org>  Sun, 05 Jan 2014 18:14:11 -0400
+
+php-sabre-http (2.0.0~alpha5-1) unstable; urgency=low
+
+  * Initial release (Closes: #729433)
+
+ -- David Prévot <taffit@debian.org>  Tue, 12 Nov 2013 16:25:35 -0400

debian.control Changed

@@ -1,15 +1,21 @@
-Source: php-sabre-http
+Source: php-sabre-http-3
 Section: php
 Priority: optional
-Maintainer: Kolab for Debian testing <devel@lists.kolab.org>
-Uploaders: hede <kolab983@der-he.de>
-Build-Depends: debhelper (>= 9), phpunit, php-symfony-classloader, pkg-php-tools (>= 1.7~), php5-curl, php-sabre-event (>= 1.0.0), php-sabre-event (<< 3)
-Standards-Version: 3.9.6
-Homepage: http://sabre.io/http/
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabre-http.git
+Maintainer: Kolab for Debian <devel@lists.kolab.org>
+Uploaders: Daniel Hoffend <dh@dotlan.net>
+Build-Depends: debhelper (>= 9),
+               php-codesniffer,
+               php5-curl,
+               php-sabre-event,
+               php5-xdebug,
+               phpunit,
+               pkg-php-tools (>= 1.7~)
+Standards-Version: 3.9.7
+Homepage: https://github.com/fruux/sabre-http
 Vcs-Git: git://anonscm.debian.org/pkg-php/php-sabre-http.git -b 3.0
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabre-http.git
 
-Package: php-sabre-http
+Package: php-sabre-http-3
 Architecture: all
 Depends: php-sabre-event (<< 3.0.0~as3),
          ${misc:Depends},
@@ -35,4 +41,3 @@
  .
  It provides a Request object, and a Response object. The objects are
  extensible and easily mockable.
-

debian.rules Changed

debian.series Changed

debian.tar.gz/autoload.php.tpl Added

debian.tar.gz/clean Added

debian.tar.gz/copyright Changed

debian.tar.gz/docs Added

debian.tar.gz/examples Added

debian.tar.gz/gbp.conf Changed

debian.tar.gz/install Changed

debian.tar.gz/watch Changed

php-sabre-http.dsc Changed

@@ -1,17 +1,24 @@
 Format: 1.0
-Source: php-sabre-http
-Binary: php-sabre-http
+Source: php-sabre-http-3
+Binary: php-sabre-http-3
 Architecture: all
-Version: 3.0.5-1
-Maintainer: Kolab for Debian testing <devel@lists.kolab.org>
-Uploaders: hede <kolab983@der-he.de>
-Homepage: http://sabre.io/http/
-Standards-Version: 3.9.3
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabre-http.git
+Version: 3.0.5-5
+Maintainer: Kolab for Debian <devel@lists.kolab.org>
+Uploaders: Daniel Hoffend <dh@dotlan.net>
+Homepage: https://github.com/fruux/sabre-http
+Standards-Version: 3.9.7
 Vcs-Git: git://anonscm.debian.org/pkg-php/php-sabre-http.git -b 3.0
-Build-Depends: debhelper (>= 9), phpunit, php-symfony-classloader, pkg-php-tools (>= 1.7~), php5-curl, php-sabre-event (>= 1.0.0), php-sabre-event (<< 3)
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabre-http.git
+Build-Depends: debhelper (>= 9),
+               php-codesniffer,
+               php5-curl,
+               php-sabre-event,
+               php5-xdebug,
+               phpab,
+               phpunit,
+               pkg-php-tools (>= 1.7~)
 Package-List:
- php-sabre-http deb php optional arch=all
+ php-sabre-http-3 deb php optional arch=all
 Files:
  00000000000000000000000000000000 0 sabre-http-3.0.5.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1880 0

Request History

dhoffend created request almost 8 years ago

Updated php-sabre to sabre-dav 2.1.11, sabre-event 2.0.2, sabre-http 3.0.5 and sabre-vobject 3.5.3. Moved sabre-dav/http/vobject to a new location to be compatible with packages of debian9/ubuntu16.

Roundcube/iRony/chwala have their include paths and/or Dependencies updated

vanmeeuwen accepted review almost 8 years ago

vanmeeuwen accepted request almost 8 years ago

Please add a comment