From nobody Sat Dec 07 15:04:49 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 4Y5BHk1dzrz5flrN; Sat, 07 Dec 2024 15:04:50 +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 4Y5BHj3yknz4pSY; Sat, 7 Dec 2024 15:04:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733583889; 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=ZsU5af4vdcXT+lNEfoXQeHiBxZAhk5T4cKDZGbVaEuw=; b=rfOHLz0E7K4sgFXdJio46+N0a8NfwvzyolRpzyCK7XyMesVhN3ho9u7ls4CIQNgIwZuOk7 pku0rLulQT6T1/r8jYZrkU/B/QERbMcV1p0u8RA+prkN7ffdJYWq215HjrX8h8BADprhpe NISw3ytRxiRG65E7gRbflRnbaYiUL2Ws16UA20PJ//tfz1LOcUmXFN78hjzVeTnVqdEA/C TUOED+dGdJrayHujG4kSEhFPGWilKAjb8SiJ8oJGbGk+Ebsr2nWANkouGcmYg3NdUVi9tz mppeIUpOKtJouw0h7SWniu/z36xIUF/eWs8+1YQw222PNn7JZqT1e1vPOXtEeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733583889; 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=ZsU5af4vdcXT+lNEfoXQeHiBxZAhk5T4cKDZGbVaEuw=; b=QJp57u0f1s1s16APnETYmxFbdpmZz24L7mUPFUs2BWKO/p5ikYN9XzgVjaTUoJqlVYiaOw IO0SAJ/tSdZ+8ABgUlldFjxsnzpcWBK3Z0IedurjxOMhrOOIKUzKzHvaDT9gn66oGsthTd zyCVkmQg//f8kMiwWhvy6v4R+cNvV5iVYXIU3WpsNgxD7I8epCA/3uT8IsLEru/5UkmQz0 n84Y81V7DtJNvwu8MlYe568l3TDN0fx0o5AKfWaERvltYgGo442CnLo6xsC+uMv8Tz7dwD ZSvkOb8x8idYkNapJWeJ/Jd95ibJ85mVeJxvjxTwwTU+JMrQux0gWBxd7luJsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733583889; a=rsa-sha256; cv=none; b=SRLeQ/2eFFX6kgBD7Yiz3koAHnReDcCA6OmoIkj2EAQtThlHz+9S4dq18fvD1oKBaXbm7I K/0vU1yqBX3gukrmUoPe49yEl6UHjoq+CHjLDU5n7BYMJkO408VFVqcjTRker4QskTzB+y Zzhr7l5ATXfHo3pFldQIkZ2zqDR+HN1JsX5qaSMR8O/IoD4Pp/Gbl2FCekw4UlIKbXsL66 QaunZE8iuzx/zEbJYjqcfGecNhF1SvRZUJ+9yt7CfglkzSCGVuPin6JLA3hMtGXANtK2e5 5bcsnZoOQogbQskUk6O3gkRwP6pZfM/DNurQ4Eb7MfMBt4HB/hdHje3PW9uxDQ== 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 4Y5BHj3Z8Pz1RSJ; Sat, 7 Dec 2024 15:04:49 +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 4B7F4nqN033227; Sat, 7 Dec 2024 15:04:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B7F4npR033224; Sat, 7 Dec 2024 15:04:49 GMT (envelope-from git) Date: Sat, 7 Dec 2024 15:04:49 GMT Message-Id: <202412071504.4B7F4npR033224@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: e63c52cbbad0 - 2024Q4 - devel/rubygem-licensee: fix another conflict with faraday 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: e63c52cbbad074599994aa8b6ac22114e76be992 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e63c52cbbad074599994aa8b6ac22114e76be992 commit e63c52cbbad074599994aa8b6ac22114e76be992 Author: Matthias Fechner AuthorDate: 2024-12-04 12:43:02 +0000 Commit: Matthias Fechner CommitDate: 2024-12-06 10:17:35 +0000 devel/rubygem-licensee: fix another conflict with faraday further isolation ports required for gitlab to work around update by 335fc7c38d61142727cb9f01fd9e401c476e4ad8 This should fix the problem if the two ports are installed: sysutils/rubygem-vagrant_cloud devel/rubygem-licensee PR: 283073 (cherry picked from commit ad3b00d8c41651b24fddaf19228561131743c739) --- devel/Makefile | 1 + devel/rubygem-licensee-gitlab/Makefile | 26 ++++++++++++++++++++++++++ devel/rubygem-licensee-gitlab/distinfo | 3 +++ devel/rubygem-licensee-gitlab/pkg-descr | 3 +++ devel/rubygem-licensee/Makefile | 6 +++--- www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- 7 files changed, 38 insertions(+), 5 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index 68342e1b0d5b..ebf8598ef834 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7389,6 +7389,7 @@ SUBDIR += rubygem-libyajl2 SUBDIR += rubygem-license_finder SUBDIR += rubygem-licensee + SUBDIR += rubygem-licensee-gitlab SUBDIR += rubygem-listen SUBDIR += rubygem-little-plugger SUBDIR += rubygem-local_time diff --git a/devel/rubygem-licensee-gitlab/Makefile b/devel/rubygem-licensee-gitlab/Makefile new file mode 100644 index 000000000000..c7ba3eaa9c0d --- /dev/null +++ b/devel/rubygem-licensee-gitlab/Makefile @@ -0,0 +1,26 @@ +PORTNAME= licensee +PORTVERSION= 9.17.1 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Detects under what license a project is distributed +WWW= https://github.com/benbalter/licensee + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.md + +RUN_DEPENDS= rubygem-dotenv>=2.0<4:misc/rubygem-dotenv \ + rubygem-octokit-gitlab>=4.20<10:net/rubygem-octokit-gitlab \ + rubygem-reverse_markdown>=1.0<3:textproc/rubygem-reverse_markdown \ + rubygem-rugged>=0.24<2.0:devel/rubygem-rugged \ + rubygem-thor>=0.19<2.0:devel/rubygem-thor + +USES= gem + +NO_ARCH= yes + +PLIST_FILES= bin/licensee + +.include diff --git a/devel/rubygem-licensee-gitlab/distinfo b/devel/rubygem-licensee-gitlab/distinfo new file mode 100644 index 000000000000..9daab429d3e2 --- /dev/null +++ b/devel/rubygem-licensee-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1724738884 +SHA256 (rubygem/licensee-9.17.1.gem) = 0be022c66d8853d35b08171a0f2575d5ccb5aef8a7020a1815938b4f26f4089a +SIZE (rubygem/licensee-9.17.1.gem) = 483840 diff --git a/devel/rubygem-licensee-gitlab/pkg-descr b/devel/rubygem-licensee-gitlab/pkg-descr new file mode 100644 index 000000000000..df5fef16abab --- /dev/null +++ b/devel/rubygem-licensee-gitlab/pkg-descr @@ -0,0 +1,3 @@ +Licensee automates the process of reading LICENSE files and compares their +contents to known licenses using a fancy math thing called Rabin-Karp +rolling-hashes. diff --git a/devel/rubygem-licensee/Makefile b/devel/rubygem-licensee/Makefile index c66e851cce5f..9d4ec702dbbe 100644 --- a/devel/rubygem-licensee/Makefile +++ b/devel/rubygem-licensee/Makefile @@ -1,10 +1,10 @@ PORTNAME= licensee PORTVERSION= 9.17.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= mfechner@FreeBSD.org +MAINTAINER= ruby@FreeBSD.org COMMENT= Detects under what license a project is distributed WWW= https://github.com/benbalter/licensee @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-dotenv>=2.0<4:misc/rubygem-dotenv \ - rubygem-octokit-gitlab>=4.20<10:net/rubygem-octokit-gitlab \ + rubygem-octokit>=4.20<10:net/rubygem-octokit \ rubygem-reverse_markdown>=1.0<3:textproc/rubygem-reverse_markdown \ rubygem-rugged>=0.24<2.0:devel/rubygem-rugged \ rubygem-thor>=0.19<2.0:devel/rubygem-thor diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 61d9f0123534..6a2d855e546e 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -195,7 +195,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ rubygem-loofah222>=2.22.0<2.23:textproc/rubygem-loofah222 \ - rubygem-licensee>=9.16<10:devel/rubygem-licensee \ + rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \ rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 6357258c76ae..7f65be2d51fb 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.6.1 -GITLAB_PORTREVISION= 1 +GITLAB_PORTREVISION= 3 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml