From owner-svn-ports-head@freebsd.org Tue Jun 2 20:51:16 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 013C72FA2AA; Tue, 2 Jun 2020 20:51:16 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49c42W6BlQz3WfJ; Tue, 2 Jun 2020 20:51:15 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CFEED2295F; Tue, 2 Jun 2020 20:51:15 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 052KpFII058576; Tue, 2 Jun 2020 20:51:15 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 052KpE0G058569; Tue, 2 Jun 2020 20:51:14 GMT (envelope-from decke@FreeBSD.org) Message-Id: <202006022051.052KpE0G058569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Tue, 2 Jun 2020 20:51:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537581 - in head: . www/radicale www/radicale/files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head: . www/radicale www/radicale/files X-SVN-Commit-Revision: 537581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Jun 2020 20:51:16 -0000 Author: decke Date: Tue Jun 2 20:51:14 2020 New Revision: 537581 URL: https://svnweb.freebsd.org/changeset/ports/537581 Log: www/radicale: - Update to 2.1.12 - Please follow UPDATING instructions because you need to export the storage with radicale 1.1.6 before updating Added: head/www/radicale/pkg-message (contents, props changed) Modified: head/UPDATING head/www/radicale/Makefile head/www/radicale/distinfo head/www/radicale/files/radicale.in head/www/radicale/pkg-descr head/www/radicale/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Jun 2 20:31:17 2020 (r537580) +++ head/UPDATING Tue Jun 2 20:51:14 2020 (r537581) @@ -6,6 +6,16 @@ You should get into the habit of checking this file fo you update your ports collection, before attempting any port upgrades. 20200602: + AFFECTS: users of www/radicale + AUTHOR: decke@FreeBSD.org + + Migration from radicale 1.x to 2.x requires that you export the storage + with radicale 1.1.6 before updating. + + Migration instructions are available at: + https://web.archive.org/web/20190314225402/https://radicale.org/1to2/ + +20200602: AFFECTS: users of sysutils/py-salt AUTHOR: krion@FreeBSD.org Modified: head/www/radicale/Makefile ============================================================================== --- head/www/radicale/Makefile Tue Jun 2 20:31:17 2020 (r537580) +++ head/www/radicale/Makefile Tue Jun 2 20:51:14 2020 (r537581) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= radicale -PORTVERSION= 1.1.6 -PORTREVISION= 3 +PORTVERSION= 2.1.12 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,32 +14,38 @@ COMMENT= Python based CalDAV/CardDAV server LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}passlib>=1.6.5:security/py-passlib@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vobject>=0.9.6:deskutils/py-vobject@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}isort>=0:devel/py-isort@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} -USES= python -USE_PYTHON= autoplist concurrent distutils - -NO_ARCH= yes - +USES= python:3.3+ shebangfix +USE_PYTHON= autoplist distutils USERS= radicale GROUPS= radicale USE_RC_SUBR= radicale -SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \ - PYTHON_VER="${PYTHON_VER}" +NO_ARCH= yes +SHEBANG_FILES= radicale.fcgi radicale.wsgi -OPTIONS_DEFINE= HTTP LDAP -HTTP_DESC= HTTP authentication support +SUB_LIST= USERS="${USERS}" GROUPS="${GROUPS}" PYTHON_CMD="${PYTHON_CMD}" -#HTTP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests1>=0:www/py-requests1@${PY_FLAVOR} -HTTP_BROKEN= www/py-requests1 does not exist any more -LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=0:net/py-ldap@${PY_FLAVOR} - post-patch: - @${REINPLACE_CMD} 's|~/.config/radicale|${DATADIR}|; s|/etc|${PREFIX}/etc|' ${WRKSRC}/config + @${REINPLACE_CMD} 's,= /etc,= ${PREFIX}/etc,g' ${WRKSRC}/config + @${REINPLACE_CMD} 's,~/.config/radicale,${DATADIR},g' ${WRKSRC}/config post-install: - @${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR} + @${MKDIR} ${STAGEDIR}/${ETCDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/config ${STAGEDIR}/${ETCDIR}/config.sample ${INSTALL_DATA} ${WRKSRC}/logging ${STAGEDIR}/${ETCDIR}/logging.sample + ${INSTALL_SCRIPT} ${WRKSRC}/radicale.fcgi ${STAGEDIR}${WWWDIR}/radicale.fcgi + ${INSTALL_SCRIPT} ${WRKSRC}/radicale.wsgi ${STAGEDIR}${WWWDIR}/radicale.wsgi + +do-test: + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include Modified: head/www/radicale/distinfo ============================================================================== --- head/www/radicale/distinfo Tue Jun 2 20:31:17 2020 (r537580) +++ head/www/radicale/distinfo Tue Jun 2 20:51:14 2020 (r537581) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501318583 -SHA256 (Radicale-1.1.6.tar.gz) = c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b -SIZE (Radicale-1.1.6.tar.gz) = 48280 +TIMESTAMP = 1589887684 +SHA256 (Radicale-2.1.12.tar.gz) = 8fd07806e3e4f873b63838dfee69bf0283216943df6051cf80a22f11d7a7eda4 +SIZE (Radicale-2.1.12.tar.gz) = 109781 Modified: head/www/radicale/files/radicale.in ============================================================================== --- head/www/radicale/files/radicale.in Tue Jun 2 20:31:17 2020 (r537580) +++ head/www/radicale/files/radicale.in Tue Jun 2 20:51:14 2020 (r537581) @@ -25,11 +25,11 @@ load_rc_config $name : ${radicale_enable:=NO} : ${radicale_config=%%ETCDIR%%/config} -: ${radicale_user:=radicale} -: ${radicale_group:=radicale} +: ${radicale_user=%%USERS%%} +: ${radicale_group=%%GROUPS%%} pidfile=/var/run/radicale/radicale.pid -command=%%PREFIX%%/bin/radicale-%%PYTHON_VER%% +command=%%PREFIX%%/bin/radicale command_args="-d -p ${pidfile} -C ${radicale_config}" command_interpreter=%%PYTHON_CMD%% required_files=${radicale_config} Modified: head/www/radicale/pkg-descr ============================================================================== --- head/www/radicale/pkg-descr Tue Jun 2 20:31:17 2020 (r537580) +++ head/www/radicale/pkg-descr Tue Jun 2 20:51:14 2020 (r537581) @@ -1,5 +1,15 @@ -The Radicale Project is a complete CalDAV (calendar) and CardDAV (contact) -server solution. +Radicale is a small but powerful CalDAV (calendars, todo-lists) and CardDAV +(contacts) server, that: + + Shares calendars through CalDAV, WebDAV and HTTP. + Shares contacts through CardDAV, WebDAV and HTTP. + Supports events, todos, journal entries and business cards. + Works out-of-the-box, no installation nor configuration required. + Can warn users on concurrent editing. + Can limit access by authentication. + Can secure connections. + Works with many CalDAV and CardDAV clients. + Is GPLv3-licensed free software. WWW: https://radicale.org/ WWW: https://github.com/Kozea/Radicale Added: head/www/radicale/pkg-message ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/radicale/pkg-message Tue Jun 2 20:51:14 2020 (r537581) @@ -0,0 +1,10 @@ +[ +{ type: install + message: <