diff options
Diffstat (limited to 'composer.spec')
-rw-r--r-- | composer.spec | 442 |
1 files changed, 271 insertions, 171 deletions
diff --git a/composer.spec b/composer.spec index 7ef7264..3d04281 100644 --- a/composer.spec +++ b/composer.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for composer # -# Copyright (c) 2015-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2015-2024 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -10,35 +10,34 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%bcond_without tests - -%global gh_commit 24d38e9686092de05214cafa187dc282a5d89497 +%global gh_commit b826edb791571ab1eaf281eb1bd6e181a1192adc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer %global gh_project composer -%global api_version 2.1.0 -%global run_version 2.1.0 +%global api_version 2.6.0 +%global run_version 2.2.2 -%global upstream_version 2.1.8 +%global upstream_version 2.7.2 #global upstream_prever RC1 #global upstream_lower rc1 -%global symfony_prefix php-symfony4 -%global symfony_path %{_datadir}/php/Symfony4 -%global symfony_min 4.4 - %global _phpunit %{_bindir}/phpunit9 +%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) +%global bashcomproot %(dirname %{bashcompdir} 2>/dev/null) + Name: composer Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} Release: 1%{?dist} Summary: Dependency Manager for PHP +# SPDX: composer and all dependencies are MIT License: MIT URL: https://getcomposer.org/ Source0: %{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz # Profile scripts +Source1: %{name}-bash-completion Source3: %{name}.sh Source4: %{name}.csh # Get a git snapshot to retrieve the test suite @@ -50,95 +49,66 @@ Patch0: %{name}-rpm.patch Patch1: %{name}-noxdg.patch BuildArch: noarch +# platform set in makesrc.sh +BuildRequires: php(language) >= 7.2.5 BuildRequires: php-cli -%if %{with tests} -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) -BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) -BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) -BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -BuildRequires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) -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(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) -BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -# remirepo:12 -%else -BuildRequires: php-composer-ca-bundle -BuildRequires: php-composer-metadata-minifier -BuildRequires: php-composer-semver3 -BuildRequires: php-composer-spdx-licenses >= 1.2 -BuildRequires: php-composer-xdebug-handler2 -BuildRequires: php-jsonlint >= 1.4 -BuildRequires: php-seld-phar-utils -BuildRequires: php-PsrLog -BuildRequires: php-justinrainbow-json-schema5 >= 5.2.11 -BuildRequires: php-react-promise >= 2.7 -%endif -BuildRequires: %{symfony_prefix}-console >= %{symfony_min} -BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} -BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min} -BuildRequires: %{symfony_prefix}-process >= %{symfony_min} -BuildRequires: php-zip -# From composer.json, "require-dev": { -# "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0", -# "phpspec/prophecy": "^1.10" -BuildRequires: %{_phpunit} -# For autoloader -BuildRequires: php-fedora-autoloader-devel -BuildRequires: php-seld-phar-utils >= 1.1 -BuildRequires: php-PsrLog >= 1.1 -%endif +BuildRequires: php-json +BuildRequires: pkgconfig(bash-completion) # From composer.json, "require": { -# "php": "^5.3.2 || ^7.0", +# "php": "^7.2.5 || ^8.0", # "composer/ca-bundle": "^1.0", # "composer/metadata-minifier": "^1.0", # "composer/semver": "^3.0", # "composer/spdx-licenses": "^1.2", -# "composer/xdebug-handler": "^2.0", +# "composer/xdebug-handler": "^2.0.2 || ^3.0.3", # "justinrainbow/json-schema": "^5.2.11", -# "psr/log": "^1.0" +# "psr/log": "^1.0 || ^2.0 || ^3.0" # "seld/jsonlint": "~1.4", -# "seld/phar-utils": "^1.0", -# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0", -# "react/promise": "^1.2 || ^2.7" -Requires: php(language) >= 5.3.2 +# "seld/phar-utils": "^1.2", +# "symfony/console": "^5.4.1 || ^6.0", +# "symfony/filesystem": "^5.4 || ^6.0", +# "symfony/finder": "^5.4 || ^6.0", +# "symfony/process": "^5.4 || ^6.0", +# "react/promise": "^2.8", +# "composer/pcre": "^2 || ^3" +# "symfony/polyfill-php73": "^1.24", +# "symfony/polyfill-php80": "^1.24" +Requires: php(language) >= 7.2.5 Requires: php-cli -# remirepo:1 -%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) -Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2) -Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4) -Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) -Requires: (php-composer(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3) -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(psr/log) >= 1.0 with php-composer(psr/log) < 2) -Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) -Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -# remirepo:12 -%else -Requires: php-composer-ca-bundle -Requires: php-composer-metadata-minifier -Requires: php-composer-semver3 -Requires: php-composer-spdx-licenses >= 1.2 -Requires: php-composer-xdebug-handler2 -Requires: php-jsonlint >= 1.4 -Requires: php-seld-phar-utils -Requires: php-PsrLog -Requires: php-justinrainbow-json-schema5 >= 5.2.11 -Requires: php-react-promise >= 2.7 -%endif -Requires: %{symfony_prefix}-console >= %{symfony_min} -Requires: %{symfony_prefix}-finder >= %{symfony_min} -Requires: %{symfony_prefix}-process >= %{symfony_min} -Requires: %{symfony_prefix}-filesystem >= %{symfony_min} +# System certificates +Requires: ca-certificates +# Bundled libraries +# License MIT +Provides: bundled(php-composer-ca-bundle) = 1.4.1 +Provides: bundled(php-composer-class-map-generator) = 1.1.0 +Provides: bundled(php-composer-metadata-minifier) = 1.0.0 +Provides: bundled(php-composer-pcre) = 2.1.2 +Provides: bundled(php-composer-semver) = 3.4.0 +Provides: bundled(php-composer-spdx-licenses) = 1.5.8 +Provides: bundled(php-composer-xdebug-handler) = 3.0.3 +Provides: bundled(php-justinrainbow-json-schema) = v5.2.13 +Provides: bundled(php-psr-container) = 1.1.1 +Provides: bundled(php-psr-log) = 1.1.4 +Provides: bundled(php-react-promise) = v3.1.0 +Provides: bundled(php-seld-jsonlint) = 1.10.2 +Provides: bundled(php-seld-phar-utils) = 1.2.1 +Provides: bundled(php-seld-signal-handler) = 2.0.2 +Provides: bundled(php-symfony-console) = v5.4.36 +Provides: bundled(php-symfony-deprecation-contracts) = v2.5.2 +Provides: bundled(php-symfony-filesystem) = v5.4.35 +Provides: bundled(php-symfony-finder) = v5.4.35 +Provides: bundled(php-symfony-polyfill-ctype) = v1.29.0 +Provides: bundled(php-symfony-polyfill-intl-grapheme) = v1.29.0 +Provides: bundled(php-symfony-polyfill-intl-normalizer) = v1.29.0 +Provides: bundled(php-symfony-polyfill-mbstring) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php73) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php80) = v1.29.0 +Provides: bundled(php-symfony-polyfill-php81) = v1.29.0 +Provides: bundled(php-symfony-process) = v5.4.36 +Provides: bundled(php-symfony-service-contracts) = v2.5.2 +Provides: bundled(php-symfony-string) = v5.4.36 + # From composer.json, suggest # "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", # "ext-zip": "Enabling the zip extension allows you to unzip archives", @@ -146,14 +116,11 @@ Requires: %{symfony_prefix}-filesystem >= %{symfony_min} Requires: php-openssl Requires: php-zip Requires: php-zlib -# For our autoloader -Requires: php-composer(fedora/autoloader) -Requires: php-seld-phar-utils >= 1.1 -Requires: php-PsrLog >= 1.1 -# From phpcompatinfo for version 2.0.0 +# From phpcompatinfo for version 2.2.5 Requires: php-ctype Requires: php-curl Requires: php-date +Requires: php-dom Requires: php-filter Requires: php-hash Requires: php-iconv @@ -188,8 +155,8 @@ Documentation: https://getcomposer.org/doc/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm -%patch1 -p1 -b .noxdg +%patch -P0 -p1 -b .rpm +%patch -P1 -p1 -b .noxdg find . \( -name \*.rpm -o -name \*noxdg \) -delete -print if grep -r '\.\./res'; then @@ -197,48 +164,38 @@ if grep -r '\.\./res'; then exit 1 fi -phpab --template fedora --output src/Composer/autoload.php src/Composer -cat << 'EOF' | tee -a src/Composer/autoload.php - -\Fedora\Autoloader\Dependencies::required([ - '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', /* before symfony which load composer */ - '%{symfony_path}/Component/Console/autoload.php', - '%{symfony_path}/Component/Finder/autoload.php', - '%{symfony_path}/Component/Process/autoload.php', - '%{symfony_path}/Component/Filesystem/autoload.php', - '%{_datadir}/php/Seld/JsonLint/autoload.php', - '%{_datadir}/php/Seld/PharUtils/autoload.php', - '%{_datadir}/php/Composer/CaBundle/autoload.php', - '%{_datadir}/php/Composer/Spdx/autoload.php', - '%{_datadir}/php/Composer/MetadataMinifier/autoload.php', - '%{_datadir}/php/Composer/Semver3/autoload.php', - '%{_datadir}/php/Psr/Log/autoload.php', - '%{_datadir}/php/JsonSchema5/autoload.php', - '%{_datadir}/php/React/Promise/autoload.php', -]); -EOF - -cat << 'EOF' | tee tests/bootstrap.php -<?php -require 'Composer/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr0('Composer\\Test\\', __DIR__ . '/'); -EOF - rm src/bootstrap.php +rm src/Composer/vendor/composer/ca-bundle/res/cacert.pem +: symlink autoloader for library +ln -s vendor/autoload.php src/Composer/autoload.php + +: fix layout +sed -e "s:/../..' . '/src/Composer::" -i src/Composer/vendor/composer/autoload_static.php + +: List bundled libraries and Licenses +php -r ' + $pkgs = file_get_contents("src/Composer/vendor/composer/installed.json"); + $pkgs = json_decode($pkgs, true); + if (!is_array($pkgs) || !isset($pkgs["packages"])) { + echo "cant decode json file\n"; + exit(3); + } + $res = []; + foreach($pkgs["packages"] as $pkg) { + $lic = implode(" and ", $pkg["license"]); + if (!isset($res[$lic])) $res[$lic] = []; + $res[$lic][] = sprintf("Provides: bundled(php-%s) = %s", str_replace(["/", "_"], ["-", "-"], $pkg["name"]), $pkg["version"]); + } + foreach($res as $lic => $lib) { + sort($lib); + printf("# License %s\n%s\n", $lic, implode("\n", $lib)); + } +' : fix reported version -%if 0%{?gh_date} -DATE=%{gh_date} -DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6:2} -sed -e '/VERSION/s/@package_version@/%{gh_commit}/' \ - -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@/%{gh_branch}/' \ - -e "/RELEASE_DATE/s/@release_date@/$DATE/" \ - -i src/Composer/Composer.php -%else sed -e '/BRANCH_ALIAS_VERSION/s/@package_branch_alias_version@//' \ -i src/Composer/Composer.php -%endif : check Plugin API version php -r ' @@ -260,6 +217,7 @@ if (version_compare(Composer::RUNTIME_API_VERSION, "%{run_version}")) { %install : Profile scripts +install -Dpm 644 %{SOURCE1} %{buildroot}%{bashcompdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/ @@ -278,43 +236,6 @@ ln -sf %{_datadir}/%{name}/LICENSE LICENSE install -Dpm 755 bin/%{name} %{buildroot}%{_bindir}/%{name} -%check -%if %{with tests} -: Online tests -rm tests/Composer/Test/Util/RemoteFilesystemTest.php - -: Ensure not used -rm -rf res - -: Run test suite -export BUILDROOT=%{buildroot} - -FILTER="--filter '^((?!(testIntegration)).)*$'" - -# Adapt for phunit9 -find tests \ - -name \*.php \ - -exec sed -e '/function setUpBeforeClass(/s/$/:void/' \ - -e '/function tearDownAfterClass(/s/$/:void/' \ - -e '/function setUp(/s/$/:void/' \ - -e '/function tearDown(/s/$/:void/' \ - -i {} \; - -# testIntegration may hang on local build -ret=0 -for cmd in php php73 php74 php80 php81; do - if which $cmd; then - $cmd -d memory_limit=1G %{_phpunit} \ - $FILTER \ - --include-path %{buildroot}%{_datadir}/php || ret=1 - fi -done -exit $ret -%else -: Test suite disabled -%endif - - %files %{!?_licensedir:%global license %%doc} %license LICENSE @@ -324,9 +245,188 @@ exit $ret %{_bindir}/%{name} %{_datadir}/php/Composer %{_datadir}/%{name} +%{bashcomproot} %changelog +* Tue Mar 12 2024 Remi Collet <remi@remirepo.net> - 2.7.2-1 +- update to 2.7.2 + +* Sat Feb 10 2024 Remi Collet <remi@remirepo.net> - 2.7.1-1 +- update to 2.7.1 + +* Fri Feb 9 2024 Remi Collet <remi@remirepo.net> - 2.7.0-1 +- update to 2.7.0 + +* Sat Dec 9 2023 Remi Collet <remi@remirepo.net> - 2.6.6-1 +- update to 2.6.6 + +* Fri Oct 6 2023 Remi Collet <remi@remirepo.net> - 2.6.5-1 +- update to 2.6.5 + +* Fri Sep 29 2023 Remi Collet <remi@remirepo.net> - 2.6.4-1 +- update to 2.6.4 + +* Fri Sep 15 2023 Remi Collet <remi@remirepo.net> - 2.6.3-1 +- update to 2.6.3 + +* Mon Sep 4 2023 Remi Collet <remi@remirepo.net> - 2.6.2-1 +- update to 2.6.2 + +* Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 2.6.1-1 +- update to 2.6.1 + +* Fri Sep 1 2023 Remi Collet <remi@remirepo.net> - 2.6.0-1 +- update to 2.6.0 + +* Sat Jun 10 2023 Remi Collet <remi@remirepo.net> - 2.5.8-1 +- update to 2.5.8 + +* Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.7-1 +- update to 2.5.7 + +* Wed May 24 2023 Remi Collet <remi@remirepo.net> - 2.5.6-1 +- update to 2.5.6 + +* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 2.5.5-1 +- update to 2.5.5 + +* Wed Feb 15 2023 Remi Collet <remi@remirepo.net> - 2.5.4-1 +- update to 2.5.4 + +* Fri Feb 10 2023 Remi Collet <remi@remirepo.net> - 2.5.3-1 +- update to 2.5.3 + +* Mon Feb 6 2023 Remi Collet <remi@remirepo.net> - 2.5.2-1 +- update to 2.5.2 + +* Thu Dec 22 2022 Remi Collet <remi@remirepo.net> - 2.5.1-1 +- update to 2.5.1 + +* Tue Dec 20 2022 Remi Collet <remi@remirepo.net> - 2.5.0-1 +- update to 2.5.0 + +* Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 2.4.4-1 +- update to 2.4.4 + +* Sat Oct 15 2022 Remi Collet <remi@remirepo.net> - 2.4.3-1 +- update to 2.4.3 + +* Thu Sep 15 2022 Remi Collet <remi@remirepo.net> - 2.4.2-1 +- update to 2.4.2 + +* Mon Aug 29 2022 Remi Collet <remi@remirepo.net> - 2.4.1-1 +- update to 2.4.1 + +* Tue Aug 16 2022 Remi Collet <remi@remirepo.net> - 2.4.0-1 +- update to 2.4.0 + +* Fri Jul 29 2022 Remi Collet <remi@remirepo.net> - 2.4.0~rc1-2 +- refresh bundled symfony for 5.4.11 + +* Fri Jul 22 2022 Remi Collet <remi@remirepo.net> - 2.4.0~rc1-1 +- open https://github.com/symfony/symfony/pull/47022 fix command path + +* Thu Jul 14 2022 Remi Collet <remi@remirepo.net> - 2.3.10-1 +- update to 2.3.10 + +* Tue Jul 5 2022 Remi Collet <remi@remirepo.net> - 2.3.9-1 +- update to 2.3.9 + +* Fri Jul 1 2022 Remi Collet <remi@remirepo.net> - 2.3.8-1 +- update to 2.3.8 + +* Wed Jun 22 2022 Remi Collet <remi@remirepo.net> - 2.3.7-2 +- add bash completion file + +* Tue Jun 7 2022 Remi Collet <remi@remirepo.net> - 2.3.7-1 +- update to 2.3.7 + +* Thu Jun 2 2022 Remi Collet <remi@remirepo.net> - 2.3.6-1 +- update to 2.3.6 + +* Thu Apr 14 2022 Remi Collet <remi@remirepo.net> - 2.3.5-1 +- update to 2.3.5 + +* Fri Apr 8 2022 Remi Collet <remi@remirepo.net> - 2.3.4-1 +- update to 2.3.4 + +* Sat Apr 2 2022 Remi Collet <remi@remirepo.net> - 2.3.3-1 +- update to 2.3.3 + +* Thu Mar 31 2022 Remi Collet <remi@remirepo.net> - 2.3.2-1 +- update to 2.3.2 + +* Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.3.1-1 +- update to 2.3.1 + +* Wed Mar 30 2022 Remi Collet <remi@remirepo.net> - 2.3.0-1 +- update to 2.3.0 + +* Mon Mar 21 2022 Remi Collet <remi@remirepo.net> - 2.3.0~RC2-1 +- update to 2.3.0RC2 + +* Wed Mar 16 2022 Remi Collet <remi@remirepo.net> - 2.3.0~RC1-1 +- update to 2.3.0RC1 +- always use bundled libraries + as symfony/* 5.4 and composer/pcre 2 are not available + +* Wed Mar 16 2022 Remi Collet <remi@remirepo.net> - 2.2.9-1 +- update to 2.2.9 + +* Tue Mar 15 2022 Remi Collet <remi@remirepo.net> - 2.2.8-1 +- update to 2.2.8 + +* Fri Feb 25 2022 Remi Collet <remi@remirepo.net> - 2.2.7-1 +- update to 2.2.7 + +* Sat Feb 5 2022 Remi Collet <remi@remirepo.net> - 2.2.6-1 +- update to 2.2.6 + +* Mon Jan 31 2022 Remi Collet <remi@remirepo.net> - 2.2.5-3 +- lower minimal php version back to 7.2.5 + +* Tue Jan 25 2022 Remi Collet <remi@remirepo.net> - 2.2.5-2 +- use system libraries on Fedora, bundled libraries on EL + +* Sat Jan 22 2022 Remi Collet <remi@remirepo.net> - 2.2.5-1 +- update to 2.2.5 + +* Sun Jan 9 2022 Remi Collet <remi@remirepo.net> - 2.2.4-1 +- update to 2.2.4 + +* Sat Jan 1 2022 Remi Collet <remi@remirepo.net> - 2.2.3-1 +- update to 2.2.3 + +* Thu Dec 30 2021 Remi Collet <remi@remirepo.net> - 2.2.2-1 +- update to 2.2.2 + +* Thu Dec 23 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1 +- update to 2.2.1 + +* Wed Dec 22 2021 Remi Collet <remi@remirepo.net> - 2.2.0-1 +- update to 2.2.0 + +* Wed Dec 8 2021 Remi Collet <remi@remirepo.net> - 2.2.0-RC1-1 +- update to 2.2.0-RC1 +- add dependency on composer/pcre + +* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 2.1.14-1 +- update to 2.1.14 + +* Tue Nov 9 2021 Remi Collet <remi@remirepo.net> - 2.1.12-1 +- update to 2.1.12 + +* Tue Nov 2 2021 Remi Collet <remi@remirepo.net> - 2.1.11-1 +- update to 2.1.11 + +* Sat Oct 30 2021 Remi Collet <remi@remirepo.net> - 2.1.10-1 +- update to 2.1.10 +- allow psr/log v2 + +* Tue Oct 5 2021 Remi Collet <remi@remirepo.net> - 2.1.9-1 +- update to 2.1.9 + * Sat Sep 18 2021 Remi Collet <remi@remirepo.net> - 2.1.8-1 - update to 2.1.8 |