From nobody Wed May 31 12:49:10 2023 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 4QWTbp4PNqz4Yf58; Wed, 31 May 2023 12:49:10 +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 4QWTbp39FTz42vR; Wed, 31 May 2023 12:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685537350; 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=gmvVuZUDbaGXkcjC9JdAao5oASHVtvyCWsEOR16NGkw=; b=defEC0o1928xgnhwvPRKCTDGYXWedEb0mhzMFPh3Yyq5XBuQbfptwNObEUbPkNFhqDEsXd x2PsKp7THna1fJGawXa8AwWHWGXNaAtRMHNY+26iiV4Td3yJV33h9oJQLbpj//cdWpu5wg pNb/P7mBh6TKQRBhREcXSIIb6BvfVfAQ3ycVsMTkaiYQ5ptkHhDLdkvAdgDZoADZpwUXco 3iLtIpEJ9MjyokOKl0IOoBnbZT75QJQ++SDsB59UNOHqRcxntgb+QkE+sKspIqRHmofTwb P8hGQtZavKoGp3JgCavjm/Faw6ZDu3SRHecgU2mELKiw5rMHX/UATGKEF20Lbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685537350; 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=gmvVuZUDbaGXkcjC9JdAao5oASHVtvyCWsEOR16NGkw=; b=XAgJLYrRHW5PRs3vc1Iwg/5vJnhXWTDi0eElxzCuqyIxkcSimBAq/rbIA3dRIqW7GE4RS6 rnGd/pOBKRPQawVkyxstHXz+92eNKHE2jwUqgD4TVPbJibiAoyHyb+96ovibwT8BMumKn1 jcsrp+nT1lzQIJD9x9unXbi2SHUWLTlpOj4t9ubi0KvfyW6b1K0MyDsu3aM3HCwb4a18tB elZ1W8jv+ipWaRsJhv8GyKz11n8k4I4HX9d34jcySN4BPWgosKlCJ1mI0Kh2vJ0wC3HagI 67K6QYKaqEZtxP7lPkkhnRwj2YBTLqI3cR65MHWeuABU/E0mQYWCnyVJ7jeEzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685537350; a=rsa-sha256; cv=none; b=QWHUq1XEYJZalLBAbzJ4fn1rYH6Bm9sFlHC2cJkjmri4ENgTQ+Xy9657kDoaHUA4ez0apr +twB1qg5Lt4FHkJpv68aU53iW0jouxucLYvXLZJ3CXUDh3Zw2jg5W1reMzxuKTNBSemaE8 BNEMWzlzjP3J8lguuy0/Hvgm5CnOnuhGN/jGu60LvxzuhXS9U03wu4O8Qbr7kSXLyZaP+e kt84r6AS0s+rh/yEs30Q8rAmPKFw5WVsf4MGn7tXTlpt5yPMxtMAXE2IzyY8JPiU0BPNcL mBNh4VnwmtgQn958ZZGq5KHqOGSbW8wcvP4Gyu1IjPc8hrbvEmWuGMoAC3nXjg== 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 4QWTbp2FsRzbQZ; Wed, 31 May 2023 12:49:10 +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 34VCnAoS060436; Wed, 31 May 2023 12:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VCnAeT060435; Wed, 31 May 2023 12:49:10 GMT (envelope-from git) Date: Wed, 31 May 2023 12:49:10 GMT Message-Id: <202305311249.34VCnAeT060435@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 31beacaf6fdc - main - net-p2p/py-ed2k-tools: add rudimentary support for TAG_TYPE_BLOB 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31beacaf6fdc745e8eda64858396f89796320042 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=31beacaf6fdc745e8eda64858396f89796320042 commit 31beacaf6fdc745e8eda64858396f89796320042 Author: Alexey Dokuchaev AuthorDate: 2023-05-31 12:47:58 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-31 12:47:58 +0000 net-p2p/py-ed2k-tools: add rudimentary support for TAG_TYPE_BLOB While most common eDonkey2000's .part.met tags are integers and strings, there could be other data embedded in them, like binary data blobs. Ignore (skip) them for now rather than choking on. While here, use a better way to detect if supplied argument is a directory. --- .../py-ed2k-tools/files/patch-ed2k__metutils.py | 33 +++++++++++++++++----- net-p2p/py-ed2k-tools/files/patch-temp__summary.py | 20 +++++++++---- 2 files changed, 40 insertions(+), 13 deletions(-) diff --git a/net-p2p/py-ed2k-tools/files/patch-ed2k__metutils.py b/net-p2p/py-ed2k-tools/files/patch-ed2k__metutils.py index 7cd01f6f60d3..7c4cfa1ac8ee 100644 --- a/net-p2p/py-ed2k-tools/files/patch-ed2k__metutils.py +++ b/net-p2p/py-ed2k-tools/files/patch-ed2k__metutils.py @@ -1,6 +1,6 @@ --- ed2k_metutils.py.orig 2003-05-06 11:53:14 UTC +++ ed2k_metutils.py -@@ -6,7 +6,6 @@ +@@ -6,24 +6,24 @@ # tested on macosx 10.2.4, python 2.2 import struct; @@ -8,9 +8,10 @@ import sys; # Some defines. -@@ -14,16 +13,16 @@ import sys; + TAG_TYPE_STRING = 2; TAG_TYPE_INTEGER = 3; ++TAG_TYPE_BLOB = 7 -TAG_HANDLE_FILENAME = chr( 1 ); -TAG_HANDLE_FILESIZE = chr( 2 ); @@ -35,7 +36,7 @@ class MetFile: """Class designed to hold the data of a .part.met file.""" -@@ -39,7 +38,7 @@ class MetFile: +@@ -39,7 +39,7 @@ class MetFile: # a .part file must exist, even if it's empty. The same doesn't apply for new overnet. self.version = 225; self.modDate = 0; @@ -44,7 +45,7 @@ return; header_struct = "