From nobody Fri Mar 25 13:49:48 2022 X-Original-To: dev-commits-ports-all@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 7FC051A339A1; Fri, 25 Mar 2022 13:49:50 +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 4KQ3P86wmSz3Ql8; Fri, 25 Mar 2022 13:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216189; 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=xpRaSdHY6VdVmofLuGzIL1SmiOnfc5C5J4V/qvI/4qE=; b=LVqnXjmvj495oK2USK04SzBoUug5icS0M554bFKpLmCrictjN/rzKBPWTWWWu4Eq6zJ0JN BD3hTAvwyZiOIXo4b8cDNcppO7Hz1IGDGfSXDYRoU0EfGC42ttqUFjD6rnRw5Jp+/zqeYb Y19iEK8k1VCTXaFJS7SGzPyoi+G5NpcXingLpJlvUPaRdlCWl34Jq8B4eZJxkhKmKp9N9R McLDmd1O+wPk/iAIAZW8GhegFXF1nkfhiQl+kw8vdsZ/rnh/Ya2u15CkdGcpOWalk2TPcb wHy6QlW9Ns9uLx5L36OeRmrcPw+K3h1bH0iRB9ktTHpiiEsM4+NXtKQFylErww== 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 3A5145983; Fri, 25 Mar 2022 13:49:48 +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 22PDnmhr027816; Fri, 25 Mar 2022 13:49:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDnm3e027815; Fri, 25 Mar 2022 13:49:48 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:49:48 GMT Message-Id: <202203251349.22PDnm3e027815@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: 7f987072052d - main - devel/codeville: Fix build with setuptools 58.0.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 7f987072052d27f6f0066dc116c39cbcbb562197 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216189; 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=xpRaSdHY6VdVmofLuGzIL1SmiOnfc5C5J4V/qvI/4qE=; b=nYyX+L9mzpSSDEqgpOjI1QrOXOrJ1SC6y7ZZcqE5UYfa6LMDbqCq30YPyC/4KwLhmGnFfA /tuVR3BTf+cT7F0i0U3ko8tly/9rjsH0F12UBGJYYGfP6ZXh5MjsEJQGa5ePfjEuSer2gr qQAN1Y49sa+URBoXPjBCy7P7bSx/1j6LCGoUR+psBBhos008SXo/eWe8JsSpnT4PFASvcs WhAshQoga75g6TiiX411ShV+vvXRYzj83hPNAMiYoOgoLDN06HcMIN0PTzFR783d2/YtAI Wn5iq8kWXPzYsJgTi5W3InW71GEI6HfbeCMl0IntLkFYOypwqDqJBdtHZ6HjKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216189; a=rsa-sha256; cv=none; b=Eb2XvaJdTxn1TVjddOkOvWO/LqfmNARgwnPb3O/vlrZiCM/phDZPLltic0z52S0I26Z6gJ QfUdW3xF+oPh+JsL4vIxO6+vv1qSIA4jaQCes7Va1tJkYJBCK7HIi4wHcWB7RC9XLZmQWt xBX+Ilqo4OdeyQ/tDUgTUgW2+eOPzx8j4GGFvLDSQ/lzdp7VGNyNHNA2ob8kYS39PHyfn8 9HLyoGs9tQTMCIoVyE5uQ9hrtpvtA8CpArH2wOQInwMd9+hQA1adLVsN6YKNY3dhZeROOL L89FOQ1opxNBZDXCWkF7C77EgJBjgo9+MvDl2Bx4bRxKPwT/JpADqfiSLVteQQ== 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=7f987072052d27f6f0066dc116c39cbcbb562197 commit 7f987072052d27f6f0066dc116c39cbcbb562197 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:06 +0000 devel/codeville: Fix build with setuptools 58.0.0+ - While I'm here, add USE_PYTHON=noflavors With hat: python --- devel/codeville/Makefile | 2 +- devel/codeville/files/patch-indent | 75 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile index d6c764a19c05..c2e6ee70ba5e 100644 --- a/devel/codeville/Makefile +++ b/devel/codeville/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} USES= python:3.7+ tar:txz -USE_PYTHON= distutils autoplist +USE_PYTHON= distutils autoplist noflavors NO_ARCH= yes PORTEXAMPLES= cdvserver.conf.sample diff --git a/devel/codeville/files/patch-indent b/devel/codeville/files/patch-indent new file mode 100644 index 000000000000..78679d8335c5 --- /dev/null +++ b/devel/codeville/files/patch-indent @@ -0,0 +1,75 @@ +--- Codeville/SRP.py.orig 2020-12-15 07:22:56 UTC ++++ Codeville/SRP.py +@@ -34,7 +34,7 @@ class ImproperKeyValue(Exception): pass + def hash(s): + """Hash a value with some hashing algorithm.""" + if type(s) != type(''): +- s = long_to_string(s) ++ s = long_to_string(s) + + return sha.new(s).digest() + +@@ -85,7 +85,7 @@ def client_key(user, passphrase, s, B, u, keys, key_fu + # We don't trust the host. Perhaps the host is being spoofed. + + if B <= 0 or n <= B: +- raise ImproperKeyValue ++ raise ImproperKeyValue + + # Calculate the shared, secret session key. + +@@ -93,7 +93,7 @@ def client_key(user, passphrase, s, B, u, keys, key_fu + v = 3 * pow(g, x, n) + t = B + if t < v: +- t = t + n ++ t = t + n + S = pow(t - v, a + u * x, n) + K = hash(S) + +@@ -118,21 +118,21 @@ def host_begin(user, A, s, v): + # order to break the protocol. + + if A <= 0 or n <= A: +- raise ImproperKeyValue ++ raise ImproperKeyValue + + # Pick our random public keys. + + B = 0 + while B == 0: +- b = random_long(ablen) +- B = ((3*v) + pow(g, b, n)) % n ++ b = random_long(ablen) ++ B = ((3*v) + pow(g, b, n)) % n + u = pow(g, random_long(tlen), n) + + # Calculate the (private, shared secret) session key. + + t = (A * pow(v, u, n)) % n + if t <= 1 or t + 1 == n: +- raise ImproperKeyValue # WeakKeyValue -- could be our fault so retry ++ raise ImproperKeyValue # WeakKeyValue -- could be our fault so retry + S = pow(t, b, n) + K = hash(S) + +--- Codeville/entropy.py.orig 2020-12-15 07:23:19 UTC ++++ Codeville/entropy.py +@@ -31,14 +31,14 @@ def string_to_long(s): + """Convert a string of bytes into a long integer.""" + r = 0 + for c in s: +- r = (r << 8) + ord(c) ++ r = (r << 8) + ord(c) + return r + + def long_to_string(i, length=0): + """Convert a long integer into a string of bytes.""" + s = '' + while i > 0: +- s = chr(i & 255) + s +- i = i >> 8 ++ s = chr(i & 255) + s ++ i = i >> 8 + s = '\x00' * (length - len(s)) + s + return s