From nobody Sun Oct 26 19:19:43 2025 X-Original-To: dev-commits-ports-all@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 4cvmfl6W1Wz6DqZS; Sun, 26 Oct 2025 19:19:43 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cvmfl5j69z49cl; Sun, 26 Oct 2025 19:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761506383; 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=Jew8/ECJ7iYR/tNBfVBcb/OQfJu+LMUcnMTI2UqPaDI=; b=Cft8kjrnQoOA6fQ2KurUV1kuOV1sp6zr3Kr2Hy4PP94WRjrdLj9ognMEGIrWzbtIsCU5jb Yh3bnPndJds+Yj1EA3WSoi4bX3uY9c0tY/lvfhf3yupEzmo6whwmGMAzzFl6RyOCV2j3BR mhKz4Kh7EY/4y4UZQg51+HPQhr/wPwNQNQ+31Zc2kqbuvYmyy5hYxKpuOK654Kddraywh8 r6KRcKRw0SqYLC8AsC9nNIBYqgJ5oZvWgWExcdByFjkPkGFl0Q0HfTN9AWaEW4kNkrTgjt B/l9loTouV7c7ba3dLrJulxxIyAzDRdUsTfiYL+31SBlp/bdm/12C95fNwOpEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761506383; 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=Jew8/ECJ7iYR/tNBfVBcb/OQfJu+LMUcnMTI2UqPaDI=; b=dGbmKewIrYzKaP9nwcUeRt6HMbYC5CW+dTrrIZPelxirDNgMGlyJ9E2H3IS85wfx+Y1jMd fY85c2iaBjZfVS/jap2QRVMV78VnWjEi2Wf65pyhaHsV5lMXkf461wTb1zxGhlX6frH7Ff jtlhlC34z26TvB1eGGCp+a1MYCOk5qmJFUfnZHtSG2GiW0fHdb2WcsTSNiC/J8c5Om24Nl NfEE/FP/nJR3x3ZZdun76CPZDbU/Dn3XT7S1bzFvzxkoUSCJyZPMql22+F2rEw6ks1sfb8 6mORQLMS9lRu74fHfJfCHujgX5dxIG4POffkmXB87dn7iOhR4kEfQeQoLtFgSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761506383; a=rsa-sha256; cv=none; b=WspGBZ4/dKvPUkb4/mngtzYJwLrvLcAdUJ6nKKq5wG9isijw342Db8H1p4iljp0yxntAMi V2VtzFIq5rO12TOEIToCeNo6I1W45DYoF7znmnQmsv1qz61Qwk3nxDiFrSm+T5d08XvyWS wfnW3vs/d4f0Sk10c96+8G54rHj/QjjhO1tLAi3sAwyZU1/KpmbrpesIL1qoy2VxY8LMeA SPPAAoUkm9XYpGAJeyg42tmHex2k2DVGIyIFE0XatzIM1PdAqUdlLihm6dW/tKw2KY7AyK Pw7FanP3i5EGH6Ens+oBxz6Hn+4YRwY6Cshgx7zZsNNM09T7AlydmWVens1zlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cvmfl56JQzlwq; Sun, 26 Oct 2025 19:19:43 +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 59QJJhkY075782; Sun, 26 Oct 2025 19:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59QJJhmY075779; Sun, 26 Oct 2025 19:19:43 GMT (envelope-from git) Date: Sun, 26 Oct 2025 19:19:43 GMT Message-Id: <202510261919.59QJJhmY075779@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 0842afa76816 - main - www/rubygem-typhoeus-gitlab: fix merge conflict in 2025Q4 with www/rubygem-typhoeus List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: 0842afa76816033c2ab539122099c6f4f1940459 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0842afa76816033c2ab539122099c6f4f1940459 commit 0842afa76816033c2ab539122099c6f4f1940459 Author: Matthias Fechner AuthorDate: 2025-10-26 19:18:25 +0000 Commit: Matthias Fechner CommitDate: 2025-10-26 19:19:36 +0000 www/rubygem-typhoeus-gitlab: fix merge conflict in 2025Q4 with www/rubygem-typhoeus which prevents build gitlab 18.4.3 --- www/Makefile | 1 + www/gitlab/Makefile | 2 +- www/gitlab/Makefile.common | 2 +- www/rubygem-faraday-typhoeus-gitlab/Makefile | 3 ++- www/rubygem-typhoeus-gitlab/Makefile | 20 ++++++++++++++++++++ www/rubygem-typhoeus-gitlab/distinfo | 3 +++ www/rubygem-typhoeus-gitlab/pkg-descr | 8 ++++++++ 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/www/Makefile b/www/Makefile index 8a0a86640272..bf605da21389 100644 --- a/www/Makefile +++ b/www/Makefile @@ -2487,6 +2487,7 @@ SUBDIR += rubygem-turbolinks SUBDIR += rubygem-turbolinks-source SUBDIR += rubygem-typhoeus + SUBDIR += rubygem-typhoeus-gitlab SUBDIR += rubygem-typhoeus14 SUBDIR += rubygem-uglifier SUBDIR += rubygem-underscore-rails diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 911afd467867..63bf21a177f7 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -145,7 +145,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-aws-sdk-s3-gitlab>=1.193.0<1.194:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \ rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \ - rubygem-typhoeus14>=1.4.0<1.5:www/rubygem-typhoeus14 \ + rubygem-typhoeus-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \ rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \ rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \ rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index e0848ef8faaa..3019a00025a3 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 18.4.3 -GITLAB_PORTREVISION= 0 +GITLAB_PORTREVISION= 1 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/rubygem-faraday-typhoeus-gitlab/Makefile b/www/rubygem-faraday-typhoeus-gitlab/Makefile index 2559b38d853c..41342f2151f0 100644 --- a/www/rubygem-faraday-typhoeus-gitlab/Makefile +++ b/www/rubygem-faraday-typhoeus-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= faraday-typhoeus PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-faraday-gitlab>=2.0<3:www/rubygem-faraday-gitlab \ - rubygem-typhoeus>=1.4<2:www/rubygem-typhoeus + rubygem-typhoeus-gitlab>=1.4<2:www/rubygem-typhoeus-gitlab USES= gem diff --git a/www/rubygem-typhoeus-gitlab/Makefile b/www/rubygem-typhoeus-gitlab/Makefile new file mode 100644 index 000000000000..39a564f53441 --- /dev/null +++ b/www/rubygem-typhoeus-gitlab/Makefile @@ -0,0 +1,20 @@ +PORTNAME= typhoeus +PORTVERSION= 1.4.1 +CATEGORIES= www rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= -gitlab + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Parallel HTTP request library +WWW= https://github.com/typhoeus/typhoeus + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rubygem-ethon>=0.9.0:www/rubygem-ethon + +USES= gem + +NO_ARCH= yes + +.include diff --git a/www/rubygem-typhoeus-gitlab/distinfo b/www/rubygem-typhoeus-gitlab/distinfo new file mode 100644 index 000000000000..32bc6f482eed --- /dev/null +++ b/www/rubygem-typhoeus-gitlab/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1700760710 +SHA256 (rubygem/typhoeus-1.4.1.gem) = 1c17db8364bd45ab302dc61e460173c3e69835896be88a3df07c206d5c55ef7c +SIZE (rubygem/typhoeus-1.4.1.gem) = 57856 diff --git a/www/rubygem-typhoeus-gitlab/pkg-descr b/www/rubygem-typhoeus-gitlab/pkg-descr new file mode 100644 index 000000000000..086ea1d8e6f3 --- /dev/null +++ b/www/rubygem-typhoeus-gitlab/pkg-descr @@ -0,0 +1,8 @@ +Typhoeus runs HTTP requests in parallel while +cleanly encapsulating handling logic. + +It's a library for accessing web services in Ruby, +specifically designed for building RESTful service +oriented architectures in Ruby that need to be fast +enough to process calls to multiple services within +the client's HTTP request/response life cycle.