From fde0f01576bafb9dc1f4a087f0ace644c65fb8af Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 17:54:40 +0100 Subject: [PATCH 1/9] pritunl-client: remove package --- .../files/pritunl-client/log/run | 3 --- .../pritunl-client/files/pritunl-client/run | 3 --- srcpkgs/pritunl-client/template | 24 ------------------- 3 files changed, 30 deletions(-) delete mode 100644 srcpkgs/pritunl-client/files/pritunl-client/log/run delete mode 100644 srcpkgs/pritunl-client/files/pritunl-client/run delete mode 100644 srcpkgs/pritunl-client/template diff --git a/srcpkgs/pritunl-client/files/pritunl-client/log/run b/srcpkgs/pritunl-client/files/pritunl-client/log/run deleted file mode 100644 index e83c637b9284..000000000000 --- a/srcpkgs/pritunl-client/files/pritunl-client/log/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec logger -t 'pritunl' diff --git a/srcpkgs/pritunl-client/files/pritunl-client/run b/srcpkgs/pritunl-client/files/pritunl-client/run deleted file mode 100644 index 5087e85dbe89..000000000000 --- a/srcpkgs/pritunl-client/files/pritunl-client/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec pritunl-client daemon --foreground 2>&1 diff --git a/srcpkgs/pritunl-client/template b/srcpkgs/pritunl-client/template deleted file mode 100644 index 6adc24621d48..000000000000 --- a/srcpkgs/pritunl-client/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'pritunl-client' -pkgname=pritunl-client -version=1.0.1865.25 -revision=2 -build_style=python2-module -make_install_args="--no-upstart --no-systemd" -hostmakedepends="python-setuptools" -depends="python-requests python-pycryptodome pygtk" -short_desc="OpenVPN Client" -maintainer="Andrew Benson " -license="custom:Proprietary" -homepage="http://client.pritunl.com/" -distfiles="https://github.com/pritunl/pritunl-client/archive/${version}.tar.gz" -checksum=a777ac4c92e8faf8f3782c0628be791f5827d3422275a6c2e79287a63783d955 -restricted=yes -repository=nonfree - -post_install() { - vsv pritunl-client - - rm -rf ${DESTDIR}/var/log - - vlicense LICENSE -} From 8895ebd346e43beb8dce41544d91c6072adff9b7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 22 Oct 2021 22:26:30 +0200 Subject: [PATCH 2/9] New package: python3-trustme-0.9.0 --- srcpkgs/python3-trustme/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-trustme/template diff --git a/srcpkgs/python3-trustme/template b/srcpkgs/python3-trustme/template new file mode 100644 index 000000000000..f284fdd55ae9 --- /dev/null +++ b/srcpkgs/python3-trustme/template @@ -0,0 +1,15 @@ +# Template file for 'python3-trustme' +pkgname=python3-trustme +version=0.9.0 +revision=1 +wrksrc="trustme-$version" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-cryptography python3-idna" +checkdepends="python3-pytest python3-service_identity python3-openssl $depends" +short_desc="Fake CA for testing" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://trustme.rtfd.io/" +distfiles="https://github.com/python-trio/trustme/archive/refs/tags/v$version.tar.gz" +checksum=e9f2544bcc39583a62b5d39d9f0ce3da8528ee448911035a679f7ddb1edeab5e From 8afd1b1a22a223899eb094ba961da6b7a7da8c01 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 17:53:41 +0100 Subject: [PATCH 3/9] New package: python3-httpbin-0.7.0 --- srcpkgs/python3-httpbin/template | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 srcpkgs/python3-httpbin/template diff --git a/srcpkgs/python3-httpbin/template b/srcpkgs/python3-httpbin/template new file mode 100644 index 000000000000..f5350fde3da4 --- /dev/null +++ b/srcpkgs/python3-httpbin/template @@ -0,0 +1,21 @@ +# Template file for 'python3-httpbin' +pkgname=python3-httpbin +version=0.7.0 +revision=1 +wrksrc="httpbin-$version" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-Flask python3-decorator python3-six python3-Brotli + python3-raven python3-blinker" +checkdepends="python3-pytest $depends" +license="ISC" +short_desc="HTTP Request & Response Service" +maintainer="Michal Vasilek " +license="ISC" +homepage="https://github.com/postmanlabs/httpbin" +distfiles="${PYPI_SITE}/h/httpbin/httpbin-${version}.tar.gz" +checksum=cbb37790c91575f4f15757f42ad41d9f729eb227d5edbe89e4ec175486db8dfa + +post_install() { + vlicense LICENSE +} From eb90e4fe8e65463502bdb14eb2dab68f682bf892 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 17:53:44 +0100 Subject: [PATCH 4/9] New package: python3-pytest-httpbin-1.0.1 --- srcpkgs/python3-pytest-httpbin/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-pytest-httpbin/template diff --git a/srcpkgs/python3-pytest-httpbin/template b/srcpkgs/python3-pytest-httpbin/template new file mode 100644 index 000000000000..7521d9bae525 --- /dev/null +++ b/srcpkgs/python3-pytest-httpbin/template @@ -0,0 +1,15 @@ +# Template file for 'python3-pytest-httpbin' +pkgname=python3-pytest-httpbin +version=1.0.1 +revision=1 +wrksrc="pytest-httpbin-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-pytest python3-httpbin" +short_desc="Easily test your HTTP library against a local copy of httpbin.org" +maintainer="Michal Vasilek " +license="MIT" +homepage="https://github.com/kevin1024/pytest-httpbin" +distfiles="${PYPI_SITE}/p/pytest-httpbin/pytest-httpbin-${version}.tar.gz" +checksum=9f73320f97d33cc20bc8a08cb945372948de51402559e87e74e92c56b48da0d7 +make_check=no # cycle: needs python3-requests which has this package in checkdepends From 3975a2d8dc437c999ee1b987d2bb0b2f8c4f2fa2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 17:52:49 +0100 Subject: [PATCH 5/9] python3-requests: update to 2.27.1 * drop python2 version * fix tests --- srcpkgs/python-requests/template | 28 ------------------- srcpkgs/python3-requests | 1 - .../patches/use-system-cacerts.patch | 0 srcpkgs/python3-requests/template | 21 ++++++++++++++ 4 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/python-requests/template delete mode 120000 srcpkgs/python3-requests rename srcpkgs/{python-requests => python3-requests}/patches/use-system-cacerts.patch (100%) create mode 100644 srcpkgs/python3-requests/template diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template deleted file mode 100644 index 6ad6fd32dd51..000000000000 --- a/srcpkgs/python-requests/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'python-requests' -pkgname=python-requests -version=2.26.0 -revision=2 -wrksrc="requests-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="ca-certificates python-chardet python-urllib3 python-idna" -short_desc="Python2 HTTP library for human beings" -maintainer="Alessio Sergi " -license="Apache-2.0" -homepage="https://python-requests.org/" -changelog="https://raw.githubusercontent.com/psf/requests/master/HISTORY.md" -distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz" -checksum=b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 -make_check=no # tests are broken for python2 requests - -post_patch() { - vsed -i '/certifi/d' setup.py -} - -python3-requests_package() { - depends="ca-certificates python3-charset-normalizer python3-urllib3 python3-idna" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-requests b/srcpkgs/python3-requests deleted file mode 120000 index 9af2ed02a93a..000000000000 --- a/srcpkgs/python3-requests +++ /dev/null @@ -1 +0,0 @@ -python-requests \ No newline at end of file diff --git a/srcpkgs/python-requests/patches/use-system-cacerts.patch b/srcpkgs/python3-requests/patches/use-system-cacerts.patch similarity index 100% rename from srcpkgs/python-requests/patches/use-system-cacerts.patch rename to srcpkgs/python3-requests/patches/use-system-cacerts.patch diff --git a/srcpkgs/python3-requests/template b/srcpkgs/python3-requests/template new file mode 100644 index 000000000000..8e710e6f7b61 --- /dev/null +++ b/srcpkgs/python3-requests/template @@ -0,0 +1,21 @@ +# Template file for 'python3-requests' +pkgname=python3-requests +version=2.27.1 +revision=1 +wrksrc="requests-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="ca-certificates python3-charset-normalizer python3-urllib3 python3-idna" +checkdepends="python3-pytest $depends python3-trustme python3-pytest-httpbin + python3-pytest-mock python3-pysocks" +short_desc="Python3 HTTP library for human beings" +maintainer="Alessio Sergi " +license="Apache-2.0" +homepage="https://python-requests.org/" +changelog="https://raw.githubusercontent.com/psf/requests/master/HISTORY.md" +distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz" +checksum=68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61 + +post_patch() { + vsed -i '/certifi/d' setup.py +} From 4acce3ac4c37b91fbe5d6b214d9ffc5a417e85c7 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 18:10:35 +0100 Subject: [PATCH 6/9] python-pycryptodome: remove package --- srcpkgs/python-pycryptodome/template | 37 --------------------------- srcpkgs/python3-pycryptodome | 1 - srcpkgs/python3-pycryptodome/template | 22 ++++++++++++++++ 3 files changed, 22 insertions(+), 38 deletions(-) delete mode 100644 srcpkgs/python-pycryptodome/template delete mode 120000 srcpkgs/python3-pycryptodome create mode 100644 srcpkgs/python3-pycryptodome/template diff --git a/srcpkgs/python-pycryptodome/template b/srcpkgs/python-pycryptodome/template deleted file mode 100644 index 77b971be4a99..000000000000 --- a/srcpkgs/python-pycryptodome/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'python-pycryptodome' -pkgname=python-pycryptodome -version=3.9.7 -revision=3 -wrksrc="pycryptodome-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -makedepends="python-devel python3-devel" -short_desc="Python2 package of low-level cryptographic primitives" -maintainer="Wietse Kuipers " -license="Public Domain, BSD-2-Clause" -homepage="https://www.pycryptodome.org/" -changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst" -distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz" -checksum=f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2 - -provides="python-crypto-${version}_1" -replaces="python-crypto>=0" - -do_check() { - python2 setup.py test - python3 setup.py test -} - -post_install() { - vlicense LICENSE.rst -} - -python3-pycryptodome_package() { - provides="python3-crypto-${version}_1" - replaces="python3-crypto>=0" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSE.rst - } -} diff --git a/srcpkgs/python3-pycryptodome b/srcpkgs/python3-pycryptodome deleted file mode 120000 index 484fe9c33a94..000000000000 --- a/srcpkgs/python3-pycryptodome +++ /dev/null @@ -1 +0,0 @@ -python-pycryptodome \ No newline at end of file diff --git a/srcpkgs/python3-pycryptodome/template b/srcpkgs/python3-pycryptodome/template new file mode 100644 index 000000000000..8e94b15f44bc --- /dev/null +++ b/srcpkgs/python3-pycryptodome/template @@ -0,0 +1,22 @@ +# Template file for 'python3-pycryptodome' +pkgname=python3-pycryptodome +version=3.9.7 +revision=3 +wrksrc="pycryptodome-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +makedepends="python3-devel" +short_desc="Python3 package of low-level cryptographic primitives" +maintainer="Wietse Kuipers " +license="Public Domain, BSD-2-Clause" +homepage="https://www.pycryptodome.org/" +changelog="https://raw.githubusercontent.com/Legrandin/pycryptodome/master/Changelog.rst" +distfiles="${PYPI_SITE}/p/pycryptodome/pycryptodome-${version}.tar.gz" +checksum=f1add21b6d179179b3c177c33d18a2186a09cc0d3af41ff5ed3f377360b869f2 + +provides="python3-crypto-${version}_1" +replaces="python3-crypto>=0" + +post_install() { + vlicense LICENSE.rst +} From aeaed84d858acf84031c0fa03a188cc0413260ed Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 18:25:21 +0100 Subject: [PATCH 7/9] python-chardet: remove package --- srcpkgs/python-chardet/template | 31 ------------------------------- srcpkgs/python3-chardet | 1 - srcpkgs/python3-chardet/template | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/python-chardet/template delete mode 120000 srcpkgs/python3-chardet create mode 100644 srcpkgs/python3-chardet/template diff --git a/srcpkgs/python-chardet/template b/srcpkgs/python-chardet/template deleted file mode 100644 index 14678b06509f..000000000000 --- a/srcpkgs/python-chardet/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'python-chardet' -pkgname=python-chardet -version=4.0.0 -revision=3 -wrksrc="chardet-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python-setuptools" -checkdepends="python3-pytest python-pytest" -short_desc="Universal encoding detector for Python 2 and 3 (Python2)" -maintainer="Alessio Sergi " -license="LGPL-2.1-only" -homepage="https://github.com/chardet/chardet" -distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz" -checksum=0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa -alternatives="chardet:chardetect:/usr/bin/chardetect2" - -do_check() { - python2 -m pytest - python3 -m pytest -} - -python3-chardet_package() { - depends="python3-setuptools" - short_desc="${short_desc/Python2/Python3}" - alternatives="chardet:chardetect:/usr/bin/chardetect3" - pkg_install() { - vmove usr/bin/chardetect3 - vmove usr/lib/python3* - } -} diff --git a/srcpkgs/python3-chardet b/srcpkgs/python3-chardet deleted file mode 120000 index e77647d75e8c..000000000000 --- a/srcpkgs/python3-chardet +++ /dev/null @@ -1 +0,0 @@ -python-chardet \ No newline at end of file diff --git a/srcpkgs/python3-chardet/template b/srcpkgs/python3-chardet/template new file mode 100644 index 000000000000..bc5dfe6ee5ec --- /dev/null +++ b/srcpkgs/python3-chardet/template @@ -0,0 +1,16 @@ +# Template file for 'python3-chardet' +pkgname=python3-chardet +version=4.0.0 +revision=3 +wrksrc="chardet-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-setuptools" +checkdepends="python3-pytest" +short_desc="Universal encoding detector" +maintainer="Alessio Sergi " +license="LGPL-2.1-only" +homepage="https://github.com/chardet/chardet" +distfiles="${PYPI_SITE}/c/chardet/chardet-${version}.tar.gz" +checksum=0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa +alternatives="chardet:chardetect:/usr/bin/chardetect2" From 41f41cb3a496f9e2c07d71360d42afd9802e7f8f Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 18:25:54 +0100 Subject: [PATCH 8/9] python3-urllib3: update to 1.26.7. * remove python2 version * enable tests --- srcpkgs/python-urllib3/template | 34 -------------------------------- srcpkgs/python3-urllib3 | 1 - srcpkgs/python3-urllib3/template | 27 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 35 deletions(-) delete mode 100644 srcpkgs/python-urllib3/template delete mode 120000 srcpkgs/python3-urllib3 create mode 100644 srcpkgs/python3-urllib3/template diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template deleted file mode 100644 index bf98d448e445..000000000000 --- a/srcpkgs/python-urllib3/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'python-urllib3' -pkgname=python-urllib3 -version=1.26.6 -revision=2 -wrksrc="urllib3-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -depends="python-six" -short_desc="HTTP library with thread-safe connection pooling (Python2)" -maintainer="Alessio Sergi " -license="MIT" -homepage="https://urllib3.readthedocs.io/" -distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz" -checksum=f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f -# Checks depend on unpackaged "trustme" -make_check=no - -post_install() { - for sitelib in ${py3_sitelib} ${py2_sitelib}; do - rm ${DESTDIR}/${sitelib}/urllib3/packages/six.py - ln -sf ../../six.py ${DESTDIR}/${sitelib}/urllib3/packages/six.py - done - - vlicense LICENSE.txt -} - -python3-urllib3_package() { - depends="python3-six" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove usr/lib/python3* - vlicense LICENSE.txt - } -} diff --git a/srcpkgs/python3-urllib3 b/srcpkgs/python3-urllib3 deleted file mode 120000 index 18d4c50ddfef..000000000000 --- a/srcpkgs/python3-urllib3 +++ /dev/null @@ -1 +0,0 @@ -python-urllib3 \ No newline at end of file diff --git a/srcpkgs/python3-urllib3/template b/srcpkgs/python3-urllib3/template new file mode 100644 index 000000000000..b137784f7009 --- /dev/null +++ b/srcpkgs/python3-urllib3/template @@ -0,0 +1,27 @@ +# Template file for 'python3-urllib3' +pkgname=python3-urllib3 +version=1.26.7 +revision=1 +wrksrc="urllib3-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-six" +checkdepends="python3-pytest python3-trustme python3-mock python3-pysocks + python3-tornado python3-dateutil" +short_desc="HTTP library with thread-safe connection pooling" +maintainer="Alessio Sergi " +license="MIT" +homepage="https://urllib3.readthedocs.io/" +distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz" +checksum=4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece + +pre_check() { + rm test/test_retry{,_deprecated}.py # FIXME +} + +post_install() { + rm ${DESTDIR}/${py3_sitelib}/urllib3/packages/six.py + ln -sf ../../six.py ${DESTDIR}/${py3_sitelib}/urllib3/packages/six.py + + vlicense LICENSE.txt +} From c44ded628dcee35a5e637ce93e1f14beeb7afc02 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 6 Jan 2022 18:04:43 +0100 Subject: [PATCH 9/9] removed-packages: add pritunl-client and its deps * pritunl-client * python-requests * python-pycryptodome * python-urllib3 * python-chardet --- srcpkgs/removed-packages/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 4bab6419b983..0f5de98a0899 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=56 +revision=57 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -246,6 +246,7 @@ replaces=" phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 polkit-qt<=0.112.0_5 + pritunl-client<=1.0.1865.25_2 profile-sync-daemon<=5.75_4 profont<=1.0_2 psiconv<=0.9.9_9 @@ -254,6 +255,8 @@ replaces=" python-PyQt4<=4.12.1_4 python-SecretStorage<=2.3.1_4 python-audit<=2.8.5_2 + python-chardet<=4.0.0_3 + python-crypto<=3.9.7_3 python-docutils<=0.16_3 python-enchant<=2.0.0_4 python-gntp<=1.0.3_7 @@ -264,10 +267,13 @@ replaces=" python-netifaces<=0.10.9_3 python-nose<=1.3.7_7 python-pivy<=0.6.4_2 + python-pycryptodome<=3.9.7_3 python-pyenet<=1.3.13.post7_2 python-pyside<=1.2.2_7 python-pytest-relaxed<=1.1.2_2 + python-requests<=2.26.0_2 python-sqlite<=2.8.3_1 + python-urllib3<=1.26.6_2 python-xlib<0.29_1 python3-Django<=3.0.7_2 python3-SPARQLWrapper<=1.8.4_4