Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 07B967A16A for ; Mon, 20 Mar 2017 10:49:05 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id A8EF8855DD; Mon, 20 Mar 2017 10:49:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 37FE5855D4 for ; Mon, 20 Mar 2017 10:49:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id F1t6g96XU0sQ for ; Mon, 20 Mar 2017 10:49:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A3522855CC for ; Mon, 20 Mar 2017 10:49:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9A352FBE4; Mon, 20 Mar 2017 10:49:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149000694330410" MIME-Version: 1.0 Date: Mon, 20 Mar 2017 10:49:03 +0000 From: "Stephen Borrill" Subject: CVS commit: pkgsrc/net/Radicale To: pkgsrc-changes@NetBSD.org Reply-To: sborrill@netbsd.org X-Mailer: log_accum Message-Id: <20170320104903.9A352FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_149000694330410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: sborrill Date: Mon Mar 20 10:49:03 UTC 2017 Modified Files: pkgsrc/net/Radicale: Makefile distinfo pkgsrc/net/Radicale/patches: patch-radicale___init__.py Log Message: Fix strip_domain patch to work in anonymous case. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/Radicale/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/Radicale/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/net/Radicale/patches/patch-radicale___init__.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149000694330410 Content-Disposition: inline Content-Length: 3130 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/Radicale/Makefile diff -u pkgsrc/net/Radicale/Makefile:1.18 pkgsrc/net/Radicale/Makefile:1.19 --- pkgsrc/net/Radicale/Makefile:1.18 Fri Mar 17 16:56:47 2017 +++ pkgsrc/net/Radicale/Makefile Mon Mar 20 10:49:03 2017 @@ -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/} Index: pkgsrc/net/Radicale/distinfo diff -u pkgsrc/net/Radicale/distinfo:1.10 pkgsrc/net/Radicale/distinfo:1.11 --- pkgsrc/net/Radicale/distinfo:1.10 Fri Mar 17 16:56:47 2017 +++ pkgsrc/net/Radicale/distinfo Mon Mar 20 10:49:03 2017 @@ -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 Index: pkgsrc/net/Radicale/patches/patch-radicale___init__.py diff -u pkgsrc/net/Radicale/patches/patch-radicale___init__.py:1.1 pkgsrc/net/Radicale/patches/patch-radicale___init__.py:1.2 --- pkgsrc/net/Radicale/patches/patch-radicale___init__.py:1.1 Fri Mar 17 16:56:47 2017 +++ pkgsrc/net/Radicale/patches/patch-radicale___init__.py Mon Mar 20 10:49:03 2017 @@ -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 sett 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: --_----------=_149000694330410--