[Python-modules-commits] r23267 - in packages/python-keyring/tags (6 files)
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Jan 6 23:39:58 UTC 2013
Date: Sunday, January 6, 2013 @ 23:39:56
Author: sramacher
Revision: 23267
[svn-buildpackage] Tagging python-keyring 0.9.3-1
Added:
packages/python-keyring/tags/0.9.3-1/
packages/python-keyring/tags/0.9.3-1/debian/changelog
(from rev 23266, packages/python-keyring/trunk/debian/changelog)
packages/python-keyring/tags/0.9.3-1/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch
(from rev 23264, packages/python-keyring/trunk/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch)
packages/python-keyring/tags/0.9.3-1/debian/patches/series
(from rev 23264, packages/python-keyring/trunk/debian/patches/series)
Deleted:
packages/python-keyring/tags/0.9.3-1/debian/changelog
packages/python-keyring/tags/0.9.3-1/debian/patches/series
Deleted: packages/python-keyring/tags/0.9.3-1/debian/changelog
===================================================================
--- packages/python-keyring/trunk/debian/changelog 2013-01-06 18:29:32 UTC (rev 23262)
+++ packages/python-keyring/tags/0.9.3-1/debian/changelog 2013-01-06 23:39:56 UTC (rev 23267)
@@ -1,96 +0,0 @@
-python-keyring (0.9.2-1.1) unstable; urgency=low
-
- * Non-maintainer upload.
- * Add 696736-Fix-insecure-permissions-on-database-files.patch
- [SECURITY]: Fix insecure permissions on database files. Fix
- CVE-2012-5577 and CVE-2012-5578. (Closes: #696736) (LP: #1031465)
-
- -- Salvatore Bonaccorso <carnil at debian.org> Sat, 29 Dec 2012 08:46:59 +0100
-
-python-keyring (0.9.2-1) unstable; urgency=low
-
- * New upstream release (Closes: #675379, #678682)
- * debian/control
- - Bump Standards-Version to 3.9.3
- - Switch uploader chaica at ohmytux.com to chaica at debian.org
- * debian/rules
- - Remove unittests executions
-
- -- Carl Chenet <chaica at debian.org> Mon, 30 Jul 2012 20:14:42 +0200
-
-python-keyring (0.7.1-1) unstable; urgency=low
-
- * New upstream version (Closes: #656680, #624690)
- * debian/control
- - Add X-Python-Version for Python 3.2
- - Add B-D for Python 3.2
- - Add unzip for B-D to repack upstream sources
- - Add python3-keyring description
- - Recommends python3-crypto for Python3 binary package
- * Add python-keyring.install and python3-keyring.install files
- * debian/rules
- - Execute unit tests if available
- - repack upstream sources
- * debian/watch
- - New URL to catch upstream sources
-
- -- Carl Chenet <chaica at ohmytux.com> Tue, 14 Feb 2012 12:07:30 +0100
-
-python-keyring (0.6.2-1) unstable; urgency=low
-
- * New upstream version
- * debian/control
- - Bump the Standards-Version field to 3.9.2
- - Removed Breaks: ${python:Breaks} from the binary package description
-
- -- Carl Chenet <chaica at ohmytux.com> Sat, 06 Aug 2011 14:52:47 +0200
-
-python-keyring (0.5.1-1) unstable; urgency=low
-
- * New upstream release (Closes: #612432)
- * KDE and GNOME extensions are no more built so dedicated binary packages
- are removed.
- * Removed python-keyring.install
- * Removed python-keyring-kwallet.install
- * Removed python-keyring-gnome.install
- * debian/control
- - Replaced XS-Python-Version by X-Python-Version
- - Bump Standard-Version to 3.9.1.0
- - Removed Build-Depends items to build extensions
- - Removed ${shlibs:Depends} from Depends of the remaining binary package
- - Added Breaks: ${python:Breaks} for the binary package
- - Removed the long descriptions of extension binary packages
- * debian/rules
- - Removed overrides to properly build extensions
- - Added an override to install changelog
- * debian/source/format
- - Bump to 3.0 (quilt)
- * debian/copyright
- - Added thanks to Barry Warsaw <barry at python.org> for his help for the
- packaging of this version
-
- -- Carl Chenet <chaica at ohmytux.com> Thu, 03 Mar 2011 01:37:19 +0100
-
-python-keyring (0.2-3) unstable; urgency=low
-
- * debian/rules
- - Added a $HOME to avoid an error from kde4-config (Closes: #548457)
- * debian/control
- - Bump dh to 7.0.50~
-
- -- Carl Chenet <chaica at ohmytux.com> Tue, 13 Oct 2009 22:59:53 +0200
-
-python-keyring (0.2-2) unstable; urgency=low
-
- * debian/control
- - Added pkg-config and libqt4-dev dependencies.
- * Add Provides: ${python:Provides} to architecture dependent packages
-
- -- Carl Chenet <chaica at ohmytux.com> Mon, 28 Sep 2009 18:59:50 +0200
-
-python-keyring (0.2-1) unstable; urgency=low
-
- * Initial release (Closes: #544486)
-
- -- Carl Chenet <chaica at ohmytux.com> Thu, 24 Sep 2009 23:24:02 +0200
-
Copied: packages/python-keyring/tags/0.9.3-1/debian/changelog (from rev 23266, packages/python-keyring/trunk/debian/changelog)
===================================================================
--- packages/python-keyring/tags/0.9.3-1/debian/changelog (rev 0)
+++ packages/python-keyring/tags/0.9.3-1/debian/changelog 2013-01-06 23:39:56 UTC (rev 23267)
@@ -0,0 +1,110 @@
+python-keyring (0.9.3-1) unstable; urgency=low
+
+ * Team upload.
+ * Acknowledge Salvatore Bonaccorso's NMU.
+ * New upstream release.
+ - Fix migration code so old databases get upgraded when a key is read.
+ First part of #697213. (LP: #1042754)
+ * debian/patches:
+ - CryptedFileKeyring-fix-unlock-logic.patch: patch from
+ upstream to fix the unlock logic in CryptedFileKeyring. Second part of
+ #697213. (Closes: #697213)
+
+ -- Sebastian Ramacher <sramacher at debian.org> Mon, 07 Jan 2013 00:33:14 +0100
+
+python-keyring (0.9.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 696736-Fix-insecure-permissions-on-database-files.patch
+ [SECURITY]: Fix insecure permissions on database files. Fix
+ CVE-2012-5577 and CVE-2012-5578. (Closes: #696736) (LP: #1031465)
+
+ -- Salvatore Bonaccorso <carnil at debian.org> Sat, 29 Dec 2012 08:46:59 +0100
+
+python-keyring (0.9.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #675379, #678682)
+ * debian/control
+ - Bump Standards-Version to 3.9.3
+ - Switch uploader chaica at ohmytux.com to chaica at debian.org
+ * debian/rules
+ - Remove unittests executions
+
+ -- Carl Chenet <chaica at debian.org> Mon, 30 Jul 2012 20:14:42 +0200
+
+python-keyring (0.7.1-1) unstable; urgency=low
+
+ * New upstream version (Closes: #656680, #624690)
+ * debian/control
+ - Add X-Python-Version for Python 3.2
+ - Add B-D for Python 3.2
+ - Add unzip for B-D to repack upstream sources
+ - Add python3-keyring description
+ - Recommends python3-crypto for Python3 binary package
+ * Add python-keyring.install and python3-keyring.install files
+ * debian/rules
+ - Execute unit tests if available
+ - repack upstream sources
+ * debian/watch
+ - New URL to catch upstream sources
+
+ -- Carl Chenet <chaica at ohmytux.com> Tue, 14 Feb 2012 12:07:30 +0100
+
+python-keyring (0.6.2-1) unstable; urgency=low
+
+ * New upstream version
+ * debian/control
+ - Bump the Standards-Version field to 3.9.2
+ - Removed Breaks: ${python:Breaks} from the binary package description
+
+ -- Carl Chenet <chaica at ohmytux.com> Sat, 06 Aug 2011 14:52:47 +0200
+
+python-keyring (0.5.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #612432)
+ * KDE and GNOME extensions are no more built so dedicated binary packages
+ are removed.
+ * Removed python-keyring.install
+ * Removed python-keyring-kwallet.install
+ * Removed python-keyring-gnome.install
+ * debian/control
+ - Replaced XS-Python-Version by X-Python-Version
+ - Bump Standard-Version to 3.9.1.0
+ - Removed Build-Depends items to build extensions
+ - Removed ${shlibs:Depends} from Depends of the remaining binary package
+ - Added Breaks: ${python:Breaks} for the binary package
+ - Removed the long descriptions of extension binary packages
+ * debian/rules
+ - Removed overrides to properly build extensions
+ - Added an override to install changelog
+ * debian/source/format
+ - Bump to 3.0 (quilt)
+ * debian/copyright
+ - Added thanks to Barry Warsaw <barry at python.org> for his help for the
+ packaging of this version
+
+ -- Carl Chenet <chaica at ohmytux.com> Thu, 03 Mar 2011 01:37:19 +0100
+
+python-keyring (0.2-3) unstable; urgency=low
+
+ * debian/rules
+ - Added a $HOME to avoid an error from kde4-config (Closes: #548457)
+ * debian/control
+ - Bump dh to 7.0.50~
+
+ -- Carl Chenet <chaica at ohmytux.com> Tue, 13 Oct 2009 22:59:53 +0200
+
+python-keyring (0.2-2) unstable; urgency=low
+
+ * debian/control
+ - Added pkg-config and libqt4-dev dependencies.
+ * Add Provides: ${python:Provides} to architecture dependent packages
+
+ -- Carl Chenet <chaica at ohmytux.com> Mon, 28 Sep 2009 18:59:50 +0200
+
+python-keyring (0.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #544486)
+
+ -- Carl Chenet <chaica at ohmytux.com> Thu, 24 Sep 2009 23:24:02 +0200
+
Copied: packages/python-keyring/tags/0.9.3-1/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch (from rev 23264, packages/python-keyring/trunk/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch)
===================================================================
--- packages/python-keyring/tags/0.9.3-1/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch (rev 0)
+++ packages/python-keyring/tags/0.9.3-1/debian/patches/CryptedFileKeyring-fix-unlock-logic.patch 2013-01-06 23:39:56 UTC (rev 23267)
@@ -0,0 +1,21 @@
+Description: fix unlock logic in CryptedFileKeyring
+Origin: upstream,
+ https://bitbucket.org/kang/python-keyring-lib/commits/28ed1e5f
+Bug-Debian: http://bugs.debian.org/697213
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-keyring/+bug/1042754
+Last-Update: 2013-01-06
+
+--- a/keyring/backend.py
++++ b/keyring/backend.py
+@@ -463,7 +463,10 @@
+ @properties.NonDataProperty
+ def keyring_key(self):
+ # _unlock or _init_file will set the key or raise an exception
+- self._check_file() and self._unlock() or self._init_file()
++ if self._check_file():
++ self._unlock()
++ else:
++ self._init_file()
+ return self.keyring_key
+
+ def _get_new_password(self):
Deleted: packages/python-keyring/tags/0.9.3-1/debian/patches/series
===================================================================
--- packages/python-keyring/trunk/debian/patches/series 2013-01-06 18:29:32 UTC (rev 23262)
+++ packages/python-keyring/tags/0.9.3-1/debian/patches/series 2013-01-06 23:39:56 UTC (rev 23267)
@@ -1 +0,0 @@
-696736-Fix-insecure-permissions-on-database-files.patch
Copied: packages/python-keyring/tags/0.9.3-1/debian/patches/series (from rev 23264, packages/python-keyring/trunk/debian/patches/series)
===================================================================
--- packages/python-keyring/tags/0.9.3-1/debian/patches/series (rev 0)
+++ packages/python-keyring/tags/0.9.3-1/debian/patches/series 2013-01-06 23:39:56 UTC (rev 23267)
@@ -0,0 +1,2 @@
+696736-Fix-insecure-permissions-on-database-files.patch
+CryptedFileKeyring-fix-unlock-logic.patch
More information about the Python-modules-commits
mailing list