diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 058df485f76a..2bc21bafdc6c 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,38 +1,38 @@ PORTNAME= cadaver -DISTVERSION= 0.26 +DISTVERSION= 0.28 CATEGORIES= www MASTER_SITES= https://notroj.github.io/cadaver/ MAINTAINER= ports@FreeBSD.org COMMENT= Commandline client for DAV WWW= https://notroj.github.io/cadaver/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 \ libneon.so:www/neon USES= cpe localbase:ldflags pkgconfig ssl CPE_VENDOR= webdav GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-netrc \ --with-ssl # Neither expat nor libneon are needed at all, but the configure # script breaks if it can not find the Makefile* in them. Exclude # them to be sure, a stray .h is not included instead of what's # found under PREFIX (installed by the neon port): EXTRACT_AFTER_ARGS= --exclude '${PORTNAME}-${DISTVERSION}/lib/expat/*.[ch]' \ --exclude '${PORTNAME}-${DISTVERSION}/lib/intl/*.[ch]' \ --exclude '${PORTNAME}-${DISTVERSION}/lib/neon/*.[ch]' \ --exclude 'glob.[ch]' --exclude 'mkstemp.[ch]' \ --exclude 'tempname.[ch]' --exclude 'basename.[ch]' OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext iconv NLS_CONFIGURE_ENABLE= nls .include diff --git a/www/cadaver/distinfo b/www/cadaver/distinfo index 5faae989beb9..257b712a48aa 100644 --- a/www/cadaver/distinfo +++ b/www/cadaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746209845 -SHA256 (cadaver-0.26.tar.gz) = 9236e43cdf3505d9ef06185fda43252840105c0c02d9370b6e1077d866357b55 -SIZE (cadaver-0.26.tar.gz) = 1075924 +TIMESTAMP = 1772305318 +SHA256 (cadaver-0.28.tar.gz) = 33e3a54bd54b1eb325b48316a7cacc24047c533ef88e6ef98b88dfbb60e12734 +SIZE (cadaver-0.28.tar.gz) = 1073003 diff --git a/www/cadaver/files/patch-Makefile.in b/www/cadaver/files/patch-Makefile.in index d286bb4a8430..391bd566fc09 100644 --- a/www/cadaver/files/patch-Makefile.in +++ b/www/cadaver/files/patch-Makefile.in @@ -1,27 +1,29 @@ ---- Makefile.in.orig 2022-10-30 10:46:52 UTC -+++ Makefile.in -@@ -41,8 +41,8 @@ SUBDIRS = lib/neon +--- Makefile.in.orig 2025-09-18 19:33:52.000000000 +0000 ++++ Makefile.in 2026-02-28 20:24:37.726900000 +0000 +@@ -42,8 +42,8 @@ OBJECTS = src/cadaver.o src/common.o src/commands.o src/ls.o \ src/cmdline.o src/options.o src/utils.o src/edit.o \ src/version.o src/search.o -LIBOBJS = lib/basename.o lib/dirname.o lib/rpmatch.o lib/yesno.o \ -- lib/glob.o lib/getpass.o lib/tempname.o lib/mkstemp.o \ +- lib/getpass.o lib/tempname.o lib/mkstemp.o \ +LIBOBJS = lib/rpmatch.o lib/yesno.o \ + lib/getpass.o \ @LIBOBJS@ ALLOBJS = $(OBJECTS) $(LIBOBJS) -@@ -91,10 +91,10 @@ Makefile: Makefile.in +@@ -103,11 +103,11 @@ + # Deps src/cadaver.o: src/cadaver.c config.h src/common.h \ src/options.h src/cmdline.h src/commands.h src/cadaver.h - src/options.o: src/options.c config.h src/options.h src/cadaver.h src/common.h +-src/options.o: src/options.c config.h src/options.h src/cadaver.h src/common.h -src/cmdline.o: src/cmdline.c src/cmdline.h src/cadaver.h lib/basename.h \ -- lib/glob.h src/commands.h src/common.h +- lib/glob/glob.h src/commands.h src/common.h ++src/optIons.o: src/options.c config.h src/options.h src/cadaver.h src/common.h +src/cmdline.o: src/cmdline.c src/cmdline.h src/cadaver.h \ + src/commands.h src/common.h src/commands.o: src/commands.c src/commands.h src/cadaver.h \ - lib/basename.h src/options.h src/common.h + src/options.h src/common.h src/edit.o: src/edit.c src/cadaver.h src/options.h src/common.h src/common.o: src/common.c src/common.h config.h src/ls.o: src/ls.c src/commands.h src/cadaver.h config.h diff --git a/www/cadaver/files/patch-src-commands.c b/www/cadaver/files/patch-src_commands.c similarity index 50% rename from www/cadaver/files/patch-src-commands.c rename to www/cadaver/files/patch-src_commands.c index 1d718bef3899..b55a9028ee08 100644 --- a/www/cadaver/files/patch-src-commands.c +++ b/www/cadaver/files/patch-src_commands.c @@ -1,73 +1,48 @@ ---- src/commands.c.orig 2025-05-02 18:23:47 UTC +--- src/commands.c.orig 2025-09-18 19:33:52 UTC +++ src/commands.c @@ -74,8 +74,7 @@ #include #include "i18n.h" -#include "basename.h" -#include "dirname.h" +#include #include "cadaver.h" #include "commands.h" #include "options.h" -@@ -956,7 +955,7 @@ static void do_copymove(int argc, const char *argv[], +@@ -970,7 +969,7 @@ else if (dest_is_coll && src_is_coll) { /* Case 1. */ char *tmp = ne_strndup(ops[n].src, strlen(ops[n].src)-1); - ops[n].dest = ne_concat(uri_dest, base_name(tmp), NULL); + ops[n].dest = ne_concat(uri_dest, basename(tmp), NULL); ne_free(tmp); } else if (src_is_coll && !dest_is_coll) { -@@ -966,7 +965,7 @@ static void do_copymove(int argc, const char *argv[], +@@ -980,7 +979,7 @@ } else if (dest_is_coll) { /* Case 2. */ - ops[n].dest = ne_concat(uri_dest, base_name(ops[n].src), NULL); + ops[n].dest = ne_concat(uri_dest, basename(ops[n].src), NULL); } else { /* Case 3. */ -@@ -1030,7 +1029,7 @@ static void execute_get(const char *native_remote, con +@@ -1044,7 +1043,7 @@ + filename = ne_strdup(native_local); + } else { - struct stat st; - - filename = ne_strdup(base_name(native_remote)); + filename = ne_strdup(basename(native_remote)); + } - /* Choose an appropriate local filename */ - if (stat(filename, &st) == 0) { -@@ -1084,7 +1083,7 @@ static void execute_put(const char *local, const char + if (stat(filename, &st) == 0) { +@@ -1134,7 +1133,7 @@ static void execute_put(const char *local, const char *remote) { - char *uri_path = uri_resolve_native(remote ? remote : base_name(local)); + char *uri_path = uri_resolve_native(remote ? remote : basename(local)); simple_put(local, uri_path); free(uri_path); } ---- src/edit.c.orig 2025-05-02 18:26:58 UTC -+++ src/edit.c -@@ -116,7 +116,7 @@ void execute_edit(const char *native_path) - struct ne_lock *lock = NULL; - char fname[PATH_MAX] = "/tmp/cadaver-edit-XXXXXX"; - const char *pnt; -- int fd; -+ int fd, sufx_len; - int is_checkout, is_checkin; - - uri_path = uri_resolve_native(native_path); -@@ -140,9 +140,11 @@ void execute_edit(const char *native_path) - if (pnt != NULL && strchr(pnt, '/') == NULL) { - strncat(fname, pnt, PATH_MAX-1); - fname[PATH_MAX-1] = '\0'; -- } -+ sufx_len = strlen(pnt); -+ } else -+ sufx_len = 0; - -- fd = cad_mkstemp(fname); -+ fd = mkstemps(fname, sufx_len); - if (fd == -1) { - printf(_("Could not create temporary file %s:\n%s\n"), fname, - strerror(errno)); diff --git a/www/cadaver/files/patch-src_edit.c b/www/cadaver/files/patch-src_edit.c new file mode 100644 index 000000000000..d54a278e6d0b --- /dev/null +++ b/www/cadaver/files/patch-src_edit.c @@ -0,0 +1,25 @@ +--- src/edit.c.orig 2026-02-28 20:33:04 UTC ++++ src/edit.c +@@ -154,7 +154,7 @@ + struct ne_lock *lock = NULL; + char fname[PATH_MAX] = "/tmp/cadaver-edit-XXXXXX"; + const char *pnt; +- int fd; ++ int fd, sufx_len; + int is_checkout, is_checkin, can_lock; + + uri_path = uri_resolve_native(native_path); +@@ -182,9 +182,11 @@ + if (pnt != NULL && strchr(pnt, '/') == NULL) { + strncat(fname, pnt, PATH_MAX-1); + fname[PATH_MAX-1] = '\0'; +- } ++ sufx_len = strlen(pnt); ++ } else ++ sufx_len = 0; + +- fd = cad_mkstemp(fname); ++ fd = mkstemps(fname, sufx_len); + if (fd == -1) { + printf(_("Could not create temporary file %s:\n%s\n"), fname, + strerror(errno));