From nobody Wed Feb 02 19:37:40 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 9AAE219B485D; Wed, 2 Feb 2022 19:37:40 +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 4JpsX43zSdz3MZ5; Wed, 2 Feb 2022 19:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643830660; 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=Ff5EVWaRJucoGgZW/HAFAfR+YuNDsKX+lYs/kpfPAcw=; b=mJj1XPFxX6s/qgC/YzjTLNMB6GXMpKYS9gZFkCQiH4/23XUQKJePupD1358PgO8PJjASIh xLo4aCsid1eNykfOAxX+m7Op6QvCdMdPH52Ip0Q4Vqc/eiIeJmoaXkaQNIrtdKbrQU22Dg Ys+9pl8qzTk+td462b5992Z8QvYhVpOZM2HjjMrcGgvy7PcdaBr3Myw6/vsNIy+EYsBatU +D+LbfGPW+nVFO9Sk6KpLYsUxjmrW75RALeI0ujuRFvURrzSoG277wauSUfChIkbnpdgs9 yTm8x6UqkqoTwlIWZqHQPNmxjKgSGT/Ai0jobPMPEF0S9v3tFDSyhFeORfn2uA== 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 684AB1F29; Wed, 2 Feb 2022 19:37:40 +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 212JbeZ9011860; Wed, 2 Feb 2022 19:37:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 212Jbe4e011859; Wed, 2 Feb 2022 19:37:40 GMT (envelope-from git) Date: Wed, 2 Feb 2022 19:37:40 GMT Message-Id: <202202021937.212Jbe4e011859@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 7155c2ef89d9 - main - databases/cassandra3: Remove code duplication in patches 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7155c2ef89d93cc0c14a24fd3add11c90922155a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643830660; 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=Ff5EVWaRJucoGgZW/HAFAfR+YuNDsKX+lYs/kpfPAcw=; b=W4VV0WI1cr6fPW8hjW1NwjM2t5TGmc2EUVw83TGqESJ/zyY54hVxAK6hhv/diW4oiwbAkE 7siuxJBmhO4wjxb5Aii0khPd/Ch4PeBdDnCy4OBFOnol46UKkMUKf6ABfZ6YbbEKbORWN9 5PvEr+XGpLXiSd8MBUQ63vhUZOu9i8s2QsXgQ+5Xinght8eHtkIgEuhLh+6kQzP7cOff2h 04WCI4g6LMCb0IfACKtg58PaVJZ7ZmzgebC7yHkgRzou+c3HHd2bdSuvufb2AVqY2a4qOT id7Q9duMrARY8boWdQD4wmuYXqK5KgqNLtOgdzIwFFq/ZLDl8x4HRTFhxAjkcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643830660; a=rsa-sha256; cv=none; b=V6mxxPGLirbMKR+UElmS6Zigl82KXWZW+kQZvF9xn4uUKF72M1Zb9GxgfpkpvFAIcXi1Dm K8ftTFFYlFPwyCJIXe7noPbsq6loL+hvf+fj0gMRlr6s4WXVgxy1VChIW0nZAEDvrE/04A C0R7yTqGtj8iSsentT0IYOdO31OnBVq2e8tnDAH8HrK9UaDPJcJvnfH/6RmyocihM4LmTI hyAFwaGxOZw9KO02BudspKI0zy/4TPFsd/Y9SBlsrf9yqDfuoAHMvKY2OJlcbKexs73Aqh r64gAazYMADl7ir1s0kD85WjhpzDIo/ShdjrQi+Tl7PqxlPT6z0+1V1+RkMQ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=7155c2ef89d93cc0c14a24fd3add11c90922155a commit 7155c2ef89d93cc0c14a24fd3add11c90922155a Author: Angelo Polo AuthorDate: 2022-01-21 15:12:53 +0000 Commit: Neel Chauhan CommitDate: 2022-02-02 19:37:26 +0000 databases/cassandra3: Remove code duplication in patches PR: 261220 --- .../files/patch-.build_build-resolver.xml | 27 ---------------------- .../cassandra3/files/patch-pylib_requirements.txt | 16 ------------- 2 files changed, 43 deletions(-) diff --git a/databases/cassandra3/files/patch-.build_build-resolver.xml b/databases/cassandra3/files/patch-.build_build-resolver.xml index e037610af9e9..2629ddab11c9 100644 --- a/databases/cassandra3/files/patch-.build_build-resolver.xml +++ b/databases/cassandra3/files/patch-.build_build-resolver.xml @@ -25,30 +25,3 @@ - \ No newline at end of file + ---- .build/build-resolver.xml.orig 2022-01-03 17:11:14 UTC -+++ .build/build-resolver.xml -@@ -182,7 +182,7 @@ - - - -- -+ - - - -@@ -216,7 +216,7 @@ - - - -- -+ - - - -@@ -243,4 +243,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/databases/cassandra3/files/patch-pylib_requirements.txt b/databases/cassandra3/files/patch-pylib_requirements.txt index 4468f4611060..27616df2d111 100644 --- a/databases/cassandra3/files/patch-pylib_requirements.txt +++ b/databases/cassandra3/files/patch-pylib_requirements.txt @@ -14,19 +14,3 @@ psutil -thrift==0.9.3 +thrift==0.10.0 ---- pylib/requirements.txt.orig 2022-01-04 12:21:36 UTC -+++ pylib/requirements.txt -@@ -1,7 +1,6 @@ - # See python driver docs: futures and six have to be installed before - # cythonizing the driver, perhaps only on old pips. - # http://datastax.github.io/python-driver/installation.html#cython-based-extensions --futures - six>=0.12.0 - -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver - # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases. -@@ -17,4 +16,4 @@ nose-test-select - parse - pycodestyle - psutil --thrift==0.9.3 -+thrift==0.10.0