From nobody Tue May 16 05:09:11 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 4QL45z4GXVz4BYXW; Tue, 16 May 2023 05:09:11 +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 4QL45z213zz42L4; Tue, 16 May 2023 05:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684213751; 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=J1Qtx85m1e9oOMN0xHEwh9o9ubEsajXi8mDhTbun8pQ=; b=Vt1IQryKRhxPI+riMR3hBl1dThU696HpRkPIo+ERMMAnUaAIqIlll9rqjWYiBtcxYnXXJq SQFt3KoTk2Ymp+LoRqm02b+xRVEQlacgbqsZ7NY8Y0I8AM0A8RIW15K6EDI5yrxk6cLh2r 95yvU6I64PzeFLatO5Wk8OWnR8fb00l5cMvXKuNIQNvX1BfiAEfWKWRpCVT3N7v9Q3Donb 4rrWn4AYFNGvqArzssaUl9HkQeJ8hgDUNT72JOLAyjZavHv2Ic0wFKczgfJ67jqlBt5Hjb 96U5RvgAFP/CpsHYAzqM6j4FkoP2IqR309Bwsc+CDnl9CSoo9fvLGR/hyItLlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684213751; 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=J1Qtx85m1e9oOMN0xHEwh9o9ubEsajXi8mDhTbun8pQ=; b=mhERn9Vldop2qlIk0JYokfGM/ZRN4fKETFn7y5n/oC/eXjqIrT8NnqeDHcvVLr+O5wWo4D IGm0sAaA9mwD8gGemBAlalytggwp+40ShrWUncZ0jMvMl6hrTrPgzSoyctGgWQ71lNuo+U c+bWpQW8H6aQp6Ulza8yre5GEkIMYXweJvwxIU3mMh4q9uwAjvMTb+u0094E+ytSKpLdwi j60wOKG0/Ncb4T1Ol7pYBc1ELmVSnAa3WOoUk1lR/7D5BogG5+mVwTvZQyTpdmRSJWvmdX uSGGsx/9sFGx7hW4rlw4n8xmKPJfETzGVZzYpDjt/kiIMEVU+9r94V3FUwPkZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684213751; a=rsa-sha256; cv=none; b=d2TgS67ZyCSPmvY+JgKgpXOJ3nJGzeHWFWGDaaDF41OSOj2WSTNmn+LmVEPaDCm1X6ldot mqKsQX5n1pKE2Ale7VrNgyzWhkPQ7wVU2LdYAbJdwGhcTR7f1jv5QiWS4bfXx8uGy/mgZ+ FCuTN4QoOCDCpWoC227x/7l/otsc0XcvF2IhGYbv4Ek5kySCqkh7mQD82ceIyAzMT75Cmt L0VGKSbnv/Vu/42gZl9OsCUNL2BloOPmzuJ9+pmfG3pEGAm0Ioi6xbyzSBRLM42G0qZMcb huUA5lzH7UyjxRdoOPuWbjHDk0cFE/BIj6D5EFuw2OpXYqtnjNrzHtab3UZB1A== 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 4QL45z11ghz18mR; Tue, 16 May 2023 05:09:11 +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 34G59BTn091295; Tue, 16 May 2023 05:09:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34G59BkU091294; Tue, 16 May 2023 05:09:11 GMT (envelope-from git) Date: Tue, 16 May 2023 05:09:11 GMT Message-Id: <202305160509.34G59BkU091294@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: e1e1e6f6c1a2 - main - devel/py-donut-shellcode: Fix build on i386 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1e1e6f6c1a215dc3af4544a1eb042d8efc47838 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1e1e6f6c1a215dc3af4544a1eb042d8efc47838 commit e1e1e6f6c1a215dc3af4544a1eb042d8efc47838 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-05-16 05:07:46 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-05-16 05:07:46 +0000 devel/py-donut-shellcode: Fix build on i386 Reported by: pkg-fallout --- devel/py-donut-shellcode/Makefile | 5 ++++- devel/py-donut-shellcode/files/patch-setup.py | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/devel/py-donut-shellcode/Makefile b/devel/py-donut-shellcode/Makefile index 8b086bcf069f..e7023195ae72 100644 --- a/devel/py-donut-shellcode/Makefile +++ b/devel/py-donut-shellcode/Makefile @@ -1,5 +1,6 @@ PORTNAME= donut-shellcode DISTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,7 +11,9 @@ WWW= https://github.com/TheWover/donut LICENSE= BSD3CLAUSE -USES= python:3.6+ +USES= dos2unix python:3.6+ USE_PYTHON= distutils autoplist +DOS2UNIX_GLOB= *.py + .include diff --git a/devel/py-donut-shellcode/files/patch-setup.py b/devel/py-donut-shellcode/files/patch-setup.py new file mode 100644 index 000000000000..ac211d79f3e1 --- /dev/null +++ b/devel/py-donut-shellcode/files/patch-setup.py @@ -0,0 +1,22 @@ +--- setup.py.orig 2023-05-16 05:00:53 UTC ++++ setup.py +@@ -1,10 +1,18 @@ + from setuptools import Extension, setup + import sys ++import platform + + with open("README.md", "r") as fh: + long_description = fh.read() + +-static_libraries = ['aplib64'] ++if platform.system() == 'FreeBSD': ++ if platform.machine() == 'i386': ++ static_libraries = ['aplib32'] ++ elif platform.machine() == 'amd64': ++ static_libraries = ['aplib64'] ++else: ++ static_libraries = ['aplib64'] ++ + static_lib_dir = 'lib' + libraries = [] + library_dirs = ['lib']