From 1843d4087daba4a172aa5b19b91f25c4129da047dbc5740b7147599564b2315b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 17 Dec 2015 12:59:53 +0000 Subject: [PATCH 1/2] - drop keyring-import-gi.patch, and update keyring-gnome-3.18.patch, which introduces the regression OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=40 --- keyring-gnome-3.18.patch | 3 ++- keyring-import-gi.patch | 12 ------------ python-keyring.changes | 6 ++++++ python-keyring.spec | 4 +--- 4 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 keyring-import-gi.patch diff --git a/keyring-gnome-3.18.patch b/keyring-gnome-3.18.patch index 2aef756..0ec584f 100644 --- a/keyring-gnome-3.18.patch +++ b/keyring-gnome-3.18.patch @@ -2,10 +2,11 @@ Index: keyring-5.4/keyring/backends/Gnome.py =================================================================== --- keyring-5.4.orig/keyring/backends/Gnome.py +++ keyring-5.4/keyring/backends/Gnome.py -@@ -3,6 +3,7 @@ import os +@@ -3,6 +3,8 @@ import os try: from gi import Repository if Repository.get_default().enumerate_versions('GnomeKeyring'): ++ import gi + gi.require_version('GnomeKeyring', '1.0') from gi.repository import GnomeKeyring except ImportError: diff --git a/keyring-import-gi.patch b/keyring-import-gi.patch deleted file mode 100644 index 321baa4..0000000 --- a/keyring-import-gi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/keyring/backends/Gnome.py b/keyring/backends/Gnome.py -index 7a8a274..642bc80 100644 ---- a/keyring/backends/Gnome.py -+++ b/keyring/backends/Gnome.py -@@ -3,6 +3,7 @@ import os - try: - from gi import Repository - if Repository.get_default().enumerate_versions('GnomeKeyring'): -+ import gi - gi.require_version('GnomeKeyring', '1.0') - from gi.repository import GnomeKeyring - except ImportError: diff --git a/python-keyring.changes b/python-keyring.changes index 4faaa21..bf4c368 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 17 12:59:08 UTC 2015 - dmueller@suse.com + +- drop keyring-import-gi.patch, and update keyring-gnome-3.18.patch, + which introduces the regression + ------------------------------------------------------------------- Mon Sep 17 11:41:56 UTC 2015 - m0ses@samaxi.de diff --git a/python-keyring.spec b/python-keyring.spec index 9ea36cd..b547fb2 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -1,7 +1,7 @@ # # spec file for package python-keyring # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -26,7 +26,6 @@ Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.tar.gz # PATCH-FIX-UPSTREAM keyring-gnome-3.18.patch dimstar@opensuse.org -- Silence a warning when run in GNOME 3.18: gi requires versioned imports now. Patch0: keyring-gnome-3.18.patch -Patch1: keyring-import-gi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-setuptools @@ -58,7 +57,6 @@ from python. It can be used in any application that needs safe password storage. %prep %setup -q -n keyring-%{version} %patch0 -p1 -%patch1 -p1 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py From c2093ea544c6b613ffde6cd9f991a44d30c6ec5f98b32c6057961c3a3e8975f0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 17 Dec 2015 13:43:06 +0000 Subject: [PATCH 2/2] - Update to version 5.7 - Removed CONTRIBUTORS.txt because not available in upstream source anymore. - dropped patches keyring-import-gi.patch and keyring-gnome-3.18.patch because they were obsoleted by fixes in upstream source 5.7 --- * Issue #177: Resolve default keyring name on Gnome using the API. * Issue #145: Add workaround for password exposure through process status for most passwords containing simple characters. 5.6 --- * Allow keyring to be invoked from command-line with ``python -m keyring``. 5.5.1 ----- * Issue #156: Fixed test failures in ``pyfs`` keyring related to 0.5 release. 5.5 --- * Pull Request #176: Use recommended mechanism for checking GnomeKeyring version. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-keyring?expand=0&rev=41 --- keyring-5.4.tar.gz | 3 --- keyring-5.7.tar.gz | 3 +++ keyring-gnome-3.18.patch | 13 ------------- python-keyring.changes | 28 +++++++++++++++++++++++++--- python-keyring.spec | 7 ++----- 5 files changed, 30 insertions(+), 24 deletions(-) delete mode 100644 keyring-5.4.tar.gz create mode 100644 keyring-5.7.tar.gz delete mode 100644 keyring-gnome-3.18.patch diff --git a/keyring-5.4.tar.gz b/keyring-5.4.tar.gz deleted file mode 100644 index 52e8142..0000000 --- a/keyring-5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45891cd0af4c4af70fbed7ec6e3964d0261c14188de9ab31030c9d02272e22d2 -size 68986 diff --git a/keyring-5.7.tar.gz b/keyring-5.7.tar.gz new file mode 100644 index 0000000..fe08e86 --- /dev/null +++ b/keyring-5.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d388e459bb18da2e3540e475f5ac4e45eb8da0926c776ee117b5c098af43bc0 +size 70370 diff --git a/keyring-gnome-3.18.patch b/keyring-gnome-3.18.patch deleted file mode 100644 index 0ec584f..0000000 --- a/keyring-gnome-3.18.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: keyring-5.4/keyring/backends/Gnome.py -=================================================================== ---- keyring-5.4.orig/keyring/backends/Gnome.py -+++ keyring-5.4/keyring/backends/Gnome.py -@@ -3,6 +3,8 @@ import os - try: - from gi import Repository - if Repository.get_default().enumerate_versions('GnomeKeyring'): -+ import gi -+ gi.require_version('GnomeKeyring', '1.0') - from gi.repository import GnomeKeyring - except ImportError: - pass diff --git a/python-keyring.changes b/python-keyring.changes index bf4c368..deb53b5 100644 --- a/python-keyring.changes +++ b/python-keyring.changes @@ -1,8 +1,30 @@ ------------------------------------------------------------------- -Thu Dec 17 12:59:08 UTC 2015 - dmueller@suse.com +Fri Dec 11 14:45:37 UTC 2015 - michael@stroeder.com -- drop keyring-import-gi.patch, and update keyring-gnome-3.18.patch, - which introduces the regression +- Update to version 5.7 +- Removed CONTRIBUTORS.txt because not available in upstream + source anymore. +- dropped patches keyring-import-gi.patch and keyring-gnome-3.18.patch + because they were obsoleted by fixes in upstream source + +5.7 +--- +* Issue #177: Resolve default keyring name on Gnome using the API. +* Issue #145: Add workaround for password exposure through + process status for most passwords containing simple + characters. +5.6 +--- +* Allow keyring to be invoked from command-line with + ``python -m keyring``. +5.5.1 +----- +* Issue #156: Fixed test failures in ``pyfs`` keyring related to + 0.5 release. +5.5 +--- +* Pull Request #176: Use recommended mechanism for checking + GnomeKeyring version. ------------------------------------------------------------------- Mon Sep 17 11:41:56 UTC 2015 - m0ses@samaxi.de diff --git a/python-keyring.spec b/python-keyring.spec index b547fb2..8745291 100644 --- a/python-keyring.spec +++ b/python-keyring.spec @@ -17,15 +17,13 @@ Name: python-keyring -Version: 5.4 +Version: 5.7 Release: 0 Url: https://bitbucket.org/kang/python-keyring-lib Summary: Store and access your passwords safely License: Python-2.0 and MIT Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/k/keyring/keyring-%{version}.tar.gz -# PATCH-FIX-UPSTREAM keyring-gnome-3.18.patch dimstar@opensuse.org -- Silence a warning when run in GNOME 3.18: gi requires versioned imports now. -Patch0: keyring-gnome-3.18.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-setuptools @@ -56,7 +54,6 @@ from python. It can be used in any application that needs safe password storage. %prep %setup -q -n keyring-%{version} -%patch0 -p1 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' keyring/cli.py keyring/backends/_win_crypto.py @@ -86,7 +83,7 @@ fi %files %defattr(-,root,root) -%doc CONTRIBUTORS.txt README.rst CHANGES.rst +%doc README.rst CHANGES.rst %ghost %{_sysconfdir}/alternatives/keyring %{_bindir}/keyring %{_bindir}/keyring-%{py_ver}