diff --git a/_service b/_service index 2661b78..77f1ccb 100644 --- a/_service +++ b/_service @@ -1,16 +1,12 @@ - + https://github.com/pyca/bcrypt/ @PARENT_TAG@~@TAG_OFFSET@ git - 4.0.1 + 4.2.0 - + bcrypt/src/_bcrypt gz - true - - - bcrypt/src/_bcrypt diff --git a/bcrypt-4.0.1.tar.gz b/bcrypt-4.0.1.tar.gz deleted file mode 100644 index 5ff4144..0000000 --- a/bcrypt-4.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27d375903ac8261cfe4047f6709d16f7d18d39b1ec92aaf72af989552a650ebd -size 25498 diff --git a/bcrypt-4.2.0.tar.gz b/bcrypt-4.2.0.tar.gz new file mode 100644 index 0000000..020dd3b --- /dev/null +++ b/bcrypt-4.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf69eaf5185fd58f268f805b505ce31f9b9fc2d64b376642164e9244540c1221 +size 24294 diff --git a/cargo_config b/cargo_config deleted file mode 100644 index 6fb4ff4..0000000 --- a/cargo_config +++ /dev/null @@ -1,5 +0,0 @@ -[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 8c3c388..68ec990 100644 --- a/python-bcrypt.changes +++ b/python-bcrypt.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Tue Jul 23 13:17:30 UTC 2024 - John Paul Adrian Glaubitz + +- Update to 4.2.0 + * Bump version for 4.2.0 release (#843) + * Import improvements from cryptography wheel building and release (#840) + * Remove setup.py (#842) + * Small cleanup (#841) + * Added 3.13 to CI (#839) + * Bump portable-atomic from 1.6.0 to 1.7.0 in /src/_bcrypt (#836) + * Bump syn from 2.0.71 to 2.0.72 in /src/_bcrypt (#837) + * Bump pyo3 from 0.22.1 to 0.22.2 in /src/_bcrypt (#834) + * Bump syn from 2.0.70 to 2.0.71 in /src/_bcrypt (#833) + * Bump actions/setup-python from 5.1.0 to 5.1.1 (#832) + * Bump syn from 2.0.69 to 2.0.70 in /src/_bcrypt (#831) + * Bump target-lexicon from 0.12.14 to 0.12.15 in /src/_bcrypt (#830) + * Don't import things from prelude (#829) + * Bump actions/upload-artifact from 4.3.3 to 4.3.4 (#824) + * Bump actions/download-artifact from 4.1.7 to 4.1.8 (#825) + * Bump syn from 2.0.68 to 2.0.69 in /src/_bcrypt (#827) + * Bump pyo3 from 0.22.0 to 0.22.1 in /src/_bcrypt (#828) + * Update for new ruff syntax (#826) + * Switch to using the new pyo3 syntax for declarative modules (#823) + * Bump pyo3 to 0.22 (#822) + * Bump bitflags from 2.5.0 to 2.6.0 in /src/_bcrypt (#821) + * Bump syn from 2.0.67 to 2.0.68 in /src/_bcrypt (#818) + * Bump syn from 2.0.66 to 2.0.67 in /src/_bcrypt (#817) + * Bump proc-macro2 from 1.0.85 to 1.0.86 in /src/_bcrypt (#816) + * Bump subtle from 2.5.0 to 2.6.0 in /src/_bcrypt (#814) + * Bump redox_syscall from 0.5.1 to 0.5.2 in /src/_bcrypt (#813) + * Bump actions/checkout from 4.1.6 to 4.1.7 (#812) + * Bump proc-macro2 from 1.0.84 to 1.0.85 in /src/_bcrypt (#811) + * Bump proc-macro2 from 1.0.83 to 1.0.84 in /src/_bcrypt (#808) + * Bump zeroize from 1.7.0 to 1.8.1 in /src/_bcrypt (#809) + * Bump parking_lot from 0.12.2 to 0.12.3 in /src/_bcrypt (#810) + * Bump syn from 2.0.65 to 2.0.66 in /src/_bcrypt (#806) + * alpine is 3.12 now (#807) + * Bump proc-macro2 from 1.0.82 to 1.0.83 in /src/_bcrypt (#804) + * Bump syn from 2.0.64 to 2.0.65 in /src/_bcrypt (#803) + * Bump libc from 0.2.154 to 0.2.155 in /src/_bcrypt (#802) + * Bump actions/checkout from 4.1.5 to 4.1.6 (#800) + * Apply the wacky staticnode workaround to this repo (#801) + * Bump syn from 2.0.63 to 2.0.64 in /src/_bcrypt (#799) + * Bump syn from 2.0.61 to 2.0.63 in /src/_bcrypt (#798) + * Try upgrading ubuntu in CI (#797) + * Bump proc-macro2 from 1.0.81 to 1.0.82 in /src/_bcrypt (#796) + * Bump syn from 2.0.60 to 2.0.61 in /src/_bcrypt (#795) + * Bump getrandom from 0.2.14 to 0.2.15 in /src/_bcrypt (#794) + * Bump actions/checkout from 3.6.0 to 4.1.5 (#793) + +------------------------------------------------------------------- +Tue May 7 16:22:09 UTC 2024 - Dirk Müller + +- update to 4.1.3: + * Bump Rust dependency versions + * Fixed the type signature on the ``kdf`` method. + * Fixed packaging bug on Windows. + * Fixed incompatibility with passlib package detection assumptions. + * Dropped support for Python 3.6. + * Bumped MSRV to 1.64. (Note: Rust 1.63 can be used by setting the + ``BCRYPT_ALLOW_RUST_163`` environment variable) + ------------------------------------------------------------------- Fri Apr 21 12:22:33 UTC 2023 - Dirk Müller diff --git a/python-bcrypt.spec b/python-bcrypt.spec index 1730638..271c3ef 100644 --- a/python-bcrypt.spec +++ b/python-bcrypt.spec @@ -1,7 +1,7 @@ # # spec file for package python-bcrypt # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2016, Martin Hauke # # All modifications and additions to the file contributed by third parties @@ -17,9 +17,10 @@ # +%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' %{?sle15_python_module_pythons} Name: python-bcrypt -Version: 4.0.1 +Version: 4.2.0 Release: 0 Summary: BSD type 2a and 2b password hashing License: Apache-2.0 @@ -27,10 +28,9 @@ Group: Development/Languages/Python 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 pip} BuildRequires: %{python_module pytest >= 3.2.1} -BuildRequires: %{python_module setuptools-rust} +BuildRequires: %{python_module setuptools-rust >= 1.7.0} 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 @@ -49,11 +49,10 @@ using the BSD-originating hashing methods known as "2a" and "2b". %prep %autosetup -p1 -a1 -n bcrypt-%{version} -mkdir .cargo -cp %{SOURCE2} .cargo/config -mv Cargo.lock src/_bcrypt +rm -v src/_bcrypt/Cargo.lock %build +export RUSTFLAGS=%{rustflags} export CFLAGS="%{optflags} -fno-strict-aliasing" %pyproject_wheel diff --git a/vendor.tar.gz b/vendor.tar.gz index 1c6ee85..f5410ac 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3730a7bcb9ed69ab494c1caddacd54e85b0d9576988e393eb4abcc187f8f7315 -size 9367315 +oid sha256:87091e3e39e2103bc214264ece25eb10caf267af8ecadccd6ff3de183cceefca +size 2600259