From nobody Wed Jul 13 11:54:59 2022 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 E62D11D21CC5; Wed, 13 Jul 2022 11:54:59 +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 4Ljbdv6C35z3vB0; Wed, 13 Jul 2022 11:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657713299; 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=ckp9qxQzsD2KO9lQXkhdzwXw4ZIvAO8d5dEe3sv/y2o=; b=hqvazzoqYjeRSEdllole65MNMn/RWqtG7xQWCiBS1mGsWOdZztoSxHV7th0ZP07KkH1vbf QjKxii05XDxGULBme7KaimmD4qOP6TWs7weTT2T7Zkuo78xdfm7JRmYS+C4eWs4Sp+b5lp Kl/3f62NR3g1cC4GbIlv1j0c5BMZJssyuEqiRuJkM0N1+WVU9GfX3noMtK0rKVxtA1hq57 F94L36OiJfSQmHjcVh6Za8KL+kWJW1anfEB/LXzTQOnEBPFz1oupaaKWgDtqHZnPTou8uJ BzIH+DKPNaWd1NE4Wk6shZ3obdHQrNc/AZ09JDlPiSC9Ybo1sd/CNB/p89gCcg== 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 4Ljbdv5HrzzMc5; Wed, 13 Jul 2022 11:54:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DBsxGi058273; Wed, 13 Jul 2022 11:54:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DBsxZS058272; Wed, 13 Jul 2022 11:54:59 GMT (envelope-from git) Date: Wed, 13 Jul 2022 11:54:59 GMT Message-Id: <202207131154.26DBsxZS058272@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 60574e38465d - main - textproc/rubygem-github-linguist: Fix gemspec for rubygem-escape_utils 1.3.0 update 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60574e38465de832c3d035888b065d8ac2137dda Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657713299; 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=ckp9qxQzsD2KO9lQXkhdzwXw4ZIvAO8d5dEe3sv/y2o=; b=S5QeCmyqly9w1ONAnOnZBfzF3WqzTZaBtdyRhSG3kNY9x8ymcg3Y55bwfFOYb+0qYK8jL9 fuWc2AOXtbxQZYfTohuPGuLEOnU06WN74Gc2i3UbcRGAuY4uRvOdxJqroM6ny1BDgOeBO1 VzYuiJYnMi7uEuUnsbLo86b8xaxQSXjBxWjkYcW9Q+z46i5fB/zu/Oqy4Cb1DzVP9yf0Z3 TR/9ZbGwXkjhSBQ5RRyNntDyzw4pR2B4tgTOx6SRiyKtyp8iYnysy52ZI65278Eus0RcYM 3PJp/i3BRIqoaoeVMnkrJtLCFf/j/AdIPdC9RNrEUFfMTtcA/uREToIvA1pGpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657713299; a=rsa-sha256; cv=none; b=C1IokVXIVgO+zAdBsQo4Xp3laf0ZTPWLlwQMQlRt78xQJDu89f0O9yUDuGy8ytg+1SILt2 PszM5jxQYsYa9QXAwGYYQik1znU4Jb3Kjzy78JSuYrO3RCGi1Z1zmRkojS+PssrCRPoxxn YsSoES8OKnBtXX0LVly1Qy/+h21m4/OL9W+a2VDofo9BUJvu2JAqTebWOZVqsj5veza31G CquLQUJ8buHv4/H0MWVJYv+MwibwsJqmY+SebnQ+diS5TFnNPLg6zR2lr3mTQTl4Jz7r12 M/pF0db27ye+47JD7lg+Kor1K6hQw4FTIs/LfFSxkGMyqoIgWf7RaWMZgSIRuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=60574e38465de832c3d035888b065d8ac2137dda commit 60574e38465de832c3d035888b065d8ac2137dda Author: Po-Chuan Hsieh AuthorDate: 2022-07-13 11:54:23 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-07-13 11:54:23 +0000 textproc/rubygem-github-linguist: Fix gemspec for rubygem-escape_utils 1.3.0 update - Bump PORTREVISION for package change Reference: https://github.com/github/linguist/pull/5949 --- textproc/rubygem-github-linguist/Makefile | 6 ++-- .../files/patch-escape_utils | 36 ++++++++++++++++++++++ .../rubygem-github-linguist/files/patch-gemspec | 11 +++++++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/textproc/rubygem-github-linguist/Makefile b/textproc/rubygem-github-linguist/Makefile index f65bd07571d4..0acb4817243a 100644 --- a/textproc/rubygem-github-linguist/Makefile +++ b/textproc/rubygem-github-linguist/Makefile @@ -1,6 +1,6 @@ PORTNAME= github-linguist PORTVERSION= 7.21.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -10,8 +10,8 @@ COMMENT= GitHub Language detection LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-charlock_holmes>=0.7.7<0.8:textproc/rubygem-charlock_holmes \ - rubygem-escape_utils12>=1.2.0<1.3:textproc/rubygem-escape_utils12 \ +RUN_DEPENDS= rubygem-cgi>=0:www/rubygem-cgi \ + rubygem-charlock_holmes>=0.7.7<0.8:textproc/rubygem-charlock_holmes \ rubygem-mini_mime>=1.0<2:mail/rubygem-mini_mime \ rubygem-rugged>=1.0<2:devel/rubygem-rugged diff --git a/textproc/rubygem-github-linguist/files/patch-escape_utils b/textproc/rubygem-github-linguist/files/patch-escape_utils new file mode 100644 index 000000000000..241522704f34 --- /dev/null +++ b/textproc/rubygem-github-linguist/files/patch-escape_utils @@ -0,0 +1,36 @@ +--- lib/linguist/blob_helper.rb.orig 2022-06-23 13:30:27 UTC ++++ lib/linguist/blob_helper.rb +@@ -1,6 +1,6 @@ + require 'linguist/generated' ++require 'cgi' + require 'charlock_holmes' +-require 'escape_utils' + require 'mini_mime' + require 'yaml' + +@@ -94,7 +94,7 @@ module Linguist + elsif name.nil? + "attachment" + else +- "attachment; filename=#{EscapeUtils.escape_url(name)}" ++ "attachment; filename=#{CGI.escape(name)}" + end + end + +--- lib/linguist/language.rb.orig 2022-06-23 13:30:27 UTC ++++ lib/linguist/language.rb +@@ -1,4 +1,4 @@ +-require 'escape_utils' ++require 'cgi' + require 'yaml' + begin + require 'yajl' +@@ -434,7 +434,7 @@ module Linguist + # + # Returns the escaped String. + def escaped_name +- EscapeUtils.escape_url(name).gsub('+', '%20') ++ CGI.escape(name).gsub('+', '%20') + end + + # Public: Get default alias name diff --git a/textproc/rubygem-github-linguist/files/patch-gemspec b/textproc/rubygem-github-linguist/files/patch-gemspec new file mode 100644 index 000000000000..26e5a94c55da --- /dev/null +++ b/textproc/rubygem-github-linguist/files/patch-gemspec @@ -0,0 +1,11 @@ +--- github-linguist.gemspec.orig 2022-06-17 15:51:08 UTC ++++ github-linguist.gemspec +@@ -26,7 +26,7 @@ Gem::Specification.new do |s| + + if s.respond_to? :add_runtime_dependency then + s.add_runtime_dependency(%q.freeze, ["~> 0.7.7"]) +- s.add_runtime_dependency(%q.freeze, ["~> 1.2.0"]) ++ s.add_runtime_dependency(%q.freeze, [">= 0"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_runtime_dependency(%q.freeze, ["~> 1.0"]) + s.add_development_dependency(%q.freeze, ["~> 5.15"])