Kolab Groupware OBS

composer.spec Changed

@@ -1,82 +1,156 @@
-# spec file for composer
+# remirepo/fedora spec file for composer
 #
-# Copyright (c) 2015 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    42a9561ae23b236da1d5a4acf50f7ea96ebe68aa
+
+# For compatibility with SCL
+%undefine __brp_mangle_shebangs
+
+%global gh_commit    b184a92419cc9a9c4c6a09db555a94d441cb11c9
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_branch    1.0-dev
-%global gh_date      20150503
 %global gh_owner     composer
 %global gh_project   composer
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%global api_version  1.1.0
+
+%global upstream_version 1.6.5
+#global upstream_prever  RC
+
+%if 0
+# see https://forum.remirepo.net/viewtopic.php?id=3677
+%global symfony_prefix php-symfony3
+%else
+%global symfony_prefix php-symfony
+%endif
 
 Name:           composer
-Version:        1.0.0
-Release:        0.4.%{gh_date}git%{gh_short}%{?dist}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        1%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
 License:        MIT
 URL:            https://getcomposer.org/
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz
+Source0:        %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz
 Source1:        %{name}-autoload.php
 Source2:        %{name}-bootstrap.php
+# Profile scripts
+Source3:        %{name}.sh
+Source4:        %{name}.csh
+# Get a git snapshot to retrieve the test suite
+Source5:        makesrc.sh
 
-# Fix shebang and use our autoloader
+# Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-composer(justinrainbow/json-schema) >= 1.4
-BuildRequires:  php-composer(seld/jsonlint)             >= 1.0
-BuildRequires:  php-composer(symfony/console)           >= 2.5
-BuildRequires:  php-composer(symfony/finder)            >= 2.2
-BuildRequires:  php-composer(symfony/process)           >= 2.1
-BuildRequires:  php-composer(symfony/class-loader)
-BuildRequires:  php-phpunit-PHPUnit
+BuildRequires:  php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:  (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
+BuildRequires:  (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
+BuildRequires:  (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+BuildRequires:  (php-composer(seld/jsonlint)            >= 1.4 with  php-composer(seld/jsonlint)             <  2)
+BuildRequires:  (php-composer(seld/phar-utils)          >= 1.0 with  php-composer(seld/phar-utils)           <  2)
+BuildRequires:  (php-composer(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
+BuildRequires:  (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+%else
+BuildRequires:  php-composer(composer/spdx-licenses)    <  2
+BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.2
+BuildRequires:  php-composer(composer/ca-bundle)        <  2
+BuildRequires:  php-composer(composer/ca-bundle)        >= 1.0
+BuildRequires:  php-composer(composer/semver)           <  2
+BuildRequires:  php-composer(composer/semver)           >= 1.0
+BuildRequires:  php-composer(seld/jsonlint)             <  2
+BuildRequires:  php-composer(seld/jsonlint)             >= 1.4
+BuildRequires:  php-composer(seld/phar-utils)           <  2
+BuildRequires:  php-composer(seld/phar-utils)           >= 1.0
+BuildRequires:  php-composer(seld/cli-prompt)           <  2
+BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
+BuildRequires:  php-composer(psr/log)                   <  2
+BuildRequires:  php-composer(psr/log)                   >= 1.0
+%endif
+BuildRequires:  %{symfony_prefix}-console
+BuildRequires:  %{symfony_prefix}-finder
+BuildRequires:  %{symfony_prefix}-filesystem
+BuildRequires:  %{symfony_prefix}-process
+BuildRequires:  php-zip
+# From composer.json, "require-dev": {
+#        "phpunit/phpunit": "^4.8.35 || ^5.7",
+#        "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
+BuildRequires:  php-composer(phpunit/phpunit)           >= 4.8.35
+# For autoloader
+BuildRequires:  php-composer(fedora/autoloader) >= 0.1.2
+BuildRequires:  php-seld-phar-utils >= 1.0.1
+BuildRequires:  php-seld-cli-prompt >= 1.0.0-3
+BuildRequires:  php-PsrLog          >= 1.0.0-8
 %endif
 
-# From composer.json, requires
-#        "php": ">=5.3.2",
-#        "justinrainbow/json-schema": "~1.4",
-#        "seld/jsonlint": "~1.0",
-#        "symfony/console": "~2.5",
-#        "symfony/finder": "~2.2",
-#        "symfony/process": "~2.1",
-#        "seld/phar-utils": "~1.0",
-#        "seld/cli-prompt": "~1.0"
+# From composer.json, "require": {
+#        "php": "^5.3.2 || ^7.0",
+#        "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+#        "composer/ca-bundle": "^1.0",
+#        "composer/semver": "^1.0",
+#        "composer/spdx-licenses": "^1.2",
+#        "seld/jsonlint": "~1.4",
+#        "symfony/console": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/finder": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/process": "^2.7 || ^3.0 || ^4.0",
+#        "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
+#        "seld/phar-utils": "^1.0",
+#        "seld/cli-prompt": "^1.0",
+#        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-composer(justinrainbow/json-schema) >= 1.4
-Requires:       php-composer(justinrainbow/json-schema) <  2
-Requires:       php-composer(seld/jsonlint)             >= 1.0
+Requires:       php-justinrainbow-json-schema5
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:       (php-composer(composer/spdx-licenses)   >= 1.2 with  php-composer(composer/spdx-licenses)    <  2)
+Requires:       (php-composer(composer/ca-bundle)       >= 1.0 with  php-composer(composer/ca-bundle)        <  2)
+Requires:       (php-composer(composer/semver)          >= 1.0 with  php-composer(composer/semver)           <  2)
+Requires:       (php-composer(seld/jsonlint)            >= 1.4 with  php-composer(seld/jsonlint)             <  2)
+Requires:       (php-composer(seld/phar-utils)          >= 1.0 with  php-composer(seld/phar-utils)           <  2)
+Requires:       (php-composer(seld/cli-prompt)          >= 1.0 with  php-composer(seld/cli-prompt)           <  2)
+Requires:       (php-composer(psr/log)                  >= 1.0 with  php-composer(psr/log)                   <  2)
+%else
+Requires:       php-composer(composer/spdx-licenses)    >= 1.2
+Requires:       php-composer(composer/spdx-licenses)    <  2
+Requires:       php-composer(composer/ca-bundle)        >= 1.0
+Requires:       php-composer(composer/ca-bundle)        <  2
+Requires:       php-composer(composer/semver)           >= 1.0
+Requires:       php-composer(composer/semver)           <  2
+Requires:       php-composer(seld/jsonlint)             >= 1.4
 Requires:       php-composer(seld/jsonlint)             <  2
 Requires:       php-composer(seld/phar-utils)           >= 1.0
 Requires:       php-composer(seld/phar-utils)           <  2
 Requires:       php-composer(seld/cli-prompt)           >= 1.0
 Requires:       php-composer(seld/cli-prompt)           <  2
-Requires:       php-composer(symfony/console)           >= 2.5
-Requires:       php-composer(symfony/console)           <  3
-Requires:       php-composer(symfony/finder)            >= 2.2
-Requires:       php-composer(symfony/finder)            <  3
-Requires:       php-composer(symfony/process)           >= 2.1
-Requires:       php-composer(symfony/process)           <  3
+Requires:       php-composer(psr/log)                   >= 1.0
+Requires:       php-composer(psr/log)                   <  2
+%endif
+Requires:       %{symfony_prefix}-console
+Requires:       %{symfony_prefix}-finder
+Requires:       %{symfony_prefix}-process
+Requires:       %{symfony_prefix}-filesystem
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
 Requires:       php-zip
 Requires:       php-openssl
 # For our autoloader
-Requires:       php-composer(symfony/class-loader)
+Requires:       php-composer(fedora/autoloader)
+Requires:       php-seld-phar-utils >= 1.0.1
+Requires:       php-seld-cli-prompt >= 1.0.0-3
+Requires:       php-PsrLog          >= 1.0.0-8
 # From phpcompatinfo
-Requires:       php-ctype
 Requires:       php-curl
 Requires:       php-date
+Requires:       php-dom
 Requires:       php-filter
 Requires:       php-hash
 Requires:       php-iconv
@@ -93,7 +167,10 @@
 Requires:       php-xsl
 Requires:       php-zlib
 
+# Composer library
 Provides:       php-composer(composer/composer) = %{version}
+# Special internal for Plugin API

composer-rpm.patch Changed

@@ -1,64 +1,61 @@
 diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm	2015-02-25 20:44:34.000000000 +0100
-+++ ./bin/composer	2015-02-26 10:25:16.012610034 +0100
-@@ -1,11 +1,11 @@
--#!/usr/bin/env php
-+#!/usr/bin/env php
- <?php
- 
- if (PHP_SAPI !== 'cli') {
-     echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+--- ./bin/composer.rpm	2018-05-04 12:59:13.065292434 +0200
++++ ./bin/composer	2018-05-04 13:00:23.293493373 +0200
+@@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') {
  }
  
+ setlocale(LC_ALL, 'C');
 -require __DIR__.'/../src/bootstrap.php';
-+require 'Composer/autoload.php';
++require '/usr/share/php/Composer/autoload.php';
+ 
+ use Composer\Factory;
+ use Composer\XdebugHandler;
+diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Autoload/AutoloadGenerator.php	2018-05-04 12:59:13.066292451 +0200
+@@ -305,7 +305,7 @@ EOF;
+         file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
  
- use Composer\Console\Application;
+         $this->safeCopy(__DIR__.'/ClassLoader.php', $targetDir.'/ClassLoader.php');
+-        $this->safeCopy(__DIR__.'/../../../LICENSE', $targetDir.'/LICENSE');
++        $this->safeCopy((getenv('BUILDROOT')?:'') . '/usr/share/composer/LICENSE', $targetDir.'/LICENSE');
  
+         if ($this->runScripts) {
+             $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
+diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
+--- ./src/Composer/Compiler.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Compiler.php	2018-05-04 12:59:13.066292451 +0200
+@@ -97,7 +97,7 @@ class Compiler
+         $finder = new Finder();
+         $finder->files()
+             ->name('*.json')
+-            ->in(__DIR__.'/../../res')
++            ->in((getenv('BUILDROOT')?:'') . '/usr/share/composer/res')
+             ->in(SpdxLicenses::getResourcesDir())
+             ->sort($finderSort)
+         ;
 diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm	2015-02-25 20:44:34.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php	2015-02-26 10:25:16.012610034 +0100
-@@ -149,7 +149,7 @@ class JsonFile
+--- ./src/Composer/Json/JsonFile.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./src/Composer/Json/JsonFile.php	2018-05-04 12:59:13.066292451 +0200
+@@ -156,7 +156,7 @@ class JsonFile
              self::validateSyntax($content, $this->path);
          }
  
 -        $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
 +        $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
-         $schemaData = json_decode(file_get_contents($schemaFile));
  
-         if ($schema === self::LAX_SCHEMA) {
-diff -up src/Composer/Util/SpdxLicense.php.old src/Composer/Util/SpdxLicense.php
---- ./src/Composer/Util/SpdxLicense.php.old	2015-04-17 09:57:53.680999733 +0200
-+++ ./src/Composer/Util/SpdxLicense.php	2015-04-17 09:59:50.397498276 +0200
-@@ -38,7 +38,7 @@ class SpdxLicense
-             return $this->licenses;
-         }
-
--        $jsonFile = new JsonFile(__DIR__ . '/../../../res/spdx-licenses.json');
-+        $jsonFile = new JsonFile((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json');
-         $this->licenses = $jsonFile->read();
-
-         return $this->licenses;
-diff -up src/Composer/Util/SpdxLicensesUpdater.php.old src/Composer/Util/SpdxLicensesUpdater.php
---- ./src/Composer/Util/SpdxLicensesUpdater.php.old	2015-04-17 09:58:00.645029479 +0200
-+++ ./src/Composer/Util/SpdxLicensesUpdater.php	2015-04-17 10:00:36.578695534 +0200
-@@ -28,7 +28,7 @@ class SpdxLicensesUpdater
+         // Prepend with file:// only when not using a special schema already (e.g. in the phar)
+         if (false === strpos($schemaFile, '://')) {
+diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm	2018-05-04 12:57:41.000000000 +0200
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php	2018-05-04 12:59:13.066292451 +0200
+@@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas
+     private function check($json)
      {
-         $json = json_encode($this->getLicenses(), true);
-         $prettyJson = JsonFormatter::format($json, true, true);
--        file_put_contents(__DIR__ . '/../../../res/spdx-licenses.json', $prettyJson);
-+        file_put_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/spdx-licenses.json', $prettyJson);
-     }
-
-     private function getLicenses()
-diff -up ./tests/Composer/Test/Json/JsonFileTest.php.rpm ./tests/Composer/Test/Json/JsonFileTest.php
---- ./tests/Composer/Test/Json/JsonFileTest.php.rpm	2015-02-26 10:26:10.607821640 +0100
-+++ ./tests/Composer/Test/Json/JsonFileTest.php	2015-02-26 10:27:05.430034125 +0100
-@@ -54,6 +54,7 @@ class JsonFileTest extends \PHPUnit_Fram
+         $validator = new Validator();
+-        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
++        $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
++        $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
  
-     public function testParseErrorDetectSingleQuotes()
-     {
-+        $this->markTestSkipped('jsonc issue');
-         $json = '{
-         \'foo\': "bar"
- }';
+         if (!$validator->isValid()) {
+             $errors = $validator->getErrors();

composer-1.0.0-42a9561.tar.gz Deleted

composer-1.6.5-b184a92.tgz Added

composer-autoload.php Changed

@@ -1,18 +1,24 @@
 <?php
+/* Autoloader for composer/composer and its dependencies */
+
 $vendorDir = '/usr/share/php';
-require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
-use Symfony\Component\ClassLoader\UniversalClassLoader;
+require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\', __DIR__);
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required(
+	$vendorDir . '/Symfony/Component/Console/autoload.php',
+	$vendorDir . '/Symfony/Component/Finder/autoload.php',
+	$vendorDir . '/Symfony/Component/Process/autoload.php',
+	$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
+	$vendorDir . '/Seld/JsonLint/autoload.php',
+	$vendorDir . '/Seld/PharUtils/autoload.php',
+	$vendorDir . '/Seld/CliPrompt/autoload.php',
+	$vendorDir . '/Composer/CaBundle/autoload.php',
+	$vendorDir . '/Composer/Spdx/autoload.php',
+	$vendorDir . '/Composer/Semver/autoload.php',
+	$vendorDir . '/Psr/Log/autoload.php',
+	$vendorDir . '/JsonSchema5/autoload.php',
+);
 
-$loader = new UniversalClassLoader();
-$loader->registerNamespaces(array(
-    'Seld\\JsonLint'                      => $vendorDir,
-    'Seld\\PharUtils'                     => $vendorDir,
-    'Seld\\CliPrompt'                     => $vendorDir,
-    'JsonSchema'                          => $vendorDir,
-    'Symfony\\Component\\Console'         => $vendorDir,
-    'Symfony\\Component\\Finder'          => $vendorDir,
-    'Symfony\\Component\\Process'         => $vendorDir,
-    'Symfony\\Component\\ClassLoader'     => $vendorDir,
-    'Composer'                            => dirname(__DIR__)
-));
-$loader->register();

composer-bootstrap.php Changed

composer.csh Added

composer.dsc Deleted

composer.sh Added

composer_1.6.5-1.debian.tar.xz Added

composer_1.6.5-1.dsc Added

@@ -0,0 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+Format: 3.0 (quilt)
+Source: composer
+Binary: composer
+Architecture: all
+Version: 1.6.5-1
+Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Uploaders: David Prévot <taffit@debian.org>
+Homepage: https://getcomposer.org/
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/php-team/pear/composer
+Vcs-Git: https://salsa.debian.org/php-team/pear/composer.git
+Build-Depends: debhelper (>= 9), help2man, jsonlint, php-cli-prompt, php-composer-ca-bundle, php-composer-semver, php-composer-spdx-licenses, php-json-schema, php-psr-log, php-symfony-console, php-symfony-filesystem, php-symfony-finder, php-symfony-process, phpab, pkg-php-tools (>= 1.29~)
+Package-List:
+ composer deb php optional arch=all
+Checksums-Sha1:
+ f62b6799cb0a0d408d35ec3af85473000bf81b82 398169 composer_1.6.5.orig.tar.gz
+ 56843ade87f0cee62fbe2c08aace1050ecf4d66c 6828 composer_1.6.5-1.debian.tar.xz
+Checksums-Sha256:
+ da4f81a53f845ed0ac4d77fb6d57e3644002b660f4c31cdd14a5a9c340db9776 398169 composer_1.6.5.orig.tar.gz
+ 051d2c34ceb64598caf97d65604ec1fcc32cc3433d45e26e3f4e2cc0262a5a52 6828 composer_1.6.5-1.debian.tar.xz
+Files:
+ 2feed0f843c82f863710f31539913a25 398169 composer_1.6.5.orig.tar.gz
+ 5bed3c5ac0d42952973c6963f232d203 6828 composer_1.6.5-1.debian.tar.xz
+
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAEBCAAdFiEEeHVNB7wJXHRI941mBYwc+UT2vTwFAlrw7OkACgkQBYwc+UT2
+vTwHTQgAm4MoIz4Xram+pxL9m3IHQI8hPMo2FZ2ba+7htZt/X9u0N+KfLdLw15zL
+AmaYhmXvJIECoaQBQUXAGIkUXuv153Wbc4YT6kqf92b0nWj7TxtEPychlsd1hXDH
+R7WhCuhlfK43B6tWUv6eda3kY32iikxnXx6U352M7phLttl4ZDZGhvbb8DfEmUc3
+7JGYD2PT0Bktn634ToHdSeCEILDRO7cyekfvN4iwvbCM1vQM5FOCQCsZ6IEC0ewo
+mhezrw8PFtjwWBGGF4ckI3wWJUNOZr3Ro85K7T7fz1A3DBNHhMv2bh8HS6zF/XyC
+PszxvRwrpTYbvklGzmT2sGQwzDgm7w==
+=Dc3a
+-----END PGP SIGNATURE-----

composer_1.6.5.orig.tar.gz Added

debian.changelog Deleted

debian.control Deleted

debian.rules Deleted

debian.tar.gz Deleted

makesrc.sh Added

Changes of Revision 5