diff options
| author | sborrill <sborrill> | 2017-03-20 10:49:03 +0000 |
|---|---|---|
| committer | sborrill <sborrill> | 2017-03-20 10:49:03 +0000 |
| commit | f6fb96dc3aa7ca0654eed3f89a2f43788dcfab86 (patch) | |
| tree | 7f623cff92b100cb4b9ad8acb6abfd2c5c9fd2e8 | |
| parent | 245ff9829c083d5c4834da1fa511e00c281de91e (diff) | |
| download | pkgsrc-f6fb96dc3aa7ca0654eed3f89a2f43788dcfab86.tar.gz | |
Fix strip_domain patch to work in anonymous case.
Bump PKGREVISION
| -rw-r--r-- | net/Radicale/Makefile | 4 | ||||
| -rw-r--r-- | net/Radicale/distinfo | 4 | ||||
| -rw-r--r-- | net/Radicale/patches/patch-radicale___init__.py | 11 |
3 files changed, 10 insertions, 9 deletions
diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile index 96c31807d16..b9d7707924c 100644 --- a/net/Radicale/Makefile +++ b/net/Radicale/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2017/03/17 16:56:47 sborrill Exp $ +# $NetBSD: Makefile,v 1.19 2017/03/20 10:49:03 sborrill Exp $ DISTNAME= Radicale-1.1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net time www MASTER_SITES= ${MASTER_SITE_PYPI:=R/Radicale/} diff --git a/net/Radicale/distinfo b/net/Radicale/distinfo index 12083d59c41..f5b9a4fd34f 100644 --- a/net/Radicale/distinfo +++ b/net/Radicale/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2017/03/17 16:56:47 sborrill Exp $ +$NetBSD: distinfo,v 1.11 2017/03/20 10:49:03 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___init__.py) = 9f5379cb4945cb1c62fd56f86e2e47f62a11885c SHA1 (patch-radicale_config.py) = ea1f0984f0744331675b8a5005d934f5c18a7447 diff --git a/net/Radicale/patches/patch-radicale___init__.py b/net/Radicale/patches/patch-radicale___init__.py index a3849c63cb0..6d85e6c1ced 100644 --- a/net/Radicale/patches/patch-radicale___init__.py +++ b/net/Radicale/patches/patch-radicale___init__.py @@ -1,10 +1,10 @@ -$NetBSD: patch-radicale___init__.py,v 1.1 2017/03/17 16:56:47 sborrill Exp $ +$NetBSD: patch-radicale___init__.py,v 1.2 2017/03/20 10:49:03 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 +--- radicale/__init__.py.orig 2016-01-07 22:29:49.000000000 +0000 ++++ radicale/__init__.py 2017-03-20 10:43:49.000000000 +0000 @@ -249,7 +249,7 @@ base_prefix = config.get("server", "base_prefix") if environ["PATH_INFO"].startswith(base_prefix): @@ -14,12 +14,13 @@ Fix reading of can_skip_base_prefix setting log.LOGGER.debug( "Prefix already stripped from path: %s", environ["PATH_INFO"]) else: -@@ -280,6 +280,9 @@ +@@ -280,6 +280,10 @@ user = environ.get("REMOTE_USER") password = None + if config.getboolean("auth", "strip_domain"): -+ user = re.sub("@.*", "", user) ++ if user: ++ user = re.sub("@.*", "", user) + well_known = WELL_KNOWN_RE.match(path) if well_known: |