From 81869a06207a58b7d5f25a29212a1acdbc338bc37321c6878fc1ce8cf1fa8310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 2 Mar 2019 15:20:43 +0000 Subject: [PATCH 1/2] - Do not use symlinks when creating fdupes OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-passlib?expand=0&rev=32 --- python-passlib.changes | 5 +++++ python-passlib.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-passlib.changes b/python-passlib.changes index 45b220c..1d781ce 100644 --- a/python-passlib.changes +++ b/python-passlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 2 15:20:20 UTC 2019 - Tomáš Chvátal + +- Do not use symlinks when creating fdupes + ------------------------------------------------------------------- Wed Dec 19 00:03:58 UTC 2018 - Jan Engelhardt diff --git a/python-passlib.spec b/python-passlib.spec index 97b4a25..94213bd 100644 --- a/python-passlib.spec +++ b/python-passlib.spec @@ -1,7 +1,7 @@ # # spec file for package python-passlib # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -48,7 +48,7 @@ applications. %install %python_install -%python_expand %fdupes -s %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check %python_expand nosetests-%{$python_version} -v From a540d3bc7393b3435b96eb3a7f334aef29c385299cb143b3ed9a051d64a309fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 18 Mar 2019 10:51:16 +0000 Subject: [PATCH 2/2] - Add patch to fix libxcrypt compatibility: * python-passlib-1.7.1-libxcrypt-compat.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-passlib?expand=0&rev=33 --- python-passlib-1.7.1-libxcrypt-compat.patch | 24 +++++++++++++++++++++ python-passlib.changes | 6 ++++++ python-passlib.spec | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 python-passlib-1.7.1-libxcrypt-compat.patch diff --git a/python-passlib-1.7.1-libxcrypt-compat.patch b/python-passlib-1.7.1-libxcrypt-compat.patch new file mode 100644 index 0000000..69dbab6 --- /dev/null +++ b/python-passlib-1.7.1-libxcrypt-compat.patch @@ -0,0 +1,24 @@ +Index: passlib-1.7.1/passlib/tests/test_handlers.py +=================================================================== +--- passlib-1.7.1.orig/passlib/tests/test_handlers.py ++++ passlib-1.7.1/passlib/tests/test_handlers.py +@@ -176,7 +176,8 @@ class _bsdi_crypt_test(HandlerCase): + + platform_crypt_support = [ + ("freebsd|openbsd|netbsd|darwin", True), +- ("linux|solaris", False), ++ ("solaris", False), ++ # linux - may be present in libxcrypt + ] + + def test_77_fuzz_input(self, **kwds): +@@ -1253,7 +1254,8 @@ class _sha1_crypt_test(HandlerCase): + + platform_crypt_support = [ + ("netbsd", True), +- ("freebsd|openbsd|linux|solaris|darwin", False), ++ ("freebsd|openbsd|solaris|darwin", False), ++ # linux - may be present in libxcrypt + ] + + # create test cases for specific backends diff --git a/python-passlib.changes b/python-passlib.changes index 1d781ce..2721879 100644 --- a/python-passlib.changes +++ b/python-passlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 18 10:46:39 UTC 2019 - Tomáš Chvátal + +- Add patch to fix libxcrypt compatibility: + * python-passlib-1.7.1-libxcrypt-compat.patch + ------------------------------------------------------------------- Sat Mar 2 15:20:20 UTC 2019 - Tomáš Chvátal diff --git a/python-passlib.spec b/python-passlib.spec index 94213bd..515effb 100644 --- a/python-passlib.spec +++ b/python-passlib.spec @@ -25,6 +25,7 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://bitbucket.org/ecollins/passlib Source: https://files.pythonhosted.org/packages/source/p/passlib/passlib-%{version}.tar.gz +Patch0: python-passlib-1.7.1-libxcrypt-compat.patch # test requirements BuildRequires: %{python_module nose} BuildRequires: %{python_module setuptools} @@ -42,6 +43,7 @@ applications. %prep %setup -q -n passlib-%{version} +%patch0 -p1 %build %python_build