From nobody Sat Sep 30 07:04:04 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RyJ9J6JF0z4vhK5; Sat, 30 Sep 2023 07:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RyJ9J5ngKz4tD3; Sat, 30 Sep 2023 07:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696057444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i382b/PDOXDjtvWP4JrjitHnbEvpSDTASbd7QwA3FC4=; b=CTiiotSyAtf2vbFnjGJZXHFsAspifBkjMpZeOnT+DQbm+ifzNpX7ko3bcb+jwwSfORlitw lsF6JwjiI5ue7hOeM8QxFdZ/dvJsMDU3pXkW5u+Xk/YUBhkH12dGLcdLaQ9GicKeID0bgt +3ZMtGFuobMZhwG5b6yxeBtPVZrSXVtor/l8oAmk/H+gg4r3LedKbHh/8aE71XMjnr+2tF tP1rWlPAt58rB5ZAcygJ2q81icP70oR9KMRTUuUhA3ITKwIvXRF0aTIelJGAYMjJvuouOO akBkKfDRKAi7sOFFq3xANtznDo/adPVdiRsSPcFTG2lQh6DWs7pXI7V0+NkVyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696057444; a=rsa-sha256; cv=none; b=VJGspcfoyc4589N5xbnW2LEIpU5qaMUxNUmQhZxNrwioWX3c7vrmnPdp8PRYMXyX+sD7J9 NvK1wMGBHIaD4flvrzyfdHELLQGQdfc0CGj1Rs5Xpo2r/rDjJkVSorsr9Y48VH0z7BJFsj vevsmbBQJPiLnt5KzOBPxcH7UdQTUG4XwZ8j9tzA9vbKbMcNM1JJ93P7b218Mk6wBtxPw+ r7Rd6pw5eGYwAPxwyqJjvD/3+3oCJfX9aF2oZ75ceNPlWhUMBmaufh7ifCEEA1LvV7/uKh dK+MN7h5Kpc+7rl3RCOLmI+MwJZJXlno028zTIB1Mw/h6gLIfoA2UstecV4htA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696057444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i382b/PDOXDjtvWP4JrjitHnbEvpSDTASbd7QwA3FC4=; b=oGYIQRhrrS4DnTv3ZxzKaqXjrdJEWfflvkTPR6FbsR0WjjfJnVs7H4MsM1BzBuH2aI23r6 KOBCuHJqV463ZuoMOYyC/3OXqL04tjx+Ah2PQxZDuxVP1sFxHFrMz5MCJRpynqVAGB9u3v 3dsMgJBAW4q0AabkQ+XMHg5tFCO/HAn3WKy6b0UvqjW+8lmivN7tqTIol7kUeZqN4E4xIQ 5zQHRZw1T2AwcASFeFVxepRMd7+VSf9UQ6nT1ZaAlC+rzK9wLdh6UZGlrAYazkPmJEC4Ki 2NxmBmCYctSBzPQAPz8MhEPGykKQuiEkihPhmgJ/8dbxvUI8SDBosK+Fenh99A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RyJ9J4s1VzdnH; Sat, 30 Sep 2023 07:04:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38U744sU063758; Sat, 30 Sep 2023 07:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U744Ih063756; Sat, 30 Sep 2023 07:04:04 GMT (envelope-from git) Date: Sat, 30 Sep 2023 07:04:04 GMT Message-Id: <202309300704.38U744Ih063756@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 8ed814568435 - main - devel/php-composer: Update to 2.6.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ed8145684356244c2a05ff696bf9f3bc9262a21 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ed8145684356244c2a05ff696bf9f3bc9262a21 commit 8ed8145684356244c2a05ff696bf9f3bc9262a21 Author: Guido Falsi AuthorDate: 2023-09-30 07:03:04 +0000 Commit: Guido Falsi CommitDate: 2023-09-30 07:03:04 +0000 devel/php-composer: Update to 2.6.4 The main composer port contains old and long EOLed/deprecated version 1.x of the software. Move the devel/php-composer2 port over, dropping it, and update to latest version. Please check UPDATING entry 20230930, to correctly update use "pkg install phpXX-composer" (replacing XX with the PHP shorthand version you're using) PR: 274160 Approved by: Naram Qashat (maintainer) Security: 33922b84-5f09-11ee-b63d-0897988a1c07 --- MOVED | 1 + UPDATING | 11 +++++++++++ devel/Makefile | 1 - devel/php-composer/Makefile | 10 +++++++--- devel/php-composer/distinfo | 6 +++--- devel/php-composer2/Makefile | 46 ------------------------------------------- devel/php-composer2/distinfo | 3 --- devel/php-composer2/pkg-descr | 3 --- 8 files changed, 22 insertions(+), 59 deletions(-) diff --git a/MOVED b/MOVED index 2d72b0c8bac7..543723e52fda 100644 --- a/MOVED +++ b/MOVED @@ -7921,3 +7921,4 @@ www/grafana8|www/grafana9|2023-09-30|Has expired: EOLed upstream www/mediawiki138|www/mediawiki139|2023-09-30|Has expired: end of life upstream www/awffull||2023-09-30|Has expired: Abandonware, last release in 14+ years ago. Consider using www/awstats textproc/raptor||2023-09-30|Has expired: No new release in 10+ years and superseded by 2.0-branch, consider using textproc/raptor2 +devel/php-composer2|devel/php-composer|2023-09-30|Port for newer version moved over old EOL version port diff --git a/UPDATING b/UPDATING index e784f379d62b..90775bb8953e 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20230930: + AFFECTS: users of devel/php-composer2 + AUTHOR: madpilot@FreeBSD.org + + The composer2 ports has been moved over the old devel/php-composer + port, which was still providing the old EOLed version 1 of the + software. + + Please use `pkg install php81-composer` (substitute 81 with the + PHP version you're using) to properly upgrade. + 20230924: AFFECTS: users of XFCE desktop (x11-wm/xfce4) AUTHOR: madpilot@FreeBSD.org diff --git a/devel/Makefile b/devel/Makefile index da30fba4e60c..e75f7a3f3be5 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4081,7 +4081,6 @@ SUBDIR += phasar SUBDIR += php-Psr_Log SUBDIR += php-composer - SUBDIR += php-composer2 SUBDIR += php-geshi SUBDIR += php-ice37 SUBDIR += php-libawl diff --git a/devel/php-composer/Makefile b/devel/php-composer/Makefile index c5046147682f..333bdc2141c6 100644 --- a/devel/php-composer/Makefile +++ b/devel/php-composer/Makefile @@ -1,5 +1,5 @@ PORTNAME= composer -DISTVERSION= 1.10.26 +DISTVERSION= 2.6.4 CATEGORIES= devel MASTER_SITES= https://getcomposer.org/download/${DISTVERSION}/ PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} @@ -13,8 +13,6 @@ WWW= https://getcomposer.org/ LICENSE= MIT -DEPRECATED= packagist.org is dropping API v1 support, please use newer 2.x version - RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss USES= cpe php:flavors @@ -30,6 +28,12 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/composer \ bin/composer.phar +OPTIONS_DEFINE= CURL +OPTIONS_DEFAULT= CURL + +CURL_DESC= Install the cURL extension for faster downloads +CURL_USE= PHP=curl + do-extract: ${MKDIR} ${WRKSRC}/ ${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/ diff --git a/devel/php-composer/distinfo b/devel/php-composer/distinfo index d951936c5b30..75f086efe5d5 100644 --- a/devel/php-composer/distinfo +++ b/devel/php-composer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649864691 -SHA256 (composer-1.10.26/composer.phar) = cbfe1f85276c57abe464d934503d935aa213494ac286275c8dfabfa91e3dbdc4 -SIZE (composer-1.10.26/composer.phar) = 1993462 +TIMESTAMP = 1696023354 +SHA256 (composer-2.6.4/composer.phar) = 5a39f3e2ce5ba391ee3fecb227faf21390f5b7ed5c56f14cab9e1c3048bcf8b8 +SIZE (composer-2.6.4/composer.phar) = 2861074 diff --git a/devel/php-composer2/Makefile b/devel/php-composer2/Makefile deleted file mode 100644 index c06390b3daf5..000000000000 --- a/devel/php-composer2/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -PORTNAME= composer -DISTVERSION= 2.6.3 -CATEGORIES= devel -MASTER_SITES= https://getcomposer.org/download/${DISTVERSION}/ -PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} -PKGNAMESUFFIX= 2 -DISTNAME= composer -EXTRACT_SUFX= .phar -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} - -MAINTAINER= cyberbotx@cyberbotx.com -COMMENT= Dependency Manager for PHP, version 2.x -WWW= https://getcomposer.org/ - -LICENSE= MIT - -RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss - -USES= cpe php:flavors -CPE_VENDOR= getcomposer -USE_PHP= ctype filter intl mbstring phar - -CONFLICTS_INSTALL= php*-composer php*-composer2 - -NO_ARCH= yes -NO_BUILD= yes -NO_WRKSUBDIR= yes - -PLIST_FILES= bin/composer \ - bin/composer.phar - -OPTIONS_DEFINE= CURL -OPTIONS_DEFAULT= CURL - -CURL_DESC= Install the cURL extension for faster downloads -CURL_USE= PHP=curl - -do-extract: - ${MKDIR} ${WRKSRC}/ - ${CP} ${_DISTDIR}/composer.phar ${WRKSRC}/ - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/composer.phar ${STAGEDIR}${PREFIX}/bin/ - ${LN} -s composer.phar ${STAGEDIR}${PREFIX}/bin/composer - -.include diff --git a/devel/php-composer2/distinfo b/devel/php-composer2/distinfo deleted file mode 100644 index 5fea9ac8e2c6..000000000000 --- a/devel/php-composer2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1694787985 -SHA256 (composer-2.6.3/composer.phar) = e58a390cac0df45ccf5a3d95ae94fa239eded8b7907fa2c8f752f020304fc9b1 -SIZE (composer-2.6.3/composer.phar) = 2859496 diff --git a/devel/php-composer2/pkg-descr b/devel/php-composer2/pkg-descr deleted file mode 100644 index 2821d610ccf5..000000000000 --- a/devel/php-composer2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Composer is a tool for dependency management in PHP. It allows you to declare -the dependent libraries your project needs and it will install them in your -project for you.