Index: devel/awscli/Makefile =================================================================== --- devel/awscli/Makefile +++ devel/awscli/Makefile @@ -20,6 +20,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,90 @@ +PORTNAME= awscli +DISTVERSION= 2.7.12 +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.16.13: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.7.1,1:sysutils/py-distro@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.13.14: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.16.13: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.7.1,1:sysutils/py-distro@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}awscrt>=0.12.4<0.13.14: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.13.14: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 +#TEST_ENV+= PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}:${PYTHON_SITELIBDIR} \ +# LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib \ +# CFLAGS=-D__BSD_VISIBLE=1 LDFLAGS='-lexecinfo -lsysinfo' + +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 + +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 = 1656642301 +SHA256 (aws-aws-cli-2.7.12_GH0.tar.gz) = a0c0c580ba8ba2b44cfd130fe0092c1aceedf54143855f23e61bfd58987c2394 +SIZE (aws-aws-cli-2.7.12_GH0.tar.gz) = 10987608 Index: devel/awscli2/files/patch-setup.cfg =================================================================== --- /dev/null +++ devel/awscli2/files/patch-setup.cfg @@ -0,0 +1,25 @@ +--- setup.cfg.orig 2022-06-29 19:00:04 UTC ++++ setup.cfg +@@ -29,16 +29,16 @@ 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.13.11 ++ prompt-toolkit>=3.0.24,<3.1.0 ++ distro>=1.5.0,<1.7.1 ++ awscrt>=0.12.4,<=0.13.14 + python-dateutil>=2.1,<3.0.0 +- jmespath>=0.7.1,<1.0.0 ++ jmespath>=0.7.1,<1.1.0 + urllib3>=1.25.4,<1.27 + + [options.packages.find] 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 =================================================================== --- /dev/null +++ devel/py-awscrt/Makefile @@ -0,0 +1,27 @@ +PORTNAME= awscrt +DISTVERSION= 0.13.13 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= hsw@bitmark.com +COMMENT= Python 3 bindings for the AWS Common Runtime + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= cmake:devel/cmake +LIB_DEPENDS= libsysinfo.so:devel/libsysinfo +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}wheel>=0.36.0:devel/py-wheel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=19.3.1:devel/py-pip@${PY_FLAVOR} + +USES= python:3.6+ localbase:ldflags +USE_PYTHON= autoplist distutils +LDFLAGS+= -lexecinfo -lsysinfo +INSTALL_TARGET= install-strip + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} -m unittest discover --failfast --verbose + + +.include Index: devel/py-awscrt/distinfo =================================================================== --- /dev/null +++ devel/py-awscrt/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1655100239 +SHA256 (awscrt-0.13.13.tar.gz) = e240a7e6dc9db79e8bdb652f590be12dc2d5af7d541fea0c7dd8e1b4bf54fde2 +SIZE (awscrt-0.13.13.tar.gz) = 19923862 Index: devel/py-awscrt/files/patch-crt_s2n_utils_s2n__fork__detection.c =================================================================== --- /dev/null +++ devel/py-awscrt/files/patch-crt_s2n_utils_s2n__fork__detection.c @@ -0,0 +1,16 @@ +# add #elif from main branch +# see: https://github.com/aws/s2n-tls/blob/main/utils/s2n_fork_detection.c#L23 + +--- crt/s2n/utils/s2n_fork_detection.c.orig 2022-06-10 20:56:14 UTC ++++ crt/s2n/utils/s2n_fork_detection.c +@@ -20,6 +20,10 @@ + typedef struct _opaque_pthread_once_t __darwin_pthread_once_t; + typedef __darwin_pthread_once_t pthread_once_t; + #define _DARWIN_C_SOURCE ++#elif defined(__FreeBSD__) ++ /* FreeBSD requires POSIX compatibility off for its syscalls (enables __BSD_VISIBLE) ++ * Without the below line, cannot be imported (it requires __BSD_VISIBLE) */ ++ #undef _POSIX_C_SOURCE + #elif !defined(_GNU_SOURCE) + /* Keep in sync with feature probe tests/features/madvise.c */ + #define _GNU_SOURCE Index: devel/py-awscrt/files/patch-setup.py =================================================================== --- /dev/null +++ devel/py-awscrt/files/patch-setup.py @@ -0,0 +1,14 @@ +# fix incorrect linker flag +# filed as: https://github.com/awslabs/aws-crt-python/issues/366 + +--- setup.py.orig 2022-06-10 20:56:14 UTC ++++ setup.py +@@ -315,7 +315,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'] + + return setuptools.Extension( + '_awscrt', Index: devel/py-awscrt/pkg-descr =================================================================== --- /dev/null +++ devel/py-awscrt/pkg-descr @@ -0,0 +1,3 @@ +Python 3 bindings for the AWS Common Runtime. + +WWW: https://awslabs.github.io/aws-crt-python