From nobody Fri Nov 15 15:57:45 2024 X-Original-To: dev-commits-ports-branches@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 4XqhVy2CvWz5dJNg; Fri, 15 Nov 2024 15:57:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqhVy0SQyz4Bs6; Fri, 15 Nov 2024 15:57:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686266; 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=pCJtc4yyK5SpySCQr0FG4jyQtk2obRdMvVrrVPR92Xc=; b=c0V74NI7qQohfWLw4/fUJmETj0FSHggg4rHhu5098+2MUuhyil5EqbXeuX90khmy2xcVOI oE6Icm3aWCzi5FXImqigeQrGy4edBi+PbfoelBcxp+/RVvR1iwNfRoTdV6WVghciSY/0uX nsy2HN6FZ36TyjDgv0opMSvgJlvpxOM4w0yZwVSkTkWpiOvOtDshxMPuEZL8ygKxDcg6+a MTg8FUnpVlaGoEVSSI3XpHgQChZ9w3xUUdgMWby3JYZGYxQXLT1xn5Odt8o2AFDHxvgU8+ bkR8YZuNPrvRkYq7N3JH5YEfYljqvYFeBNv+XFmBY4Knm+dcMzcSfviCZ9Y0ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686266; 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=pCJtc4yyK5SpySCQr0FG4jyQtk2obRdMvVrrVPR92Xc=; b=BPZDZhFnqSiuXEj5gUtlm6kEpGIq6ZQWfMzsLVy8A7wZeQ6XLMqXgUWYnIIcld/4tdkg97 WSHByr7BAAqXJB2xNEgMB7g5C3WEWqVAuo3g7rBlN/TzuIOxhuZGJUvA6RCM/f/jzhwP47 b5D21J5hrERCrverdyWaitwOBzp5NWcYaPQ5NRwLzyonZ4glQ7lblamt5bvMNSQrhycmD2 j7Gkl1Ov0eLXzxmBFvtxL7HAjsN3/Zx6c+SQWOk2loVZWY5jq6HPg9hTc+zuDPtE7N5my1 RpJHnrgTD4goeQFpwg1iy3dxYichWiFDXuWNi7sdp1RYQQLfmOYTvCqqomeUKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731686266; a=rsa-sha256; cv=none; b=R76l+id4PW3gaMju8XEgQbEENYiBrBG4j4t8Gdtsx+DtA2GzAzhlj+PN4IHIS2afiY8y/h EL6wHH+gfi5+I4veFxj8KhbZh71ZJSZkrwXsOLx1Ap42tNnBZuwfULsLttPHIspuBi/M2a ljF7kmCSGgGESXwCv74wM1Np09FKwGr2nFDYAuFOPvX6IHhTiCwSZM5nThyumXFSxBSYlT bgVz5BPnksb7KQnxE7ehZOP7HegNSxo59nhVbZf8NRGAgc2kH/vsJKMraVishS6bhEUn3E pl9DE1wu+NtXGNo2teNMjG261VEq5IW9dCRY7TvXVfrJQTQgOSzKy3wSg+LV/w== 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 4XqhVx71NwzTxT; Fri, 15 Nov 2024 15:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AFFvjHE094304; Fri, 15 Nov 2024 15:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFFvj85094301; Fri, 15 Nov 2024 15:57:45 GMT (envelope-from git) Date: Fri, 15 Nov 2024 15:57:45 GMT Message-Id: <202411151557.4AFFvj85094301@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: a4ad5f78fcad - 2024Q4 - www/gitlab: unbreak build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: a4ad5f78fcadb53e786cb20535ba5d77e3bb86dd Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4ad5f78fcadb53e786cb20535ba5d77e3bb86dd commit a4ad5f78fcadb53e786cb20535ba5d77e3bb86dd Author: Matthias Fechner AuthorDate: 2024-10-30 11:22:12 +0000 Commit: Matthias Fechner CommitDate: 2024-11-15 15:56:43 +0000 www/gitlab: unbreak build fixes dependency issues caused by: 5be56f86c88a5f043568ef3bbf2385798f3574a5 f79209ce44089dabaf319913ffd2365b890ca751 35f8b875d522febb1d34e748bc75bc061b7a34d5 (cherry picked from commit 50704b2d55547d50db9078bbecaf75b24491666a) --- devel/Makefile | 1 + devel/rubygem-fog-core250/Makefile | 23 +++++++++++++++++++++++ devel/rubygem-fog-core250/distinfo | 3 +++ devel/rubygem-fog-core250/pkg-descr | 2 ++ net/Makefile | 1 + net/rubygem-fog-aws328/Makefile | 26 ++++++++++++++++++++++++++ net/rubygem-fog-aws328/distinfo | 3 +++ net/rubygem-fog-aws328/pkg-descr | 1 + net/rubygem-fog-google/Makefile | 4 ++-- www/gitlab/Makefile | 4 ++-- www/gitlab/Makefile.common | 2 +- 11 files changed, 65 insertions(+), 5 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index ed83b1fa62c6..2916b5193ee5 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7168,6 +7168,7 @@ SUBDIR += rubygem-fog-core1 SUBDIR += rubygem-fog-core210 SUBDIR += rubygem-fog-core220 + SUBDIR += rubygem-fog-core250 SUBDIR += rubygem-fog-json SUBDIR += rubygem-font-awesome-rails SUBDIR += rubygem-font-awesome-rails-rails5 diff --git a/devel/rubygem-fog-core250/Makefile b/devel/rubygem-fog-core250/Makefile new file mode 100644 index 000000000000..d731452410cb --- /dev/null +++ b/devel/rubygem-fog-core250/Makefile @@ -0,0 +1,23 @@ +PORTNAME= fog-core +PORTVERSION= 2.5.0 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 250 + +MAINTAINER= ruby@FreeBSD.org +COMMENT= Shared classes and tests for fog providers and services +WWW= https://github.com/fog/fog-core + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= rubygem-builder>=0:devel/rubygem-builder \ + rubygem-excon0>=0.71<1:devel/rubygem-excon0 \ + rubygem-formatador>=0.2<2.0:devel/rubygem-formatador \ + rubygem-mime-types>=0:misc/rubygem-mime-types + +USES= gem + +NO_ARCH= yes + +.include diff --git a/devel/rubygem-fog-core250/distinfo b/devel/rubygem-fog-core250/distinfo new file mode 100644 index 000000000000..d14e4848df23 --- /dev/null +++ b/devel/rubygem-fog-core250/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1730285943 +SHA256 (rubygem/fog-core-2.5.0.gem) = b47b80647a6e5817455ec2baa8f5ca5e3f431d9518e876d55330d08b450cc2ed +SIZE (rubygem/fog-core-2.5.0.gem) = 47104 diff --git a/devel/rubygem-fog-core250/pkg-descr b/devel/rubygem-fog-core250/pkg-descr new file mode 100644 index 000000000000..3e29961b2579 --- /dev/null +++ b/devel/rubygem-fog-core250/pkg-descr @@ -0,0 +1,2 @@ +rubygem-fog-core (Fog::Core) provides shared classes and tests for fog providers +and services. diff --git a/net/Makefile b/net/Makefile index 55189a0e36af..645816fb5b16 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1285,6 +1285,7 @@ SUBDIR += rubygem-fog-aliyun SUBDIR += rubygem-fog-atmos SUBDIR += rubygem-fog-aws + SUBDIR += rubygem-fog-aws328 SUBDIR += rubygem-fog-azure SUBDIR += rubygem-fog-brightbox SUBDIR += rubygem-fog-cloudatcost diff --git a/net/rubygem-fog-aws328/Makefile b/net/rubygem-fog-aws328/Makefile new file mode 100644 index 000000000000..25d0b3266582 --- /dev/null +++ b/net/rubygem-fog-aws328/Makefile @@ -0,0 +1,26 @@ +PORTNAME= fog-aws +PORTVERSION= 3.28.0 +CATEGORIES= net rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 328 + +MAINTAINER= ruby@FreeBSD.org +COMMENT= Module for the 'fog' gem to support Amazon Web Services +WWW= https://github.com/fog/fog-aws + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= rubygem-base64>=0.2.0<0.3:converters/rubygem-base64 \ + rubygem-fog-core250>=2.1<3:devel/rubygem-fog-core250 \ + rubygem-fog-json>=1.1<2:devel/rubygem-fog-json \ + rubygem-fog-xml>=0.1<1:textproc/rubygem-fog-xml + +USES= gem + +NO_ARCH= yes + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/console ${STAGEDIR}${PREFIX}/bin/setup + +.include diff --git a/net/rubygem-fog-aws328/distinfo b/net/rubygem-fog-aws328/distinfo new file mode 100644 index 000000000000..e774eb7264a3 --- /dev/null +++ b/net/rubygem-fog-aws328/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1730286749 +SHA256 (rubygem/fog-aws-3.28.0.gem) = 7d2e7e13eb123914be9cea12f3d134285fa9fc14e0fa0daebc97386a3d9567cd +SIZE (rubygem/fog-aws-3.28.0.gem) = 433664 diff --git a/net/rubygem-fog-aws328/pkg-descr b/net/rubygem-fog-aws328/pkg-descr new file mode 100644 index 000000000000..2a3a99644d5a --- /dev/null +++ b/net/rubygem-fog-aws328/pkg-descr @@ -0,0 +1 @@ +Fog::Aws is a module for the 'fog' gem to support Amazon Web Services. diff --git a/net/rubygem-fog-google/Makefile b/net/rubygem-fog-google/Makefile index 30acbc80ac4d..ab09919b0859 100644 --- a/net/rubygem-fog-google/Makefile +++ b/net/rubygem-fog-google/Makefile @@ -1,6 +1,6 @@ PORTNAME= fog-google PORTVERSION= 1.24.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net rubygems MASTER_SITES= RG @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-addressable>=2.7.0:www/rubygem-addressable \ - rubygem-fog-core>=0<2.6:devel/rubygem-fog-core \ + rubygem-fog-core250>=0<2.6:devel/rubygem-fog-core250 \ rubygem-fog-json>=1.2<2:devel/rubygem-fog-json \ rubygem-fog-xml>=0.1.0<0.2:textproc/rubygem-fog-xml \ rubygem-google-apis-compute_v1>=0.53<1:devel/rubygem-google-apis-compute_v1 \ diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 6f3439ea12a7..ad9f4b7bfb87 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -110,7 +110,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \ rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \ - rubygem-fog-aws>=3.26<4:net/rubygem-fog-aws \ + rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.24.1<1.25:net/rubygem-fog-google \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ @@ -192,7 +192,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ - rubygem-loofah>=2.22.0<2.23:textproc/rubygem-loofah \ + rubygem-loofah222>=2.22.0<2.23:textproc/rubygem-loofah222 \ rubygem-licensee>=9.16<10:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index ed13ae884ce2..4dcefc11a462 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.5.1 -GITLAB_PORTREVISION= 0 +GITLAB_PORTREVISION= 1 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml