Index: devel/awscli/Makefile =================================================================== --- devel/awscli/Makefile +++ devel/awscli/Makefile @@ -19,6 +19,7 @@ USES= python USE_PYTHON= autoplist distutils concurrent noflavors +CONFLICTS= py*-awscli* NO_ARCH= yes SUB_FILES= pkg-message Index: devel/awscli2/Makefile =================================================================== --- /dev/null +++ devel/awscli2/Makefile @@ -0,0 +1,92 @@ +PORTNAME= awscli +DISTVERSION= 2.7.32 +CATEGORIES= devel python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 2 + +MAINTAINER= hsw@bitmark.com +COMMENT= Universal Command Line Interface for Amazon Web Services V2 + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +# used by post-build target below +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5<=0.4.5:devel/py-colorama@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.10<0.17.2,1:textproc/py-docutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.2<37.0.0:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.0<=0.17.21:devel/py-ruamel.yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.8<0.2.0:devel/py-wcwidth@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.24<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}distro>=1.5.0<1.8.0:sysutils/py-distro@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.15:devel/py-awscrt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1<1.1.0:devel/py-jmespath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.4<1.27,1:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.8.13:databases/py-sqlite3@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5<=0.4.5:devel/py-colorama@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.10<0.17.2,1:textproc/py-docutils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cryptography>=3.3.2<37.0.0:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15.0<=0.17.21:devel/py-ruamel.yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wcwidth>=0.1.8<0.2.0:devel/py-wcwidth@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.24<3.1.0:devel/py-prompt-toolkit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}distro>=1.5.0<1.8.0:sysutils/py-distro@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.15:devel/py-awscrt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1<3.0.0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1<1.1.0:devel/py-jmespath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.4<1.27,1:net/py-urllib3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.8.13:databases/py-sqlite3@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mock>=1.3.0:devel/py-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=6.2.5:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=5.5:devel/py-coverage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov<=2.12.1:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.4.0:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.15:devel/py-awscrt@${PY_FLAVOR} \ + cmake:devel/cmake \ + rustc:lang/rust \ + ${LOCALBASE}/include/sys/sysinfo.h:devel/libsysinfo + +USES= python:3.8+ groff:run +USE_PYTHON= autoplist distutils +CONFLICTS= awscli py*-awscli* +INSTALL_TARGET= install-strip + +USE_GITHUB= yes +GH_ACCOUNT= aws +GH_PROJECT= aws-cli + +OPTIONS_DEFINE= BASH ZSH +OPTIONS_DEFAULT= BASH ZSH + +BASH_PLIST_FILES= share/bash-completion/completions/aws +ZSH_PLIST_FILES= share/zsh/site-functions/_aws + +NO_ARCH= yes + +PLIST_FILES+= ${PYTHON_SITELIBDIR}/awscli/data/ac.index +post-build: + @${ECHO} "building completion index..." + cd "${WRKSRC}" && \ + ${SETENV} PYTHONPATH=build/lib \ + ${PYTHON_VERSION} ./scripts/gen-ac-index --include-builtin-index --index-location=./build/lib/awscli/data/ac.index + +do-install-BASH-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ + ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/bin/aws_bash_completer \ + ${STAGEDIR}${PREFIX}/share/bash-completion/completions/aws + +do-install-ZSH-on: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions + ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/bin/aws_zsh_completer.sh \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_aws + +# enable after devel/py-awscrt +# - has its s2n submodule is updated to include FreeBSD fixes +# - had '-fatal_warnings' changed to '-fatal-warnings' +# - has '-lexecinfo' added to the linker options +# - see: https://github.com/awslabs/aws-crt-python/pull/376 +do-test: + cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m tox + +.include Index: devel/awscli2/distinfo =================================================================== --- /dev/null +++ devel/awscli2/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1663213265 +SHA256 (aws-aws-cli-2.7.32_GH0.tar.gz) = a1717cfad7d3f93ed2c6496ef1db0e712edad8d230b1d1d4d16b8627605844fb +SIZE (aws-aws-cli-2.7.32_GH0.tar.gz) = 11254019 Index: devel/awscli2/files/patch-setup.cfg =================================================================== --- /dev/null +++ devel/awscli2/files/patch-setup.cfg @@ -0,0 +1,21 @@ +--- setup.cfg.orig 2022-09-14 16:20:08 UTC ++++ setup.cfg +@@ -29,13 +29,13 @@ packages = find: + python_requires = >=3.8 + include_package_data = True + install_requires = +- colorama>=0.2.5,<0.4.4 +- docutils>=0.10,<0.16 ++ colorama>=0.2.5,<0.4.5 ++ docutils>=0.10,<0.17.2 + cryptography>=3.3.2,<37.0.0 + ruamel.yaml>=0.15.0,<=0.17.21 + wcwidth<0.2.0 +- prompt-toolkit>=3.0.24,<3.0.29 +- distro>=1.5.0,<1.6.0 +- awscrt>=0.12.4,<=0.14.0 ++ prompt-toolkit>=3.0.24,<3.1.0 ++ distro>=1.5.0,<1.7.1 ++ awscrt>=0.12.4,<0.15.0 + python-dateutil>=2.1,<3.0.0 + jmespath>=0.7.1,<1.1.0 Index: devel/awscli2/pkg-descr =================================================================== --- /dev/null +++ devel/awscli2/pkg-descr @@ -0,0 +1,17 @@ +This package provides a unified command line interface to many Amazon Web +Services. + +The currently supported services include: + +* Amazon Elastic Compute Cloud (Amazon EC2) +* Elastic Load Balancing +* Auto Scaling +* AWS CloudFormation +* AWS Elastic Beanstalk +* Amazon Simple Notification Service (Amazon SNS) +* Amazon Simple Queue Service (Amazon SQS) +* Amazon Relational Database Service (Amazon RDS) + +... and more. + +WWW: https://aws.amazon.com/cli/ Index: devel/py-awscrt/Makefile =================================================================== --- devel/py-awscrt/Makefile +++ devel/py-awscrt/Makefile @@ -1,5 +1,5 @@ PORTNAME= awscrt -PORTVERSION= 0.13.14 +PORTVERSION= 0.14.6 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ USES= python:3.6+ USE_PYTHON= autoplist concurrent distutils -CFLAGS+= -D__BSD_VISIBLE +#CFLAGS+= -D__BSD_VISIBLE post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + Index: devel/py-awscrt/distinfo =================================================================== --- devel/py-awscrt/distinfo +++ devel/py-awscrt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657835401 -SHA256 (awscrt-0.13.14.tar.gz) = 2b6c74529dc7ea4216718796bd57a07750a44e3abc46833400e9b4497e6eeb04 -SIZE (awscrt-0.13.14.tar.gz) = 19952268 +TIMESTAMP = 1663645733 +SHA256 (awscrt-0.14.6.tar.gz) = b0b87d90ce0772c2ebbe58ef7722c16b4164909c934fdcdbc2e98a1931cdd541 +SIZE (awscrt-0.14.6.tar.gz) = 21475700 Index: devel/py-awscrt/files/patch-crt-aws-c-common-source-posix-system_info.c =================================================================== --- devel/py-awscrt/files/patch-crt-aws-c-common-source-posix-system_info.c +++ /dev/null @@ -1,12 +0,0 @@ ---- crt/aws-c-common/source/posix/system_info.c.orig 2022-07-12 00:42:37 UTC -+++ crt/aws-c-common/source/posix/system_info.c -@@ -15,7 +15,9 @@ - #endif - - #if defined(__linux__) || defined(__unix__) -+# if !defined(__FreeBSD__) - # include -+# endif - # include - #endif - Index: devel/py-awscrt/files/patch-powerpc64le =================================================================== --- devel/py-awscrt/files/patch-powerpc64le +++ /dev/null @@ -1,25 +0,0 @@ ---- crt/aws-lc/CMakeLists.txt.orig 2022-07-25 08:51:35 UTC -+++ crt/aws-lc/CMakeLists.txt -@@ -623,7 +623,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips") - # Just to avoid the “unknown processor” error. - set(ARCH "generic") --elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc64le|ppc64le") - set(ARCH "ppc64le") - else() - message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR}) ---- crt/aws-lc/crypto/fipsmodule/cpucap/cpu_ppc64le.c.orig 2020-10-26 11:38:52 UTC -+++ crt/aws-lc/crypto/fipsmodule/cpucap/cpu_ppc64le.c -@@ -28,7 +28,11 @@ - #endif - - void OPENSSL_cpuid_setup(void) { -+#if defined(__linux__) - OPENSSL_ppc64le_hwcap2 = getauxval(AT_HWCAP2); -+#elif defined(__FreeBSD__) -+ elf_aux_info(AT_HWCAP2, &OPENSSL_ppc64le_hwcap2, sizeof(OPENSSL_ppc64le_hwcap2)); -+#endif - } - - int CRYPTO_is_PPC64LE_vcrypto_capable(void) { Index: devel/py-awscrt/files/patch-setup.py =================================================================== --- devel/py-awscrt/files/patch-setup.py +++ devel/py-awscrt/files/patch-setup.py @@ -1,11 +1,11 @@ ---- setup.py.orig 2022-07-12 00:42:43 UTC +--- setup.py.orig 2022-09-08 17:32:28 UTC +++ setup.py -@@ -315,7 +315,7 @@ def awscrt_ext(): +@@ -320,7 +320,7 @@ def awscrt_ext(): if distutils.ccompiler.get_default_compiler() != 'msvc': extra_compile_args += ['-Wextra', '-Werror', '-Wno-strict-aliasing', '-std=gnu99'] - extra_link_args += ['-Wl,-fatal_warnings'] -+ extra_link_args += ['-Wl,-fatal-warnings'] ++ extra_link_args += ['-Wl,-fatal-warnings', '-lexecinfo'] return setuptools.Extension( '_awscrt',