diff --git a/net/unfs3/Makefile b/net/unfs3/Makefile index a71d39b9459d..78f1b79c406d 100644 --- a/net/unfs3/Makefile +++ b/net/unfs3/Makefile @@ -1,32 +1,31 @@ PORTNAME= unfs3 DISTVERSIONPREFIX= unfs3- -DISTVERSION= 0.9.23 -PORTREVISION= 2 +DISTVERSION= 0.11.0 CATEGORIES= net -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rodrigo@FreeBSD.org COMMENT= User-space implementation of the NFSv3 server specification WWW= https://unfs3.github.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= autoreconf USE_GITHUB= yes GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ENV= YACC=byacc MAKE_JOBS_UNSAFE= yes INSTALL_TARGET= install-strip PLIST_FILES= sbin/unfsd \ share/man/man7/tags.7.gz \ share/man/man8/unfsd.8.gz -OPTIONS_DEFINE= CLUSTER_EXT -CLUSTER_EXT_DESC= include clustering extensions +OPTIONS_DEFINE= CLUSTER_EXT +CLUSTER_EXT_DESC= include clustering extensions CLUSTER_EXT_CONFIGURE_ON= --enable-cluster .include diff --git a/net/unfs3/distinfo b/net/unfs3/distinfo index d78336587177..4d871842003f 100644 --- a/net/unfs3/distinfo +++ b/net/unfs3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668687846 -SHA256 (unfs3-unfs3-unfs3-0.9.23_GH0.tar.gz) = d0545286b559fa6ad8a28e77d69c26bdfa461922401c90cea46cb5d2584a8a93 -SIZE (unfs3-unfs3-unfs3-0.9.23_GH0.tar.gz) = 108616 +TIMESTAMP = 1774189713 +SHA256 (unfs3-unfs3-unfs3-0.11.0_GH0.tar.gz) = 563359f4e336d89f3f04361555ff4483acb951b1442a067407a19214410668c6 +SIZE (unfs3-unfs3-unfs3-0.11.0_GH0.tar.gz) = 110613 diff --git a/net/unfs3/files/patch-Config_Makefile.in b/net/unfs3/files/patch-Config_Makefile.in new file mode 100644 index 000000000000..101078810087 --- /dev/null +++ b/net/unfs3/files/patch-Config_Makefile.in @@ -0,0 +1,9 @@ +--- Config/Makefile.in.orig 2026-03-22 15:36:09 UTC ++++ Config/Makefile.in +@@ -1,5 +1,5 @@ + CC = @CC@ +-CFLAGS = @CFLAGS@ @TIRPC_CFLAGS@ -I.. -I$(srcdir) -I$(top_srcdir) ++CFLAGS = @CFLAGS@ -I.. -I$(srcdir) -I$(top_srcdir) + AR = @AR@ + RM = rm -f + LEX = @LEX@ diff --git a/net/unfs3/files/patch-Extras_Makefile.in b/net/unfs3/files/patch-Extras_Makefile.in new file mode 100644 index 000000000000..09d122520dbb --- /dev/null +++ b/net/unfs3/files/patch-Extras_Makefile.in @@ -0,0 +1,9 @@ +--- Extras/Makefile.in.orig 2026-03-22 15:37:30 UTC ++++ Extras/Makefile.in +@@ -1,5 +1,5 @@ + CC = @CC@ +-CFLAGS = @CFLAGS@ @TIRPC_CFLAGS@ ++CFLAGS = @CFLAGS@ + AR = ar + RM = rm -f + diff --git a/net/unfs3/files/patch-Makefile.in b/net/unfs3/files/patch-Makefile.in new file mode 100644 index 000000000000..2036296fa3fc --- /dev/null +++ b/net/unfs3/files/patch-Makefile.in @@ -0,0 +1,38 @@ +--- Makefile.in.orig 2025-03-28 08:56:00 UTC ++++ Makefile.in +@@ -1,5 +1,5 @@ + CC = @CC@ +-CFLAGS = @CFLAGS@ @AFS_INCLUDES@ @TIRPC_CFLAGS@ -D_GNU_SOURCE -I. ++CFLAGS = @CFLAGS@ @AFS_INCLUDES@ -D_GNU_SOURCE -I. + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + VERSION = @PACKAGE_VERSION@ +@@ -12,7 +12,7 @@ + md5.o mount.o nfs.o password.o readdir.o user.o xdr.o winsupport.o + CONFOBJ = Config/lib.a + EXTRAOBJ = @EXTRAOBJ@ +-LDFLAGS = @LDFLAGS@ @LIBS@ @AFS_LIBS@ @TIRPC_LIBS@ ++LDFLAGS = @LDFLAGS@ @LIBS@ @AFS_LIBS@ + EXEEXT = @EXEEXT@ + + srcdir = @srcdir@ +@@ -29,17 +29,16 @@ + + VPATH = $(srcdir) + +-.PHONY: FORCE + + all: unfsd$(EXEEXT) + + unfsd$(EXEEXT): $(OBJS) $(CONFOBJ) $(EXTRAOBJ) + $(CC) -o $@ $(OBJS) $(CONFOBJ) $(EXTRAOBJ) $(LDFLAGS) + +-$(CONFOBJ): FORCE ++$(CONFOBJ): + $(MAKE) -C $(@D) + +-$(EXTRAOBJ): FORCE ++$(EXTRAOBJ): + $(MAKE) -C $(@D) + + install: diff --git a/net/unfs3/files/patch-attr.c b/net/unfs3/files/patch-attr.c deleted file mode 100644 index 345f376e38ed..000000000000 --- a/net/unfs3/files/patch-attr.c +++ /dev/null @@ -1,11 +0,0 @@ ---- attr.c.orig 2022-11-17 12:28:15 UTC -+++ attr.c -@@ -7,6 +7,8 @@ - - #include "config.h" - -+#include -+#include - #include - #include - #include diff --git a/net/unfs3/files/patch-configure.ac b/net/unfs3/files/patch-configure.ac index 1c75fd70cebe..dee3f0c14dd6 100644 --- a/net/unfs3/files/patch-configure.ac +++ b/net/unfs3/files/patch-configure.ac @@ -1,17 +1,18 @@ ---- configure.ac.orig 2019-06-12 14:22:57 UTC +--- configure.ac.orig 2026-03-22 15:24:10 UTC +++ configure.ac -@@ -31,14 +31,12 @@ AC_CHECK_FUNCS(xdr_int xdr_u_int) - AC_CHECK_FUNCS(xdr_int32 xdr_int32_t) - AC_CHECK_FUNCS(xdr_uint32 xdr_uint32_t xdr_u_int32_t) - AC_CHECK_FUNCS(xdr_uint64 xdr_uint64_t xdr_u_int64_t) --AC_CHECK_FUNCS(svc_getreq_poll) - AC_CHECK_FUNCS(statvfs) - AC_CHECK_FUNCS(seteuid setegid) - AC_CHECK_FUNCS(setresuid setresgid) - AC_CHECK_FUNCS(vsyslog) - AC_CHECK_FUNCS(lchown) - AC_CHECK_FUNCS(setgroups) --UNFS3_SOLARIS_RPC - UNFS3_PORTMAP_DEFINE +@@ -47,15 +47,8 @@ + AC_CHECK_FUNCS(lutimes) UNFS3_COMPILE_WARNINGS +-PKG_CHECK_MODULES([TIRPC], [libtirpc]) +-AC_SUBST(TIRPC_CFLAGS) +-AC_SUBST(TIRPC_LIBS) +- + saved_CPPFLAGS="$CPPFLAGS" + saved_LIBS="$LIBS" +-CPPFLAGS="$CPPFLAGS $TIRPC_CFLAGS" +-LIBS="$LIBS $TIRPC_LIBS" +-AC_CHECK_FUNCS(svc_getreq_poll) + # Old libtirpc has not implement poll() fully + AC_CHECK_DECLS(svc_pollfd,,,[#include ]) + CPPFLAGS="$saved_CPPFLAGS" diff --git a/net/unfs3/files/patch-fh.c b/net/unfs3/files/patch-fh.c deleted file mode 100644 index 0d0abaa701b2..000000000000 --- a/net/unfs3/files/patch-fh.c +++ /dev/null @@ -1,29 +0,0 @@ ---- fh.c.orig 2022-11-17 12:27:07 UTC -+++ fh.c -@@ -86,7 +86,7 @@ uint32 get_gen(backend_statstruct obuf, U(int fd), U(c - backend_setegid(0); - backend_seteuid(0); - -- if (fd != FD_NONE) { -+ if (fd != -1) { - res = ioctl(fd, EXT2_IOC_GETVERSION, &gen); - if (res == -1) - gen = 0; -@@ -220,7 +220,7 @@ unfs3_fh_t fh_comp_raw(const char *path, struct svc_re - - fh.dev = buf.st_dev; - fh.ino = buf.st_ino; -- fh.gen = backend_get_gen(buf, FD_NONE, path); -+ fh.gen = backend_get_gen(buf, -1, path); - - /* special case for root directory */ - if (strcmp(path, "/") == 0) -@@ -341,7 +341,7 @@ post_op_fh3 fh_extend_type(nfs_fh3 fh, const char *pat - st_cache = buf; - - return fh_extend_post(fh, buf.st_dev, buf.st_ino, -- backend_get_gen(buf, FD_NONE, path)); -+ backend_get_gen(buf, -1, path)); - } - - /* diff --git a/net/unfs3/files/patch-md5.c b/net/unfs3/files/patch-md5.c deleted file mode 100644 index b2342754c4d5..000000000000 --- a/net/unfs3/files/patch-md5.c +++ /dev/null @@ -1,19 +0,0 @@ ---- md5.c.orig 2022-11-17 12:35:16 UTC -+++ md5.c -@@ -54,6 +54,7 @@ - - #include "md5.h" - #include -+#include - - #undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, - 0 = unknown */ -@@ -162,7 +163,7 @@ static void md5_process(md5_state_t * pms, const md5_b - * On little-endian machines, we can process properly aligned - * data without copying it. - */ -- if (!((data - (const md5_byte_t *) 0) & 3)) { -+ if (((uintptr_t)data & 3) == 0) { - /* data are properly aligned */ - X = (const md5_word_t *) data; - } else { diff --git a/net/unfs3/files/patch-nfs.c b/net/unfs3/files/patch-nfs.c deleted file mode 100644 index 7e736437b6b8..000000000000 --- a/net/unfs3/files/patch-nfs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs.c.orig 2022-11-17 12:27:52 UTC -+++ nfs.c -@@ -209,7 +209,7 @@ LOOKUP3res *nfsproc3_lookup_3_svc(LOOKUP3args * argp, - strcmp(argp->what.name, "..") == 0) { - fh = fh_comp_ptr(obj, rqstp, 0); - } else { -- gen = backend_get_gen(buf, FD_NONE, obj); -+ gen = backend_get_gen(buf, -1, obj); - fh = fh_extend(argp->what.dir, buf.st_dev, buf.st_ino, gen); - fh_cache_add(buf.st_dev, buf.st_ino, obj); - }