CVS commit: pkgsrc/net/Radicale

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Fri Mar 17 16:56:47 UTC 2017

Modified Files:
        pkgsrc/net/Radicale: Makefile distinfo
Added Files:
        pkgsrc/net/Radicale/patches: patch-config patch-radicale___init__.py
            patch-radicale_config.py

Log Message:
Add support for strip_domain
Fix reading of can_skip_base_prefix setting

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/Radicale/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/Radicale/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/Radicale/patches/patch-config \
    pkgsrc/net/Radicale/patches/patch-radicale___init__.py \
    pkgsrc/net/Radicale/patches/patch-radicale_config.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/Radicale/Makefile
diff -u pkgsrc/net/Radicale/Makefile:1.17 pkgsrc/net/Radicale/Makefile:1.18
--- pkgsrc/net/Radicale/Makefile:1.17   Wed Jun  8 17:43:36 2016
+++ pkgsrc/net/Radicale/Makefile        Fri Mar 17 16:56:47 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2016/06/08 17:43:36 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2017/03/17 16:56:47 sborrill Exp $
 
 DISTNAME=      Radicale-1.1.1
+PKGREVISION=   1
 CATEGORIES=    net time www
 MASTER_SITES=  ${MASTER_SITE_PYPI:=R/Radicale/}
 

Index: pkgsrc/net/Radicale/distinfo
diff -u pkgsrc/net/Radicale/distinfo:1.9 pkgsrc/net/Radicale/distinfo:1.10
--- pkgsrc/net/Radicale/distinfo:1.9    Tue Jan 12 00:17:11 2016
+++ pkgsrc/net/Radicale/distinfo        Fri Mar 17 16:56:47 2017
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.9 2016/01/12 00:17:11 prlw1 Exp $
+$NetBSD: distinfo,v 1.10 2017/03/17 16:56:47 sborrill Exp $
 
 SHA1 (Radicale-1.1.1.tar.gz) = 0358b15a2cf2a0b3f95c9a490f2ff0747fc254c5
 RMD160 (Radicale-1.1.1.tar.gz) = d3d6d8051e7b0d95d72bc5a00af9a82f79240238
 SHA512 (Radicale-1.1.1.tar.gz) = dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2
 Size (Radicale-1.1.1.tar.gz) = 47174 bytes
+SHA1 (patch-config) = de1060a10ace5de77dfc8dd25cfae4d6aefa96ee
+SHA1 (patch-radicale___init__.py) = 9094c5fbe1659b376230d97cf7c8c67a5887ca11
+SHA1 (patch-radicale_config.py) = ea1f0984f0744331675b8a5005d934f5c18a7447

Added files:

Index: pkgsrc/net/Radicale/patches/patch-config
diff -u /dev/null pkgsrc/net/Radicale/patches/patch-config:1.1
--- /dev/null   Fri Mar 17 16:56:47 2017
+++ pkgsrc/net/Radicale/patches/patch-config    Fri Mar 17 16:56:47 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-config,v 1.1 2017/03/17 16:56:47 sborrill Exp $
+
+Add support for strip_domain
+
+--- config.orig        2017-03-17 16:09:59.000000000 +0000
++++ config     2017-03-17 16:10:41.000000000 +0000
+@@ -129,6 +129,8 @@
+ # POST parameter to use for password
+ #http_password_parameter =
+ 
++# Strip @domain off username if email address used for authentication
++strip_domain = False
+ 
+ [git]
+ 
Index: pkgsrc/net/Radicale/patches/patch-radicale___init__.py
diff -u /dev/null pkgsrc/net/Radicale/patches/patch-radicale___init__.py:1.1
--- /dev/null   Fri Mar 17 16:56:47 2017
+++ pkgsrc/net/Radicale/patches/patch-radicale___init__.py      Fri Mar 17 16:56:47 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-radicale___init__.py,v 1.1 2017/03/17 16:56:47 sborrill Exp $
+
+Add support for strip_domain
+Fix reading of can_skip_base_prefix setting
+
+--- radicale/__init__.py.orig  2017-03-17 16:04:32.000000000 +0000
++++ radicale/__init__.py       2017-03-17 16:04:57.000000000 +0000
+@@ -249,7 +249,7 @@
+         base_prefix = config.get("server", "base_prefix")
+         if environ["PATH_INFO"].startswith(base_prefix):
+             environ["PATH_INFO"] = environ["PATH_INFO"][len(base_prefix):]
+-        elif config.get("server", "can_skip_base_prefix"):
++        elif config.getboolean("server", "can_skip_base_prefix"):
+             log.LOGGER.debug(
+                 "Prefix already stripped from path: %s", environ["PATH_INFO"])
+         else:
+@@ -280,6 +280,9 @@
+             user = environ.get("REMOTE_USER")
+             password = None
+ 
++        if config.getboolean("auth", "strip_domain"):
++            user = re.sub("@.*", "", user)
++
+         well_known = WELL_KNOWN_RE.match(path)
+         if well_known:
+             redirect = config.get("well-known", well_known.group(1))
Index: pkgsrc/net/Radicale/patches/patch-radicale_config.py
diff -u /dev/null pkgsrc/net/Radicale/patches/patch-radicale_config.py:1.1
--- /dev/null   Fri Mar 17 16:56:47 2017
+++ pkgsrc/net/Radicale/patches/patch-radicale_config.py        Fri Mar 17 16:56:47 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-radicale_config.py,v 1.1 2017/03/17 16:56:47 sborrill Exp $
+
+Add support for strip_domain
+
+--- radicale/config.py.orig    2017-03-17 16:04:36.000000000 +0000
++++ radicale/config.py 2017-03-17 16:05:03.000000000 +0000
+@@ -76,7 +76,8 @@
+         "courier_socket": "",
+         "http_url": "",
+         "http_user_parameter": "",
+-        "http_password_parameter": ""},
++        "http_password_parameter": "",
++        "strip_domain": "False"},
+     "git": {
+         "committer": "Radicale <radicale%example.com@localhost>"},
+     "rights": {