Update www/kcaldav to 0.1.11. Fixes interop problems with davx on Android.

Upstream no longer creates the kcaldav.cgi hard link. This breaks URLs
which use this filename. Create a symlink for backwards compat.

ok jturner@
This commit is contained in:
stsp 2019-11-17 09:28:23 +00:00
parent bbbe0d366a
commit 211ea883bb
5 changed files with 15 additions and 30 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.15 2019/07/12 20:50:47 sthen Exp $
# $OpenBSD: Makefile,v 1.16 2019/11/17 09:28:23 stsp Exp $
COMMENT = a simple, safe, and minimal CalDAV server
DISTNAME = kcaldav-0.1.9
DISTNAME = kcaldav-0.1.11
CATEGORIES = www
HOMEPAGE = https://kristaps.bsd.lv/kcaldav/
@ -36,4 +36,7 @@ NO_TEST = Yes
ALL_TARGET = all libkcaldav.a
INSTALL_TARGET = install installcgi
post-install:
ln -s kcaldav ${WRKINST}${VARBASE}/www/cgi-bin/kcaldav.cgi
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (kcaldav-0.1.9.tgz) = MeZ8jNIyQUaz6BIA0ErFg5E8SgYoqtJjwr8DCcA4t5o=
SIZE (kcaldav-0.1.9.tgz) = 89188
SHA256 (kcaldav-0.1.11.tgz) = kdhMkW/oZWZemKDP+eSmDzqYB5nH9Pj2Rj2bhLeVerk=
SIZE (kcaldav-0.1.11.tgz) = 91960

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.4 2018/04/08 08:29:22 stsp Exp $
$OpenBSD: patch-Makefile,v 1.5 2019/11/17 09:28:23 stsp Exp $
Index: Makefile
--- Makefile.orig
@ -12,5 +12,5 @@ Index: Makefile
+#HTDOCSPREFIX = /var/www/vhosts/www.bsd.lv/htdocs/kcaldav
+HTDOCSPREFIX = /var/www/htdocs/kcaldav
# This is the relative URI of the server executable.
CGIURI = /cgi-bin/kcaldav.cgi
# File-system directory where "installwww" installs.
# You probably aren't going to use that!

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-ical_c,v 1.1 2019/04/28 21:46:35 stsp Exp $
fix parsing of 'whole day' calendar entries
Index: ical.c
--- ical.c.orig
+++ ical.c
@@ -180,8 +180,10 @@ ical_datetime(const struct icalparse *p, struct icaltm
memset(&tmm, 0, sizeof(struct tm));
if (NULL == strptime(cp, "%Y%m%dT%H%M%S", &tmm)) {
- kerrx("%s:%zu: bad UTC time", p->file, p->line);
- return(0);
+ if (NULL == strptime(cp, "%Y%m%d", &tmm)) {
+ kerrx("%s:%zu: bad UTC time", p->file, p->line);
+ return(0);
+ }
}
tm->year = tmm.tm_year;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2018/09/04 12:46:24 espie Exp $
@comment $OpenBSD: PLIST,v 1.4 2019/11/17 09:28:23 stsp Exp $
@bin bin/kcaldav.passwd
include/libkcaldav.h
lib/libkcaldav.a
@ -7,15 +7,15 @@ lib/libkcaldav.a
@man man/man8/kcaldav.8
share/doc/pkg-readmes/${PKGSTEM}
@cwd /var/www
@mode 775
@owner www
@group www
@mode 775
@dir caldav/
caldav/
@mode
@owner
@group
@mode
@bin cgi-bin/kcaldav
@bin cgi-bin/kcaldav.cgi
cgi-bin/kcaldav.cgi
htdocs/kcaldav/
htdocs/kcaldav/collection.html
htdocs/kcaldav/collection.min.js