[pkgsrc/trunk]: pkgsrc/net/calypso Update to 1.2:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ad4233eac47
branches:  trunk
changeset: 624742:5ad4233eac47
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Sep 30 09:35:55 2013 +0000

description:
Update to 1.2:
chrysn and Joe Nahmias have done a bunch of work on Calypso, and I even
managed to fix a couple of bugs. I've merged their stuff in and pushed
out a version 1.2 release this afternoon, along with an updated debian
package. A this point, all reported Debian bugs are closed (surely that
can't last through more than one release).

The only piece unmerged was the ForkingMixin stuff as that means that
each connection has to re-read the entire database at startup as there's
no persistent in-memory state. I'd love to figure out how to use the
ThreadingMixin instead, providing the same multi-session support along
with caching.

diffstat:

 net/calypso/Makefile                              |  13 +++++--------
 net/calypso/PLIST                                 |  13 ++++++++++++-
 net/calypso/distinfo                              |   9 +++++----
 net/calypso/patches/patch-calypso_____init____.py |  15 +++++++++++++++
 4 files changed, 37 insertions(+), 13 deletions(-)

diffs (97 lines):

diff -r f7c9bd705c95 -r 5ad4233eac47 net/calypso/Makefile
--- a/net/calypso/Makefile      Mon Sep 30 09:34:52 2013 +0000
+++ b/net/calypso/Makefile      Mon Sep 30 09:35:55 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2013/09/09 14:07:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/30 09:35:55 wiz Exp $
 
-DISTNAME=      calypso-1.0
-PKGREVISION=   2
+DISTNAME=      calypso-1.2
 CATEGORIES=    net time
 MASTER_SITES=  http://keithp.com/calypso/
 
@@ -13,10 +12,8 @@
 DEPENDS+=      ${PYPKGPREFIX}-vobject>=0.8.1c:../../textproc/py-vobject
 DEPENDS+=      git-base-[0-9]*:../../devel/git-base
 
-#WRKSRC=               ${WRKDIR}/calypso
-
-PYDISTUTILSPKG=                        yes
-PYTHON_VERSIONS_INCLUDE_3X=    yes
+EGG_NAME=      ${DISTNAME:S/c/C/}
+WRKSRC=                ${WRKDIR}
 
 INSTALLATION_DIRS=     share/examples/calypso
 
@@ -26,5 +23,5 @@
        ${INSTALL_DATA} ${WRKSRC}/config ${DESTDIR}${PREFIX}/share/examples/calypso/
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f7c9bd705c95 -r 5ad4233eac47 net/calypso/PLIST
--- a/net/calypso/PLIST Mon Sep 30 09:34:52 2013 +0000
+++ b/net/calypso/PLIST Mon Sep 30 09:35:55 2013 +0000
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/01/08 15:11:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/09/30 09:35:55 wiz Exp $
 bin/calypso
+${PYSITELIB}/${EGG_FILE}/PKG-INFO
+${PYSITELIB}/${EGG_FILE}/SOURCES.txt
+${PYSITELIB}/${EGG_FILE}/dependency_links.txt
+${PYSITELIB}/${EGG_FILE}/requires.txt
+${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/calypso/__init__.py
 ${PYSITELIB}/calypso/__init__.pyc
 ${PYSITELIB}/calypso/__init__.pyo
@@ -12,9 +17,15 @@
 ${PYSITELIB}/calypso/acl/htpasswd.py
 ${PYSITELIB}/calypso/acl/htpasswd.pyc
 ${PYSITELIB}/calypso/acl/htpasswd.pyo
+${PYSITELIB}/calypso/acl/pam.py
+${PYSITELIB}/calypso/acl/pam.pyc
+${PYSITELIB}/calypso/acl/pam.pyo
 ${PYSITELIB}/calypso/config.py
 ${PYSITELIB}/calypso/config.pyc
 ${PYSITELIB}/calypso/config.pyo
+${PYSITELIB}/calypso/paths.py
+${PYSITELIB}/calypso/paths.pyc
+${PYSITELIB}/calypso/paths.pyo
 ${PYSITELIB}/calypso/webdav.py
 ${PYSITELIB}/calypso/webdav.pyc
 ${PYSITELIB}/calypso/webdav.pyo
diff -r f7c9bd705c95 -r 5ad4233eac47 net/calypso/distinfo
--- a/net/calypso/distinfo      Mon Sep 30 09:34:52 2013 +0000
+++ b/net/calypso/distinfo      Mon Sep 30 09:35:55 2013 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/01/08 15:11:37 wiz Exp $
+$NetBSD: distinfo,v 1.2 2013/09/30 09:35:55 wiz Exp $
 
-SHA1 (calypso-1.0.tar.gz) = 12ec37f3ba38510b895b1fa4a4e614707749ca90
-RMD160 (calypso-1.0.tar.gz) = 64caca6ceafc47cfc7a5a9315bf5e8fac7faebd5
-Size (calypso-1.0.tar.gz) = 25144 bytes
+SHA1 (calypso-1.2.tar.gz) = ffde9a55f7f08a3ef8fd5907734f82882899a86c
+RMD160 (calypso-1.2.tar.gz) = a7417b8c41c8ada91af7168f9c54b9dabb3a6893
+Size (calypso-1.2.tar.gz) = 31875 bytes
+SHA1 (patch-calypso_____init____.py) = 9d5ea62eb3481c52457ab69a4af9c4e72dc9c1f1
diff -r f7c9bd705c95 -r 5ad4233eac47 net/calypso/patches/patch-calypso_____init____.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/calypso/patches/patch-calypso_____init____.py Mon Sep 30 09:35:55 2013 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-calypso_____init____.py,v 1.1 2013/09/30 09:35:55 wiz Exp $
+
+Fix version number. Accepted upstream.
+
+--- calypso/__init__.py.orig   2013-09-20 17:59:23.000000000 +0000
++++ calypso/__init__.py
+@@ -61,7 +61,7 @@ formatter = logging.Formatter("%(message
+ ch.setFormatter (formatter)
+ log.addHandler(ch)
+ 
+-VERSION = "1.1"
++VERSION = "1.2"
+ 
+ def _check(request, function):
+     """Check if user has sufficient rights for performing ``request``."""