Hi Bryan, I apologize. No comments.
--Aaron > On Oct 13, 2024, at 14:44, Bryan Vyhmeister <br...@bsdjournal.net> wrote: > > On Mon, Aug 19, 2024 at 03:57:59PM +0100, Stuart Henderson wrote: >> +cc maintainer, any comment? >> >> On 2024/08/16 17:38, Bryan Vyhmeister wrote: >>> On Sun, Aug 04, 2024 at 10:47:50PM -0700, Bryan Vyhmeister wrote: >>>> On Sat, Jul 27, 2024 at 11:45:53PM -0700, Bryan Vyhmeister wrote: >>>>> I am re-posting again. This is a simple update to www/kcaldav 0.2.5. The >>>>> changelog simply says: >>>>> >>>>> "Configuration bug-fixes and making it easier to deploy on OpenBSD." >>>>> >>>>> I can confirm that one of the two patches is no longer needed as it has >>>>> been upstreamed. I have not yet been able to do much testing since I am >>>>> not (yet) using kcaldav but plan to shortly. I don't anticipate any >>>>> issues based on the minimal changes in this release. > > Posting again on this with CC maintainer as well. > > Bryan > > > Index: www/kcaldav/Makefile > =================================================================== > RCS file: /cvs/ports/www/kcaldav/Makefile,v > retrieving revision 1.22 > diff -u -p -u -r1.22 Makefile > --- www/kcaldav/Makefile 13 Nov 2023 11:00:32 -0000 1.22 > +++ www/kcaldav/Makefile 10 Jul 2024 23:51:45 -0000 > @@ -1,6 +1,6 @@ > COMMENT = a simple, safe, and minimal CalDAV server > > -DISTNAME = kcaldav-0.2.4 > +DISTNAME = kcaldav-0.2.5 > CATEGORIES = www > > HOMEPAGE = https://kristaps.bsd.lv/kcaldav/ > Index: www/kcaldav/distinfo > =================================================================== > RCS file: /cvs/ports/www/kcaldav/distinfo,v > retrieving revision 1.8 > diff -u -p -u -r1.8 distinfo > --- www/kcaldav/distinfo 13 Nov 2023 11:00:32 -0000 1.8 > +++ www/kcaldav/distinfo 10 Jul 2024 23:51:45 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (kcaldav-0.2.4.tgz) = zuP4UsBT5zk03Q7z04eZKVEjpcvsst0EygkRVNhjRN0= > -SIZE (kcaldav-0.2.4.tgz) = 300373 > +SHA256 (kcaldav-0.2.5.tgz) = QlObQOAyIO6aOwZP/wIKCd6W4C/22dOun83mkjlPozw= > +SIZE (kcaldav-0.2.5.tgz) = 300632 > Index: www/kcaldav/patches/patch-kcaldav_c > =================================================================== > RCS file: www/kcaldav/patches/patch-kcaldav_c > diff -N www/kcaldav/patches/patch-kcaldav_c > --- www/kcaldav/patches/patch-kcaldav_c 13 Nov 2023 11:00:32 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,52 +0,0 @@ > -Fix NULL-pointer deref on startup with bad config file. > -Ignore unveil ENOENT errors from optional directories in chroot. > -Index: kcaldav.c > ---- kcaldav.c.orig > -+++ kcaldav.c > -@@ -19,6 +19,7 @@ > - > - #include <assert.h> > - #include <ctype.h> > -+#include <errno.h> > - #include <limits.h> > - #if HAVE_MD5 > - # include <md5.h> > -@@ -422,7 +423,7 @@ main(void) > - { kvalid_hash, valids[VALID_PASS] }, > - { kvalid_path, valids[VALID_PATH] } }; > - struct state *st = NULL; > -- char *np, *logfile = NULL; > -+ char *np; > - struct conf conf; > - const char *cfgfile = NULL; > - size_t i, sz; > -@@ -460,7 +461,7 @@ main(void) > - verbose = conf.verbose; > - if (conf.logfile != NULL && *conf.logfile != '\0') > - if (!kutil_openlog(conf.logfile)) > -- kutil_err(NULL, NULL, "%s", logfile); > -+ kutil_err(NULL, NULL, "%s", conf.logfile); > - > - free(conf.logfile); > - memset(&conf, 0, sizeof(struct conf)); > -@@ -494,13 +495,13 @@ main(void) > - * Directories required by sqlite3. > - */ > - if (unveil(CALDIR, "rwxc") == -1) > -- kutil_err(NULL, NULL, "unveil"); > -- if (unveil("/tmp", "rwxc") == -1) > -- kutil_err(NULL, NULL, "unveil"); > -- if (unveil("/var/tmp", "rwxc") == -1) > -- kutil_err(NULL, NULL, "unveil"); > -- if (unveil("/dev", "rwx") == -1) > -- kutil_err(NULL, NULL, "unveil"); > -+ kutil_err(NULL, NULL, "unveil " CALDIR); > -+ if (unveil("/tmp", "rwxc") == -1 && errno != ENOENT) > -+ kutil_err(NULL, NULL, "unveil /tmp"); > -+ if (unveil("/var/tmp", "rwxc") == -1 && errno != ENOENT) > -+ kutil_err(NULL, NULL, "unveil /var/tmp"); > -+ if (unveil("/dev", "rwx") == -1 && errno != ENOENT) > -+ kutil_err(NULL, NULL, "unveil /dev"); > - if (pledge("stdio rpath cpath wpath flock fattr", NULL) == -1) > - kutil_err(NULL, NULL, "pledge"); > - #endif
