security update to Radicale 1.1, see http://radicale.org/news/ for more
info. (maintainer timeout, though I didn't wait very long due to the security issues). - while there, remove unneeded MODPY_ADJ_FILES (spotted by shadchin@), use BUILD_DEPENDS not LIB_DEPENDS for a python module dependency, and fix missing VARBASE subst in the sample config file. Note that there was a NON-BACKWARDS-COMPATIBLE change: for users who have added a custom user rights file, previously the most permissive rights were allowed; now the first section in the file matching the path and user takes priority instead.
This commit is contained in:
parent
b478eaf953
commit
f6a04301de
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.25 2015/11/30 20:17:53 jung Exp $
|
||||
# $OpenBSD: Makefile,v 1.26 2016/01/08 22:37:51 sthen Exp $
|
||||
|
||||
COMMENT = simple CalDAV calendar server
|
||||
|
||||
MODPY_EGG_VERSION = 1.0.1
|
||||
MODPY_EGG_VERSION = 1.1
|
||||
DISTNAME = Radicale-${MODPY_EGG_VERSION}
|
||||
PKGNAME = ${DISTNAME:L}
|
||||
CATEGORIES = productivity net
|
||||
@ -14,15 +14,14 @@ MAINTAINER = Sergey Bronnikov <estetus@gmail.com>
|
||||
# GPLv3+
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
MODPY_SETUPTOOLS = Yes
|
||||
MODULES = lang/python
|
||||
MODPY_PI = Yes
|
||||
MODPY_SETUPTOOLS = Yes
|
||||
|
||||
MODPY_PI = Yes
|
||||
RUN_DEPENDS = security/py-passlib
|
||||
|
||||
MODULES = lang/python
|
||||
MODPY_ADJ_FILES = radicale.py
|
||||
LIB_DEPENDS = security/py-passlib
|
||||
|
||||
NO_TEST = Yes
|
||||
NO_TEST = Yes
|
||||
SUBST_VARS += VARBASE
|
||||
|
||||
pre-configure:
|
||||
@${SUBST_CMD} ${WRKSRC}/radicale/config.py
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (Radicale-1.0.1.tar.gz) = 4Ypo0Hk0A+dZHHJffSuDSQ3MXzzdAIvXX+lSMR7uG2A=
|
||||
SIZE (Radicale-1.0.1.tar.gz) = 45658
|
||||
SHA256 (Radicale-1.1.tar.gz) = mgsZX3PK1BPq2pfW7/NpcTliswyEC9JMFnwyQpRJARs=
|
||||
SIZE (Radicale-1.1.tar.gz) = 47179
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-config,v 1.9 2015/11/30 20:17:53 jung Exp $
|
||||
--- config.orig Wed Aug 19 15:06:33 2015
|
||||
+++ config Fri Nov 27 22:12:29 2015
|
||||
$OpenBSD: patch-config,v 1.10 2016/01/08 22:37:52 sthen Exp $
|
||||
--- config.orig Thu Nov 5 18:01:41 2015
|
||||
+++ config Tue Jan 5 10:25:26 2016
|
||||
@@ -28,10 +28,10 @@
|
||||
#ssl = False
|
||||
|
||||
@ -22,9 +22,8 @@ $OpenBSD: patch-config,v 1.9 2015/11/30 20:17:53 jung Exp $
|
||||
+htpasswd_filename = ${SYSCONFDIR}/radicale/users
|
||||
|
||||
# Htpasswd encryption method
|
||||
-# Value: plain | sha1 | ssha | crypt
|
||||
# Value: plain | sha1 | ssha | crypt | bcrypt | md5
|
||||
-#htpasswd_encryption = crypt
|
||||
+# Value: plain | sha1 | ssha | crypt | bcrypt
|
||||
+htpasswd_encryption = bcrypt
|
||||
|
||||
# LDAP server URL, with protocol and port
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.10 2015/11/30 20:17:53 jung Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.11 2016/01/08 22:37:52 sthen Exp $
|
||||
@newgroup _radicale:672
|
||||
@newuser _radicale:672:_radicale:daemon:radicale user:/nonexistent:/sbin/nologin
|
||||
bin/radicale
|
||||
@ -36,6 +36,8 @@ 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
|
||||
|
Loading…
x
Reference in New Issue
Block a user