From 49ec21e35ae38fa47bd76bc61aaef59062b37297 Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 14:57:07 -0800 Subject: user/py3-tz: bump to 2018.9 --- user/py3-tz/APKBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index 1222f1f53..acc48d6ea 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: zlg pkgname=py3-tz _pkgname=pytz -pkgver=2018.7 +pkgver=2018.9 pkgrel=0 pkgdesc="Timezone definitions for Python" url="http://pytz.sourceforge.net/" @@ -29,6 +29,10 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } +<<<<<<< Updated upstream sha512sums="49cd9ed0b4b0959bab59c91ac1ced36b28ab0fa097002ab1d45daa0e7f962c43de2e0b9228344d9b1f8aa4dc2f3b02d51f41a3ed7e6af8c51fc2eec7aace5b48 pytz-2018.7.tar.gz +======= +sha512sums="c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159 pytz-2018.9.tar.gz +>>>>>>> Stashed changes be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch a09467dbb00c1ab9f7e7527d9b020a6d913b8da2380a5359e782f27ccf9ec4dd4f50bfc92c95dc2e793904242c8139793c15e78e651d2777fb3b3abc48fcd640 zoneinfo-fix.patch" -- cgit v1.2.3-70-g09d2 From 3e7480b4e9fbcf832fd92c1bfdd2d9234923ba92 Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 15:05:19 -0800 Subject: user/py3-openssl: bump to 19.0.0 --- user/py3-openssl/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/py3-openssl/APKBUILD b/user/py3-openssl/APKBUILD index ecab996e1..b19a1d09d 100644 --- a/user/py3-openssl/APKBUILD +++ b/user/py3-openssl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: zlg pkgname=py3-openssl _pkgname=pyOpenSSL -pkgver=18.0.0 +pkgver=19.0.0 pkgrel=0 pkgdesc="Python wrapper module around the OpenSSL library" url="https://github.com/pyca/pyopenssl" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15 pyOpenSSL-18.0.0.tar.gz" +sha512sums="a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818 pyOpenSSL-19.0.0.tar.gz" -- cgit v1.2.3-70-g09d2 From a72ee3779c30740f692b2c09ee29d1433db08b64 Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 15:27:24 -0800 Subject: user/py3-future: bump to 0.17.0 Arch and others have 0.17.1, but upstream does not have a formal release for us to target yet. --- user/py3-future/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD index e34369279..d98fc65c2 100644 --- a/user/py3-future/APKBUILD +++ b/user/py3-future/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: zlg pkgname=py3-future _pkgname=python-future -pkgver=0.16.0 +pkgver=0.17.0 pkgrel=0 pkgdesc="Easy, clean, reliable Python 2/3 compatibility" url="http://python-future.org/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="8422e132921d7c0da1f1025ce672ddb301d604bf4629c73634b709a12d77465e941f7365f9e85e870d98718a37988bd928cda7325eb0cc27b1351d23d31a365e py3-future-0.16.0.tar.gz" +sha512sums="0b914ba062dd2b3c6837d8d8d274d27faadc587b264e887266527940fa7b4b98ce1b0076f1e589f943406d24b9e17f3ae8c2060c4ffa2207f620040988c176a3 py3-future-0.17.0.tar.gz" -- cgit v1.2.3-70-g09d2 From e32e989d4ad622263003ca3e42f35c1e694232e9 Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 15:46:05 -0800 Subject: user/py3-cryptography: bump to 2.5 --- user/py3-cryptography/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index 9232dd69d..587199c0e 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: zlg pkgname=py3-cryptography _pkgname=${pkgname#py3-} -pkgver=2.4.2 +pkgver=2.5 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" url="https://pypi.org/project/cryptography" arch="all" options="!check" # tests want hypothesis; deep rabbit hole license="Apache-2.0 OR BSD-3-Clause" -depends="python3 py3-cffi py3-idna py3-asn1crypto py3-six" +depends="python3 py3-cffi py3-asn1crypto py3-six" makedepends="python3-dev libffi-dev openssl-dev" subpackages="" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28 cryptography-2.4.2.tar.gz" +sha512sums="5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f cryptography-2.5.tar.gz" -- cgit v1.2.3-70-g09d2 From 42b8b321f18277443530220d9a414c6df8c8f55f Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 16:00:31 -0800 Subject: user/py3-configargparse: bump to 0.14.0 --- user/py3-configargparse/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD index 2cb311647..4641df6e8 100644 --- a/user/py3-configargparse/APKBUILD +++ b/user/py3-configargparse/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: zlg pkgname=py3-configargparse _pkgname=ConfigArgParse -pkgver=0.13.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="A drop-in replacement for argparse" url="https://github.com/bw2/ConfigArgParse" @@ -33,5 +33,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="797c5edbc51353797204152b5c908ddb4e883a98f247430448d774957fd841286ea1a3cb87db3186e683a65f566cfce0a815e4bd558b9c823d9226d856341ca9 py3-configargparse-0.13.0.tar.gz +sha512sums="e48ca61027abf0e0acb8414b6d89b276b186b4f714368b8c33975537c2264bb2d81f18cf3013b99d9ce752014361afa973f704b3f6957ca4b98319bb0ca5ca8c py3-configargparse-0.14.0.tar.gz df324cbc12d0d5cf3cf8bfe494e358d366d8a7891183e9a7922d5331f86e30cbe5810b709ad93dfd41f33cd08c1d87371b9aa13c92d7637d4459d83db41be33f python3.patch" -- cgit v1.2.3-70-g09d2 From 493adf3bf3defbe1cbe8ab511b4154777cf345fa Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 16:08:58 -0800 Subject: user/certbot: bump to 0.30.2 --- user/certbot/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index 8e9489e01..cbe6853f5 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg # Maintainer: zlg pkgname=certbot -pkgver=0.30.0 +pkgver=0.30.2 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -41,4 +41,4 @@ acme() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5 certbot-0.30.0.tar.gz" +sha512sums="94c26be7c04de74acf650b4d243675e92c6807eb6bb82fcffd867b22aa5b5527e6f637155fafcb121dfeff77e8a236301c080ad42284b3bf777d2cfc7f4d0de6 certbot-0.30.2.tar.gz" -- cgit v1.2.3-70-g09d2 From affa94487faef5b2f5af62e76b8b0625633c4ca3 Mon Sep 17 00:00:00 2001 From: zlg Date: Sun, 27 Jan 2019 16:28:07 -0800 Subject: user/py3-tz: correct incomplete stash pop --- user/py3-tz/APKBUILD | 5 ----- 1 file changed, 5 deletions(-) diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index acc48d6ea..d8182670c 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -28,11 +28,6 @@ package() { cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } - -<<<<<<< Updated upstream -sha512sums="49cd9ed0b4b0959bab59c91ac1ced36b28ab0fa097002ab1d45daa0e7f962c43de2e0b9228344d9b1f8aa4dc2f3b02d51f41a3ed7e6af8c51fc2eec7aace5b48 pytz-2018.7.tar.gz -======= sha512sums="c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159 pytz-2018.9.tar.gz ->>>>>>> Stashed changes be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch a09467dbb00c1ab9f7e7527d9b020a6d913b8da2380a5359e782f27ccf9ec4dd4f50bfc92c95dc2e793904242c8139793c15e78e651d2777fb3b3abc48fcd640 zoneinfo-fix.patch" -- cgit v1.2.3-70-g09d2