Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1498888627295680"
MIME-Version: 1.0
Date: Sat, 1 Jul 2017 05:57:07 +0000
From: "D'Arcy J.M. Cain" <darcy@netbsd.org>
Subject: CVS commit: pkgsrc/net
To: pkgsrc-changes@NetBSD.org
Reply-To: darcy@netbsd.org
Message-Id: <20170701055707.520BCFAE8@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1498888627295680
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	darcy
Date:		Sat Jul  1 05:57:07 UTC 2017

Modified Files:
	pkgsrc/net: Makefile
Added Files:
	pkgsrc/net/Radicale2: DESCR Makefile PLIST distinfo options.mk
	pkgsrc/net/Radicale2/files: radicale.sh

Log Message:
Version 2.1.1 of Radicale.
This is a new package as the file storage is incompatible with 1.x.x.

Too many changes from 1.1.4.  Please see http://radicale.org/news/ for details.


To generate a diff of this commit:
cvs rdiff -u -r1.1161 -r1.1162 pkgsrc/net/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/Radicale2/DESCR \
    pkgsrc/net/Radicale2/Makefile pkgsrc/net/Radicale2/PLIST \
    pkgsrc/net/Radicale2/distinfo pkgsrc/net/Radicale2/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/Radicale2/files/radicale.sh

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


--_----------=_1498888627295680
Content-Disposition: inline
Content-Length: 6264
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/Makefile
diff -u pkgsrc/net/Makefile:1.1161 pkgsrc/net/Makefile:1.1162
--- pkgsrc/net/Makefile:1.1161	Sat Jun 24 14:24:45 2017
+++ pkgsrc/net/Makefile	Sat Jul  1 05:57:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1161 2017/06/24 14:24:45 tnn Exp $
+# $NetBSD: Makefile,v 1.1162 2017/07/01 05:57:06 darcy Exp $
 #
 
 COMMENT=	Networking tools
@@ -13,6 +13,7 @@ SUBDIR+=	LaBrea
 SUBDIR+=	ORBit
 SUBDIR+=	ORBit2
 SUBDIR+=	Radicale
+SUBDIR+=	Radicale2
 SUBDIR+=	SDL2_net
 SUBDIR+=	SDL_net
 SUBDIR+=	adns

Added files:

Index: pkgsrc/net/Radicale2/DESCR
diff -u /dev/null pkgsrc/net/Radicale2/DESCR:1.1
--- /dev/null	Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/DESCR	Sat Jul  1 05:57:07 2017
@@ -0,0 +1,7 @@
+The Radicale Project is a complete CalDAV (calendar) and CardDAV
+(contact) server solution.
+
+Calendars and address books are available for both local and remote
+access, possibly limited through authentication policies. They can be
+viewed and edited by calendar and contact clients on mobile phones or
+computers.
Index: pkgsrc/net/Radicale2/Makefile
diff -u /dev/null pkgsrc/net/Radicale2/Makefile:1.1
--- /dev/null	Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/Makefile	Sat Jul  1 05:57:07 2017
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile,v 1.1 2017/07/01 05:57:07 darcy Exp $
+
+DISTNAME=	Radicale-2.1.1
+CATEGORIES=	net time www
+MASTER_SITES=	${MASTER_SITE_PYPI:=R/Radicale/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://radicale.org/
+COMMENT=	CalDAV (calendar) and CardDAV (contact) server
+LICENSE=	gnu-gpl-v3
+
+EGDIR=			share/examples/radicale
+
+RADICALE_USER?=		www
+RADICALE_GROUP?=	www
+PKG_GROUPS=		${RADICALE_GROUP}
+PKG_USERS=		${RADICALE_USER}:${RADICALE_GROUP}
+CONFLICTS+=		Radicale-1*
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+INSTALLATION_DIRS=	${EGDIR}
+OWN_DIRS=		${PKG_SYSCONFDIR}/radicale
+CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/radicale/config
+RCD_SCRIPTS=		radicale
+FILES_SUBST+=		RADICALE_USER=${RADICALE_USER}
+FILES_SUBST+=		RADICALE_GROUP=${RADICALE_GROUP}
+FILES_SUBST+=		PYTHONBIN=${PYTHONBIN}
+
+SUBST_CLASSES+=		config
+SUBST_SED.config+=	-e 's,/etc,${PKG_SYSCONFDIR},g'
+SUBST_SED.config+=	-e 's,apache2/,httpd/,g'
+SUBST_FILES.config+=	radicale/config.py config logging
+SUBST_STAGE.config=	pre-configure
+SUBST_MESSAGE.config=	Fixing path to configuration file.
+
+SUBST_CLASSES+=		server
+SUBST_SED.server+=	-e 's,\#daemon = False,daemon = True,'
+SUBST_FILES.server+=	config
+SUBST_STAGE.server=	pre-configure
+SUBST_MESSAGE.server=	Configure as a daemon by default.
+
+.include "options.mk"
+
+# for md5 htpasswd_encryption method
+DEPENDS+=		${PYPKGPREFIX}-passlib-[0-9]*:../../security/py-passlib
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/config ${DESTDIR}${PREFIX}/${EGDIR}/config
+
+.include "../../lang/python/distutils.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/Radicale2/PLIST
diff -u /dev/null pkgsrc/net/Radicale2/PLIST:1.1
--- /dev/null	Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/PLIST	Sat Jul  1 05:57:07 2017
@@ -0,0 +1,39 @@
+@comment $NetBSD: PLIST,v 1.1 2017/07/01 05:57:07 darcy Exp $
+bin/radicale
+${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}/radicale/__init__.py
+${PYSITELIB}/radicale/__main__.py
+${PYSITELIB}/radicale/__init__.pyo
+${PYSITELIB}/radicale/__init__.pyc
+${PYSITELIB}/radicale/__main__.pyo
+${PYSITELIB}/radicale/__main__.pyc
+${PYSITELIB}/radicale/auth.pyo
+${PYSITELIB}/radicale/auth.pyc
+${PYSITELIB}/radicale/config.pyo
+${PYSITELIB}/radicale/config.pyc
+${PYSITELIB}/radicale/log.pyo
+${PYSITELIB}/radicale/log.pyc
+${PYSITELIB}/radicale/rights.pyo
+${PYSITELIB}/radicale/rights.pyc
+${PYSITELIB}/radicale/storage.pyo
+${PYSITELIB}/radicale/storage.pyc
+${PYSITELIB}/radicale/web.pyo
+${PYSITELIB}/radicale/web.pyc
+${PYSITELIB}/radicale/xmlutils.pyo
+${PYSITELIB}/radicale/xmlutils.pyc
+${PYSITELIB}/radicale/auth.py
+${PYSITELIB}/radicale/config.py
+${PYSITELIB}/radicale/log.py
+${PYSITELIB}/radicale/rights.py
+${PYSITELIB}/radicale/storage.py
+${PYSITELIB}/radicale/web.py
+${PYSITELIB}/radicale/web/css/icon.png
+${PYSITELIB}/radicale/web/css/main.css
+${PYSITELIB}/radicale/web/fn.js
+${PYSITELIB}/radicale/web/index.html
+${PYSITELIB}/radicale/xmlutils.py
+share/examples/radicale/config
Index: pkgsrc/net/Radicale2/distinfo
diff -u /dev/null pkgsrc/net/Radicale2/distinfo:1.1
--- /dev/null	Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/distinfo	Sat Jul  1 05:57:07 2017
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2017/07/01 05:57:07 darcy Exp $
+
+SHA1 (Radicale-2.1.1.tar.gz) = e250986f11a946da7e48de189b10da61c93d2427
+RMD160 (Radicale-2.1.1.tar.gz) = c950be03fd5b2edf37f4977bf4e060e544acfe8f
+SHA512 (Radicale-2.1.1.tar.gz) = 3aa5aa6d6d3abfa256ab0f02a932d68daeb91ea857b68376a2bda3dae9dd8951e78a54a0657e4e827186ebb6c0d90165cb876d22ebc988cb66ba2f4617761830
+Size (Radicale-2.1.1.tar.gz) = 70878 bytes
Index: pkgsrc/net/Radicale2/options.mk
diff -u /dev/null pkgsrc/net/Radicale2/options.mk:1.1
--- /dev/null	Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/options.mk	Sat Jul  1 05:57:07 2017
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1 2017/07/01 05:57:07 darcy Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.Radicale
+PKG_SUPPORTED_OPTIONS=	ldap
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mldap)
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ldap
+DEPENDS+=	${PYPKGPREFIX}-ldap-[0-9]*:../../databases/py-ldap
+.endif

Index: pkgsrc/net/Radicale2/files/radicale.sh
diff -u /dev/null pkgsrc/net/Radicale2/files/radicale.sh:1.1
--- /dev/null	Sat Jul  1 05:57:07 2017
+++ pkgsrc/net/Radicale2/files/radicale.sh	Sat Jul  1 05:57:07 2017
@@ -0,0 +1,20 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: radicale.sh,v 1.1 2017/07/01 05:57:07 darcy Exp $
+#
+# PROVIDE: radicale
+# REQUIRE: DAEMON
+# KEYWORD: shutdown
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="radicale"
+rcvar=$name
+radicale_user=@RADICALE_USER@
+radicale_group=@RADICALE_GROUP@
+command="@PREFIX@/bin/radicale"
+command_interpreter="@PYTHONBIN@"
+required_files="@PKG_SYSCONFDIR@/radicale/config"
+
+load_rc_config $name
+run_rc_command "$1"


--_----------=_1498888627295680--