From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35DF81581E7 for ; Tue, 23 Apr 2024 15:51:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E422E2A68; Tue, 23 Apr 2024 15:51:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 38376E2A68 for ; Tue, 23 Apr 2024 15:51:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA4C4343145 for ; Tue, 23 Apr 2024 15:51:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2028F1332 for ; Tue, 23 Apr 2024 15:51:37 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1713887493.8c1ca1e9e15eb15364f74ac7a4f82a413307b245.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/yara-python/, dev-python/yara-python/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/yara-python/files/yara-python-4.4.0-python3_12.patch dev-python/yara-python/yara-python-4.4.0.ebuild X-VCS-Directories: dev-python/yara-python/files/ dev-python/yara-python/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8c1ca1e9e15eb15364f74ac7a4f82a413307b245 X-VCS-Branch: master Date: Tue, 23 Apr 2024 15:51:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6456a63a-16ad-4413-93d2-8ae47c1a97bc X-Archives-Hash: bbc030530b894cdfefc3357c81558d5c commit: 8c1ca1e9e15eb15364f74ac7a4f82a413307b245 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Tue Apr 23 15:37:54 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Apr 23 15:51:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1ca1e9 dev-python/yara-python: remove unnecessary patch Upstream did a re-release which already contained this patch. Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/36373 Signed-off-by: Michał Górny gentoo.org> .../files/yara-python-4.4.0-python3_12.patch | 17 ----------------- dev-python/yara-python/yara-python-4.4.0.ebuild | 6 +----- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dev-python/yara-python/files/yara-python-4.4.0-python3_12.patch b/dev-python/yara-python/files/yara-python-4.4.0-python3_12.patch deleted file mode 100644 index 36bf1d60f686..000000000000 --- a/dev-python/yara-python/files/yara-python-4.4.0-python3_12.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream: https://github.com/VirusTotal/yara-python/pull/244 -From c00fd68cfb2f00c4bfe4ea6465a93af2d1d1a68f Mon Sep 17 00:00:00 2001 -From: Mario Haustein -Date: Sat, 16 Sep 2023 17:35:36 +0200 -Subject: [PATCH] Fix unknown escape sequence - ---- a/tests.py -+++ b/tests.py -@@ -719,7 +719,7 @@ def testRE(self): - 'rule test { strings: $a = /[M-N]iss/ nocase condition: $a }', - 'rule test { strings: $a = /(Mi|ssi)ssippi/ nocase condition: $a }', - r'rule test { strings: $a = /ppi\tmi/ condition: $a }', -- 'rule test { strings: $a = /ppi\.mi/ condition: $a }', -+ r'rule test { strings: $a = /ppi\.mi/ condition: $a }', - 'rule test { strings: $a = /^mississippi/ fullword condition: $a }', - 'rule test { strings: $a = /mississippi.*mississippi$/s condition: $a }', - ], 'mississippi\tmississippi.mississippi\nmississippi') diff --git a/dev-python/yara-python/yara-python-4.4.0.ebuild b/dev-python/yara-python/yara-python-4.4.0.ebuild index 911515e6d4e3..bde11ea7577c 100644 --- a/dev-python/yara-python/yara-python-4.4.0.ebuild +++ b/dev-python/yara-python/yara-python-4.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,10 +27,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}/${P}-python3_12.patch" -) - distutils_enable_tests unittest python_configure_all() {