cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to radicale-1.1.6, the most recent of the 1.1.x branch.

Browse Source 
py3 works so switch across.

2.x is a bit different and would probably benefit from being a separate
port rather than directly updating productivity/radicale (not least
because you need to export data from 1.1.x before migrating).
This commit is contained in:
sthen 2018-09-06 22:48:30 +00:00
parent 242bbf1ba9
commit 4ffbadf18b
5 changed files with 86 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
productivity/radicale/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.32 2018/09/04 12:46:20 espie Exp $
# $OpenBSD: Makefile,v 1.33 2018/09/06 22:48:30 sthen Exp $
COMMENT = simple CalDAV calendar server
MODPY_EGG_VERSION = 1.1.3
MODPY_EGG_VERSION = 1.1.6
DISTNAME = Radicale-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:L}
CATEGORIES = productivity net
REVISION = 1
HOMEPAGE = http://radicale.org/
@ -18,8 +17,9 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
RUN_DEPENDS = security/py-passlib
RUN_DEPENDS = security/py-passlib${MODPY_FLAVOR}
NO_TEST = Yes
SUBST_VARS += VARBASE

4
productivity/radicale/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (Radicale-1.1.3.tar.gz) = r+0mVp96GcuYshQ4jDwubQLbX9fdk5MVkxrfeGAh3wE=
SIZE (Radicale-1.1.3.tar.gz) = 48907
SHA256 (Radicale-1.1.6.tar.gz) = wAcZjqRe95c0RnLGgdTBP4tKqFwVxBoRViJXZ6QFySs=
SIZE (Radicale-1.1.6.tar.gz) = 48280

10
productivity/radicale/patches/patch-config
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-config,v 1.11 2017/05/16 17:15:40 jasper Exp $
$OpenBSD: patch-config,v 1.12 2018/09/06 22:48:30 sthen Exp $
Index: config
--- config.orig
+++ config
@ -15,7 +15,7 @@ Index: config
# SSL Protocol used. See python's ssl module for available values
#protocol = PROTOCOL_SSLv23
@@ -80,11 +80,11 @@
@@ -84,11 +84,11 @@
#custom_handler =
# Htpasswd filename
@ -29,7 +29,7 @@ Index: config
# LDAP server URL, with protocol and port
#ldap_url = ldap://localhost:389/
@@ -146,7 +146,7 @@
@@ -150,7 +150,7 @@
#custom_handler =
# File for rights management from_file
@ -38,7 +38,7 @@ Index: config
[storage]
@@ -163,7 +163,7 @@
@@ -167,7 +167,7 @@
#custom_handler =
# Folder for storing local collections, created if not present
@ -47,7 +47,7 @@ Index: config
# Database URL for SQLAlchemy
# dialect+driver://user:password@host/dbname[?key=value..]
@@ -178,7 +178,7 @@
@@ -182,7 +182,7 @@
# If no config is given, simple information is printed on the standard output
# For more information about the syntax of the configuration file, see:
# http://docs.python.org/library/logging.config.html

46
productivity/radicale/patches/patch-rights Normal file
View File

@ -0,0 +1,46 @@
$OpenBSD: patch-rights,v 1.1 2018/09/06 22:48:30 sthen Exp $
File missing from distribution tar.gz, though still present in repo.
Index: rights
--- rights.orig
+++ rights
@@ -0,0 +1,38 @@
+# -*- mode: conf -*-
+# vim:ft=cfg
+
+# Rights management file for Radicale - A simple calendar server
+#
+# Default path for this kind of files is ~/.config/radicale/rights
+
+# This means all users starting with "admin" may read any collection
+[admin]
+user: ^admin.*$
+collection: .*
+permission: r
+
+# This means all users may read and write any collection starting with public.
+# We do so by just not testing against the user string.
+[public]
+user: .*
+collection: ^public(/.+)?$
+permission: rw
+
+# A little more complex: give read access to users from a domain for all
+# collections of all the users (ie. user@domain.tld can read domain/*).
+[domain-wide-access]
+user: ^.+@(.+)\..+$
+collection: ^{0}/.+$
+permission: r
+
+# Allow authenticated user to read all collections
+[allow-everyone-read]
+user: .+
+collection: .*
+permission: r
+
+# Give write access to owners
+[owner-write]
+user: .+
+collection: ^%(login)s/.*$
+permission: w

54
productivity/radicale/pkg/PLIST
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.14 2018/09/04 12:46:20 espie Exp $
@comment $OpenBSD: PLIST,v 1.15 2018/09/06 22:48:30 sthen Exp $
@newgroup _radicale:672
@newuser _radicale:672:_radicale:daemon:radicale user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/radicale
bin/radicale
lib/python${MODPY_VERSION}/site-packages/Radicale-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Radicale-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -9,50 +10,54 @@ lib/python${MODPY_VERSION}/site-packages/Radicale-${MODPY_EGG_VERSION}-py${MODPY
lib/python${MODPY_VERSION}/site-packages/Radicale-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/radicale/
lib/python${MODPY_VERSION}/site-packages/radicale/__init__.py
lib/python${MODPY_VERSION}/site-packages/radicale/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/__main__.py
lib/python${MODPY_VERSION}/site-packages/radicale/__main__.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}ical.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}pathutils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/${MODPY_PYCACHE}xmlutils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/
lib/python${MODPY_VERSION}/site-packages/radicale/auth/IMAP.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/IMAP.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/LDAP.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/LDAP.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/PAM.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/PAM.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/__init__.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}IMAP.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}LDAP.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}PAM.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}courier.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}htpasswd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/${MODPY_PYCACHE}remote_user.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/courier.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/courier.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/htpasswd.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/htpasswd.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/http.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/http.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/auth/remote_user.py
lib/python${MODPY_VERSION}/site-packages/radicale/auth/remote_user.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/config.py
lib/python${MODPY_VERSION}/site-packages/radicale/config.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/ical.py
lib/python${MODPY_VERSION}/site-packages/radicale/ical.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/log.py
lib/python${MODPY_VERSION}/site-packages/radicale/log.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/pathutils.py
lib/python${MODPY_VERSION}/site-packages/radicale/pathutils.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/rights/
lib/python${MODPY_VERSION}/site-packages/radicale/rights/__init__.py
lib/python${MODPY_VERSION}/site-packages/radicale/rights/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/rights/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/radicale/rights/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/rights/${MODPY_PYCACHE}regex.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/rights/regex.py
lib/python${MODPY_VERSION}/site-packages/radicale/rights/regex.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/
lib/python${MODPY_VERSION}/site-packages/radicale/storage/__init__.py
lib/python${MODPY_VERSION}/site-packages/radicale/storage/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/radicale/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/${MODPY_PYCACHE}database.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/${MODPY_PYCACHE}filesystem.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/${MODPY_PYCACHE}multifilesystem.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/database.py
lib/python${MODPY_VERSION}/site-packages/radicale/storage/database.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/filesystem.py
lib/python${MODPY_VERSION}/site-packages/radicale/storage/filesystem.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/storage/multifilesystem.py
lib/python${MODPY_VERSION}/site-packages/radicale/storage/multifilesystem.pyc
lib/python${MODPY_VERSION}/site-packages/radicale/xmlutils.py
lib/python${MODPY_VERSION}/site-packages/radicale/xmlutils.pyc
share/doc/pkg-readmes/${PKGSTEM}
share/doc/radicale/
share/doc/radicale/COPYING
@ -66,9 +71,9 @@ share/examples/radicale/log
@mode 640
@owner _radicale
@group _radicale
@sample /var/log/radicale
@sample ${VARBASE}/log/radicale
@mode 700
@sample /var/db/radicale/
@sample ${VARBASE}/db/radicale/
@sample ${SYSCONFDIR}/radicale/private/
@mode
@owner
@ -77,4 +82,3 @@ share/examples/radicale/logging
@sample ${SYSCONFDIR}/radicale/logging
share/examples/radicale/rights
@sample ${SYSCONFDIR}/radicale/rights
@rcscript ${RCDIR}/radicale