diff options
author | sborrill <sborrill@pkgsrc.org> | 2017-03-17 16:56:47 +0000 |
---|---|---|
committer | sborrill <sborrill@pkgsrc.org> | 2017-03-17 16:56:47 +0000 |
commit | 6dde778fd9a4c3d1d7aae1d448534b1368f439d6 (patch) | |
tree | d3cf54d6ef84e9db6746788297ba97de2a54274b /net/Radicale | |
parent | 42395c0349d3d1cee98115911d2ad6e2836bc10a (diff) | |
download | pkgsrc-6dde778fd9a4c3d1d7aae1d448534b1368f439d6.tar.gz |
Add support for strip_domain
Fix reading of can_skip_base_prefix setting
Bump PKGREVISION
Diffstat (limited to 'net/Radicale')
-rw-r--r-- | net/Radicale/Makefile | 3 | ||||
-rw-r--r-- | net/Radicale/distinfo | 5 | ||||
-rw-r--r-- | net/Radicale/patches/patch-config | 15 | ||||
-rw-r--r-- | net/Radicale/patches/patch-radicale___init__.py | 26 | ||||
-rw-r--r-- | net/Radicale/patches/patch-radicale_config.py | 16 |
5 files changed, 63 insertions, 2 deletions
diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile index 3cba4222040..96c31807d16 100644 --- a/net/Radicale/Makefile +++ b/net/Radicale/Makefile @@ -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/} diff --git a/net/Radicale/distinfo b/net/Radicale/distinfo index 9c16b3e6784..12083d59c41 100644 --- a/net/Radicale/distinfo +++ b/net/Radicale/distinfo @@ -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 diff --git a/net/Radicale/patches/patch-config b/net/Radicale/patches/patch-config new file mode 100644 index 00000000000..bbeb791a45a --- /dev/null +++ b/net/Radicale/patches/patch-config @@ -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] + diff --git a/net/Radicale/patches/patch-radicale___init__.py b/net/Radicale/patches/patch-radicale___init__.py new file mode 100644 index 00000000000..a3849c63cb0 --- /dev/null +++ b/net/Radicale/patches/patch-radicale___init__.py @@ -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)) diff --git a/net/Radicale/patches/patch-radicale_config.py b/net/Radicale/patches/patch-radicale_config.py new file mode 100644 index 00000000000..6afbb20e2b2 --- /dev/null +++ b/net/Radicale/patches/patch-radicale_config.py @@ -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>"}, + "rights": { |