From nobody Sat Jan 25 17:32:29 2025 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 4YgMFV1msZz5lfQD; Sat, 25 Jan 2025 17:32:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgMFT71r7z4P1g; Sat, 25 Jan 2025 17:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826350; 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=GDP6Rr8HHLBQqe09QKqjjB5Zhp3+3xEQxVn0fNTmGY0=; b=pZK/uRjx2CNCebix4IuVYhe9T7LQGenXgCzGxT8y/4xQZShMY5XXN3v+2PZjqKmrvf2G4z G70uJz/+1CibvTwL0Ho8FR6/DxFdkERzad+HhDH0+rtb7Oe2s+KCenk3tJrrAOf3/o0j/l WPsiMewc6P7n55TA/wEgp51SuEuF7A5JAjBcXjvrS5txZQadoTHGNEL0aUwmK9LZWNxrUG XfasxI4KpwrmFRdMsfInxfgGYSUPeAF4ufhWSvTToyYx4L8/rmnQyf/1qh7FW4oN3gPI2u 8MbDl6+d9+U2oZemZsQgzn3RX1+zGgO6CNCFVvPZ1h2DtIPwyHZHJJOrt66kwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826350; 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=GDP6Rr8HHLBQqe09QKqjjB5Zhp3+3xEQxVn0fNTmGY0=; b=IFwZpHgbU0bXru5pew5Kg2oNVJ3yZ+9xdcY4s7w2zw5iHSydjFcZ/w8f+5Obubfgmd6kXB OE1pk0BEN+qOLHOoEavYDQ2at7rG7cwT0DASFEtn6mhkAjl/LpPZRJcfsa4N1GukzYgg8z G2rYEMPTVixyE3fPb8vYzk+mV546Tw0NEWXLUg34hWPC7torTAlxVYr9IDniq+udOUwWrV X4Zis2ouOEVheYjml36coG/g6P/TJCZ5h69NSPoPWkeQUlKHo/73d7HvMvvK8YABwG6KIi kx259SvXMO012/bqmTnBXEc7GfBzg8mzgh85wu8DswK6l9a4G6ai5NaxfotCMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737826350; a=rsa-sha256; cv=none; b=X+KBOSsFMVqH6zbji0IfaJH4kMxRWgV5Td4glrJuXVZ9UPnvHb49wBNG70qER8qUWUeBH9 o//CEbjZD1K5ro4MF0ngWq7YThs0BSgHfIiINOaOT3QAyuL3+QwzBI2mzCBkxkF4Hm/BG1 Cl2pnw2bOn9D7A9FXryvLi0jgZfj1w0HoItqxF5sYW1IvavqW0iQS4uBcbBi5w7XklIHjh h5iO1xH55DSSzShTJakzjuaOF0B1WAyvskUP1w2yjDY1Kx96QPWyqA5Dz3uddQtqpzgUMF /VDN+iMppVccawLeDfLrWb427nlnSJ2N6NND1NAw4lAf4lg6lAsIpEjypY3mQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YgMFT6DxWz1LTb; Sat, 25 Jan 2025 17:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50PHWTL5043997; Sat, 25 Jan 2025 17:32:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PHWTIN043994; Sat, 25 Jan 2025 17:32:29 GMT (envelope-from git) Date: Sat, 25 Jan 2025 17:32:29 GMT Message-Id: <202501251732.50PHWTIN043994@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 59f3b797be23 - main - devel/py-p4python: Update to 2024.2.2682690 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59f3b797be231de7ed2800bd1f59556b9517fc43 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=59f3b797be231de7ed2800bd1f59556b9517fc43 commit 59f3b797be231de7ed2800bd1f59556b9517fc43 Author: antonfb AuthorDate: 2025-01-25 17:26:37 +0000 Commit: Daniel Engberg CommitDate: 2025-01-25 17:31:53 +0000 devel/py-p4python: Update to 2024.2.2682690 Changelog: https://github.com/perforce/p4python/blob/2024.2.0/RELNOTES.txt PR: 283668 --- devel/py-p4python/Makefile | 2 +- devel/py-p4python/distinfo | 6 +++--- devel/py-p4python/files/patch-P4API.cpp | 6 +++--- devel/py-p4python/files/patch-setup.py | 28 ++++++++++++++++++++++------ 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/devel/py-p4python/Makefile b/devel/py-p4python/Makefile index b59f5a593e60..8485381c426e 100644 --- a/devel/py-p4python/Makefile +++ b/devel/py-p4python/Makefile @@ -1,5 +1,5 @@ PORTNAME= p4python -PORTVERSION= 2024.1.2645203 +PORTVERSION= 2024.2.2682690 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-p4python/distinfo b/devel/py-p4python/distinfo index ffe1424b6723..8bde5e16aa23 100644 --- a/devel/py-p4python/distinfo +++ b/devel/py-p4python/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731550319 -SHA256 (p4python-2024.1.2645203.tar.gz) = 49be8597c6469d8ecfd087a779874722a3fd08e6d93277a5ecea37a9b272527f -SIZE (p4python-2024.1.2645203.tar.gz) = 85474 +TIMESTAMP = 1735417252 +SHA256 (p4python-2024.2.2682690.tar.gz) = 4206dd31bf77e8ec7e41d19367363dd749b96864e463e0e028fedd607988de6f +SIZE (p4python-2024.2.2682690.tar.gz) = 85503 diff --git a/devel/py-p4python/files/patch-P4API.cpp b/devel/py-p4python/files/patch-P4API.cpp index 87fccebddb99..54c391b0f08a 100644 --- a/devel/py-p4python/files/patch-P4API.cpp +++ b/devel/py-p4python/files/patch-P4API.cpp @@ -1,6 +1,6 @@ ---- P4API.cpp.orig 2020-07-15 12:24:50 UTC +--- P4API.cpp.orig 2024-12-28 20:29:18 UTC +++ P4API.cpp -@@ -337,7 +337,7 @@ static PyObject * P4API_dvcs_init(P4Adapter * self, Py +@@ -338,7 +338,7 @@ static PyObject * P4API_dvcs_init(P4Adapter * self, Py return NULL; @@ -9,7 +9,7 @@ if( personalServer.get() == NULL) return NULL; -@@ -399,7 +399,7 @@ static PyObject * P4API_dvcs_clone(P4Adapter * self, P +@@ -400,7 +400,7 @@ static PyObject * P4API_dvcs_clone(P4Adapter * self, P &progress)) return NULL; diff --git a/devel/py-p4python/files/patch-setup.py b/devel/py-p4python/files/patch-setup.py index 20229a81115d..cf207601a273 100644 --- a/devel/py-p4python/files/patch-setup.py +++ b/devel/py-p4python/files/patch-setup.py @@ -1,6 +1,6 @@ ---- setup.py.orig 2023-04-04 23:31:58 UTC +--- setup.py.orig 2024-12-30 02:45:50 UTC +++ setup.py -@@ -243,7 +243,7 @@ class p4build_ext(build_ext_module): +@@ -245,7 +245,7 @@ class p4build_ext(build_ext_module): pathToFile = os.path.join(p, "openssl") if os.path.exists(pathToFile) and os.access(pathToFile, os.X_OK): entry = subprocess.check_output("ldd {0} | grep libssl".format(pathToFile), @@ -9,7 +9,7 @@ if entry is not False: libpath = os.path.dirname(entry.split()[2]) -@@ -275,7 +275,7 @@ class p4build_ext(build_ext_module): +@@ -277,23 +277,10 @@ class p4build_ext(build_ext_module): ssl_ver = "" if not p4_ssl_dir: @@ -18,7 +18,23 @@ # check for a version of SSL already installed via 'openssl version' self.ssl, ssl_ver = self.check_installed_ssl() # return libpath or None -@@ -313,7 +313,7 @@ class p4build_ext(build_ext_module): +- # we only support 1.0.2 or 1.1.1 using 2019.1 p4api +- if not (("1.0.2" in ssl_ver) or ("1.1.1" in ssl_ver) or ("3.0" in ssl_ver)): +- self.ssl = "" +- +- if not self.ssl: +- # try downloading and building ssl +- if self.is_super(): +- (self.ssl, ssl_src, ssl_tarball, loaded_ssl_from_ftp) = self.build_ssl_lib(ssl_ver) +- p4_ssl_dir = self.ssl +- p4_ssl_ver = ssl_ver +- else: +- print("must be root to build and install SSL") +- + if not self.ssl: + print("***********************************************", file=sys.stderr) + print("** Cannot build P4Python without SSL support **", file=sys.stderr) +@@ -315,7 +302,7 @@ class p4build_ext(build_ext_module): p4_api_dir = self.apidir try: @@ -27,7 +43,7 @@ releaseVersion = VersionInfo(".") except IOError: print("Cannot find Version file in API dir {0}.".format(p4_api_dir)) -@@ -334,9 +334,18 @@ class p4build_ext(build_ext_module): +@@ -336,9 +323,18 @@ class p4build_ext(build_ext_module): #spawn._nt_quote_args = monkey_nt_quote_args # add the paths for p4 headers and library @@ -48,7 +64,7 @@ # check if the interpreter is mayapy.exe namedir = os.path.dirname(os.path.dirname(sys.executable)) if "maya" in namedir.lower(): -@@ -469,7 +478,7 @@ def cleanup_api(api_dir, tarball): +@@ -471,7 +467,7 @@ def cleanup_api(api_dir, tarball): # declare some evil globals