ports/169232: Update port: security/py-keyring Upgrade to 0.9.2

[douglas at douglasthrift.net]

>Number:         169232
>Category:       ports
>Synopsis:       Update port: security/py-keyring Upgrade to 0.9.2
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 19 04:40:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        FreeBSD 8.0-RELEASE-p6 amd64
>Organization:
>Environment:
System: FreeBSD slowhand.douglasthrift.net 8.0-RELEASE-p6 FreeBSD 8.0-RELEASE-p6 #2: Wed Sep 28 21:40:42 PDT 2011 user at jail8.johncompanies.com:/usr/obj/usr/src/sys/jail8 amd64
>Description:
Upgrade sysutils/py-keyring to 0.9.2.

https://redports.org/buildarchive/20120618204234-37226/

>From CHANGES.txt:

-----
0.9.2
-----

* Keyring 0.9.1 introduced a whole different storage format for the
  CryptedFileKeyring, but this introduced some potential compatibility issues.
  This release incorporates the security updates but reverts to the INI file
  format for storage, only encrypting the passwords and leaving the service
  and usernames in plaintext. Subsequent releases may incorporate a new
  keyring to implement a whole-file encrypted version. Fixes #64.
* The CryptedFileKeyring now requires simplejson for Python 2.5 clients.
>How-To-Repeat:
>Fix:
--- py-keyring.2012-06-19T042843Z.diff begins here ---
diff -Nrux .svn -x work /usr/ports/security/py-keyring/Makefile py-keyring/Makefile
--- /usr/ports/security/py-keyring/Makefile	2012-06-17 18:20:15.000000000 -0700
+++ py-keyring/Makefile	2012-06-18 13:39:26.000000000 -0700
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	keyring
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,12 +22,12 @@
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 
-OPTIONS_DEFINE=		CRYPT_FILE GNOME_KEYRING KDE_KWALLET
+OPTIONS_DEFINE=	CRYPT_FILE GNOME_KEYRING KDE_KWALLET
 GNOME_KEYRING_DESC=	GNOME Keyring backend
 KDE_KWALLET_DESC=	KDE KWallet backend
 CRYPT_FILE_DESC=	Crypt(ed) File backend
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MGNOME_KEYRING}
 USE_GNOME+=	pygnomedesktop
@@ -39,6 +39,9 @@
 
 .if ${PORT_OPTIONS:MCRYPT_FILE}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:${PORTSDIR}/security/py-pycrypto
+.if ${PYTHON_VERSION} == "python2.5"
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.5:${PORTSDIR}/devel/py-simplejson
+.endif
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
--- /usr/ports/security/py-keyring/distinfo	2012-06-17 18:20:15.000000000 -0700
+++ py-keyring/distinfo	2012-06-18 13:20:14.000000000 -0700
@@ -1,2 +1,2 @@
-SHA256 (keyring-0.9.1.zip) = ef9fad76daeadd4ea2f8992e768d8dd873c812dd4c226cae1e64ccca4627377b
-SIZE (keyring-0.9.1.zip) = 46907
+SHA256 (keyring-0.9.2.zip) = 3495c72ec6fdefd6da3a7271acac89903e6ffdfb984a71a3e087c49538351c30
+SIZE (keyring-0.9.2.zip) = 49117
diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
--- /usr/ports/security/py-keyring/pkg-plist	2012-03-02 10:47:43.000000000 -0800
+++ py-keyring/pkg-plist	2012-06-18 13:22:51.000000000 -0700
@@ -31,6 +31,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/http.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/py25compat.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/keyring/tests/__init__.pyo
--- py-keyring.2012-06-19T042843Z.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: