From 7708650de41a293fc908a61dba5c8dbdc145e34091ddfda897f9008ffd735e9c Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Wed, 2 Nov 2022 15:45:21 +0000 Subject: [PATCH 1/3] - Remove not needed python-six dependency OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bcrypt?expand=0&rev=31 --- python-bcrypt.changes | 5 +++++ python-bcrypt.spec | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/python-bcrypt.changes b/python-bcrypt.changes index 19adf93..c928b2a 100644 --- a/python-bcrypt.changes +++ b/python-bcrypt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 2 15:43:50 UTC 2022 - Daniel Garcia + +- Remove not needed python-six dependency + ------------------------------------------------------------------- Wed May 4 19:20:18 UTC 2022 - Dirk Müller diff --git a/python-bcrypt.spec b/python-bcrypt.spec index e37e89c..3b24939 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -33,12 +33,10 @@ BuildRequires: %{python_module pytest >= 3.2.1} # setuptools 40.8.0 is required by upstream only for a pip issue that doesn't # affect us, so we relax the requirement to build in SLE/Leap 15.2 with 40.5.0 BuildRequires: %{python_module setuptools >= 40.5.0} -BuildRequires: %{python_module six >= 1.4.1} BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: pkgconfig(libffi) -Requires: python-six >= 1.4.1 %requires_eq python-cffi Provides: python-py-bcrypt = %{version} Obsoletes: python-py-bcrypt < %{version} From 38905dc70d4542289b2df9cbdef1250a22387595ed852eb7335823d7eeb184ce Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 2 Nov 2022 17:41:25 +0000 Subject: [PATCH 2/3] Accepting request 1032937 from home:dgarcia:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 4.0.1: * We now build PyPy manylinux wheels. * Fixed a bug where passing an invalid salt to checkpw could result in a pyo3_runtime.PanicException. It now correctly raises a ValueError. - 4.0.0: * bcrypt is now implemented in Rust. Users building from source will need to have a Rust compiler available. Nothing will change for users downloading wheels. * We no longer ship manylinux2010 wheels. Users should upgrade to the latest pip to ensure this doesn’t cause issues downloading wheels on their platform. We now ship manylinux_2_28 wheels for users on new enough platforms. * NUL bytes are now allowed in inputs. OBS-URL: https://build.opensuse.org/request/show/1032937 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bcrypt?expand=0&rev=32 --- _service | 16 ++++++++++++++++ bcrypt-3.2.2.tar.gz | 3 --- bcrypt-4.0.1.tar.gz | 3 +++ cargo_config | 5 +++++ python-bcrypt.changes | 17 +++++++++++++++++ python-bcrypt.spec | 24 ++++++++++++++++-------- vendor.tar.gz | 3 +++ 7 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 _service delete mode 100644 bcrypt-3.2.2.tar.gz create mode 100644 bcrypt-4.0.1.tar.gz create mode 100644 cargo_config create mode 100644 vendor.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..2661b78 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + https://github.com/pyca/bcrypt/ + @PARENT_TAG@~@TAG_OFFSET@ + git + 4.0.1 + + + bcrypt/src/_bcrypt + gz + true + + + bcrypt/src/_bcrypt + + diff --git a/bcrypt-3.2.2.tar.gz b/bcrypt-3.2.2.tar.gz deleted file mode 100644 index 95a7a2b..0000000 --- a/bcrypt-3.2.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:433c410c2177057705da2a9f2cd01dd157493b2a7ac14c8593a16b3dab6b6bfb -size 42455 diff --git a/bcrypt-4.0.1.tar.gz b/bcrypt-4.0.1.tar.gz new file mode 100644 index 0000000..5ff4144 --- /dev/null +++ b/bcrypt-4.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27d375903ac8261cfe4047f6709d16f7d18d39b1ec92aaf72af989552a650ebd +size 25498 diff --git a/cargo_config b/cargo_config new file mode 100644 index 0000000..6fb4ff4 --- /dev/null +++ b/cargo_config @@ -0,0 +1,5 @@ +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" \ No newline at end of file diff --git a/python-bcrypt.changes b/python-bcrypt.changes index c928b2a..3a56cfd 100644 --- a/python-bcrypt.changes +++ b/python-bcrypt.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Nov 2 16:32:00 UTC 2022 - Daniel Garcia + +- Update to 4.0.1: + * We now build PyPy manylinux wheels. + * Fixed a bug where passing an invalid salt to checkpw could result in a + pyo3_runtime.PanicException. It now correctly raises a ValueError. +- 4.0.0: + * bcrypt is now implemented in Rust. Users building from source will need to + have a Rust compiler available. Nothing will change for users downloading + wheels. + * We no longer ship manylinux2010 wheels. Users should upgrade to the latest + pip to ensure this doesn’t cause issues downloading wheels on their + platform. We now ship manylinux_2_28 wheels for users on new enough + platforms. + * NUL bytes are now allowed in inputs. + ------------------------------------------------------------------- Wed Nov 2 15:43:50 UTC 2022 - Daniel Garcia diff --git a/python-bcrypt.spec b/python-bcrypt.spec index 3b24939..268a6da 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -17,26 +17,31 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 Name: python-bcrypt -Version: 3.2.2 +Version: 4.0.1 Release: 0 Summary: BSD type 2a and 2b password hashing License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/pyca/bcrypt/ -Source: https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz +Source1: vendor.tar.gz +Source2: cargo_config BuildRequires: %{python_module cffi >= 1.1} BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 3.2.1} +BuildRequires: %{python_module setuptools-rust} +BuildRequires: %{python_module wheel} # setuptools 40.8.0 is required by upstream only for a pip issue that doesn't # affect us, so we relax the requirement to build in SLE/Leap 15.2 with 40.5.0 BuildRequires: %{python_module setuptools >= 40.5.0} +BuildRequires: cargo-packaging BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: python-rpm-macros BuildRequires: pkgconfig(libffi) +ExclusiveArch: %{rust_tier1_arches} %requires_eq python-cffi Provides: python-py-bcrypt = %{version} Obsoletes: python-py-bcrypt < %{version} @@ -48,14 +53,17 @@ This Python module supports creating (and verifying) password hashes using the BSD-originating hashing methods known as "2a" and "2b". %prep -%setup -q -n bcrypt-%{version} +%autosetup -p1 -a1 -n bcrypt-%{version} +mkdir .cargo +cp %{SOURCE2} .cargo/config +mv Cargo.lock src/_bcrypt %build export CFLAGS="%{optflags} -fno-strict-aliasing" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}/%{$python_sitearch} %check @@ -65,6 +73,6 @@ export CFLAGS="%{optflags} -fno-strict-aliasing" %license LICENSE %doc README.rst %{python_sitearch}/bcrypt -%{python_sitearch}/bcrypt-%{version}-py*.egg-info +%{python_sitearch}/bcrypt-%{version}*-info %changelog diff --git a/vendor.tar.gz b/vendor.tar.gz new file mode 100644 index 0000000..1c6ee85 --- /dev/null +++ b/vendor.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3730a7bcb9ed69ab494c1caddacd54e85b0d9576988e393eb4abcc187f8f7315 +size 9367315 From 88ca7f5baf9cbacfb0d790a36e65576159047fa2a4d1f45b686e41053a9eb019 Mon Sep 17 00:00:00 2001 From: Daniel Garcia Date: Thu, 3 Nov 2022 06:56:00 +0000 Subject: [PATCH 3/3] - Removed not needed C build dependencies - Enable for all archs by default OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bcrypt?expand=0&rev=33 --- python-bcrypt.changes | 6 ++++++ python-bcrypt.spec | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python-bcrypt.changes b/python-bcrypt.changes index 3a56cfd..49da0fb 100644 --- a/python-bcrypt.changes +++ b/python-bcrypt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 3 06:44:04 UTC 2022 - Daniel Garcia + +- Removed not needed C build dependencies +- Enable for all archs by default + ------------------------------------------------------------------- Wed Nov 2 16:32:00 UTC 2022 - Daniel Garcia diff --git a/python-bcrypt.spec b/python-bcrypt.spec index 268a6da..88f0a98 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -27,8 +27,6 @@ URL: https://github.com/pyca/bcrypt/ Source0: https://files.pythonhosted.org/packages/source/b/bcrypt/bcrypt-%{version}.tar.gz Source1: vendor.tar.gz Source2: cargo_config -BuildRequires: %{python_module cffi >= 1.1} -BuildRequires: %{python_module devel} BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest >= 3.2.1} BuildRequires: %{python_module setuptools-rust} @@ -38,11 +36,7 @@ BuildRequires: %{python_module wheel} BuildRequires: %{python_module setuptools >= 40.5.0} BuildRequires: cargo-packaging BuildRequires: fdupes -BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: pkgconfig(libffi) -ExclusiveArch: %{rust_tier1_arches} -%requires_eq python-cffi Provides: python-py-bcrypt = %{version} Obsoletes: python-py-bcrypt < %{version}