From nobody Wed Mar 09 10:09:04 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 A5E941A08AEC; Wed, 9 Mar 2022 10:09:05 +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 4KD7Fs0QTSz4qk5; Wed, 9 Mar 2022 10:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646820545; 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=BHWyOUW/8D9qeVUYSwYa2MkSq4zt1S7aa2ZKhP7kWWw=; b=t5bAc2HY8S4Q5SosQxgtudho1JIObmHPQRstXGWrh5pa+uucKjefaCXrtRwu1OCB1UoImv GV83pP/Px1X01Yv7z5r9oiiNJRuttiPJSS7ezYXkpFVGCYTQgvzcUE6xdscX9NBwXPdukp A8LntLHqFB+IURU1poFAxMTFXAcOg+qOCf1RlJ0AcHsBNPF5O7/s9R+m6lt0JoHnQ56U2f BpWJy5YiF+4iQh/IX2R4oMKfq5fL5gBxOVe5XUj/UX62MuwVSpbnMNp35kxfnhKDodvCFh xtQt183bte3g9DeoRAzt6fMZyn0jDG6+j5+sCxoFNdwzdLY5SyDsW67Osy5eNw== 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 B96486FFD; Wed, 9 Mar 2022 10:09:04 +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 229A94ah090694; Wed, 9 Mar 2022 10:09:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229A94pt090693; Wed, 9 Mar 2022 10:09:04 GMT (envelope-from git) Date: Wed, 9 Mar 2022 10:09:04 GMT Message-Id: <202203091009.229A94pt090693@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: c23808a15234 - main - www/gitlab-ce: disable database migration check for Google::Apis::VERSION 0.50.0 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: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c23808a15234917edbdcaa8b366eabb0759b0eed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646820545; 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=BHWyOUW/8D9qeVUYSwYa2MkSq4zt1S7aa2ZKhP7kWWw=; b=UDC2rmixLJWdmiVRvQJpZxdmi3Rb5oznc/sb3I/qe+erZF0TogCgpjtsfAZQ7ytxkA8OGg 8g6hePO8KqZC0Tpk/Ei4uK6HvW1jq3cN70tpiC5NUpWBgOZTn/Bes5GBaJNqP2JmIR6q+z wKG2Z/Sejg5UpzN5vRthvtcf/afmcMa4dFrduW42MObIhx2wTUB6pFOlagSSKkHiXRPHn4 tnXh/FLM3SFXCLJrGaV081dGAcv98rNsqaWYGEEBzb6/BOswu03codKGdlFjCsf8itdQqw pskoJU6+lySngzBjJXfsSaGe4AVH4tBepuIiXvbBLeUPABfN7DR7NuxXf3Uj1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646820545; a=rsa-sha256; cv=none; b=mrBa+5D5Jd5ywJzzfFpG1HdaUEdLCnKB2uVIKLxptoaHvVdJKJGb6CziwDfMsFKZzovwr4 baDm219Z3SjCKs+fKQx7GIlWdwMhLxj75j732dzBIzY4GEYN+OPruuwwG1bLD6TjRZ2c1w +1/iqo8t2z7pv3W+euzbCG2rX1f3nsO7v5qwO4RG28PNcNwfmcTcPAX37SMfl2HfGvZHXF wrTfX05qh/MZ8BF5OQ7dUmeDd+Aeb9dQZW3VZsTsc1m6u493iyyJT0DEZWLxdyHymmFT6n W6yCZmazFuojBK94+RsiChXr7tMajSZyrUwrfgpGEreqam7x5znJvar3zlGsVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=c23808a15234917edbdcaa8b366eabb0759b0eed commit c23808a15234917edbdcaa8b366eabb0759b0eed Author: Matthias Fechner AuthorDate: 2022-03-09 09:42:10 +0000 Commit: Matthias Fechner CommitDate: 2022-03-09 10:07:56 +0000 www/gitlab-ce: disable database migration check for Google::Apis::VERSION 0.50.0 Current package version is using rubygem-google-api-client-0.53.0. Executing the database migration will show: ``` rake aborted! NameError: uninitialized constant Google::Apis::VERSION Did you mean? VersionCheck /usr/local/www/gitlab-ce/config/initializers/google_api_client_patch.rb:5:in `' /usr/local/www/gitlab-ce/config/environment.rb:7:in `' Tasks: TOP => db:migrate => db:load_config => environment (See full trace by running task with --trace) ``` I tested it successfully with version 0.53.0. --- .../patch-config_initializers_google__api__client__patch.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/www/gitlab-ce/files/patch-config_initializers_google__api__client__patch.rb b/www/gitlab-ce/files/patch-config_initializers_google__api__client__patch.rb new file mode 100644 index 000000000000..a175857e3c92 --- /dev/null +++ b/www/gitlab-ce/files/patch-config_initializers_google__api__client__patch.rb @@ -0,0 +1,11 @@ +--- config/initializers/google_api_client_patch.rb.orig 2022-03-09 09:41:27 UTC ++++ config/initializers/google_api_client_patch.rb +@@ -2,7 +2,7 @@ + + require 'google/apis/core/http_command' + +-raise 'This patch is only tested with google-api-client-ruby v0.50.0' unless Google::Apis::VERSION == "0.50.0" ++#raise 'This patch is only tested with google-api-client-ruby v0.50.0' unless Google::Apis::VERSION == "0.50.0" + + # The google-api-ruby-client does not have a way to increase or disable + # the maximum allowed time for a request to be retried. By default, it