On Sat, Nov 16, 2019 at 08:19:16PM +0100, Stefan Sperling wrote: > This update fixes calender sync against davx on Android for me. > > Upstream no longer creates the kcaldav.cgi hard link. This breaks URLs > which use this filename so I am creating a symlink for backwards compat. > > OK? >
ok jturner@ > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/kcaldav/Makefile,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile > --- Makefile 12 Jul 2019 20:50:47 -0000 1.15 > +++ Makefile 16 Nov 2019 19:14:26 -0000 > @@ -2,7 +2,7 @@ > > 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/ > @@ -35,5 +35,8 @@ 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> > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/kcaldav/distinfo,v > retrieving revision 1.5 > diff -u -p -r1.5 distinfo > --- distinfo 28 Apr 2019 21:46:35 -0000 1.5 > +++ distinfo 16 Nov 2019 19:00:34 -0000 > @@ -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 > Index: patches/patch-Makefile > =================================================================== > RCS file: /cvs/ports/www/kcaldav/patches/patch-Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-Makefile > --- patches/patch-Makefile 8 Apr 2018 08:29:22 -0000 1.4 > +++ patches/patch-Makefile 15 Nov 2019 16:21:10 -0000 > @@ -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! > Index: patches/patch-ical_c > =================================================================== > RCS file: patches/patch-ical_c > diff -N patches/patch-ical_c > --- patches/patch-ical_c 28 Apr 2019 21:46:35 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -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; > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/kcaldav/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -r1.3 PLIST > --- pkg/PLIST 4 Sep 2018 12:46:24 -0000 1.3 > +++ pkg/PLIST 16 Nov 2019 19:16:03 -0000 > @@ -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 >
